aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-01-06 11:06:53 -0500
committerJack Lloyd <[email protected]>2018-01-12 13:28:13 -0500
commit2f690b43d4bcd41ad2483d75a6108b41c7b1dbb5 (patch)
treed9c7345b39ceb5b53e4a54ca3c3cae1ad5207742
parentf4a7e496584a86da1e5eb960d18e7e6594abe6ea (diff)
ABI for Aarch64 crypto
-rw-r--r--src/build-data/arch/arm64.txt1
-rw-r--r--src/build-data/cc/clang.txt2
-rw-r--r--src/build-data/cc/gcc.txt2
-rw-r--r--src/lib/block/aes/aes_armv8/info.txt4
-rw-r--r--src/lib/hash/sha1/sha1_armv8/info.txt5
-rw-r--r--src/lib/hash/sha2_32/sha2_32_armv8/info.txt5
-rw-r--r--src/lib/modes/aead/gcm/pmull/info.txt4
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