[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  79844cbba576098675317b95ee4fc1cfc84fa784 (commit)
       via  87030f54b23d39d9f4b1122b80adc6b7f8deab53 (commit)
      from  d6637ce17ec5b811ea06543f3b584d25bfdeaaa3 (commit)


- Log -----------------------------------------------------------------
commit 79844cbba576098675317b95ee4fc1cfc84fa784
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 21 01:49:53 2016 +0200

    descrip.mms.tmpl: in obj2bin, make sure an empty @deps means no empty lines
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 47852e6ae763a40ddc3538c76a02be06fd0595a5)

commit 87030f54b23d39d9f4b1122b80adc6b7f8deab53
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 21 01:49:04 2016 +0200

    util/dofile.pl: report if a template couldn't be loaded
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit f6be8315cbdb4173008b5917d2b0fc80bb0bf06b)

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

Summary of changes:
 Configurations/descrip.mms.tmpl | 16 ++++++++++------
 util/dofile.pl                  |  6 +++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 48b3476..39709a1 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -677,10 +677,11 @@ EOF
       # previous line's file spec as default, so if no directory spec
       # is present in the current line and the previous line has one that
       # doesn't apply, you're in for a surprise.
-      my $write_opt =
+      my $write_opt1 =
           join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
                                  "WRITE OPT_FILE \"$x" } @objs).
-          "\"\n\t".
+          "\"";
+      my $write_opt2 =
           join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
                              $x =~ s|(\.EXE)|$1/SHARE|;
                              $x =~ s|(\.OLB)|$1/LIB|;
@@ -690,7 +691,8 @@ EOF
 $lib.EXE : $deps
         OPEN/WRITE/SHARE=READ OPT_FILE $lib.OPT
         TYPE $engine_opt /OUTPUT=OPT_FILE:
-        $write_opt
+        $write_opt1
+        $write_opt2
         CLOSE OPT_FILE
         LINK /MAP=$lib.MAP /FULL/SHARE=$lib.EXE $lib.OPT/OPT \$(EX_LIBS)
         - PURGE $lib.EXE,$lib.OPT,$lib.MAP
@@ -723,10 +725,11 @@ EOF
       # previous line's file spec as default, so if no directory spec
       # is present in the current line and the previous line has one that
       # doesn't apply, you're in for a surprise.
-      my $write_opt =
+      my $write_opt1 =
           join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
                                  "WRITE OPT_FILE \"$x" } @objs).
-          "\"\n\t".
+          "\"";
+      my $write_opt2 =
           join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
                              $x =~ s|(\.EXE)|$1/SHARE|;
                              $x =~ s|(\.OLB)|$1/LIB|;
@@ -735,7 +738,8 @@ EOF
       return <<"EOF";
 $bin.EXE : $deps
         OPEN/WRITE/SHARE=READ OPT_FILE $bin.OPT
-        $write_opt
+        $write_opt1
+        $write_opt2
         CLOSE OPT_FILE
         LINK/EXEC=$bin.EXE \$(LDFLAGS) $bin.OPT/OPT \$(EX_LIBS)
         - PURGE $bin.EXE,$bin.OPT
diff --git a/util/dofile.pl b/util/dofile.pl
index e0333fe..8b0c7b4 100644
--- a/util/dofile.pl
+++ b/util/dofile.pl
@@ -159,7 +159,11 @@ my @autowarntext = ("WARNING: do not edit!",
 my $prev_linecount = 0;
 my $text =
     @ARGV
-    ? join("", map { my $x = "{- output_reset_on() -}".Text::Template::_load_text($_);
+    ? join("", map { my $x = Text::Template::_load_text($_);
+                     if (!defined($x)) {
+                         die $Text::Template::ERROR, "\n";
+                     }
+                     $x = "{- output_reset_on() -}" . $x;
                      my $linecount = $x =~ tr/\n//;
                      $prev_linecount = ($linecount += $prev_linecount);
                      $lines{$linecount} = $_;