Revert ADX due to build issues.
Using ADX instructions requires relatively new assemblers. Conscrypt are currently using Yasm 1.2.0. Revert these for the time being to unbreak their build. Change-Id: Iaba5761ccedcafaffb5ca79a8eaf7fa565583c32 Reviewed-on: https://boringssl-review.googlesource.com/19244 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Adam Langley <agl@google.com> Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
+2
-3
@@ -32,9 +32,8 @@
|
||||
* [Go](https://golang.org/dl/) is required. If not found by CMake, the go
|
||||
executable may be configured explicitly by setting `GO_EXECUTABLE`.
|
||||
|
||||
* To build the x86 and x86\_64 assembly, your assembler must support AVX2,
|
||||
MOVBE, and ADX. If using GNU binutils, you must have 2.23 or later. If using
|
||||
Yasm, you must have 1.3.0 or later.
|
||||
* To build the x86 and x86\_64 assembly, your assembler must support AVX2
|
||||
instructions and MOVBE. If using GNU binutils, you must have 2.22 or later
|
||||
|
||||
## Building
|
||||
|
||||
|
||||
@@ -82,8 +82,10 @@ 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): Set $addx to one once build problems are resolved.
|
||||
$avx = 2;
|
||||
$addx = 1;
|
||||
$addx = 0;
|
||||
|
||||
open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
|
||||
*STDOUT = *OUT;
|
||||
|
||||
@@ -56,7 +56,9 @@ open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
|
||||
# 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.
|
||||
$addx = 1;
|
||||
#
|
||||
# TODO(davidben): Set $addx to one once build problems are resolved.
|
||||
$addx = 0;
|
||||
|
||||
# int bn_mul_mont(
|
||||
$rp="%rdi"; # BN_ULONG *rp,
|
||||
|
||||
@@ -41,7 +41,9 @@ open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
|
||||
# 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.
|
||||
$addx = 1;
|
||||
#
|
||||
# TODO(davidben): Set $addx to one once build problems are resolved.
|
||||
$addx = 0;
|
||||
|
||||
# int bn_mul_mont_gather5(
|
||||
$rp="%rdi"; # BN_ULONG *rp,
|
||||
|
||||
@@ -54,8 +54,9 @@ die "can't locate x86_64-xlate.pl";
|
||||
open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
|
||||
*STDOUT=*OUT;
|
||||
|
||||
# TODO(davidben): Set $addx to one once build problems are resolved.
|
||||
$avx = 2;
|
||||
$addx = 1;
|
||||
$addx = 0;
|
||||
|
||||
$code.=<<___;
|
||||
.text
|
||||
|
||||
Reference in New Issue
Block a user