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

Clean away $no_asm since with have $disabled{asm}

Browse source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-22 14:10:45 +01:00
parent 93e3d3f3ff
commit 00b0d6632b
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Configure
View file

@ -209,7 +209,6 @@ $config{fipslibdir}="/usr/local/ssl/fips-2.0/lib/";
my $nofipscanistercheck=0; my $nofipscanistercheck=0;
$config{baseaddr}="0xFB00000"; $config{baseaddr}="0xFB00000";
my $threads=0; my $threads=0;
my $no_asm=0;
my $no_dso=0; my $no_dso=0;
my $default_ranlib; my $default_ranlib;
$config{fips}=0; $config{fips}=0;
@ -809,7 +808,6 @@ foreach (sort (keys %disabled))
print " OPENSSL_NO_$ALGO"; print " OPENSSL_NO_$ALGO";
if (/^err$/) { push @user_defines, "OPENSSL_NO_ERR"; } if (/^err$/) { push @user_defines, "OPENSSL_NO_ERR"; }
elsif (/^asm$/) { $no_asm = 1; }
} }
else else
{ {
@ -916,7 +914,7 @@ if ($target =~ /^mingw/ && `$target{cc} --target-help 2>&1` =~ m/-mno-cygwin/m)
$target{shared_ldflag} .= " -mno-cygwin"; $target{shared_ldflag} .= " -mno-cygwin";
} }
if ($target =~ /linux.*-mips/ && !$no_asm && $user_cflags !~ /-m(ips|arch=)/) { if ($target =~ /linux.*-mips/ && !$disabled{asm} && $user_cflags !~ /-m(ips|arch=)/) {
# minimally required architecture flags for assembly modules # minimally required architecture flags for assembly modules
$config{cflags}="-mips2 $config{cflags}" if ($target =~ /mips32/); $config{cflags}="-mips2 $config{cflags}" if ($target =~ /mips32/);
$config{cflags}="-mips3 $config{cflags}" if ($target =~ /mips64/); $config{cflags}="-mips3 $config{cflags}" if ($target =~ /mips64/);
@ -979,7 +977,7 @@ else
$config{ex_libs}="$libs$config{ex_libs}" if ($libs ne ""); $config{ex_libs}="$libs$config{ex_libs}" if ($libs ne "");
if ($no_asm) if ($disabled{asm})
{ {
@{$config{defines}} = grep !/^[BL]_ENDIAN$/, @{$config{defines}} @{$config{defines}} = grep !/^[BL]_ENDIAN$/, @{$config{defines}}
if ($config{fips}); if ($config{fips});
@ -1056,7 +1054,7 @@ if ($target{ranlib} eq "")
$target{ranlib} = $default_ranlib; $target{ranlib} = $default_ranlib;
} }
if (!$no_asm) { unless ($disabled{asm}) {
$target{cpuid_asm_src}=$table{BASE}->{cpuid_asm_src} if ($config{processor} eq "386"); $target{cpuid_asm_src}=$table{BASE}->{cpuid_asm_src} if ($config{processor} eq "386");
$target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m})); $target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));
@ -1931,14 +1929,14 @@ exit(0);
# Configuration file reading ######################################### # Configuration file reading #########################################
# Helper function to implement conditional inheritance depending on the # Helper function to implement conditional inheritance depending on the
# value of $no_asm. Used in inherit_from values as follows: # value of $disabled{asm}. Used in inherit_from values as follows:
# #
# inherit_from => [ "template", asm("asm_tmpl") ] # inherit_from => [ "template", asm("asm_tmpl") ]
# #
sub asm { sub asm {
my @x = @_; my @x = @_;
sub { sub {
$no_asm ? () : @x; $disabled{asm} ? () : @x;
} }
} }