Revert GCC push/pop pragmas

utelle · utelle · commit 01f77adc9491 · 2025-01-06T15:31:04.000+01:00
Using GCC push/pop pragmas for individual algorithm implementations led to compile time errors.

To restrict the GCC target options to the AEGIS code GCC push/pop pragmas are now used in `libaegis.c`.
diff --git a/src/aegis/aegis128l/aegis128l_aesni.c b/src/aegis/aegis128l/aegis128l_aesni.c
@@ -20,7 +20,6 @@
 #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,8 +105,6 @@ 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,7 +22,6 @@
 #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
 
@@ -102,8 +101,6 @@ 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,7 +36,6 @@
 #  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
 
@@ -116,8 +115,6 @@ 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,7 +20,6 @@
 #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
 
@@ -112,8 +111,6 @@ 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,7 +22,6 @@
 #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
 
@@ -107,8 +106,6 @@ 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,7 +36,6 @@
 #  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
 
@@ -121,8 +120,6 @@ 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,7 +22,6 @@
 #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,8 +106,6 @@ 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,7 +20,6 @@
 #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
 
@@ -121,8 +120,6 @@ 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,7 +22,6 @@
 #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
 
@@ -115,8 +114,6 @@ 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,7 +36,6 @@
 #  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
 
@@ -129,8 +128,6 @@ 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,7 +22,6 @@
 #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
 
@@ -113,8 +112,6 @@ 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,7 +28,6 @@
                                              apply_to = function)
 #  endif
 #elif defined(__GNUC__)
-#  pragma GCC push_options
 #  pragma GCC target("vaes,avx512f")
 #endif
 
@@ -113,8 +112,6 @@ 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,7 +20,6 @@
 #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
 
@@ -102,8 +101,6 @@ 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,7 +22,6 @@
 #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
 
@@ -100,8 +99,6 @@ 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,7 +36,6 @@
 #  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
 
@@ -114,8 +113,6 @@ 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,7 +20,6 @@
 #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
 
@@ -107,8 +106,6 @@ 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,7 +22,6 @@
 #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,8 +105,6 @@ 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,7 +36,6 @@
 #  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
 
@@ -119,8 +118,6 @@ 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,7 +22,6 @@
 #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
 
@@ -102,8 +101,6 @@ 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,7 +20,6 @@
 #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
 
@@ -116,8 +115,6 @@ 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,7 +22,6 @@
 #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
 
@@ -113,8 +112,6 @@ 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,7 +36,6 @@
 #  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
 
@@ -127,8 +126,6 @@ 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,7 +22,6 @@
 #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
 
@@ -108,8 +107,6 @@ 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/libaegis.c b/src/aegis/libaegis.c
