From cd4f90e3608a49d44e49eba1ddac9bce09c933a8 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Tue, 5 Oct 2021 00:30:24 +0100
Subject: [PATCH] Fix SIMD definitions and add more definitions for ARM.

---
 simd.h | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/simd.h b/simd.h
index a551edf..dfbc6ef 100644
--- a/simd.h
+++ b/simd.h
@@ -1,7 +1,20 @@
+#ifdef _MSC_VER
+#define ALIGNED_(n) __declspec(align(n))
+#else
+#define ALIGNED_(n) __attribute__((aligned(n)))
+#endif
+
 #if defined(__x86_64__) || defined(__amd64) || defined(_M_AMD64) || defined(_M_X64) || defined(__I386__) ||            \
     defined(__i386__) || defined(__THW_INTEL) || defined(_M_IX86)
 
+#ifdef _MSC_VER
+#define AVX2
+#define CLMUL
+#else
 #define AVX2 __attribute__((target("avx2")))
+#define SSSE3 __attribute__((target("ssse3")))
+#define CLMUL __attribute__((target("pclmul,sse4.1")))
+#endif
 
 int have_clmul(void);
 int have_ssse3(void);
@@ -10,15 +23,40 @@ int have_avx2(void);
 
 #if defined(__arm__) || defined(_M_ARM)
 #define HWCAP_NEON (1 << 12)
+#define HWCAP2_AES (1 << 0)
 #define HWCAP2_CRC32 (1 << 4)
 #endif
 
 #if defined(__aarch64__) || defined(_M_ARM64)
 #define HWCAP_NEON (1 << 1)
+#define HWCAP_AES (1 << 3)
 #define HWCAP_CRC32 (1 << 7)
 #endif
 
 #if defined(__aarch64__) || defined(_M_ARM64) || defined(__arm__) || defined(_M_ARM)
 int have_neon(void);
 int have_arm_crc32(void);
-#endif
\ No newline at end of file
+int have_arm_crypto(void);
+#endif
+
+#if defined(__aarch64__) || defined(_M_ARM64) || defined(__arm__) || defined(_M_ARM)
+
+#ifdef _MSC_VER
+
+#define TARGET_ARMV8_WITH_CRC
+
+#else // _MSC_VER
+
+#if defined(__aarch64__) || defined(_M_ARM64)
+#define TARGET_ARMV8_WITH_CRC __attribute__((target("+crc")))
+#define TARGET_WITH_CRYPTO __attribute__((target("+crypto")))
+#define TARGET_WITH_SIMD
+#else
+#define TARGET_ARMV8_WITH_CRC __attribute__((target("armv8-a,crc")))
+#define TARGET_WITH_CRYPTO __attribute__((target("+crc")))
+#define TARGET_WITH_SIMD __attribute__((target("+neon")))
+#endif // __aarch64__ || _M_ARM64
+
+#endif // _MSC_VER
+
+#endif // __aarch64__ || _M_ARM64 || __arm__ || _M_ARM