Fix compilation on x32

Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>

diff --git a/Zend/zend_string.c b/Zend/zend_string.c
index 9b8c4d809c2f88bc20310156a64520de9d377299..0aa6665c1938954c3438f182d9b0392745eec350 100644 (file)
--- a/Zend/zend_string.c
+++ b/Zend/zend_string.c
@@ -392,7 +392,7 @@ ZEND_API zend_bool ZEND_FASTCALL I_WRAP_SONAME_FNNAME_ZU(NONE,zend_string_equal_
 }
 #endif
 
-#elif defined(__GNUC__) && defined(__x86_64__)
+#elif defined(__GNUC__) && defined(__x86_64__) && !defined(__ILP32__)
 ZEND_API zend_bool ZEND_FASTCALL zend_string_equal_val(zend_string *s1, zend_string *s2)
 {
        char *ptr = ZSTR_VAL(s1);

diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index 4b375c5beceb479ea29d2af1b3bfe4b2df692328..c95578d4a524746da1cb8bc317a37a1dba0b463b 100644 (file)
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -294,7 +294,7 @@ static zend_always_inline void zend_string_release_ex(zend_string *s, int persis
        }
 }
 
-#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+#if defined(__GNUC__) && (defined(__i386__) || (defined(__x86_64__) && !defined(__ILP32__)))
 BEGIN_EXTERN_C()
 ZEND_API zend_bool ZEND_FASTCALL zend_string_equal_val(zend_string *s1, zend_string *s2);
 END_EXTERN_C()

diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c
index 90f82fd53dad430a4118471c8d8bcfd22e5a79f1..1b2247f9ce7c937e8d4e665802ead7c5a699dba9 100644 (file)
--- a/ext/opcache/zend_accelerator_util_funcs.c
+++ b/ext/opcache/zend_accelerator_util_funcs.c
@@ -719,7 +719,7 @@ static zend_always_inline void fast_memcpy(void *dest, const void *src, size_t s
                : "r"(delta)
                : "cc", "memory", "%xmm0", "%xmm1", "%xmm1", "%xmm2");
 }
-# elif defined(__GNUC__) && defined(__x86_64__)
+# elif defined(__GNUC__) && defined(__x86_64__) && !defined(__ILP32__)
 static zend_always_inline void fast_memcpy(void *dest, const void *src, size_t size)
 {
        size_t delta = (char*)dest - (char*)src;