diff options
| author | Jack Lloyd <[email protected]> | 2018-01-17 10:56:36 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-01-17 10:56:36 -0500 |
| commit | 71b6a1013dee31c5263fbe4b935e46d95746b61e (patch) | |
| tree | 01af838567365720cb2008710c8dee7d2c4bf8e5 /src | |
| parent | 6284b523ebeadc4b91e83ee624058af4f664f00a (diff) | |
| parent | 2f690b43d4bcd41ad2483d75a6108b41c7b1dbb5 (diff) | |
Merge GH #1408 Use an ABI flag for enabling Aarch64 crypto operations
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/arch/arm64.txt | 1 | ||||
| -rw-r--r-- | src/build-data/cc/clang.txt | 2 | ||||
| -rw-r--r-- | src/build-data/cc/gcc.txt | 2 | ||||
| -rw-r--r-- | src/lib/block/aes/aes_armv8/info.txt | 4 | ||||
| -rw-r--r-- | src/lib/hash/sha1/sha1_armv8/info.txt | 5 | ||||
| -rw-r--r-- | src/lib/hash/sha2_32/sha2_32_armv8/info.txt | 5 | ||||
| -rw-r--r-- | src/lib/modes/aead/gcm/pmull/info.txt | 4 |
7 files changed, 9 insertions, 14 deletions
diff --git a/src/build-data/arch/arm64.txt b/src/build-data/arch/arm64.txt index 1685681bf..d4781c874 100644 --- a/src/build-data/arch/arm64.txt +++ b/src/build-data/arch/arm64.txt @@ -11,4 +11,5 @@ armv8-a <isa_extensions> neon +armv8crypto </isa_extensions> diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt index 2e02cb7b5..97e2d4c2f 100644 --- a/src/build-data/cc/clang.txt +++ b/src/build-data/cc/clang.txt @@ -47,6 +47,8 @@ rdseed -> "-mrdseed" sha -> "-msha" altivec -> "-maltivec" +arm64:armv8crypto -> "" + arm32:neon -> "-mfpu=neon" arm64:neon -> "" </isa_flags> diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 236b588a5..8c8620552 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -57,6 +57,8 @@ rdseed -> "-mrdseed" sha -> "-msha" altivec -> "-maltivec" +arm64:armv8crypto -> "" + # For Aarch32 -mfpu=neon is required # For Aarch64 NEON is enabled by default arm32:neon -> "-mfpu=neon" diff --git a/src/lib/block/aes/aes_armv8/info.txt b/src/lib/block/aes/aes_armv8/info.txt index 1b432556c..08d51a1b2 100644 --- a/src/lib/block/aes/aes_armv8/info.txt +++ b/src/lib/block/aes/aes_armv8/info.txt @@ -2,9 +2,7 @@ AES_ARMV8 -> 20170903 </defines> -<arch> -arm64 -</arch> +need_isa armv8crypto <cc> gcc:5 diff --git a/src/lib/hash/sha1/sha1_armv8/info.txt b/src/lib/hash/sha1/sha1_armv8/info.txt index 7e9f7ba22..405ac412c 100644 --- a/src/lib/hash/sha1/sha1_armv8/info.txt +++ b/src/lib/hash/sha1/sha1_armv8/info.txt @@ -2,10 +2,7 @@ SHA1_ARMV8 -> 20170117 </defines> -<arch> -#arm32 -arm64 -</arch> +need_isa armv8crypto <cc> gcc:4.9 diff --git a/src/lib/hash/sha2_32/sha2_32_armv8/info.txt b/src/lib/hash/sha2_32/sha2_32_armv8/info.txt index 88e5c2b80..74d3fe4ab 100644 --- a/src/lib/hash/sha2_32/sha2_32_armv8/info.txt +++ b/src/lib/hash/sha2_32/sha2_32_armv8/info.txt @@ -2,10 +2,7 @@ SHA2_32_ARMV8 -> 20170117 </defines> -<arch> -#arm32 -arm64 -</arch> +need_isa armv8crypto <cc> gcc:4.9 diff --git a/src/lib/modes/aead/gcm/pmull/info.txt b/src/lib/modes/aead/gcm/pmull/info.txt index 711587568..80cd03720 100644 --- a/src/lib/modes/aead/gcm/pmull/info.txt +++ b/src/lib/modes/aead/gcm/pmull/info.txt @@ -2,9 +2,7 @@ GCM_PMULL -> 20170903 </defines> -<arch> -arm64 -</arch> +need_isa armv8crypto <cc> gcc:4.9 |