diff options
author | Kenny Root <kroot@google.com> | 2015-11-06 23:09:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-06 23:09:15 +0000 |
commit | 30217ab4bfb9ab256cf52e478c39af1b50e178db (patch) | |
tree | 24150183cfed2ad79eb2258cf525b4fc4544bd2d /src/crypto/bn/asm/rsaz-avx2.pl | |
parent | 80043196325becce95d8fae59b7a8eb498839f40 (diff) | |
parent | 9659931bf7d197c3ab757604b3ca730aeac2129f (diff) | |
download | external_boringssl-30217ab4bfb9ab256cf52e478c39af1b50e178db.zip external_boringssl-30217ab4bfb9ab256cf52e478c39af1b50e178db.tar.gz external_boringssl-30217ab4bfb9ab256cf52e478c39af1b50e178db.tar.bz2 |
Merge "Revert "external/boringssl: sync with upstream.""
am: 9659931bf7
* commit '9659931bf7d197c3ab757604b3ca730aeac2129f':
Revert "external/boringssl: sync with upstream."
Diffstat (limited to 'src/crypto/bn/asm/rsaz-avx2.pl')
-rw-r--r-- | src/crypto/bn/asm/rsaz-avx2.pl | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/src/crypto/bn/asm/rsaz-avx2.pl b/src/crypto/bn/asm/rsaz-avx2.pl index bbceccb..3b6ccf8 100644 --- a/src/crypto/bn/asm/rsaz-avx2.pl +++ b/src/crypto/bn/asm/rsaz-avx2.pl @@ -79,13 +79,29 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; ( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or die "can't locate x86_64-xlate.pl"; -# In upstream, this is controlled by shelling out to the compiler to check -# versions, but BoringSSL is intended to be used with pre-generated perlasm -# output, so this isn't useful anyway. -# -# TODO(davidben): Enable these after testing. $avx goes up to 2 and $addx to 1. -$avx = 0; -$addx = 0; +if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1` + =~ /GNU assembler version ([2-9]\.[0-9]+)/) { + $avx = ($1>=2.19) + ($1>=2.22); + $addx = ($1>=2.23); +} + +if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && + `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/) { + $avx = ($1>=2.09) + ($1>=2.10); + $addx = ($1>=2.10); +} + +if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && + `ml64 2>&1` =~ /Version ([0-9]+)\./) { + $avx = ($1>=10) + ($1>=11); + $addx = ($1>=11); +} + +if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) { + my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10 + $avx = ($ver>=3.0) + ($ver>=3.01); + $addx = ($ver>=3.03); +} open OUT,"| \"$^X\" $xlate $flavour $output"; *STDOUT = *OUT; |