diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-01-27 15:38:04 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-01-27 15:38:04 -0500 |
| commit | 02bd40d552f6c3f56db43ea63f06ae4312a8e48a (patch) | |
| tree | beae214fccca9f8716d47b5992480090d04548a3 /src/base/compiler.hh | |
| parent | 5c7bf74c073d0aea808046d10dfcaa6c319217a3 (diff) | |
| download | gem5-02bd40d552f6c3f56db43ea63f06ae4312a8e48a.tar.xz | |
While I'm waiting for legion to run make m5 compile with a few more compilers
SConstruct:
src/SConscript:
Add flags for Intel CC while i'm at it
src/base/compiler.hh:
the _Pragma stuff needst to be called this way unless someone happens to have a cleaner way
src/base/cprintf_formats.hh:
add std:: where appropriate
src/base/statistics.hh:
use this->map since icc was getting confused about std::map vs the locally defined map
src/cpu/static_inst.hh:
Add some more dummy returns where needed
src/mem/packet.hh:
add more dummy returns where needed
src/sim/host.hh:
use limits to come up with max tick
--HG--
extra : convert_revision : 08e9f7898b29fb9d063136529afb9b6abceab60c
Diffstat (limited to 'src/base/compiler.hh')
| -rw-r--r-- | src/base/compiler.hh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/base/compiler.hh b/src/base/compiler.hh index 5f2e9d7af..dc23ed7b3 100644 --- a/src/base/compiler.hh +++ b/src/base/compiler.hh @@ -44,7 +44,8 @@ // 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_PRAGMA_NORETURN(x) DO_PRAGMA(does_not_return(x)) #else #error "Need to define compiler options in base/compiler.hh" #endif |