diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-03-21 14:58:12 +0100 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-03-21 14:58:12 +0100 |
| commit | 3c1f99e3da15a80ab0ee819df14ed4dbe4cb4965 (patch) | |
| tree | 709320683bbfa5944140725ad1a5c377922cbc15 /BUILD/check-cpu | |
| parent | 5439445c15c4bbf46048842c97264f7e0db18edd (diff) | |
| parent | f52dcd1a85c41540df3957c78f975e40e57cd731 (diff) | |
| download | mariadb-git-3c1f99e3da15a80ab0ee819df14ed4dbe4cb4965.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.1-build-work-26701
BUILD/check-cpu:
Auto merged
Diffstat (limited to 'BUILD/check-cpu')
| -rwxr-xr-x | BUILD/check-cpu | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index e1001409d15..155ddd6ecde 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -166,27 +166,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-*) - 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="" |