From b2bed3c6e53fd8e439bae6a66860d31ce994bb70 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 1 Jul 2020 12:04:24 +0200 Subject: util/perl/OpenSSL/config.pm: move misplaced Windows and VMS entries OpenSSL::config::guess_system() is supposed to return system triplets. However, for Windows and VMS, it returned the final OpenSSL config target instead. We move the entries for them to the table that OpenSSL::config::map_guess() uses, so it can properly convert the input triplet to an OpenSSL config target. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/12339) --- util/perl/OpenSSL/config.pm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'util/perl') diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm index 46dad98d08..7a37399bca 100755 --- a/util/perl/OpenSSL/config.pm +++ b/util/perl/OpenSSL/config.pm @@ -160,18 +160,6 @@ my $guess_patterns = [ [ 'CYGWIN.*', '${MACHINE}-pc-cygwin' ], [ 'vxworks.*', '${MACHINE}-whatever-vxworks' ], - # Windows values found by looking at Perl 5's win32/win32.c - [ 'Windows NT:.*:amd64', 'VC-WIN64A' ], - [ 'Windows NT:.*:ia64', 'VC-WIN64I' ], - [ 'Windows NT:.*:x86', 'VC-WIN32' ], - - # VMS values found by observation on existing machinery. Unfortunately, - # the machine part is a bit... overdone. It seems, though, that 'Alpha' - # exists in that part, making it distinguishable from Itanium. It will - # be interesting to see what we'll get in the upcoming x86_64 port... - [ 'OpenVMS:.*?:.*?:.*?:.*Alpha.*', 'vms-alpha' ], - [ 'OpenVMS:.*', 'vms-ia64' ], - [ sub { -d '/usr/apollo' }, 'whatever-apollo-whatever' ], ]; @@ -859,6 +847,20 @@ EOF return %config; } ], + + # Windows values found by looking at Perl 5's win32/win32.c + [ 'amd64-.*?-Windows NT', { target => 'VC-WIN64A' } ], + [ 'ia64-.*?-Windows NT', { target => 'VC-WIN64I' } ], + [ 'x86-.*?-Windows NT', { target => 'VC-WIN32' } ], + + # VMS values found by observation on existing machinery. + # Unfortunately, the machine part is a bit... overdone. It seems, + # though, that 'Alpha' exists in that part for Alphas, making it + # distinguishable from Itanium. It will be interesting to see what + # we'll get in the upcoming x86_64 port... + [ '.*Alpha.*?-.*?-OpenVMS', { target => 'vms-alpha' } ], + [ '.*?-.*?-OpenVMS', { target => 'vms-ia64' } ], + ]; # Map GUESSOS into OpenSSL terminology. -- cgit v1.2.3