Merge with head.

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

diff --git a/src/base/compiler.hh b/src/base/compiler.hh
index 5f2e9d7af245fd792588d2bd4871fbf90c36649b..2c655af608959070d0642cb30c6cb1fcfd3c206c 100644 (file)
--- a/src/base/compiler.hh
+++ b/src/base/compiler.hh
@@ -40,11 +40,14 @@
 #define M5_ATTR_NORETURN  __attribute__((noreturn))
 #define M5_PRAGMA_NORETURN(x)
 #define M5_DUMMY_RETURN
+#define M5_VAR_USED __attribute__((unused))
 #elif defined(__SUNPRO_CC)
 // this doesn't do anything with sun cc, but why not
 #define M5_ATTR_NORETURN  __sun_attr__((__noreturn__))
 #define M5_DUMMY_RETURN return (0);
-#define M5_PRAGMA_NORETURN(x) _Pragma("does_not_return(x)")
+#define DO_PRAGMA(x) _Pragma(#x)
+#define M5_VAR_USED
+#define M5_PRAGMA_NORETURN(x) DO_PRAGMA(does_not_return(x))
 #else
 #error "Need to define compiler options in base/compiler.hh"
 #endif