The branch OpenSSL_1_1_0-stable has been updated via b09aa2709ddaa5bb2ffd323c3289076b5e9c6531 (commit) via 425df74ab666d89d7110fda3b61453fb148ec6de (commit) from b15e62ecc5fc8f6c5b170b96480f13bf1b8e7915 (commit)
- Log ----------------------------------------------------------------- commit b09aa2709ddaa5bb2ffd323c3289076b5e9c6531 Author: Richard Levitte <levi...@openssl.org> Date: Mon Jan 29 10:22:51 2018 +0100 Don't define OPENSSL_NO_ERR for the command line It's already in opensslconf.h, which is included where this is relevant. Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5188) (cherry picked from commit 711a8b999e7a0733f349e7f330fa3fa013e995fd) commit 425df74ab666d89d7110fda3b61453fb148ec6de Author: Richard Levitte <levi...@openssl.org> Date: Mon Jan 29 10:21:46 2018 +0100 Remove $no_sse2, as it's just a 'copy' of $disabled{sse2} Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5188) (cherry picked from commit 0d59958c4999a456531835d0b61ba4eaecceaf86) ----------------------------------------------------------------------- Summary of changes: Configure | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Configure b/Configure index 933b9e6..90a4651 100755 --- a/Configure +++ b/Configure @@ -508,8 +508,6 @@ while ((my $first, my $second) = (shift @list, shift @list)) { # To remove something from %disabled, use "enable-foo". # For symmetry, "disable-foo" is a synonym for "no-foo". -my $no_sse2=0; - &usage if ($#ARGV < 0); my $user_cflags=""; @@ -859,7 +857,7 @@ foreach (sort (keys %disabled)) elsif (/^zlib-dynamic$/) { } elsif (/^sse2$/) - { $no_sse2 = 1; } + { } elsif (/^engine$/) { @{$config{dirs}} = grep !/^engines$/, @{$config{dirs}}; @@ -892,8 +890,6 @@ foreach (sort (keys %disabled)) { push @{$config{openssl_other_defines}}, "OPENSSL_NO_$WHAT"; print " OPENSSL_NO_$WHAT"; - - if (/^err$/) { push @user_defines, "OPENSSL_NO_ERR"; } } } @@ -1147,7 +1143,7 @@ unless ($disabled{asm}) { # bn-586 is the only one implementing bn_*_part_words push @{$config{defines}}, "OPENSSL_BN_ASM_PART_WORDS" if ($target{bn_asm_src} =~ /bn-586/); - push @{$config{defines}}, "OPENSSL_IA32_SSE2" if (!$no_sse2 && $target{bn_asm_src} =~ /86/); + push @{$config{defines}}, "OPENSSL_IA32_SSE2" if (!$disabled{sse2} && $target{bn_asm_src} =~ /86/); push @{$config{defines}}, "OPENSSL_BN_ASM_MONT" if ($target{bn_asm_src} =~ /-mont/); push @{$config{defines}}, "OPENSSL_BN_ASM_MONT5" if ($target{bn_asm_src} =~ /-mont5/); @@ -1179,7 +1175,7 @@ unless ($disabled{asm}) { push @{$config{defines}}, "AES_CTR_ASM" if ($target{aes_asm_src} =~ s/\s*aes-ctr\.fake//); # aes-xts.fake indicates presence of AES_xts_[en|de]crypt... push @{$config{defines}}, "AES_XTS_ASM" if ($target{aes_asm_src} =~ s/\s*aes-xts\.fake//); - $target{aes_asm_src} =~ s/\s*(vpaes|aesni)-x86\.s//g if ($no_sse2); + $target{aes_asm_src} =~ s/\s*(vpaes|aesni)-x86\.s//g if ($disabled{sse2}); push @{$config{defines}}, "VPAES_ASM" if ($target{aes_asm_src} =~ m/vpaes/); push @{$config{defines}}, "BSAES_ASM" if ($target{aes_asm_src} =~ m/bsaes/); } _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits