From fadfa6b0020b934500356e7aea8934a4565657d3 Mon Sep 17 00:00:00 2001 From: Tamar Christina Date: Thu, 16 Nov 2017 16:15:51 +0000 Subject: [PATCH] Correct AArch64 crypto dependencies. The crypto options depend on SIMD and FP, the documentation states so but the dependency is not there the code. We have mostly gotten away with this due to the default flags for the architectures (e.g. Armv8.2-a implies +simd) but this discrepancy needs to be addressed. gas/ 2017-11-16 Tamar Christina * opcodes/aarch64-tbl.h (aarch64_feature_crypto): Add ARCH64_FEATURE_SIMD and AARCH64_FEATURE_FP. (aarch64_feature_crypto_v8_2, aarch64_feature_sm4): Likewise. (aarch64_feature_sha3): Likewise. --- gas/ChangeLog | 7 +++++++ opcodes/aarch64-tbl.h | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 116d7e34bce..78b2f945e26 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2017-11-16 Tamar Christina + + * opcodes/aarch64-tbl.h + (aarch64_feature_crypto): Add ARCH64_FEATURE_SIMD and AARCH64_FEATURE_FP. + (aarch64_feature_crypto_v8_2, aarch64_feature_sm4): Likewise. + (aarch64_feature_sha3): Likewise. + 2017-11-16 Tamar Christina * doc/c-aarch64.texi (armv8.4-a, sha2, sha3, sm4): New. diff --git a/opcodes/aarch64-tbl.h b/opcodes/aarch64-tbl.h index 4d77eabc897..ad6fae4f6fd 100644 --- a/opcodes/aarch64-tbl.h +++ b/opcodes/aarch64-tbl.h @@ -2096,7 +2096,7 @@ static const aarch64_feature_set aarch64_feature_simd = AARCH64_FEATURE (AARCH64_FEATURE_SIMD, 0); static const aarch64_feature_set aarch64_feature_crypto = AARCH64_FEATURE (AARCH64_FEATURE_CRYPTO | AARCH64_FEATURE_AES - | AARCH64_FEATURE_SHA2, 0); + | AARCH64_FEATURE_SHA2 | AARCH64_FEATURE_SIMD | AARCH64_FEATURE_FP, 0); static const aarch64_feature_set aarch64_feature_crc = AARCH64_FEATURE (AARCH64_FEATURE_CRC, 0); static const aarch64_feature_set aarch64_feature_lse = @@ -2134,12 +2134,14 @@ static const aarch64_feature_set aarch64_feature_aes = static const aarch64_feature_set aarch64_feature_v8_4 = AARCH64_FEATURE (AARCH64_FEATURE_V8_4, 0); static const aarch64_feature_set aarch64_feature_crypto_v8_2 = - AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_CRYPTO, 0); + AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_CRYPTO + | AARCH64_FEATURE_SIMD | AARCH64_FEATURE_FP, 0); static const aarch64_feature_set aarch64_feature_sm4 = - AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_SM4, 0); + AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_SM4 + | AARCH64_FEATURE_SIMD | AARCH64_FEATURE_FP, 0); static const aarch64_feature_set aarch64_feature_sha3 = AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_SHA2 - | AARCH64_FEATURE_SHA3, 0); + | AARCH64_FEATURE_SHA3 | AARCH64_FEATURE_SIMD | AARCH64_FEATURE_FP, 0); static const aarch64_feature_set aarch64_feature_fp_16_v8_2 = AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_F16 | AARCH64_FEATURE_FP, 0); -- 2.30.2