Ugly, but hopefully working

Author: cmb69

ext/hash/hash_sha.c

@@ -164,7 +164,7 @@ static void SHA256Transform(uint32_t state[8], const unsigned char block[64])
 #if defined(PHP_HASH_INTRIN_SHA_NATIVE)
 	SHA256_Transform_shani(state, block);
 	return;
-#elif defined(PHP_HASH_INTRIN_SHA_RESOLVER)
+#elif defined(PHP_HASH_INTRIN_SHA_RESOLVER) || (defined(_M_X64) || defined(_M_IX86)) && ZEND_INTRIN_SSSE3_RESOLVER
 	if (zend_cpu_supports(ZEND_CPU_FEATURE_SSSE3) && zend_cpu_supports(ZEND_CPU_FEATURE_SHA)) {
 		SHA256_Transform_shani(state, block);
 		return;

ext/hash/hash_sha_ni.c

@@ -27,10 +27,15 @@
 #include "php_hash.h"
 #include "php_hash_sha.h"
 
-#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IMMINTRIN_H) || defined(_M_X64) || defined(_M_IX86)
+#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IMMINTRIN_H) || (defined(_M_X64) || defined(_M_IX86)) && ZEND_INTRIN_SSSE3_RESOLVER
 
 # include <immintrin.h>
 
+# if PHP_HASH_INTRIN_SHA_RESOLVER
+static __m128i be32dec_128(const uint8_t * src)  __attribute__((target("ssse3")));
+void SHA256_Transform_shani(uint32_t state[PHP_STATIC_RESTRICT 8], const uint8_t block[PHP_STATIC_RESTRICT 64])  __attribute__((target("ssse3,sha")));
+# endif
+
 /* Original implementation from libcperciva follows.
  *
  * Modified to use `PHP_STATIC_RESTRICT` for MSVC compatibility.

ext/hash/php_hash_sha.h

@@ -56,10 +56,10 @@ PHP_HASH_API void PHP_SHA256Update(PHP_SHA256_CTX *, const unsigned char *, size
 void SHA256_Transform_sse2(uint32_t state[PHP_STATIC_RESTRICT 8], const uint8_t block[PHP_STATIC_RESTRICT 64], uint32_t W[PHP_STATIC_RESTRICT 64], uint32_t S[PHP_STATIC_RESTRICT 8]);
 #endif
 
-#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IMMINTRIN_H) || defined(_M_X64) || defined(_M_IX86)
+#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IMMINTRIN_H)
 # if defined(__SSSE3__) && defined(__SHA__)
 #  define PHP_HASH_INTRIN_SHA_NATIVE 1
-# elif defined(ZEND_INTRIN_SSSE3_RESOLVER)
+# elif defined(HAVE_FUNC_ATTRIBUTE_TARGET)
 #  define PHP_HASH_INTRIN_SHA_RESOLVER 1
 # endif