From b1e68caa810a3d23435c317cd4e2b2e363e9d42d Mon Sep 17 00:00:00 2001 From: Alexandros Lamprineas Date: Fri, 27 Sep 2024 17:05:35 +0100 Subject: [PATCH] [compiler-rt][FMV][AArch64] Remove sha1 from fuchsia and apple targets. In e2cc63d80ce374fa04067c105a45ca7f0abba329 I forgot to remove these references. --- compiler-rt/lib/builtins/cpu_model/aarch64/fmv/apple.inc | 2 -- compiler-rt/lib/builtins/cpu_model/aarch64/fmv/fuchsia.inc | 2 -- 2 files changed, 4 deletions(-) diff --git a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/apple.inc b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/apple.inc index f0694900f231f..da1c4dfcb0c9a 100644 --- a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/apple.inc +++ b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/apple.inc @@ -77,7 +77,6 @@ void __init_cpu_features_resolver(void) { CHECK_BIT(CAP_BIT_FEAT_RDM, FEAT_RDM); CHECK_BIT(CAP_BIT_FEAT_LSE, FEAT_LSE); CHECK_BIT(CAP_BIT_FEAT_SHA256, FEAT_SHA2); - CHECK_BIT(CAP_BIT_FEAT_SHA1, FEAT_SHA1); CHECK_BIT(CAP_BIT_FEAT_AES, FEAT_AES); CHECK_BIT(CAP_BIT_FEAT_PMULL, FEAT_PMULL); CHECK_BIT(CAP_BIT_FEAT_SPECRES, FEAT_PREDRES); @@ -123,7 +122,6 @@ void __init_cpu_features_resolver(void) { {"hw.optional.arm.FEAT_LSE", FEAT_LSE}, {"hw.optional.AdvSIMD", FEAT_SIMD}, {"hw.optional.armv8_crc32", FEAT_CRC}, - {"hw.optional.arm.FEAT_SHA1", FEAT_SHA1}, {"hw.optional.arm.FEAT_SHA256", FEAT_SHA2}, {"hw.optional.arm.FEAT_SHA3", FEAT_SHA3}, {"hw.optional.arm.FEAT_AES", FEAT_AES}, diff --git a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/fuchsia.inc b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/fuchsia.inc index 1ae4780e4978e..b0c4c801a633a 100644 --- a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/fuchsia.inc +++ b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/fuchsia.inc @@ -24,8 +24,6 @@ void __init_cpu_features_resolver() { setCPUFeature(FEAT_AES); if (features & ZX_ARM64_FEATURE_ISA_PMULL) setCPUFeature(FEAT_PMULL); - if (features & ZX_ARM64_FEATURE_ISA_SHA1) - setCPUFeature(FEAT_SHA1); if (features & ZX_ARM64_FEATURE_ISA_SHA256) setCPUFeature(FEAT_SHA2); if (features & ZX_ARM64_FEATURE_ISA_CRC32)