Skip to content

M
mariadb
Commit 1b84cb44 authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files
Options

Modify BUG#26701 patch and a different location to also use the correct arguments for GCC 5 and 6.

parent 2658b085
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 15 deletions
BUILD/check-cpu
View file @ 1b84cb44
...@@ -166,27 +166,23 @@ check_cpu () { ...@@ -166,27 +166,23 @@ check_cpu () {
# different gcc backends (and versions) have different CPU flags # different gcc backends (and versions) have different CPU flags
case `gcc -dumpmachine` in case `gcc -dumpmachine` in
i?86-*) i?86-*)
case "$cc_verno" in if test "$cc_verno" -lt "3.4"
3.4*|3.5*|4.*) then
check_cpu_args='-mtune=$cpu_arg -march=$cpu_arg' check_cpu_args='-mcpu=$cpu_arg'
;; else
*) check_cpu_args='-mtune=$cpu_arg'
check_cpu_args='-mcpu=$cpu_arg -march=$cpu_arg' fi
;;
esac
;; ;;
ppc-*) ppc-*)
check_cpu_args='-mcpu=$cpu_arg -mtune=$cpu_arg' check_cpu_args='-mcpu=$cpu_arg -mtune=$cpu_arg'
;; ;;
x86_64-*) x86_64-*)
case "$cc_verno" in if test "$cc_verno" -lt "3.4"
3.4*|3.5*|4.*) then
check_cpu_args='-mtune=$cpu_arg'
;;
*)
check_cpu_args='-mcpu=$cpu_arg' check_cpu_args='-mcpu=$cpu_arg'
;; else
esac check_cpu_args='-mtune=$cpu_arg'
fi
;; ;;
*) *)
check_cpu_cflags="" check_cpu_cflags=""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7