From: Jan Rękorajski <baggins@pld-linux.org>
Date: Wed, 24 Oct 2018 21:02:33 +0000 (+0200)
Subject: Fix compilation on x32
X-Git-Tag: php-7.3.0RC6~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f76be1a0d682fb11c706a789cce1dfb898041f30;p=php

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 9b8c4d809c..0aa6665c19 100644
--- 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 4b375c5bec..c95578d4a5 100644
--- 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 90f82fd53d..1b2247f9ce 100644
--- 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;