Port the GCC target changes for aarch64 to aegis

Fixes #1313
jedisct1 · Sep 13, 2023 · fb4533b · fb4533b
1 parent b795a93
commit fb4533b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c b/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c
@@ -20,9 +20,12 @@
 #ifdef __clang__
 #pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
 #elif defined(__GNUC__)
-#pragma GCC target("neon,crypto,aes")
+#pragma GCC target("+simd+crypto")
 #endif
 
+#ifndef __ARM_FEATURE_CRYPTO
+#define __ARM_FEATURE_CRYPTO 1
+#endif
 #ifndef __ARM_FEATURE_AES
 #define __ARM_FEATURE_AES 1
 #endif

diff --git a/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c b/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c
@@ -20,9 +20,12 @@
 #ifdef __clang__
 #pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
 #elif defined(__GNUC__)
-#pragma GCC target("neon,crypto,aes")
+#pragma GCC target("+simd+crypto")
 #endif
 
+#ifndef __ARM_FEATURE_CRYPTO
+#define __ARM_FEATURE_CRYPTO 1
+#endif
 #ifndef __ARM_FEATURE_AES
 #define __ARM_FEATURE_AES 1
 #endif