From 2658b0853be98dafb9e0372fee15813834399d0b Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Thu, 1 Mar 2007 20:58:51 +0100
Subject: BUG#26701 check-cpu compile flags in x86-64 doesn't support gcc <
 3.4, apply suggestion from jocelyn fournier

---
 BUILD/check-cpu | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'BUILD')

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index 55f4e62327b..8c41b79a126 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -179,7 +179,14 @@ check_cpu () {
                     check_cpu_args='-mcpu=$cpu_arg -mtune=$cpu_arg'
             ;;
           x86_64-*)
-                    check_cpu_args='-mtune=$cpu_arg'
+                case "$cc_verno" in
+                      3.4*|3.5*|4.*)
+                            check_cpu_args='-mtune=$cpu_arg'
+                            ;;
+                      *)
+                            check_cpu_args='-mcpu=$cpu_arg'
+                            ;;
+            esac
             ;;
           *)
             check_cpu_cflags=""
-- 
cgit v1.2.1


From 1b84cb44b337df7c464831058e99d60585958022 Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Mon, 19 Mar 2007 16:15:47 +0100
Subject: Modify BUG#26701 patch and a different location to also use the
 correct arguments for GCC 5 and 6.

---
 BUILD/check-cpu | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'BUILD')

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index 8c41b79a126..f1c9bc51dc5 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -166,27 +166,23 @@ check_cpu () {
         # different gcc backends (and versions) have different CPU flags
         case `gcc -dumpmachine` in
           i?86-*)
-                case "$cc_verno" in
-                      3.4*|3.5*|4.*)
-                            check_cpu_args='-mtune=$cpu_arg -march=$cpu_arg'
-                            ;;
-                      *)
-                            check_cpu_args='-mcpu=$cpu_arg -march=$cpu_arg'
-                            ;;
-            esac
+	    if test "$cc_verno" -lt "3.4"
+            then
+                            check_cpu_args='-mcpu=$cpu_arg'
+            else
+                            check_cpu_args='-mtune=$cpu_arg'
+            fi
             ;;
           ppc-*)
                     check_cpu_args='-mcpu=$cpu_arg -mtune=$cpu_arg'
             ;;
           x86_64-*)
-                case "$cc_verno" in
-                      3.4*|3.5*|4.*)
-                            check_cpu_args='-mtune=$cpu_arg'
-                            ;;
-                      *)
+	    if test "$cc_verno" -lt "3.4"
+            then
                             check_cpu_args='-mcpu=$cpu_arg'
-                            ;;
-            esac
+            else
+                            check_cpu_args='-mtune=$cpu_arg'
+            fi
             ;;
           *)
             check_cpu_cflags=""
-- 
cgit v1.2.1