]>
Commit | Line | Data |
---|---|---|
ff24a478 JR |
1 | --- php-7.3.0RC3/Zend/zend_string.c~ 2018-10-09 11:26:41.000000000 +0200 |
2 | +++ php-7.3.0RC3/Zend/zend_string.c 2018-10-24 22:05:01.639560148 +0200 | |
3 | @@ -392,7 +392,7 @@ | |
4 | } | |
5 | #endif | |
6 | ||
7 | -#elif defined(__GNUC__) && defined(__x86_64__) | |
8 | +#elif defined(__GNUC__) && defined(__x86_64__) && !defined(__ILP32__) | |
9 | ZEND_API zend_bool ZEND_FASTCALL zend_string_equal_val(zend_string *s1, zend_string *s2) | |
10 | { | |
11 | char *ptr = ZSTR_VAL(s1); | |
12 | --- php-7.3.0RC3/Zend/zend_string.h~ 2018-10-09 11:26:41.000000000 +0200 | |
13 | +++ php-7.3.0RC3/Zend/zend_string.h 2018-10-24 22:47:14.745614884 +0200 | |
14 | @@ -294,7 +294,7 @@ | |
15 | } | |
16 | } | |
17 | ||
18 | -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) | |
19 | +#if defined(__GNUC__) && (defined(__i386__) || (defined(__x86_64__) && !defined(__ILP32__))) | |
20 | ZEND_API zend_bool ZEND_FASTCALL zend_string_equal_val(zend_string *s1, zend_string *s2); | |
21 | #else | |
22 | static zend_always_inline zend_bool zend_string_equal_val(zend_string *s1, zend_string *s2) | |
23 | --- php-7.3.0RC3/ext/opcache/zend_accelerator_util_funcs.c~ 2018-10-09 11:26:32.000000000 +0200 | |
24 | +++ php-7.3.0RC3/ext/opcache/zend_accelerator_util_funcs.c 2018-10-24 22:15:44.849117508 +0200 | |
25 | @@ -719,7 +719,7 @@ | |
26 | : "r"(delta) | |
27 | : "cc", "memory", "%xmm0", "%xmm1", "%xmm1", "%xmm2"); | |
28 | } | |
29 | -# elif defined(__GNUC__) && defined(__x86_64__) | |
30 | +# elif defined(__GNUC__) && defined(__x86_64__) && !defined(__ILP32__) | |
31 | static zend_always_inline void fast_memcpy(void *dest, const void *src, size_t size) | |
32 | { | |
33 | size_t delta = (char*)dest - (char*)src; |