[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  c3ad47f501303f86a7ae9bf957f5d05615ec84ff (commit)
       via  6d8b3dce7c8feee8aa9107e2ffcc588c782a6113 (commit)
      from  981b5bb8efca8a8adbf6a567e3a401c586a694cc (commit)


- Log -----------------------------------------------------------------
commit c3ad47f501303f86a7ae9bf957f5d05615ec84ff
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue May 10 00:06:11 2016 +0200

    windows-makefile.tmpl: minor adjustments.
    
    - some Perl versions are allergic to missing ';';
    - don't stop if del fails;
    - omit unused environment variable;
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit 6d8b3dce7c8feee8aa9107e2ffcc588c782a6113
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon May 9 23:50:43 2016 +0200

    util/mkdef.pl: omit ordinals from Windows DLLs.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

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

Summary of changes:
 Configurations/windows-makefile.tmpl | 24 +++++++++++-------------
 util/mkdef.pl                        |  8 ++++----
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 887b7a2..3be7f76 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -163,19 +163,19 @@ install: install_sw install_ssldirs install_docs
 uninstall: uninstall_docs uninstall_sw
 
 libclean:
-	$(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*""" } @ARGV" $(SHLIBS)
-	del /Q /F $(LIBS)
-	del lib.pdb
+	$(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS)
+	-del /Q /F $(LIBS)
+	-del lib.pdb
 
 clean: libclean
-	del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)
-	del /Q /S /F *.asm
-	del /Q /S /F *.d
-	del /Q /S /F *.obj
-	del /Q /S /F *.pdb
-	del /Q /S /F *.exp
-	del /Q /S /F engines\*.ilk
-	del /Q /S /F engines\*.lib
+	-del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)
+	-del /Q /S /F *.asm
+	-del /Q /S /F *.d
+	-del /Q /S /F *.obj
+	-del /Q /S /F *.pdb
+	-del /Q /S /F *.exp
+	-del /Q /S /F engines\*.ilk
+	-del /Q /S /F engines\*.lib
 
 depend:
 
@@ -281,7 +281,6 @@ EOF
                    return <<"EOF";
 $target: $args{generator}->[0] $deps
 	set ASM=\$(AS)
-	set CC=\$(CC)
 	$generator \$@.S
 	\$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@.i && move /Y \$@.i \$@
         del /Q \$@.S
@@ -291,7 +290,6 @@ EOF
               return <<"EOF";
 $target: $args{generator}->[0] $deps
 	set ASM=\$(AS)
-	set CC=\$(CC)
 	$generator \$@
 EOF
           }
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 19bbfee..4d8befe 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -1325,11 +1325,11 @@ EOF
                                             print OUT $symline;
                                             $symvtextcount += length($symline) - 2;
 					} elsif($v) {
-						printf OUT "    %s%-39s @%-8d DATA\n",
-								($W32)?"":"_",$s2,$n;
+						printf OUT "    %s%-39s DATA\n",
+								($W32)?"":"_",$s2;
 					} else {
-						printf OUT "    %s%-39s @%d\n",
-								($W32)?"":"_",$s2,$n;
+						printf OUT "    %s%s\n",
+								($W32)?"":"_",$s2;
 					}
 				}
 			}