* cgen-mem.h (DECLARE_GETT): Don't inline.

	(DECLARE_SETT): Ditto.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index a684da5c5cb3af40ce2a6013958850f5c995f5fd..7b10e9536d5e48d0388127d557a5af43baa40cfe 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-05  Doug Evans  <dje@sebabeach.org>
+
+       * cgen-mem.h (DECLARE_GETT): Don't inline.
+       (DECLARE_SETT): Ditto.
+
 2009-10-15  Joel Sherrill <joel.sherrill@oarcorp.com>
 
        * sim-inline.h: Fix spelling error.

diff --git a/sim/common/cgen-mem.h b/sim/common/cgen-mem.h
index 81bf943690083fb9e775f967c0cc98145f85726f..b7f767f43fcc0ad4e3b9db367fe5220d36fb29b2 100644 (file)
--- a/sim/common/cgen-mem.h
+++ b/sim/common/cgen-mem.h
@@ -160,9 +160,9 @@ DECLARE_SETMEM (DF, 8) /* TAGS: SETMEMDF */
    This needn't be very efficient (i.e. can call memcpy) as this is
    only used when interfacing with the outside world (e.g. gdb).  */
 
-#if defined (__GNUC__) || defined (MEMOPS_DEFINE_INLINE)
+#if defined (MEMOPS_DEFINE_INLINE)
 #define DECLARE_GETT(mode, size) \
-MEMOPS_INLINE mode \
+mode \
 XCONCAT2 (GETT,mode) (unsigned char *p) \
 { \
   mode tmp; \
@@ -195,9 +195,9 @@ DECLARE_GETT (TF, 16) /* TAGS: GETTTF */
    This needn't be very efficient (i.e. can call memcpy) as this is
    only used when interfacing with the outside world (e.g. gdb).  */
 
-#if defined (__GNUC__) || defined (MEMOPS_DEFINE_INLINE)
+#if defined (MEMOPS_DEFINE_INLINE)
 #define DECLARE_SETT(mode, size) \
-MEMOPS_INLINE void \
+void \
 XCONCAT2 (SETT,mode) (unsigned char *buf, mode val) \
 { \
   mode tmp; \
@@ -206,7 +206,7 @@ XCONCAT2 (SETT,mode) (unsigned char *buf, mode val) \
 }
 #else
 #define DECLARE_SETT(mode, size) \
-extern mode XCONCAT2 (GETT,mode) (unsigned char *, mode);
+extern mode XCONCAT2 (SETT,mode) (unsigned char *, mode);
 #endif
 
 DECLARE_SETT (QI, 1)  /* TAGS: SETTQI */