common: cgen-mem/cgen-ops: fix extern inline handling

With newer versions of gcc (5.x), the extern inline we're using with the
cgen-{mem,ops} modules no longer work.  Since this code really wants the
gnu inline semantics, use that attribute explicitly.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 533634399caada8719906c5b1f0a053e7f405839..f4ca558dfcab15bab3e5e7c2fe39201a13a46515 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-31  Mike Frysinger  <vapier@gentoo.org>
+
+       * cgen-mem.h (MEMOPS_INLINE): Change to EXTERN_INLINE.
+       * cgen-ops.h (SEMOPS_INLINE): Likewise.
+
 2015-03-29  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-arange.h (SIM_ARANGE_INLINE): Move above sim_addr_range_hit_p.

diff --git a/sim/common/cgen-mem.h b/sim/common/cgen-mem.h
index 3245ca934d338cf3a689c7d2dcb958c8f441decb..5e4d4645d858b9af2a3d9286337dc97a238e3b67 100644 (file)
--- a/sim/common/cgen-mem.h
+++ b/sim/common/cgen-mem.h
@@ -20,10 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef CGEN_MEM_H
 #define CGEN_MEM_H
 
+/* TODO: This should get moved into sim-inline.h.  */
 #ifdef MEMOPS_DEFINE_INLINE
 #define MEMOPS_INLINE
 #else
-#define MEMOPS_INLINE extern inline
+#define MEMOPS_INLINE EXTERN_INLINE
 #endif
 
 /* Integer memory read support.

diff --git a/sim/common/cgen-ops.h b/sim/common/cgen-ops.h
index ef750ef8876779d627c4fe292a5d7b5754e67a8b..9f33d70ec8c12e8ab6ebc8c91ba364f27ab8c2b4 100644 (file)
--- a/sim/common/cgen-ops.h
+++ b/sim/common/cgen-ops.h
@@ -24,9 +24,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <assert.h>
 
+/* TODO: This should get moved into sim-inline.h.  */
 #if defined (__GNUC__) && ! defined (SEMOPS_DEFINE_INLINE)
 #define SEMOPS_DEFINE_INLINE
-#define SEMOPS_INLINE extern inline
+#define SEMOPS_INLINE EXTERN_INLINE
 #else
 #define SEMOPS_INLINE
 #endif