diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-13 12:31:44 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-13 12:31:44 +0100 |
| commit | 12cbe930cda74ed29d67472c0a2bd65e0f89ab3f (patch) | |
| tree | 502db2af924424e94a5efbf51d1f2435715f75b0 | |
| parent | 78fac5ed95960a909a62863d1803796a82991dba (diff) | |
| parent | f76be1a0d682fb11c706a789cce1dfb898041f30 (diff) | |
| download | php-git-12cbe930cda74ed29d67472c0a2bd65e0f89ab3f.tar.gz | |
Merge branch 'PHP-7.3'
| -rw-r--r-- | Zend/zend_string.c | 2 | ||||
| -rw-r--r-- | Zend/zend_string.h | 2 | ||||
| -rw-r--r-- | ext/opcache/zend_accelerator_util_funcs.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 7b243be18b..c628b9a4c7 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -376,7 +376,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 9758a1f87d..daea8829f5 100644 --- a/Zend/zend_string.h +++ b/Zend/zend_string.h @@ -293,7 +293,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 f9df19cc38..bf9eb08f7b 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -609,7 +609,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; |