yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge BoringSSL e189c86: Consistently disable the Intel SHA Extensions code.

Browse Source 
See also the previous commit.
This commit is contained in:
Brian Smith 2015-10-27 19:53:03 -10:00
commit 6ffa3f144e
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/sha/asm/sha-x86_64.pl
View File

@ -128,6 +128,8 @@ if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]
$avx = ($2>=3.0) + ($2>3.0);
}
# TODO(davidben): Consider enabling the Intel SHA Extensions code once it's
# been tested.
$shaext=0; ### set to zero if compiling for 1.0.1
$avx=1 if (!$shaext && $avx);

4
crypto/sha/asm/sha1-586.pl
View File

@ -136,6 +136,10 @@ $ymm=1 if ($xmm && !$ymm && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM
$shaext=$xmm; ### set to zero if compiling for 1.0.1
# TODO(davidben): Consider enabling the Intel SHA Extensions code once it's
# been tested.
$shaext = 0;
&external_label("OPENSSL_ia32cap_P") if ($xmm);

2
crypto/sha/asm/sha1-x86_64.pl
View File

@ -111,6 +111,8 @@ if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([2-9]\.[0-9]
$avx = ($2>=3.0) + ($2>3.0);
}
# TODO(davidben): Consider enabling the Intel SHA Extensions code once it's
# been tested.
$shaext=0; ### set to zero if compiling for 1.0.1
$avx=1 if (!$shaext && $avx);

4
crypto/sha/asm/sha256-586.pl
View File

@ -89,6 +89,10 @@ if ($xmm && !$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9
$shaext=$xmm; ### set to zero if compiling for 1.0.1
# TODO(davidben): Consider enabling the Intel SHA Extensions code once it's
# been tested.
$shaext = 0;
$unroll_after = 64*4; # If pre-evicted from L1P cache first spin of
# fully unrolled loop was measured to run about
# 3-4x slower. If slowdown coefficient is N and