[openssl-commits] [openssl] master update

Richard Levitte levitte at openssl.org
Wed Mar 9 11:34:27 UTC 2016 

The branch master has been updated
       via  63ee7129f1e034b4befd4706dc9ab471fc525e73 (commit)
       via  5b14d5b5a0271ec0063d57b90f7d0b14a87c94d2 (commit)
      from  a772e9d01a81dae132cb03107292b3ecc725e5af (commit)


- Log -----------------------------------------------------------------
commit 63ee7129f1e034b4befd4706dc9ab471fc525e73
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Mar 4 15:41:42 2016 +0100

    Have Configure display the value of SHARED_CFLAG
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 5b14d5b5a0271ec0063d57b90f7d0b14a87c94d2
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Mar 4 15:36:07 2016 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure                   | 1 +
 crypto/Makefile.in          | 2 +-
 crypto/aes/Makefile.in      | 2 +-
 crypto/bf/Makefile.in       | 2 +-
 crypto/bn/Makefile.in       | 2 +-
 crypto/camellia/Makefile.in | 2 +-
 crypto/cast/Makefile.in     | 2 +-
 crypto/chacha/Makefile.in   | 2 +-
 crypto/des/Makefile.in      | 2 +-
 crypto/ec/Makefile.in       | 2 +-
 crypto/md5/Makefile.in      | 2 +-
 crypto/modes/Makefile.in    | 2 +-
 crypto/poly1305/Makefile.in | 2 +-
 crypto/rc4/Makefile.in      | 2 +-
 crypto/rc5/Makefile.in      | 2 +-
 crypto/ripemd/Makefile.in   | 2 +-
 crypto/sha/Makefile.in      | 2 +-
 crypto/whrlpool/Makefile.in | 2 +-
 engines/Makefile.in         | 2 +-
 19 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Configure b/Configure
index fa1272b..cbd9395 100755
--- a/Configure
+++ b/Configure
@@ -1751,6 +1751,7 @@ close(OUT);
 print "IsMK1MF       =", ($builder eq "mk1mf" ? "yes" : "no"), "\n";
 print "CC            =$target{cc}\n";
 print "CFLAG         =$target{cflags} $config{cflags}\n";
+print "SHARED_CFLAG  =$target{shared_cflag}\n";
 print "DEFINES       =",join(" ", @{$target{defines}}, @{$config{defines}}),"\n";
 print "LFLAG         =$target{lflags}\n";
 print "PLIB_LFLAG    =$target{plib_lflags}\n";
diff --git a/crypto/Makefile.in b/crypto/Makefile.in
index 7a5a988..8c54e77 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 0439245..46566c3 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 398844a..4a3d726 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 6ae831c..85b7d56 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 e809152..cb62c91 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 c43eecb..f1ad0c7 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 c34224c..e728b4d 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 93a715a..74c5862 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 48091d2..4203b70 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 7e13a04..9c3fb1f 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 c37a8c8..581896d 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 e27fcaf..03bde08 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 00e39ec..0d4952c 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 501b118..a440fda 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 ba77fe4..a0135b3 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 e2d20aa..9041c3c 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 fa51f08..4e16f7d 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 cc61427..aaffe1e 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

More information about the openssl-commits mailing list