1 --- a/Zend/zend_alloc_canary.c
2 +++ b/Zend/zend_alloc_canary.c
3 @@ -720,7 +720,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size)
4 #elif defined(__GNUC__) && defined(__x86_64__)
7 - __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size));
8 + __asm__("bsr %1,%0\n\t" : "=r" (n) : "rm" (_size));
9 return (unsigned int)n;
10 #elif defined(_MSC_VER) && defined(_M_IX86)
12 @@ -746,12 +746,12 @@ static inline unsigned int zend_mm_low_bit(size_t _size)
13 #elif defined(__GNUC__) && defined(__x86_64__)
16 - __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size));
17 + __asm__("bsf %1,%0\n\t" : "=r" (n) : "rm" (_size));
18 return (unsigned int)n;
19 #elif defined(_MSC_VER) && defined(_M_IX86)
25 static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0};
27 @@ -2481,12 +2481,22 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
29 unsigned long overflow = 0;
31 - __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1"
32 +#ifdef __ILP32__ /* x32 */
38 + __asm__ ("mul" LP_SUFF " %3\n\t"
41 : "=&a"(res), "=&d" (overflow)
48 if (UNEXPECTED(overflow)) {
49 zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);