[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  12940f08f416102a78a08b64866224ada798bdb3 (commit)
       via  0218fc3778428a7b485335bb369f0040d97d74cf (commit)
      from  d0db7ee0b1dfc72a5e7c105040b8580ee57e99eb (commit)


- Log -----------------------------------------------------------------
commit 12940f08f416102a78a08b64866224ada798bdb3
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Mar 11 12:04:15 2016 +0100

    crypto/*/build.info: SPARC-specific fixups.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 0218fc3778428a7b485335bb369f0040d97d74cf
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Mar 11 11:55:44 2016 +0100

    Configurations/unix-Makefile.tmpl: don't leave empty .s files behind.
    
    If pre-processor failed, an empty .s file could be left behind,
    which could get successfully compiled if one simply re-ran make
    and cause linking failures. Not anymore. Remove even intermediate .S
    in case of pre-processor failure.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configurations/unix-Makefile.tmpl | 4 ++--
 crypto/bn/build.info              | 3 +++
 crypto/evp/build.info             | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 3718467..05844f0 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -850,9 +850,9 @@ EOF
                    (my $target = $args{src}) =~ s|\.S$|.s|;
                    return <<"EOF";
 $target: $args{generator}->[0]
-	( trap "rm -f \$@.S" INT; \\
+	( trap "rm -f \$@.*" INT 0; \\
 	  $generator \$@.S; \\
-	  \$(CC) \$(CFLAGS) $incs -E -P \$@.S > \$@ && rm -f \$@.S )
+	  \$(CC) \$(CFLAGS) $incs -E -P \$@.S > \$@.i && mv -f \$@.i \$@ )
 EOF
               }
               # Otherwise....
diff --git a/crypto/bn/build.info b/crypto/bn/build.info
index aac7ca0..782dcce 100644
--- a/crypto/bn/build.info
+++ b/crypto/bn/build.info
@@ -9,6 +9,8 @@ SOURCE[../../libcrypto]=\
         bn_depr.c bn_const.c bn_x931p.c bn_intern.c bn_dh.c bn_srp.c
 INCLUDE[../../libcrypto]={- rel2abs(catdir($builddir,"..","..","crypto","include")) -}
 
+INCLUDE[bn_exp.o]=..
+
 GENERATE[bn-586.s]=asm/bn-586.pl \
 	$(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
 DEPEND[bn-586.s]=../perlasm/x86asm.pl
@@ -31,6 +33,7 @@ INCLUDE[vis3-mont.o]=..
 GENERATE[sparct4-mont.S]=asm/sparct4-mont.pl $(PERLASM_SCHEME)
 INCLUDE[sparct4-mont.o]=..
 GENERATE[sparcv9-gf2m.S]=asm/sparcv9-gf2m.pl $(PERLASM_SCHEME)
+INCLUDE[sparcv9-gf2m.o]=..
 
 GENERATE[bn-mips.s]=asm/mips.pl $(PERLASM_SCHEME)
 GENERATE[mips-mont.s]=asm/mips-mont.pl $(PERLASM_SCHEME)
diff --git a/crypto/evp/build.info b/crypto/evp/build.info
index 61331dbf..bf633dc 100644
--- a/crypto/evp/build.info
+++ b/crypto/evp/build.info
@@ -17,4 +17,6 @@ SOURCE[../../libcrypto]=\
 INCLUDE[e_aes.o]=.. ../modes
 INCLUDE[e_aes_cbc_hmac_sha1.o]=../modes
 INCLUDE[e_aes_cbc_hmac_sha256.o]=../modes
-INCLUDE[e_camellia.o]=../modes
+INCLUDE[e_camellia.o]=.. ../modes
+INCLUDE[e_des.o]=..
+INCLUDE[e_des3.o]=..