diff options
| author | unknown <joerg@trift2.> | 2007-03-23 10:57:17 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-03-23 10:57:17 +0100 |
| commit | 4f5a822947a4a9e5aa8c2a223f3aa8de81496e35 (patch) | |
| tree | 36b7180c86dfeccae6ebcb449634f7aa1885cd80 /BUILD/check-cpu | |
| parent | 6f17f42c59e78e2bc618c7d00c661dea1d1c8a57 (diff) | |
| parent | cea1cf3251d7e98105c4b03a0836dabeaab528f6 (diff) | |
| download | mariadb-git-4f5a822947a4a9e5aa8c2a223f3aa8de81496e35.tar.gz | |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
BUILD/check-cpu:
Auto merged
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
Auto merged
BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c:
Auto merged
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'BUILD/check-cpu')
| -rwxr-xr-x | BUILD/check-cpu | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index 7bcb6815323..2852aa98ef3 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -165,26 +165,34 @@ check_cpu () { cc_ver=`$cc --version | sed 1q` cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g; s/^ *//g; s/ .*//g'` + set -- `echo $cc_verno | tr '.' ' '` + cc_major=$1 + cc_minor=$2 + cc_patch=$3 + cc_comp=`expr $cc_major '*' 100 '+' $cc_minor` case "$cc_ver--$cc_verno" in *GCC*) # 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_comp" -lt 304 + 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-*) - check_cpu_args='-mtune=$cpu_arg' + if test "$cc_comp" -lt 304 + then + check_cpu_args='-mcpu=$cpu_arg' + else + check_cpu_args='-mtune=$cpu_arg' + fi ;; *) check_cpu_cflags="" |