Merge BoringSSL e189c86: Consistently disable the Intel SHA Extensions code.
See also the previous commit.
This commit is contained in:
commit
6ffa3f144e
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user