From 47bc8df4605d4ef28e44c38a99228b40b72b2595 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 27 Feb 2017 16:07:57 +0100
Subject: [PATCH] Avoid unsupport pragmas

---
 .../crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c |  8 +++++---
 .../blake2b/ref/blake2b-compress-avx2.c                | 10 ++++++----
 .../blake2b/ref/blake2b-compress-sse41.c               |  8 +++++---
 .../blake2b/ref/blake2b-compress-ssse3.c               |  6 ++++--
 .../crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c   |  4 +++-
 .../crypto_pwhash/argon2/argon2-fill-block-ssse3.c     |  6 ++++--
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c b/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
index 4baae622..d09b0442 100644
--- a/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
+++ b/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
@@ -19,9 +19,11 @@
 
 #if defined(HAVE_TMMINTRIN_H) && defined(HAVE_WMMINTRIN_H)
 
-#pragma GCC target("ssse3")
-#pragma GCC target("aes")
-#pragma GCC target("pclmul")
+# ifdef __GNUC__
+#  pragma GCC target("ssse3")
+#  pragma GCC target("aes")
+#  pragma GCC target("pclmul")
+# endif
 
 #include <tmmintrin.h>
 #include <wmmintrin.h>
diff --git a/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c b/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c
index 4b01b170..d57ef7b8 100644
--- a/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c
+++ b/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c
@@ -12,10 +12,12 @@
 #if defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && \
     defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)
 
-#pragma GCC target("sse2")
-#pragma GCC target("ssse3")
-#pragma GCC target("sse4.1")
-#pragma GCC target("avx2")
+# ifdef __GNUC__
+#  pragma GCC target("sse2")
+#  pragma GCC target("ssse3")
+#  pragma GCC target("sse4.1")
+#  pragma GCC target("avx2")
+# endif
 
 #include <emmintrin.h>
 #include <immintrin.h>
diff --git a/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-sse41.c b/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-sse41.c
index 6043f21f..535d925e 100644
--- a/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-sse41.c
+++ b/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-sse41.c
@@ -11,9 +11,11 @@
 #if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && \
     defined(HAVE_SMMINTRIN_H)
 
-#pragma GCC target("sse2")
-#pragma GCC target("ssse3")
-#pragma GCC target("sse4.1")
+# ifdef __GNUC__
+#  pragma GCC target("sse2")
+#  pragma GCC target("ssse3")
+#  pragma GCC target("sse4.1")
+# endif
 
 #include <emmintrin.h>
 #include <smmintrin.h>
diff --git a/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c b/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c
index 0470901e..401f42c1 100644
--- a/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c
+++ b/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c
@@ -7,8 +7,10 @@
 
 #if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)
 
-#pragma GCC target("sse2")
-#pragma GCC target("ssse3")
+# ifdef __GNUC__
+#  pragma GCC target("sse2")
+#  pragma GCC target("ssse3")
+# endif
 
 #ifdef _MSC_VER
 # include <intrin.h> /* for _mm_set_epi64x */
diff --git a/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c b/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c
index f3e5f3bd..41796d78 100644
--- a/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c
+++ b/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c
@@ -10,7 +10,9 @@
 
 #if defined(HAVE_TI_MODE) && defined(HAVE_EMMINTRIN_H)
 
-# pragma GCC target("sse2")
+# ifdef __GNUC__
+#  pragma GCC target("sse2")
+# endif
 
 # include <emmintrin.h>
 
diff --git a/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c
index 77d0adb9..b72f8263 100644
--- a/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c
+++ b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c
@@ -21,8 +21,10 @@
 
 #if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)
 
-# pragma GCC target("sse2")
-# pragma GCC target("ssse3")
+# ifdef __GNUC__
+#  pragma GCC target("sse2")
+#  pragma GCC target("ssse3")
+# endif
 
 # ifdef _MSC_VER
 #  include <intrin.h> /* for _mm_set_epi64x */