diff options
author | unknown <df@pippilotta.erinye.com> | 2007-03-21 15:00:30 +0100 |
---|---|---|
committer | unknown <df@pippilotta.erinye.com> | 2007-03-21 15:00:30 +0100 |
commit | 7ee021e100ef2cd951eecd00a7b03cb52e354a09 (patch) | |
tree | af1faf59f44ef77e4d41138801f33c383761a4ac /BUILD/check-cpu | |
parent | e5f2e2632da9d6e6e9ba4ea77d1a767c0c0c5a07 (diff) | |
parent | f52dcd1a85c41540df3957c78f975e40e57cd731 (diff) | |
download | mariadb-git-7ee021e100ef2cd951eecd00a7b03cb52e354a09.tar.gz |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
BUILD/check-cpu:
Auto merged
Diffstat (limited to 'BUILD/check-cpu')
-rwxr-xr-x | BUILD/check-cpu | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index 3fded0a680f..96ed1d0e08f 100755 --- 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 - 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-*) - check_cpu_args='-mtune=$cpu_arg' + 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="" |