QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-10 00:19:40 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Richard Levitte 2016-03-04 15:36:07 +01:00
parent a772e9d01a
commit 5b14d5b5a0
18 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/Makefile.in
View File

@ -22,7 +22,7 @@ PLIB_LDFLAG=
EX_LIBS= EX_LIBS=
CFLAGS= $(INCLUDE) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDE) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDE) $(ASFLAG) ASFLAGS= $(INCLUDE) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS=$(ASFLAGS) AFLAGS=$(ASFLAGS)
CPUID_OBJ=mem_clr.o CPUID_OBJ=mem_clr.o
UPLINK_OBJ= UPLINK_OBJ=

2
crypto/aes/Makefile.in
View File

@ -14,7 +14,7 @@ AR= ar r
AES_ENC=aes_core.o aes_cbc.o AES_ENC=aes_core.o aes_cbc.o
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/bf/Makefile.in
View File

@ -14,7 +14,7 @@ AR= ar r
BF_ENC= bf_enc.o BF_ENC= bf_enc.o
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/bn/Makefile.in
View File

@ -14,7 +14,7 @@ AR= ar r
BN_ASM= bn_asm.o BN_ASM= bn_asm.o
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/camellia/Makefile.in
View File

@ -14,7 +14,7 @@ AR= ar r
CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/cast/Makefile.in
View File

@ -14,7 +14,7 @@ AR= ar r
CAST_ENC=c_enc.o CAST_ENC=c_enc.o
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/chacha/Makefile.in
View File

@ -13,7 +13,7 @@ AR= ar r
CHACHA_ENC=chacha_enc.o CHACHA_ENC=chacha_enc.o
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/des/Makefile.in
View File

@ -14,7 +14,7 @@ RANLIB= ranlib
DES_ENC= des_enc.o fcrypt_b.o DES_ENC= des_enc.o fcrypt_b.o
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/ec/Makefile.in
View File

@ -11,7 +11,7 @@ MAKEFILE= Makefile
AR= ar r AR= ar r
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/md5/Makefile.in
View File

@ -14,7 +14,7 @@ AR= ar r
MD5_ASM_OBJ= MD5_ASM_OBJ=
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/modes/Makefile.in
View File

@ -13,7 +13,7 @@ AR= ar r
MODES_ASM_OBJ= MODES_ASM_OBJ=
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/poly1305/Makefile.in
View File

@ -13,7 +13,7 @@ AR= ar r
POLY1305_ASM_OBJ= POLY1305_ASM_OBJ=
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/rc4/Makefile.in
View File

@ -13,7 +13,7 @@ AR= ar r
RC4_ENC=rc4_enc.o rc4_skey.o RC4_ENC=rc4_enc.o rc4_skey.o
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/rc5/Makefile.in
View File

@ -14,7 +14,7 @@ AR= ar r
RC5_ENC= rc5_enc.o RC5_ENC= rc5_enc.o
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/ripemd/Makefile.in
View File

@ -14,7 +14,7 @@ AR= ar r
RIP_ASM_OBJ= RIP_ASM_OBJ=
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/sha/Makefile.in
View File

@ -14,7 +14,7 @@ AR= ar r
SHA1_ASM_OBJ= SHA1_ASM_OBJ=
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
crypto/whrlpool/Makefile.in
View File

@ -14,7 +14,7 @@ AR= ar r
WP_ASM_OBJ=wp_block.o WP_ASM_OBJ=wp_block.o
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile GENERAL=Makefile

2
engines/Makefile.in
View File

@ -21,7 +21,7 @@ PLIB_LDFLAG=
EX_LIBS= EX_LIBS=
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
ASFLAGS= $(INCLUDES) $(ASFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS) AFLAGS= $(ASFLAGS)
GENERAL=Makefile engines.com install.com engine_vector.mar GENERAL=Makefile engines.com install.com engine_vector.mar