Make sure the effect of "pic" / "no-pic" is used with assembler compilations

Before the 'Introduce the "pic" / "no-pic" config option' commit, the
shared_cflag value for the chosen config would be part of the make
variable CFLAG, which got replicated into CFLAGS and ASFLAGS.

Since said commit, the shared_cflag value has become a make variable
of its own, SHARED_CFLAG (which is left empty in a "no-pic" build).

However, ASFLAGS was forgotten.  That's what's corrected with this
change.

Reviewed-by: Andy Polyakov <appro@openssl.org>

diff --git a/crypto/Makefile.in b/crypto/Makefile.in
index 7a5a9889b4620e135a7a2bf5183a51413b473823..8c54e77107de4d63b93b17c23d610c1b36478a30 100644 (file)
--- a/crypto/Makefile.in
+++ b/crypto/Makefile.in
@@ -22,7 +22,7 @@ PLIB_LDFLAG=
 EX_LIBS=
 
 CFLAGS= $(INCLUDE) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDE) $(ASFLAG)
+ASFLAGS= $(INCLUDE) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS=$(ASFLAGS)
 CPUID_OBJ=mem_clr.o
 UPLINK_OBJ=

diff --git a/crypto/aes/Makefile.in b/crypto/aes/Makefile.in
index 0439245458be712016c77645bd00c67562de3a5a..46566c36084ac2a4d91dc084a5a2f875e4f303ee 100644 (file)
--- a/crypto/aes/Makefile.in
+++ b/crypto/aes/Makefile.in
@@ -14,7 +14,7 @@ AR=           ar r
 AES_ENC=aes_core.o aes_cbc.o
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/bf/Makefile.in b/crypto/bf/Makefile.in
index 398844aaebf95bc0b7974e7e672664028a613248..4a3d726e5d008cf0a120102db790ae8e229d8fcb 100644 (file)
--- a/crypto/bf/Makefile.in
+++ b/crypto/bf/Makefile.in
@@ -14,7 +14,7 @@ AR=           ar r
 BF_ENC=                bf_enc.o
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/bn/Makefile.in b/crypto/bn/Makefile.in
index 6ae831ccda3978a371511eb6ec98a196d68a8efe..85b7d56f44430b1c3ef5d4278076de2c29bfaadb 100644 (file)
--- a/crypto/bn/Makefile.in
+++ b/crypto/bn/Makefile.in
@@ -14,7 +14,7 @@ AR=           ar r
 BN_ASM=                bn_asm.o
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/camellia/Makefile.in b/crypto/camellia/Makefile.in
index e8091524905a7a4f161a724ee82ac35e61e9e2a9..cb62c91cb309fcfdb51e2a181a9a7fcd22e7e726 100644 (file)
--- a/crypto/camellia/Makefile.in
+++ b/crypto/camellia/Makefile.in
@@ -14,7 +14,7 @@ AR=           ar r
 CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/cast/Makefile.in b/crypto/cast/Makefile.in
