From ef2dfc9902e015de91f015177bdf235c9000839e Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 30 Sep 2018 14:44:59 +0200 Subject: Refactor linker script generation The generation of linker scripts was badly balanced, as all sorts of platform dependent stuff went into the top build.info, when that part should really be made as simply and generic as possible. Therefore, we move a lot of the "magic" to the build files templates, since they are the place for platform dependent things. What remains is to parametrize just enough in the build.info file to generate the linker scripts correctly for each associated library. "linker script" is a term usually reserved for certain Unix linkers. However, we only use them to say what symbols should be exported, so we use the term loosely for all platforms. The internal extension is '.ld', and is changed by the build file templates as appropriate for each target platform. Note that this adds extra meaning to the value of the shared_target attribute. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/7333) --- util/mkdef.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'util') diff --git a/util/mkdef.pl b/util/mkdef.pl index bcbb475832..6523a057ee 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -167,12 +167,13 @@ foreach (@ARGV, split(/ /, $config{options})) $debug=1 if $_ eq "debug"; $trace=1 if $_ eq "trace"; $verbose=1 if $_ eq "verbose"; - $W32=1 if $_ eq "32"; die "win16 not supported" if $_ eq "16"; - if($_ eq "NT") { + if ($_ eq "32" || $_ eq "mingw") { + $W32=1; + } elsif ($_ eq "NT") { $W32 = 1; $NT = 1; - } elsif ($_ eq "linux") { + } elsif ($_ eq "linux" || $_ eq "solaris") { $linux=1; $UNIX=1; } elsif ($_ eq "aix") { -- cgit v1.2.3