sim: ppc: replace local NORETURN macros with common one

Drop local NORETURN macro with the common ansidecl.h ATTRIBUTE_NORETURN define.

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 4f54f77273bd15d2b45a1492dc94b77f741fa7a1..f40504ebcfe48992b0facbd84b099df8dae26c06 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,10 @@
+2021-06-16  Mike Frysinger  <vapier@gentoo.org>
+
+       * basics.h (NORETURN): Delete.
+       * sim_callbacks.h: Include ansidecl.h.  Change NORETURN to
+       ATTRIBUTE_NORETURN.
+       * sim_calls.c: Likewise.
+
 2021-06-16  Mike Frysinger  <vapier@gentoo.org>
 
        * basics.h (UNUSED): Delete.

diff --git a/sim/ppc/basics.h b/sim/ppc/basics.h
index a6a35ca688adfd5715409731d505f920f69f419d..7b785b21f0c975f5d4261954bc1caf117f23230b 100644 (file)
--- a/sim/ppc/basics.h
+++ b/sim/ppc/basics.h
@@ -83,10 +83,6 @@ typedef enum {
 #include <stdlib.h>
 
 
-#ifndef NORETURN
-#define NORETURN
-#endif
-
 #if !defined (__attribute__)
 #if (!defined(__GNUC__) \
      || (__GNUC__ < 2) \

diff --git a/sim/ppc/sim_callbacks.h b/sim/ppc/sim_callbacks.h
index 61c6e2f42142c72b960292c4fe9bc678db05b938..e4d9c70bb016d29313e1d1338cfb7d78d51a0f5e 100644 (file)
--- a/sim/ppc/sim_callbacks.h
+++ b/sim/ppc/sim_callbacks.h
@@ -21,6 +21,8 @@
 #ifndef _SIM_CALLBACKS_H_
 #define _SIM_CALLBACKS_H_
 
+#include "ansidecl.h"
+
 /* Simulator output:
 
    Functions to report diagnostic information to the user. */
@@ -29,7 +31,7 @@
 void sim_io_printf_filtered
 (const char *msg, ...) __attribute__ ((format (printf, 1, 2)));
 
-void NORETURN error
+void ATTRIBUTE_NORETURN error
 (const char *msg, ...);
 
 

diff --git a/sim/ppc/sim_calls.c b/sim/ppc/sim_calls.c
index ce4464aa8eabe25dda37747929a53ba6e61eb26c..14d4d6586c78d0a1b8e1c865aa8244c274f36b93 100644 (file)
--- a/sim/ppc/sim_calls.c
+++ b/sim/ppc/sim_calls.c
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "ansidecl.h"
 #include "libiberty.h"
 #include "bfd.h"
 #include "sim/callback.h"
@@ -383,7 +384,7 @@ sim_io_error (SIM_DESC sd, const char *fmt, ...)
 
 /****/
 
-void NORETURN
+void ATTRIBUTE_NORETURN
 error (const char *msg, ...)
 {
   va_list ap;