diff options
| author | df@pippilotta.erinye.com <> | 2007-03-19 16:15:47 +0100 |
|---|---|---|
| committer | df@pippilotta.erinye.com <> | 2007-03-19 16:15:47 +0100 |
| commit | 1b84cb44b337df7c464831058e99d60585958022 (patch) | |
| tree | ad976cc5024ebba65bbf359c30bfbbd3ee78b624 /BUILD/check-cpu | |
| parent | 2658b0853be98dafb9e0372fee15813834399d0b (diff) | |
| download | mariadb-git-1b84cb44b337df7c464831058e99d60585958022.tar.gz | |
Modify BUG#26701 patch and a different location to also use the correct arguments for GCC 5 and 6.
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 8c41b79a126..f1c9bc51dc5 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="" |