From: Richard Levitte Date: Fri, 4 Mar 2016 14:36:07 +0000 (+0100) Subject: Make sure the effect of "pic" / "no-pic" is used with assembler compilations X-Git-Tag: OpenSSL_1_1_0-pre4~163 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5b14d5b5a0271ec0063d57b90f7d0b14a87c94d2;p=oweals%2Fopenssl.git 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 --- diff --git a/crypto/Makefile.in b/crypto/Makefile.in index 7a5a9889b4..8c54e77107 100644 --- 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 0439245458..46566c3608 100644 --- 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 398844aaeb..4a3d726e5d 100644 --- 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 6ae831ccda..85b7d56f44 100644 --- 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 e809152490..cb62c91cb3 100644 --- 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 c43eecb5e5..f1ad0c7f3e 100644 --- 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 c34224cfc6..e728b4d93b 100644 --- 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 93a715a7fb..74c5862ab2 100644 --- 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 48091d21f0..4203b70f2e 100644 --- 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 7e13a0467d..9c3fb1f857 100644 --- 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 c37a8c8306..581896d2ad 100644 --- 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 e27fcafa31..03bde08091 100644 --- 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 00e39ecb36..0d4952c9ff 100644 --- 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 501b118f72..a440fda5b0 100644 --- 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 ba77fe4f36..a0135b3079 100644 --- 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 e2d20aa1c0..9041c3cfa6 100644 --- 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 fa51f08f30..4e16f7d798 100644 --- 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 cc614278fc..aaffe1e8dd 100644 --- 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