Make sure the effect of "pic" / "no-pic" is used with assembler compilations
authorRichard Levitte <levitte@openssl.org>
Fri, 4 Mar 2016 14:36:07 +0000 (15:36 +0100)
committerRichard Levitte <levitte@openssl.org>
Wed, 9 Mar 2016 11:33:23 +0000 (12:33 +0100)
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>
18 files changed:
crypto/Makefile.in
crypto/aes/Makefile.in
crypto/bf/Makefile.in
crypto/bn/Makefile.in
crypto/camellia/Makefile.in
crypto/cast/Makefile.in
crypto/chacha/Makefile.in
crypto/des/Makefile.in
crypto/ec/Makefile.in
crypto/md5/Makefile.in
crypto/modes/Makefile.in
crypto/poly1305/Makefile.in
crypto/rc4/Makefile.in
crypto/rc5/Makefile.in
crypto/ripemd/Makefile.in
crypto/sha/Makefile.in
crypto/whrlpool/Makefile.in
engines/Makefile.in

index 7a5a988..8c54e77 100644 (file)
@@ -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=
index 0439245..46566c3 100644 (file)
@@ -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
index 398844a..4a3d726 100644 (file)
@@ -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
index 6ae831c..85b7d56 100644 (file)
@@ -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
index e809152..cb62c91 100644 (file)
@@ -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
index c43eecb..f1ad0c7 100644 (file)
@@ -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
index c34224c..e728b4d 100644 (file)
@@ -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
index 93a715a..74c5862 100644 (file)
@@ -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
index 48091d2..4203b70 100644 (file)
@@ -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
index 7e13a04..9c3fb1f 100644 (file)
@@ -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
index c37a8c8..581896d 100644 (file)
@@ -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
index e27fcaf..03bde08 100644 (file)
@@ -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
index 00e39ec..0d4952c 100644 (file)
@@ -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
index 501b118..a440fda 100644 (file)
@@ -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
index ba77fe4..a0135b3 100644 (file)
@@ -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
index e2d20aa..9041c3c 100644 (file)
@@ -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
index fa51f08..4e16f7d 100644 (file)
@@ -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
index cc61427..aaffe1e 100644 (file)
@@ -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