diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog
index 368f71968..02984a14e 100644
--- a/include/gdb/ChangeLog
+++ b/include/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-07  Hans-Peter Nilsson  <hp@axis.com>
+
+	* callback.h (struct host_callback_struct): Mark member error as
+	pointing to a noreturn function.
+
 2008-02-12  M Ranga Swami Reddy <MR.Swami.Reddy@nsc.com>
 
 	* sim-cr16.h: New file.
diff --git a/include/gdb/callback.h b/include/gdb/callback.h
index 5ae1d00c3..5ac48cef6 100644
--- a/include/gdb/callback.h
+++ b/include/gdb/callback.h
@@ -124,7 +124,11 @@ struct host_callback_struct
   /* Print an error message and "exit".
      In the case of gdb "exiting" means doing a longjmp back to the main
      command loop.  */
-  void (*error) PARAMS ((host_callback *, const char *, ...));
+  void (*error) PARAMS ((host_callback *, const char *, ...))
+#ifdef __GNUC__
+    __attribute__ ((__noreturn__))
+#endif
+    ;
 
   int last_errno;		/* host format */