Merge with the main repository again.

[gem5.git] / src / base / compiler.hh

diff --git a/src/base/compiler.hh b/src/base/compiler.hh
index 2c655af608959070d0642cb30c6cb1fcfd3c206c..a95cb791c88aa7891b04d8be0a822b32d1dec02d 100644 (file)
--- a/src/base/compiler.hh
+++ b/src/base/compiler.hh
@@ -41,6 +41,8 @@
 #define M5_PRAGMA_NORETURN(x)
 #define M5_DUMMY_RETURN
 #define M5_VAR_USED __attribute__((unused))
+#define M5_ATTR_PACKED __attribute__ ((__packed__))
+#define M5_NO_INLINE __attribute__ ((__noinline__))
 #elif defined(__SUNPRO_CC)
 // this doesn't do anything with sun cc, but why not
 #define M5_ATTR_NORETURN  __sun_attr__((__noreturn__))
@@ -48,6 +50,8 @@
 #define DO_PRAGMA(x) _Pragma(#x)
 #define M5_VAR_USED
 #define M5_PRAGMA_NORETURN(x) DO_PRAGMA(does_not_return(x))
+#define M5_ATTR_PACKED __attribute__ ((__packed__))
+#define M5_NO_INLINE __attribute__ ((__noinline__))
 #else
 #error "Need to define compiler options in base/compiler.hh"
 #endif