index c43eecb5e54a51fd5dfa2dace1c51e65876218ec..f1ad0c7f3ec66a5042e04df3a055a4828c58e75d 100644 (file)
--- a/crypto/cast/Makefile.in
+++ b/crypto/cast/Makefile.in
@@ -14,7 +14,7 @@ AR=           ar r
 CAST_ENC=c_enc.o
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/chacha/Makefile.in b/crypto/chacha/Makefile.in
index c34224cfc6841180ae472292a23d115038df45f0..e728b4d93b90739a5c173813aae3f36291bb8a98 100644 (file)
--- a/crypto/chacha/Makefile.in
+++ b/crypto/chacha/Makefile.in
@@ -13,7 +13,7 @@ AR=           ar r
 CHACHA_ENC=chacha_enc.o
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/des/Makefile.in b/crypto/des/Makefile.in
index 93a715a7fb64862b5fc47f43bfb092821e085b99..74c5862ab2ab7aa7f79c016c65b233658026b6ac 100644 (file)
--- a/crypto/des/Makefile.in
+++ b/crypto/des/Makefile.in
@@ -14,7 +14,7 @@ RANLIB=               ranlib
 DES_ENC=       des_enc.o fcrypt_b.o
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/ec/Makefile.in b/crypto/ec/Makefile.in
index 48091d21f0e793dca2bb3b25b3fc76c45933bd1c..4203b70f2e3a553fa297d6ff1722e9fd3a0a07c6 100644 (file)
--- a/crypto/ec/Makefile.in
+++ b/crypto/ec/Makefile.in
@@ -11,7 +11,7 @@ MAKEFILE=     Makefile
 AR=            ar r
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/md5/Makefile.in b/crypto/md5/Makefile.in
index 7e13a0467df7a7ff7d6a7850b0f7bb319f08b2ec..9c3fb1f85732efd8ade62e3da9f41b928f5d80a6 100644 (file)
--- a/crypto/md5/Makefile.in
+++ b/crypto/md5/Makefile.in
@@ -14,7 +14,7 @@ AR=             ar r
 MD5_ASM_OBJ=
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/modes/Makefile.in b/crypto/modes/Makefile.in
index c37a8c8306cee9999fb6f27b11d7f902433597cb..581896d2ad8b98be3ecec12cf3635feb51164d27 100644 (file)
--- a/crypto/modes/Makefile.in
+++ b/crypto/modes/Makefile.in
@@ -13,7 +13,7 @@ AR=           ar r
 MODES_ASM_OBJ=
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/poly1305/Makefile.in b/crypto/poly1305/Makefile.in
index e27fcafa318db411f4efcaf07299db23d0c54572..03bde0809170504eced1aec016dc2702f7c5f596 100644 (file)
--- a/crypto/poly1305/Makefile.in
+++ b/crypto/poly1305/Makefile.in
@@ -13,7 +13,7 @@ AR=           ar r
 POLY1305_ASM_OBJ=
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/rc4/Makefile.in b/crypto/rc4/Makefile.in
index 00e39ecb36d24cba48f3f58316285f833685fe27..0d4952c9ffde69a3bfb3d987442613e57e40f2f1 100644 (file)
--- a/crypto/rc4/Makefile.in
+++ b/crypto/rc4/Makefile.in
@@ -13,7 +13,7 @@ AR=           ar r
 RC4_ENC=rc4_enc.o rc4_skey.o
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/rc5/Makefile.in b/crypto/rc5/Makefile.in
index 501b118f7228631306800ddaeee3b285c1c1cf71..a440fda5b03a9ecb90208eb392611b02a48506a1 100644 (file)
--- a/crypto/rc5/Makefile.in
+++ b/crypto/rc5/Makefile.in
@@ -14,7 +14,7 @@ AR=           ar r
 RC5_ENC=               rc5_enc.o
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/ripemd/Makefile.in b/crypto/ripemd/Makefile.in
index ba77fe4f362e51bfff37fb6e0c44f2f98b3de84b..a0135b3079f748e3d7d63ce3d95de6158ff20ab4 100644 (file)
--- a/crypto/ripemd/Makefile.in
+++ b/crypto/ripemd/Makefile.in
@@ -14,7 +14,7 @@ AR=             ar r
 RIP_ASM_OBJ=
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/sha/Makefile.in b/crypto/sha/Makefile.in
index e2d20aa1c0202b7789a269eb8cecbcc7e28db079..9041c3cfa6301fd933e1bea3dc31ac1e11a9f86e 100644 (file)
--- a/crypto/sha/Makefile.in
+++ b/crypto/sha/Makefile.in
@@ -14,7 +14,7 @@ AR=             ar r
 SHA1_ASM_OBJ=
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/crypto/whrlpool/Makefile.in b/crypto/whrlpool/Makefile.in
index fa51f08f30607bb74b16e8d5fd11043fcaad4ad4..4e16f7d798977ad2056c7ebccf4ac2b8a5512b78 100644 (file)
--- a/crypto/whrlpool/Makefile.in
+++ b/crypto/whrlpool/Makefile.in
@@ -14,7 +14,7 @@ AR=           ar r
 WP_ASM_OBJ=wp_block.o
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile

diff --git a/engines/Makefile.in b/engines/Makefile.in
index cc614278fc0e91e3f4a68969445454017ad0c1f2..aaffe1e8dddb1db2214cddc2d5a7b0a76cec57a3 100644 (file)
--- a/engines/Makefile.in
+++ b/engines/Makefile.in
@@ -21,7 +21,7 @@ PLIB_LDFLAG=
 EX_LIBS=
 
 CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile engines.com install.com engine_vector.mar