summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2017-06-29 21:11:48 +0200
committerRichard Levitte <levitte@openssl.org>2017-06-29 21:21:20 +0200
commit60ccf93d1bb5fb29907f789a913e6e259dfc1ee2 (patch)
tree7ce47310aa6a6552a8f1b9a6fe9a8eaa3514c60e /util
parentc2b980d89fa8aa2084206f007ab9879cee4cda4e (diff)
util/mkdef.pl: Make symbol version processing Linux only
For Windows, we care which way it is, the resulting file is just a pile of symbols. For VMS, we really need to care about the numeric ordering, and getting the symbols sorted by symbol version too didn't agree with that. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3804) (cherry picked from commit 0e288c2af2f24121ebd5f0c58912d9429915c02a)
Diffstat (limited to 'util')
-rwxr-xr-xutil/mkdef.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 918c243fb4..b0571157bd 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -1244,7 +1244,6 @@ EOF
if(!$do_update);
} else {
(my $n, my $symversion, my $dummy) = split /\\/, $nums{$s};
- next if $symversion ne $thisversion;
my %pf = ();
my $p = ($i =~ /^[^:]*:([^:]*):/,$1);
my $a = ($i =~ /^[^:]*:[^:]*:[^:]*:([^:]*)/,$1);
@@ -1257,6 +1256,7 @@ EOF
}
$prev = $s2; # To warn about duplicates...
if($linux) {
+ next if $symversion ne $thisversion;
if ($symversion ne $prevsymversion) {
if ($prevsymversion ne "") {
if ($prevprevsymversion ne "") {
@@ -1312,7 +1312,7 @@ EOF
}
}
}
- } while ($thisversion ne $currversion);
+ } while ($linux && $thisversion ne $currversion);
if ($linux) {
if ($prevprevsymversion ne "") {
print OUT " local: *;\n} OPENSSL_$prevprevsymversion;\n\n";