Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701

into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
90da5ed4 · df@pippilotta.erinye.com · f6c30190 · 4cae191d · 90da5ed4
Commit 90da5ed4 authored Mar 21, 2007 by df@pippilotta.erinye.com
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 9 deletions

BUILD/check-cpu BUILD/check-cpu +12 -9

No files found.
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -170,20 +170,23 @@ check_cpu () {
        # different gcc backends (and versions) have different CPU flags
        case `gcc -dumpmachine` in
          i?86-*)
-                case "$cc_verno" in
+	    if test "$cc_verno" -lt "3.4"
-                      3.4*|3.5*|4.*)
+            then
-                            check_cpu_args='-mtune=$cpu_arg -march=$cpu_arg'
+                            check_cpu_args='-mcpu=$cpu_arg'
-                            ;;
+            else
-                      *)
+                            check_cpu_args='-mtune=$cpu_arg'
-                            check_cpu_args='-mcpu=$cpu_arg -march=$cpu_arg'
+            fi
-                            ;;
-            esac
            ;;
          ppc-*)
                    check_cpu_args='-mcpu=$cpu_arg -mtune=$cpu_arg'
            ;;
          x86_64-*)
+	    if test "$cc_verno" -lt "3.4"
+            then
+                            check_cpu_args='-mcpu=$cpu_arg'
+            else
                            check_cpu_args='-mtune=$cpu_arg'
+            fi
            ;;
          *)
            check_cpu_cflags=""