Commit 55dbbbbe authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge changes If529f310,I0f4a8202

* changes:
  configure: test for -mssse3
  configure: factorize gcc machine option checks
parents 4b41800d f1e8d58a
...@@ -378,6 +378,19 @@ EOF ...@@ -378,6 +378,19 @@ EOF
fi fi
} }
# tests for -m$1 toggling the feature given in $2. If $2 is empty $1 is used.
check_gcc_machine_option() {
local opt="$1"
local feature="$2"
[ -n "$feature" ] || feature="$opt"
if enabled gcc && ! disabled "$feature" && ! check_cflags "-m$opt"; then
RTCD_OPTIONS="${RTCD_OPTIONS}--disable-$feature "
else
soft_enable "$feature"
fi
}
write_common_config_banner() { write_common_config_banner() {
print_webm_license config.mk "##" "" print_webm_license config.mk "##" ""
echo '# This file automatically generated by configure. Do not edit!' >> config.mk echo '# This file automatically generated by configure. Do not edit!' >> config.mk
...@@ -1093,26 +1106,12 @@ EOF ...@@ -1093,26 +1106,12 @@ EOF
soft_enable sse soft_enable sse
soft_enable sse2 soft_enable sse2
soft_enable sse3 soft_enable sse3
soft_enable ssse3
# We can't use 'check_cflags' until the compiler is configured and CC is # We can't use 'check_cflags' until the compiler is configured and CC is
# populated. # populated.
if enabled gcc && ! disabled sse4_1 && ! check_cflags -msse4; then check_gcc_machine_option ssse3
RTCD_OPTIONS="${RTCD_OPTIONS}--disable-sse4_1 " check_gcc_machine_option sse4 sse4_1
else check_gcc_machine_option avx
soft_enable sse4_1 check_gcc_machine_option avx2
fi
if enabled gcc && ! disabled avx && ! check_cflags -mavx; then
RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx "
else
soft_enable avx
fi
if enabled gcc && ! disabled avx2 && ! check_cflags -mavx2; then
RTCD_OPTIONS="${RTCD_OPTIONS}--disable-avx2 "
else
soft_enable avx2
fi
case "${AS}" in case "${AS}" in
auto|"") auto|"")
......
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