diff options
author | Andy Polyakov <appro@openssl.org> | 2014-06-24 08:24:25 +0200 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2014-06-27 22:55:07 +0200 |
commit | 912f08dd5ed4f68fb275f3b2db828349fcffba14 (patch) | |
tree | de456b2669094d7018a5e28fa4112bef0b7f61d9 /crypto/modes | |
parent | 1067663d852435b1adff32ec01e9b8e54d2b5896 (diff) |
x86_64 assembly pack: allow clang to compile AVX code.
(cherry picked from commit ac171925ab527a55fbb27872ff69af94f7ec995b)
Diffstat (limited to 'crypto/modes')
-rw-r--r-- | crypto/modes/asm/aesni-gcm-x86_64.pl | 4 | ||||
-rw-r--r-- | crypto/modes/asm/ghash-x86_64.pl | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/crypto/modes/asm/aesni-gcm-x86_64.pl b/crypto/modes/asm/aesni-gcm-x86_64.pl index 3781933917..1ac6b5b845 100644 --- a/crypto/modes/asm/aesni-gcm-x86_64.pl +++ b/crypto/modes/asm/aesni-gcm-x86_64.pl @@ -53,6 +53,10 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && $avx = ($1>=10) + ($1>=11); } +if (!$avx && `$ENV{CC} -v` =~ /LLVM ([3-9]\.[0-9]+)/) { + $avx = ($1>=3.0) + ($1>=3.1); +} + open OUT,"| \"$^X\" $xlate $flavour $output"; *STDOUT=*OUT; diff --git a/crypto/modes/asm/ghash-x86_64.pl b/crypto/modes/asm/ghash-x86_64.pl index f1aca3e534..f88af15995 100644 --- a/crypto/modes/asm/ghash-x86_64.pl +++ b/crypto/modes/asm/ghash-x86_64.pl @@ -102,6 +102,10 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && $avx = ($1>=10) + ($1>=11); } +if (!$avx && `$ENV{CC} -v` =~ /LLVM ([3-9]\.[0-9]+)/) { + $avx = ($1>=3.0) + ($1>=3.1); +} + open OUT,"| \"$^X\" $xlate $flavour $output"; *STDOUT=*OUT; |