From c25c4a8b0e4a21b527424fa7f0675a858bf0a9e6 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun, 2 May 2010 23:52:14 +0000
Subject: gdb/ 	* cli/cli-cmds.h (error_no_arg): Remove.  Move the comment ...
 	* command.h (error_no_arg): ... here.  Remove NORETURN, change 
 ATTR_NORETURN to ATTRIBUTE_NORETURN. 	* defs.h (NORETURN, ATTR_NORETURN):
 Remove. 	(perror_with_name, verror, error, error_stream, vfatal, fatal)
 	(internal_verror, internal_error, nomem): Remove NORETURN, change 
 ATTR_NORETURN to ATTRIBUTE_NORETURN. 	* exceptions.c (throw_exception,
 deprecated_throw_reason, throw_verror) 	(throw_vfatal, throw_error):
 Remove NORETURN. 	(throw_it): Remove NORETURN, change ATTR_NORETURN to
 ATTRIBUTE_NORETURN. 	* exceptions.h (throw_exception, throw_verror,
 throw_vfatal) 	(throw_error, deprecated_throw_reason): Remove NORETURN,
 change 	ATTR_NORETURN to ATTRIBUTE_NORETURN. 	* linespec.c
 (cplusplus_error): Remove NORETURN, change ATTR_NORETURN 	to
 ATTRIBUTE_NORETURN for prototype, for the definition only remove 
 NORETURN. 	* remote-mips.c (mips_error): Change NORETURN to
 ATTRIBUTE_NORETURN. 	* remote-sim.c (gdb_os_error): Change ATTR_NORETURN to
 	ATTRIBUTE_NORETURN. 	* target.c (tcomplain): Likewise. 	*
 target.h (noprocess): Remove NORETURN, change ATTR_NORETURN to 
 ATTRIBUTE_NORETURN. 	* utils.c (verror, error, vfatal, fatal, error_stream,
 internal_verror) 	(internal_error, perror_with_name, nomem): Remove
 NORETURN. 	* xml-support.h (gdb_xml_error): Change ATTR_NORETURN to 
 ATTRIBUTE_NORETURN.

gdb/doc/
	* gdbint.texinfo (Host Definition): Remove items NORETURN and
	ATTR_NORETURN.
---
 gdb/utils.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'gdb/utils.c')

diff --git a/gdb/utils.c b/gdb/utils.c
index fcffabe..b4b85b1 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -806,13 +806,13 @@ warning (const char *string, ...)
    The first argument STRING is the error message, used as a fprintf string,
    and the remaining args are passed as arguments to it.  */
 
-NORETURN void
+void
 verror (const char *string, va_list args)
 {
   throw_verror (GENERIC_ERROR, string, args);
 }
 
-NORETURN void
+void
 error (const char *string, ...)
 {
   va_list args;
@@ -825,13 +825,13 @@ error (const char *string, ...)
    The first argument STRING is the error message, used as a fprintf string,
    and the remaining args are passed as arguments to it.  */
 
-NORETURN void
+void
 vfatal (const char *string, va_list args)
 {
   throw_vfatal (string, args);
 }
 
-NORETURN void
+void
 fatal (const char *string, ...)
 {
   va_list args;
@@ -840,7 +840,7 @@ fatal (const char *string, ...)
   va_end (args);
 }
 
-NORETURN void
+void
 error_stream (struct ui_file *stream)
 {
   char *message = ui_file_xstrdup (stream, NULL);
@@ -1036,14 +1036,14 @@ static struct internal_problem internal_error_problem = {
   "internal-error", internal_problem_ask, internal_problem_ask
 };
 
-NORETURN void
+void
 internal_verror (const char *file, int line, const char *fmt, va_list ap)
 {
   internal_vproblem (&internal_error_problem, file, line, fmt, ap);
   deprecated_throw_reason (RETURN_ERROR);
 }
 
-NORETURN void
+void
 internal_error (const char *file, int line, const char *string, ...)
 {
   va_list ap;
@@ -1174,7 +1174,7 @@ Show whether GDB will create a core file of GDB when %s is detected"),
    as the file name for which the error was encountered.
    Then return to command level.  */
 
-NORETURN void
+void
 perror_with_name (const char *string)
 {
   char *err;
@@ -1240,7 +1240,7 @@ quit (void)
 /* Called when a memory allocation fails, with the number of bytes of
    memory requested in SIZE. */
 
-NORETURN void
+void
 nomem (long size)
 {
   if (size > 0)
-- 
cgit v1.1