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/x86_64-mont.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/x86_64-mont.pl')
| -rw-r--r-- | src/crypto/bn/asm/x86_64-mont.pl | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/crypto/bn/asm/x86_64-mont.pl b/src/crypto/bn/asm/x86_64-mont.pl index 04c4bea..39476ab 100644 --- a/src/crypto/bn/asm/x86_64-mont.pl +++ b/src/crypto/bn/asm/x86_64-mont.pl @@ -53,12 +53,20 @@ die "can't locate x86_64-xlate.pl"; open OUT,"| \"$^X\" $xlate $flavour $output"; *STDOUT=*OUT; -# 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 this option after testing. $addx goes up to 1. -$addx = 0; +if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1` + =~ /GNU assembler version ([2-9]\.[0-9]+)/) { + $addx = ($1>=2.23); +} + +if (!$addx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && + `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/) { + $addx = ($1>=2.10); +} + +if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && + `ml64 2>&1` =~ /Version ([0-9]+)\./) { + $addx = ($1>=12); +} # int bn_mul_mont( $rp="%rdi"; # BN_ULONG *rp, |