nasm defaults to -Ox
No need to specify default behaviour. The original change introducing nasm:
https://chromium.googlesource.com/webm/libvpx/+/7be093ea4d50c8d38438f88cb9fa817c1c9de8dd
mentions requiring 2.0.9, which was the first release to default to this behaviour:
http://www.nasm.us/doc/nasmdoc2.html
"The -Ox mode is recommended for most uses, and is the default since NASM 2.09."
Cherry picked from libvpx 65df957 and cmake updated.
Change-Id: Ie860b37d070b0fbd7f61d20f527396ee796e826f
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index 96e39d7..4f17b4b 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -137,7 +137,6 @@
if (ENABLE_NASM)
find_program(AS_EXECUTABLE nasm $ENV{NASM_PATH})
test_nasm()
- set(AOM_AS_FLAGS ${AOM_AS_FLAGS} -Ox)
else ()
find_program(AS_EXECUTABLE yasm $ENV{YASM_PATH})
endif ()
diff --git a/build/cmake/aom_optimization.cmake b/build/cmake/aom_optimization.cmake
index c58c399..59b47e8 100644
--- a/build/cmake/aom_optimization.cmake
+++ b/build/cmake/aom_optimization.cmake
@@ -200,17 +200,11 @@
endfunction ()
# Terminates generation if nasm found in PATH does not meet requirements.
-# Currently checks only for presence of required object formats and support for
-# the -Ox argument (multipass optimization).
+# Currently checks only for presence of required object formats.
function (test_nasm)
execute_process(COMMAND ${AS_EXECUTABLE} -hf
OUTPUT_VARIABLE nasm_helptext)
- if (NOT "${nasm_helptext}" MATCHES "-Ox")
- message(FATAL_ERROR
- "Unsupported nasm: multipass optimization not supported.")
- endif ()
-
if ("${AOM_TARGET_CPU}" STREQUAL "x86")
if ("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
if (NOT "${nasm_helptext}" MATCHES "macho32")
diff --git a/build/make/configure.sh b/build/make/configure.sh
index 8ca2213..44c706f 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1267,7 +1267,6 @@
esac
log_echo " using $AS"
fi
- [ "${AS##*/}" = nasm ] && add_asflags -Ox
AS_SFX=.asm
case ${tgt_os} in
win32)
