wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Configurations/10-main.conf: replace -bexpall with explicit list on AIX.

Browse source 
[omit even -b:SRE, as it's implied by -G flag.]

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6453)
This commit is contained in:
Andy Polyakov 2018-06-11 12:50:25 +02:00
parent 10aafed3ec
commit d3273ef6c5
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Configurations/10-main.conf
View file

@ -1127,7 +1127,9 @@ my %targets = (
shared_target => "self", shared_target => "self",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
bin_lflags => shared("-Wl,-bsvr4"), bin_lflags => shared("-Wl,-bsvr4"),
shared_ldflag => "-Wl,-G,-bsymbolic,-bexpall,-bnolibpath,-bM:SRE", module_ldflags => "-Wl,-G,-bsymbolic,-bexpall,-bnolibpath",
shared_ldflag => "-Wl,-G,-bsymbolic,-bnolibpath",
shared_defflag => "-Wl,-bE:",
}, },
"aix-gcc" => { "aix-gcc" => {
inherit_from => [ "aix-common", asm("ppc32_asm") ], inherit_from => [ "aix-common", asm("ppc32_asm") ],

8
build.info
View file

@ -33,6 +33,14 @@ IF[{- defined $target{shared_defflag} -}]
SHARED_SOURCE[libcrypto]=libcrypto.def SHARED_SOURCE[libcrypto]=libcrypto.def
SHARED_SOURCE[libssl]=libssl.def SHARED_SOURCE[libssl]=libssl.def
ELSIF[{- $config{target} =~ /^aix/ -}]
GENERATE[libcrypto.map]=util/mkdef.pl crypto aix
DEPEND[libcrypto.map]=util/libcrypto.num
GENERATE[libssl.map]=util/mkdef.pl ssl aix
DEPEND[libssl.map]=util/libssl.num
SHARED_SOURCE[libcrypto]=libcrypto.map
SHARED_SOURCE[libssl]=libssl.map
ELSE ELSE
GENERATE[libcrypto.map]=util/mkdef.pl crypto linux GENERATE[libcrypto.map]=util/mkdef.pl crypto linux
DEPEND[libcrypto.map]=util/libcrypto.num DEPEND[libcrypto.map]=util/libcrypto.num

16
util/mkdef.pl
View file

@ -126,6 +126,7 @@ my $W32=0;
my $NT=0; my $NT=0;
my $UNIX=0; my $UNIX=0;
my $linux=0; my $linux=0;
my $aix=0;
# Set this to make typesafe STACK definitions appear in DEF # Set this to make typesafe STACK definitions appear in DEF
my $safe_stack_def = 0; my $safe_stack_def = 0;
@ -171,12 +172,15 @@ foreach (@ARGV, split(/ /, $config{options}))
if($_ eq "NT") { if($_ eq "NT") {
$W32 = 1; $W32 = 1;
$NT = 1; $NT = 1;
} } elsif ($_ eq "linux") {
if ($_ eq "linux") {
$linux=1; $linux=1;
$UNIX=1; $UNIX=1;
} elsif ($_ eq "aix") {
$aix=1;
$UNIX=1;
} elsif ($_ eq "VMS") {
$VMS=1;
} }
$VMS=1 if $_ eq "VMS";
if ($_ eq "zlib" || $_ eq "enable-zlib" || $_ eq "zlib-dynamic" if ($_ eq "zlib" || $_ eq "enable-zlib" || $_ eq "zlib-dynamic"
|| $_ eq "enable-zlib-dynamic") { || $_ eq "enable-zlib-dynamic") {
$zlib = 1; $zlib = 1;
@ -204,11 +208,11 @@ if (!$libname) {
} }
# If no platform is given, assume WIN32 # If no platform is given, assume WIN32
if ($W32 + $VMS + $linux == 0) { if ($W32 + $VMS + $linux + $aix == 0) {
$W32 = 1; $W32 = 1;
} }
die "Please, only one platform at a time" die "Please, only one platform at a time"
if ($W32 + $VMS + $linux > 1); if ($W32 + $VMS + $linux + $aix > 1);
if (!$do_ssl && !$do_crypto) if (!$do_ssl && !$do_crypto)
{ {
@ -1237,6 +1241,8 @@ EOF
$prevsymversion = $symversion; $prevsymversion = $symversion;
} }
print OUT " $s2;\n"; print OUT " $s2;\n";
} elsif ($aix) {
print OUT "$s2\n";
} elsif ($VMS) { } elsif ($VMS) {
while(++$prevnum < $n) { while(++$prevnum < $n) {
my $symline=" ,SPARE -\n ,SPARE -\n"; my $symline=" ,SPARE -\n ,SPARE -\n";