Amend all subdirs' Makefiles to use compiler flags chosen for CPU

This commit only applies to autoconf builds. Closes #5598
openwall · Dec 3, 2024 · f88688e · f88688e
1 parent 40752fe
commit f88688e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/ed25519-donna/Makefile.in b/src/ed25519-donna/Makefile.in
@@ -5,7 +5,7 @@ AS = @CC@
 LD = @CC@
 CPP = @CC@
 CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@ @CFLAGS_EXTRA@ @OPENSSL_CFLAGS@ -Wno-unused-function
+CFLAGS = -c -DAC_BUILT @CC_CPU@ @CC_MAIN_CPU@ @CFLAGS@ @JOHN_NO_SIMD@ @CFLAGS_EXTRA@ @OPENSSL_CFLAGS@ @OPENMP_CFLAGS@ @HAVE_MPI@ @PTHREAD_CFLAGS@ @CPPFLAGS@ -Wno-unused-function
 ASFLAGS = @ASFLAGS@ -c @EXTRA_AS_FLAGS@
 LDFLAGS = @LDFLAGS@ @OPENSSL_LIBS@
 AR = @AR@

diff --git a/src/mbedtls/Makefile.in b/src/mbedtls/Makefile.in
@@ -3,7 +3,7 @@ CC = @CC@
 AS = @CC@
 LD = @CC@
 CPP = @CC@
-CFLAGS = @CFLAGS@ @CFLAGS_EXTRA@ @JOHN_NO_SIMD@ -std=c99
+CFLAGS = -c -DAC_BUILT @CC_CPU@ @CC_MAIN_CPU@ @CFLAGS@ @JOHN_NO_SIMD@ @CFLAGS_EXTRA@ @OPENSSL_CFLAGS@ @OPENMP_CFLAGS@ @HAVE_MPI@ @PTHREAD_CFLAGS@ @CPPFLAGS@ -std=c99
 ASFLAGS = @ASFLAGS@ -c @EXTRA_AS_FLAGS@
 LDFLAGS = @LDFLAGS@
 AR = @AR@

diff --git a/src/poly1305-donna/Makefile.in b/src/poly1305-donna/Makefile.in
@@ -5,7 +5,7 @@ AS = @CC@
 LD = @CC@
 CPP = @CC@
 CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@ @CFLAGS_EXTRA@ -Wno-unused-function
+CFLAGS = -c -DAC_BUILT @CC_CPU@ @CC_MAIN_CPU@ @CFLAGS@ @JOHN_NO_SIMD@ @CFLAGS_EXTRA@ @OPENSSL_CFLAGS@ @OPENMP_CFLAGS@ @HAVE_MPI@ @PTHREAD_CFLAGS@ @CPPFLAGS@ -Wno-unused-function
 ASFLAGS = @ASFLAGS@ -c @EXTRA_AS_FLAGS@
 LDFLAGS = @LDFLAGS@
 AR = @AR@

diff --git a/src/secp256k1/Makefile.in b/src/secp256k1/Makefile.in
@@ -4,7 +4,7 @@ CXX = @CXX@
 AS = @CC@
 LD = @CC@
 CPP = @CC@
-CFLAGS = @CFLAGS@ @CFLAGS_EXTRA@ @OPENSSL_CFLAGS@ -Wno-unused-function
+CFLAGS = -c -DAC_BUILT @CC_CPU@ @CC_MAIN_CPU@ @CFLAGS@ @JOHN_NO_SIMD@ @CFLAGS_EXTRA@ @OPENSSL_CFLAGS@ @OPENMP_CFLAGS@ @HAVE_MPI@ @PTHREAD_CFLAGS@ @CPPFLAGS@ -Wno-unused-function
 ASFLAGS = @ASFLAGS@ -c @EXTRA_AS_FLAGS@
 LDFLAGS = @LDFLAGS@ @OPENSSL_LIBS@
 AR = @AR@

diff --git a/src/ztex/Makefile.in b/src/ztex/Makefile.in
@@ -5,7 +5,7 @@
 # modification, are permitted.
 
 CC = gcc
-CFLAGS = -c -Wall -O2 -g
+CFLAGS = -c -DAC_BUILT @CC_CPU@ @CC_MAIN_CPU@ @CFLAGS@ @JOHN_NO_SIMD@ @CFLAGS_EXTRA@ @OPENSSL_CFLAGS@ @OPENMP_CFLAGS@ @HAVE_MPI@ @PTHREAD_CFLAGS@ @CPPFLAGS@
 CFLAGS_TEST = -O
 #LD = ld
 RM = /bin/rm -f