From: Richard Levitte <levitte@openssl.org>
Date: Fri, 4 Nov 2016 13:08:25 +0000 (+0100)
Subject: VMS: correct the logic around linking executables
X-Git-Tag: OpenSSL_1_1_1-pre1~3184
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb0abdceffd5385f0a009f8a65d97ea975a5add1;p=openssl

VMS: correct the logic around linking executables

The logic around avoiding MULDEF warnings was flawed.  Simplifying it
makes it better.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1846)
---

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 15e0678ac5..b3e2cc4948 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -788,11 +788,14 @@ $bin.EXE : $deps
                      search_severity = \$severity
         @ ! search_severity is 3 when the last search didn't find any matching
         @ ! string: %SEARCH-I-NOMATCHES, no strings matched
-        -@ IF search_severity .NE. 3 .OR. link_severity .NE. 1 THEN -
-                TYPE $bin.LINKLOG
+        @ ! If that was the result, we pretend linking got through without
+        @ ! fault or warning.
+        @ IF search_severity .EQ. 3 THEN link_severity = 1
+        @ ! At this point, if link_severity shows that there was a fault
+        @ ! or warning, make sure to restore the linking status.
+        -@ IF .NOT. link_severity THEN TYPE $bin.LINKLOG
         -@ DELETE $bin.LINKLOG;*
-        @ IF search_severity .NE. 3 .OR. link_severity .NE. 1 THEN -
-                SPAWN/WAIT/NOLOG EXIT 'link_status'
+        @ IF .NOT. link_severity THEN SPAWN/WAIT/NOLOG EXIT 'link_status'
         - PURGE $bin.EXE,$bin.OPT
 EOF
   }