[binutils-gdb] sim: ppc: replace local NORETURN macros with common one

[Michael Frysinger]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6e57d0253200f0ad4f770fe2a82ab1995e6e5bc0

commit 6e57d0253200f0ad4f770fe2a82ab1995e6e5bc0
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Tue Jun 15 20:40:31 2021 -0400

    sim: ppc: replace local NORETURN macros with common one
    
    Drop local NORETURN macro with the common ansidecl.h ATTRIBUTE_NORETURN define.

Diff:
---
 sim/ppc/ChangeLog       | 7 +++++++
 sim/ppc/basics.h        | 4 ----
 sim/ppc/sim_callbacks.h | 4 +++-
 sim/ppc/sim_calls.c     | 3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 4f54f77273b..f40504ebcfe 100644
--- 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 a6a35ca688a..7b785b21f0c 100644
--- 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 61c6e2f4214..e4d9c70bb01 100644
--- 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 ce4464aa8ea..14d4d6586c7 100644
--- 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;