summaryrefslogtreecommitdiff
path: root/ext/libelf/SConscript
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2013-01-07 13:05:39 -0500
committerAndreas Hansson <andreas.hansson@arm.com>2013-01-07 13:05:39 -0500
commit406891c62a4948ddee3c83a18b5d1453b159953d (patch)
treec62c8fd60d86425dc579fc28b5e6857524228fa3 /ext/libelf/SConscript
parent221302335baa7bfb532aeb73bb37d2f802ecec25 (diff)
downloadgem5-406891c62a4948ddee3c83a18b5d1453b159953d.tar.xz
scons: Enforce gcc >= 4.4 or clang >= 2.9 and c++0x support
This patch checks that the compiler in use is either gcc >= 4.4 or clang >= 2.9. and enables building with --std=c++0x in all cases. As a consequence, we can tidy up the hashmap and always have static_assert available. If anyone wants to use alternative compilers, icc for example supports c++0x to a similar level and could be added if needed. This patch opens up for a more elaborate use of c++0x features that are present in gcc 4.4 and clang 2.9, e.g. auto typed variables, variadic templates, rvalues and move semantics, and strongly typed enums. There will be no going back on this one...
Diffstat (limited to 'ext/libelf/SConscript')
-rw-r--r--ext/libelf/SConscript3
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript
index ac91a3025..a110602cc 100644
--- a/ext/libelf/SConscript
+++ b/ext/libelf/SConscript
@@ -93,8 +93,7 @@ ElfFile('libelf_msize.c')
m4env = main.Clone()
if m4env['GCC']:
- if compareVersions(m4env['GCC_VERSION'], '4') >= 0:
- m4env.Append(CCFLAGS=['-Wno-pointer-sign'])
+ m4env.Append(CCFLAGS=['-Wno-pointer-sign'])
if compareVersions(m4env['GCC_VERSION'], '4.6') >= 0:
m4env.Append(CCFLAGS=['-Wno-unused-but-set-variable',
'-Wno-implicit-function-declaration'])