diff options
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8d667849..2c907620 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -3,8 +3,11 @@ # Check that NASM exists and determine flags AC_DEFUN([AC_PROG_NASM],[ -AC_CHECK_PROGS(NASM, [nasm nasmw yasm]) -test -z "$NASM" && AC_MSG_ERROR([no nasm (Netwide Assembler) found]) +AC_ARG_VAR(NASM, [NASM command (used to build the x86/x86-64 SIMD code)]) +if test "x$NASM" = "x"; then + AC_CHECK_PROGS(NASM, [nasm nasmw yasm]) + test -z "$NASM" && AC_MSG_ERROR([no nasm (Netwide Assembler) found]) +fi AC_MSG_CHECKING([for object file format of host system]) case "$host_os" in @@ -219,14 +222,20 @@ AC_DEFUN([AC_CHECK_COMPATIBLE_ARM64_ASSEMBLER_IFELSE],[ CC="$CCAS" AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ .text - movi v0.16b, #100]])], ac_good_gnu_arm_assembler=yes) + MYVAR .req x0 + movi v0.16b, #100 + mov MYVAR, #100 + .unreq MYVAR]])], ac_good_gnu_arm_assembler=yes) ac_use_gas_preprocessor=no if test "x$ac_good_gnu_arm_assembler" = "xno" ; then CC="gas-preprocessor.pl $CCAS" AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ .text - movi v0.16b, #100]])], ac_use_gas_preprocessor=yes) + MYVAR .req x0 + movi v0.16b, #100 + mov MYVAR, #100 + .unreq MYVAR]])], ac_use_gas_preprocessor=yes) fi CFLAGS="$ac_save_CFLAGS" CC="$ac_save_CC" |