From 5d4ca77c60c51d831ba7027f0858170d84adf2af Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@briansmith.org>
Date: Sun, 23 Jun 2024 14:05:52 -0700
Subject: [PATCH] aes_gcm aarch64/x86_64: Don't look at target_feature for
 `#[cold]`.

---
 src/aead/aes_gcm.rs | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/aead/aes_gcm.rs b/src/aead/aes_gcm.rs
index 8472c93c37..b2ddefe221 100644
--- a/src/aead/aes_gcm.rs
+++ b/src/aead/aes_gcm.rs
@@ -231,13 +231,7 @@ pub(super) fn seal(
     ),
     inline(never)
 )]
-#[cfg_attr(
-    any(
-        all(target_arch = "aarch64", target_feature = "neon"),
-        all(target_arch = "x86_64", target_feature = "sse")
-    ),
-    cold
-)]
+#[cfg_attr(any(target_arch = "aarch64", target_arch = "x86_64"), cold)]
 fn seal_strided<A: aes::EncryptBlock + aes::EncryptCtr32, G: gcm::UpdateBlocks + gcm::Gmult>(
     Combo { aes_key, gcm_key }: &Combo<A, G>,
     aad: Aad<&[u8]>,
@@ -425,13 +419,7 @@ pub(super) fn open(
     ),
     inline(never)
 )]
-#[cfg_attr(
-    any(
-        all(target_arch = "aarch64", target_feature = "neon"),
-        all(target_arch = "x86_64", target_feature = "sse")
-    ),
-    cold
-)]
+#[cfg_attr(any(target_arch = "aarch64", target_arch = "x86_64"), cold)]
 fn open_strided<A: aes::EncryptBlock + aes::EncryptCtr32, G: gcm::UpdateBlocks + gcm::Gmult>(
     Combo { aes_key, gcm_key }: &Combo<A, G>,
     aad: Aad<&[u8]>,