o3: correct the number of cc registers in rename map

[gem5.git] / ext / libelf / SConscript

diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript
index 7f33990d8ed7f3e7091ffd41e6bf2ee10090bb0c..a110602ccf8a70dfec9e8b4d3d2830df4e83cfe6 100644 (file)
--- a/ext/libelf/SConscript
+++ b/ext/libelf/SConscript
@@ -32,6 +32,8 @@ import os, subprocess
 
 Import('main')
 
+from m5.util import compareVersions
+
 elf_files = []
 def ElfFile(filename):
     elf_files.append(File(filename))
@@ -91,9 +93,17 @@ ElfFile('libelf_msize.c')
 
 m4env = main.Clone()
 if m4env['GCC']:
-    major,minor,dot = [int(x) for x in m4env['GCC_VERSION'].split('.')]
-    if major >= 4:
-        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'])
+if m4env['CLANG']:
+    m4env.Append(CCFLAGS=['-Wno-initializer-overrides', '-Wno-pointer-sign'])
+    # clang defaults to c99 (while gcc defaults to gnu89) and there is a
+    # difference in the handling of inlining functions which causes
+    # linking problems with multiple definitions of the symbols in
+    # sysmacros.h for older versions of glibc
+    m4env.Append(CCFLAGS=['-std=gnu89'])
 m4env.Append(CCFLAGS=['-Wno-implicit'])
 del m4env['CPPPATH']