From: Andreas Hansson <andreas.hansson@arm.com>
Date: Wed, 2 Oct 2013 10:08:43 +0000 (-0400)
Subject: ext: Fix fputils compiler flags to ensure ISO C99
X-Git-Tag: stable_2014_02_15~101
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2bcced58978bc698527f9c8cb4c6ca682c270d2f;p=gem5.git

ext: Fix fputils compiler flags to ensure ISO C99

The fp code relies on C99, and depending on gcc version, the default
is to use c89. This patch adds -std=c99 when using gcc to ensure the
code is compiled in ISO C99 mode.
---

diff --git a/ext/fputils/SConscript b/ext/fputils/SConscript
index 0d9f63adf..9c5685264 100644
--- a/ext/fputils/SConscript
+++ b/ext/fputils/SConscript
@@ -30,11 +30,19 @@
 
 Import('main')
 
-main.Library('fputils', [
-        main.SharedObject('fp80.c'),
+main.Prepend(CPPPATH=Dir('./include'))
+
+fpenv = main.Clone()
+
+# By default gcc uses c89 and clang uses c99. For fputils to compile
+# we need to use c99.
+if fpenv['GCC']:
+    fpenv.Append(CCFLAGS=['-std=c99'])
+
+fpenv.Library('fputils', [
+        fpenv.SharedObject('fp80.c'),
     ])
 
-main.Prepend(CPPPATH=Dir('./include'))
 main.Append(LIBS=['fputils'])
 main.Prepend(LIBPATH=[Dir('.')])