Add ASM_FLAGS variable to configure.

diff --git a/ChangeLog b/ChangeLog
index 0246a7dc8080e713c801c73eff78672b6322daec..33f917e3c7e932cd58c1fcd33efc8c432540ce76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-11-07  Niels Möller  <nisse@lysator.liu.se>
+
+       * configure.ac (ASM_FLAGS): New configure environment variable.
+       * aclocal.m4 (GMP_TRY_ASSEMBLE): Use $ASM_FLAGS.
+       * config.make.in (ASM_FLAGS): Add substitution.
+       * Makefile.in: Use $(ASM_FLAGS) when compiling .asm files.
+
 2022-10-31  Niels Möller  <nisse@lysator.liu.se>
 
        * configure.ac: (asm_file_list): Add HAVE_NATIVE_poly1305_blocks.

diff --git a/Makefile.in b/Makefile.in
index f4069ab78f5ca7dee22a41505860e8460469ab8d..16ae452f107bdec65532a078c0e7bc2815625b24 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -298,7 +298,7 @@ libhogweed.a: $(hogweed_OBJS)
 
 %.$(OBJEXT): %.asm $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4
        $(M4) $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 $< >$*.s
-       $(COMPILE) -c $*.s
+       $(COMPILE) $(ASM_FLAGS) -c $*.s
 
 %.$(OBJEXT): %.c
        $(COMPILE) -c $< \

diff --git a/aclocal.m4 b/aclocal.m4
index 15977f10c98e2e71e981d5148cd6c4ccb952f59f..c87c3fa82a734ec6370e16f2e59dc3c8bea7be47 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -302,7 +302,7 @@ AC_DEFUN([GMP_TRY_ASSEMBLE],
 [cat >conftest.s <<EOF
 [$1]
 EOF
-gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1"
+gmp_assemble="$CC $CFLAGS $CPPFLAGS $ASM_FLAGS -c conftest.s >conftest.out 2>&1"
 if AC_TRY_EVAL(gmp_assemble); then
   cat conftest.out >&AC_FD_CC
   ifelse([$2],,:,[$2])

diff --git a/config.make.in b/config.make.in
index f8e1f74ef6f2de4552b30da983936e1eb0b156c4..6aec7c731095e128e1bf334d0b69f3e6e5704b64 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -8,6 +8,7 @@ CCPIC = @CCPIC@
 CPPFLAGS = @CPPFLAGS@
 DEFS = @DEFS@
 LDFLAGS = @LDFLAGS@
+ASM_FLAGS = @ASM_FLAGS@
 LIBS = @LIBS@
 LIBOBJS = @LIBOBJS@
 EMULATOR = @EMULATOR@

diff --git a/configure.ac b/configure.ac
index 4e9dcedaed2d39950815b6753d45c1871cd17519..d1f30ae846da78fc767de57a24f07669e3fd3e17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -121,6 +121,8 @@ AC_ARG_ENABLE(mini-gmp,
   AC_HELP_STRING([--enable-mini-gmp], [Enable mini-gmp, used instead of libgmp.]),,
   [enable_mini_gmp=no])
 
+AC_ARG_VAR(ASM_FLAGS, [Extra flags for processing assembly source files])
+
 if test "x$enable_mini_gmp" = xyes ; then
   NETTLE_USE_MINI_GMP=1
   HOGWEED_EXTRA_SYMBOLS="mpz_*;gmp_*;mpn_*;mp_*;"