bk commit into 5.0 tree (df:1.2430) BUG#26701

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.0 repository of df. When df does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-19 16:15:47+01:00, df@stripped +1 -0
  Modify BUG#26701 patch and a different location to also use the correct arguments for
GCC 5 and 6.

  BUILD/check-cpu@stripped, 2007-03-19 16:15:46+01:00, df@stripped +11 -15
    case -> if ... -lt

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	df
# Host:	pippilotta.erinye.com
# Root:	/shared/home/df/mysql/build/mysql-5.0-build-work-26701

--- 1.19/BUILD/check-cpu	2007-03-01 20:58:50 +01:00
+++ 1.20/BUILD/check-cpu	2007-03-19 16:15:46 +01:00
@@ -166,27 +166,23 @@
         # 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=""