Push/pop GCC options in AEGIS code

utelle · utelle · commit 443da3d09ab8 · 2025-01-06T13:09:48.000+01:00
Attempt to fix issue #186.
diff --git a/src/aegis/aegis128l/aegis128l_aesni.c b/src/aegis/aegis128l/aegis128l_aesni.c
@@ -20,6 +20,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("aes,avx"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("aes,avx")
 #endif
 
@@ -105,6 +106,8 @@ struct aegis128l_implementation aegis128l_aesni_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis128l/aegis128l_altivec.c b/src/aegis/aegis128l/aegis128l_altivec.c
@@ -22,6 +22,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("altivec,crypto"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("altivec,crypto")
 #endif
 
@@ -101,6 +102,8 @@ struct aegis128l_implementation aegis128l_altivec_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis128l/aegis128l_armcrypto.c b/src/aegis/aegis128l/aegis128l_armcrypto.c
@@ -36,6 +36,7 @@
 #  pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), \
                                      apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("+simd+crypto")
 #endif
 
@@ -115,6 +116,8 @@ struct aegis128l_implementation aegis128l_armcrypto_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis128x2/aegis128x2_aesni.c b/src/aegis/aegis128x2/aegis128x2_aesni.c
@@ -20,6 +20,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("aes,avx"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("aes,avx")
 #endif
 
@@ -111,6 +112,8 @@ struct aegis128x2_implementation aegis128x2_aesni_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis128x2/aegis128x2_altivec.c b/src/aegis/aegis128x2/aegis128x2_altivec.c
@@ -22,6 +22,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("altivec,crypto"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("altivec,crypto")
 #endif
 
@@ -106,6 +107,8 @@ struct aegis128x2_implementation aegis128x2_altivec_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis128x2/aegis128x2_armcrypto.c b/src/aegis/aegis128x2/aegis128x2_armcrypto.c
@@ -36,6 +36,7 @@
 #  pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), \
                                      apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("+simd+crypto")
 #endif
 
@@ -120,6 +121,8 @@ struct aegis128x2_implementation aegis128x2_armcrypto_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis128x2/aegis128x2_avx2.c b/src/aegis/aegis128x2/aegis128x2_avx2.c
@@ -22,6 +22,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("vaes,avx2"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("vaes,avx2")
 #endif
 
@@ -106,6 +107,8 @@ struct aegis128x2_implementation aegis128x2_avx2_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif /* HAVE_VAESINTRIN_H */
diff --git a/src/aegis/aegis128x4/aegis128x4_aesni.c b/src/aegis/aegis128x4/aegis128x4_aesni.c
@@ -20,6 +20,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("aes,avx"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("aes,avx")
 #endif
 
@@ -120,6 +121,8 @@ struct aegis128x4_implementation aegis128x4_aesni_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis128x4/aegis128x4_altivec.c b/src/aegis/aegis128x4/aegis128x4_altivec.c
@@ -22,6 +22,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("altivec,crypto"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("altivec,crypto")
 #endif
 
@@ -114,6 +115,8 @@ struct aegis128x4_implementation aegis128x4_altivec_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis128x4/aegis128x4_armcrypto.c b/src/aegis/aegis128x4/aegis128x4_armcrypto.c
@@ -36,6 +36,7 @@
 #  pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), \
                                      apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("+simd+crypto")
 #endif
 
@@ -128,6 +129,8 @@ struct aegis128x4_implementation aegis128x4_armcrypto_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis128x4/aegis128x4_avx2.c b/src/aegis/aegis128x4/aegis128x4_avx2.c
@@ -22,6 +22,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("vaes,avx2"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("vaes,avx2")
 #endif
 
@@ -112,6 +113,8 @@ struct aegis128x4_implementation aegis128x4_avx2_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif /* HAVE_VAESINTRIN_H */
diff --git a/src/aegis/aegis128x4/aegis128x4_avx512.c b/src/aegis/aegis128x4/aegis128x4_avx512.c
@@ -28,6 +28,7 @@
                                              apply_to = function)
 #  endif
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("vaes,avx512f")
 #endif
 
@@ -112,6 +113,8 @@ struct aegis128x4_implementation aegis128x4_avx512_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif /* HAVE_VAESINTRIN_H */
diff --git a/src/aegis/aegis256/aegis256_aesni.c b/src/aegis/aegis256/aegis256_aesni.c
@@ -20,6 +20,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("aes,avx"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("aes,avx")
 #endif
 
@@ -101,6 +102,8 @@ struct aegis256_implementation aegis256_aesni_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis256/aegis256_altivec.c b/src/aegis/aegis256/aegis256_altivec.c
@@ -22,6 +22,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("altivec,crypto"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("altivec,crypto")
 #endif
 
@@ -99,6 +100,8 @@ struct aegis256_implementation aegis256_altivec_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis256/aegis256_armcrypto.c b/src/aegis/aegis256/aegis256_armcrypto.c
@@ -36,6 +36,7 @@
 #  pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), \
                                      apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("+simd+crypto")
 #endif
 
@@ -113,6 +114,8 @@ struct aegis256_implementation aegis256_armcrypto_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis256x2/aegis256x2_aesni.c b/src/aegis/aegis256x2/aegis256x2_aesni.c
@@ -20,6 +20,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("aes,avx"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("aes,avx")
 #endif
 
@@ -106,6 +107,8 @@ struct aegis256x2_implementation aegis256x2_aesni_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis256x2/aegis256x2_altivec.c b/src/aegis/aegis256x2/aegis256x2_altivec.c
@@ -22,6 +22,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("altivec,crypto"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("altivec,crypto")
 #endif
 
@@ -105,6 +106,8 @@ struct aegis256x2_implementation aegis256x2_altivec_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis256x2/aegis256x2_armcrypto.c b/src/aegis/aegis256x2/aegis256x2_armcrypto.c
@@ -36,6 +36,7 @@
 #  pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), \
                                      apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("+simd+crypto")
 #endif
 
@@ -118,6 +119,8 @@ struct aegis256x2_implementation aegis256x2_armcrypto_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis256x2/aegis256x2_avx2.c b/src/aegis/aegis256x2/aegis256x2_avx2.c
@@ -22,6 +22,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("vaes,avx2"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("vaes,avx2")
 #endif
 
@@ -101,6 +102,8 @@ struct aegis256x2_implementation aegis256x2_avx2_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif /* HAVE_VAESINTRIN_H */
diff --git a/src/aegis/aegis256x4/aegis256x4_aesni.c b/src/aegis/aegis256x4/aegis256x4_aesni.c
@@ -20,6 +20,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("aes,avx"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("aes,avx")
 #endif
 
@@ -115,6 +116,8 @@ struct aegis256x4_implementation aegis256x4_aesni_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis256x4/aegis256x4_altivec.c b/src/aegis/aegis256x4/aegis256x4_altivec.c
@@ -22,6 +22,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("altivec,crypto"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("altivec,crypto")
 #endif
 
@@ -112,6 +113,8 @@ struct aegis256x4_implementation aegis256x4_altivec_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis256x4/aegis256x4_armcrypto.c b/src/aegis/aegis256x4/aegis256x4_armcrypto.c
@@ -36,6 +36,7 @@
 #  pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), \
                                      apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("+simd+crypto")
 #endif
 
@@ -126,6 +127,8 @@ struct aegis256x4_implementation aegis256x4_armcrypto_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif
diff --git a/src/aegis/aegis256x4/aegis256x4_avx2.c b/src/aegis/aegis256x4/aegis256x4_avx2.c
@@ -22,6 +22,7 @@
 #ifdef __clang__
 #  pragma clang attribute push(__attribute__((target("vaes,avx2"))), apply_to = function)
 #elif defined(__GNUC__)
+#  pragma GCC push_options
 #  pragma GCC target("vaes,avx2")
 #endif
 
@@ -107,6 +108,8 @@ struct aegis256x4_implementation aegis256x4_avx2_implementation = {
 
 #ifdef __clang__
 #  pragma clang attribute pop
+#elif defined(__GNUC__)
+#  pragma GCC pop_options
 #endif
 
 #endif /* HAVE_VAESINTRIN_H */
diff --git a/src/aegis/aegis256x4/aegis256x4_avx512.c b/src/aegis/aegis256x4/aegis256x4_avx512.c
diff --git a/src/aegis/common/common.c b/src/aegis/common/common.c
diff --git a/src/cipher_common.c b/src/cipher_common.c
diff --git a/src/sqlite3mc.c b/src/sqlite3mc.c
