diff options
author | unknown <df@pippilotta.erinye.com> | 2007-03-21 15:00:55 +0100 |
---|---|---|
committer | unknown <df@pippilotta.erinye.com> | 2007-03-21 15:00:55 +0100 |
commit | 7dcf587c9f3ba3d6b2c2a4a9e701b2039c73c0c4 (patch) | |
tree | 95857bc98ead0e76f342d1a387fa594e82bcecc6 /BUILD | |
parent | e02c142a01f9fb1ec9da5689a9844997cf56d491 (diff) | |
parent | 3c1f99e3da15a80ab0ee819df14ed4dbe4cb4965 (diff) | |
download | mariadb-git-7dcf587c9f3ba3d6b2c2a4a9e701b2039c73c0c4.tar.gz |
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
BUILD/check-cpu:
Auto merged
Diffstat (limited to 'BUILD')
-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 24b76c7198d..4cb43b141d2 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="" |