[SM-Commit] GIT changes to master archspecs by Eric Sandall (2d9db7c5f066d330b94d5c324dc6a8835de1c79d)

Eric Sandall scm at sourcemage.org
Mon Mar 16 15:11:11 EDT 2009


GIT changes to master archspecs by Eric Sandall <sandalle at sourcemage.org>:

 32/ia32/intel/em64t/core2_32   |    6 ++----
 64/x86_64/intel/em64t/core2_64 |    6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 2d9db7c5f066d330b94d5c324dc6a8835de1c79d
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Make core2_{32,64} future proof (e.g. for gcc 4.4), thanks Jaka
    
    This does mean that if you are using a compiler version which we do not
    check for, that Sorcery will use the GCC 4.3+ -march=core2 flag and not
    fail back to -march=nocona (which your non-detected compiler version
    probably doesn't have anyways).

diff --git a/32/ia32/intel/em64t/core2_32 b/32/ia32/intel/em64t/core2_32
index 882f87a..a8f6306 100755
--- a/32/ia32/intel/em64t/core2_32
+++ b/32/ia32/intel/em64t/core2_32
@@ -1,13 +1,11 @@
 CPUNAME="Intel Core 2 with EM64T, 32bit mode"
 
-if use_gcc 4.3. ; then
-  CFLAGS="-march=core2 -m32"
-elif use_gcc 3.3. ; then
+if use_gcc 3.3. || use_gcc 3.4. || use_gcc 4.0. || use_gcc 4.1. || use_gcc 4.2.; then
   CFLAGS="-march=nocona -m32"
 elif use_gcc2 ; then
   CFLAGS="-march=i686"
 else
-  CFLAGS="-march=nocona -m32"
+  CFLAGS="-march=core2 -m32"
 fi
 
 HOST="i686-pc-linux-gnu"
diff --git a/64/x86_64/intel/em64t/core2_64 b/64/x86_64/intel/em64t/core2_64
index f4ffaac..53d2f9f 100755
--- a/64/x86_64/intel/em64t/core2_64
+++ b/64/x86_64/intel/em64t/core2_64
@@ -1,13 +1,11 @@
 CPUNAME="Intel Core 2 with EM64T"
 
-if use_gcc 4.3. ; then
-  CFLAGS="-march=core2 -fPIC -DPIC"
-elif use_gcc 3.3. ; then
+if use_gcc 3.3. || use_gcc 3.4. || use_gcc 4.0. || use_gcc 4.1. || use_gcc 4.2.; then
   CFLAGS="-march=nocona -fPIC -DPIC"
 elif use_gcc2 ; then
   CFLAGS="-march=i686"
 else
-  CFLAGS="-march=nocona -fPIC -DPIC"
+  CFLAGS="-march=core2 -fPIC -DPIC"
 fi
 
 HOST="x86_64-pc-linux-gnu"



More information about the SM-Commit mailing list