The branch master has been updated
via 5c3dbd2eacc879a890b6ff15b587a87fc3363b05 (commit)
via fb0abdceffd5385f0a009f8a65d97ea975a5add1 (commit)
from 308b876da9eff2f6455a32751b7ffeeaf6ee3fb8 (commit)
- Log -----------------------------------------------------------------
commit 5c3dbd2eacc879a890b6ff15b587a87fc3363b05
Author: Richard Levitte <levi...@openssl.org>
Date: Fri Nov 4 14:08:55 2016 +0100
VMS: update the list of files that need some extra treatment
This is related to a lack in path merging involding includes of includes
Reviewed-by: Rich Salz <rs...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1846)
commit fb0abdceffd5385f0a009f8a65d97ea975a5add1
Author: Richard Levitte <levi...@openssl.org>
Date: Fri Nov 4 14:08:25 2016 +0100
VMS: correct the logic around linking executables
The logic around avoiding MULDEF warnings was flawed. Simplifying it
makes it better.
Reviewed-by: Rich Salz <rs...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1846)
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 15e0678..2c58078 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -63,17 +63,13 @@
}
my $sd1 = sourcedir("ssl","record");
my $sd2 = sourcedir("ssl","statem");
- $unified_info{before}->{"[.test]heartbeat_test.OBJ"}
- = $unified_info{before}->{"[.test]ssltest_old.OBJ"}
- = qq(record_include = F\$PARSE("$sd1","A.;",,,"SYNTAX_ONLY") - "A.;"
- define record 'record_include'
- statem_include = F\$PARSE("$sd2","A.;",,,"SYNTAX_ONLY") - "A.;"
- define statem 'statem_include');
- $unified_info{after}->{"[.test]heartbeat_test.OBJ"}
- = $unified_info{after}->{"[.test]ssltest.OBJ"}
- = qq(deassign statem
- deassign record);
- foreach (grep /^\[\.ssl\.(?:record|statem)\].*\.o$/, keys
%{$unified_info{sources}}) {
+ my @ssl_locl_users =
+ ( "[.test]cipher_overhead_test.o",
+ "[.test]dtls_mtu_test.o",
+ "[.test]heartbeat_test.o",
+ "[.test]ssltest_old.o",
+ grep /^\[\.ssl\.(?:record|statem)\].*\.o$/, keys
%{$unified_info{sources}} );
+ foreach (@ssl_locl_users) {
(my $x = $_) =~ s|\.o$|.OBJ|;
$unified_info{before}->{$x}
= qq(record_include = F\$PARSE("$sd1","A.;",,,"SYNTAX_ONLY") - "A.;"
@@ -788,11 +784,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
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
