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: N Andy Polyakov <appro@openssl.org>

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: N Andy Polyakov <appro@openssl.org>
5b14d5b5 · Richard Levitte · a772e9d0 · 5b14d5b5 · 5b14d5b5 · 5b14d5b5
18 changed 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=

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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