From: Thomas Pornin <pornin@bolet.org>
Date: Mon, 28 Aug 2017 17:28:59 +0000 (+0200)
Subject: Worked around some compiler errors with GCC 4.4 and 4.5.
X-Git-Tag: v0.6~21
X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=commitdiff_plain;h=8e94ad2fcb11794c559025277e56f3fbeb676f5d;ds=sidebyside

Worked around some compiler errors with GCC 4.4 and 4.5.
---

diff --git a/src/inner.h b/src/inner.h
index 52bcaf0..fb49d0e 100644
--- a/src/inner.h
+++ b/src/inner.h
@@ -2243,18 +2243,25 @@ int br_ssl_choose_hash(unsigned bf);
  */
 #if BR_i386 || BR_amd64
 
+/*
+ * On GCC before version 5.0, we need to use the pragma to enable the
+ * target options globally, because the 'target' function attribute
+ * appears to be unreliable. Before 4.6 we must also avoid the
+ * push_options / pop_options mechanism, because it tends to trigger
+ * some internal compiler errors.
+ */
 #if BR_GCC && !BR_GCC_5_0
 #if BR_GCC_4_6
 #define BR_TARGETS_X86_UP \
 	_Pragma("GCC push_options") \
 	_Pragma("GCC target(\"sse2,ssse3,sse4.1,aes,pclmul,rdrnd\")")
+#define BR_TARGETS_X86_DOWN \
+	_Pragma("GCC pop_options")
 #else
 #define BR_TARGETS_X86_UP \
-	_Pragma("GCC push_options") \
 	_Pragma("GCC target(\"sse2,ssse3,sse4.1,aes,pclmul\")")
 #endif
-#define BR_TARGETS_X86_DOWN \
-	_Pragma("GCC pop_options")
+#define BR_TARGETS_X86_DOWN
 #pragma GCC diagnostic ignored "-Wpsabi"
 #endif
 
@@ -2286,7 +2293,7 @@ int br_ssl_choose_hash(unsigned bf);
 BR_TARGETS_X86_UP
 #include <x86intrin.h>
 #include <cpuid.h>
-#define bswap32   __builtin_bswap32
+#define br_bswap32   __builtin_bswap32
 BR_TARGETS_X86_DOWN
 #endif
 
@@ -2294,7 +2301,7 @@ BR_TARGETS_X86_DOWN
 #include <stdlib.h>
 #include <intrin.h>
 #include <immintrin.h>
-#define bswap32   _byteswap_ulong
+#define br_bswap32   _byteswap_ulong
 #endif
 
 static inline int
diff --git a/src/symcipher/aes_x86ni_ctr.c b/src/symcipher/aes_x86ni_ctr.c
index 292d044..1cddd60 100644
--- a/src/symcipher/aes_x86ni_ctr.c
+++ b/src/symcipher/aes_x86ni_ctr.c
@@ -68,10 +68,10 @@ br_aes_x86ni_ctr_run(const br_aes_x86ni_ctr_keys *ctx,
 	while (len > 0) {
 		__m128i x0, x1, x2, x3;
 
-		x0 = _mm_insert_epi32(ivx, bswap32(cc + 0), 3);
-		x1 = _mm_insert_epi32(ivx, bswap32(cc + 1), 3);
-		x2 = _mm_insert_epi32(ivx, bswap32(cc + 2), 3);
-		x3 = _mm_insert_epi32(ivx, bswap32(cc + 3), 3);
+		x0 = _mm_insert_epi32(ivx, br_bswap32(cc + 0), 3);
+		x1 = _mm_insert_epi32(ivx, br_bswap32(cc + 1), 3);
+		x2 = _mm_insert_epi32(ivx, br_bswap32(cc + 2), 3);
+		x3 = _mm_insert_epi32(ivx, br_bswap32(cc + 3), 3);
 		x0 = _mm_xor_si128(x0, sk[0]);
 		x1 = _mm_xor_si128(x1, sk[0]);
 		x2 = _mm_xor_si128(x2, sk[0]);