1 From 514afd67b651bea834bdb84b7685b48e9e56ac21 Mon Sep 17 00:00:00 2001
2 From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
3 Date: Tue, 30 Apr 2013 19:00:31 +0200
4 Subject: [PATCH] Fix bug #64729: compilation failure on x32
7 Zend/zend_alloc.c | 18 ++++++++++++++----
8 Zend/zend_multiply.h | 4 ++--
9 2 files changed, 16 insertions(+), 6 deletions(-)
11 diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
12 index 605e396..0bbd59a 100644
13 --- a/Zend/zend_alloc_canary.c
14 +++ b/Zend/zend_alloc_canary.c
15 @@ -720,7 +720,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size)
16 #elif defined(__GNUC__) && defined(__x86_64__)
19 - __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size));
20 + __asm__("bsr %1,%0\n\t" : "=r" (n) : "rm" (_size));
21 return (unsigned int)n;
22 #elif defined(_MSC_VER) && defined(_M_IX86)
24 @@ -746,12 +746,12 @@ static inline unsigned int zend_mm_low_bit(size_t _size)
25 #elif defined(__GNUC__) && defined(__x86_64__)
28 - __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size));
29 + __asm__("bsf %1,%0\n\t" : "=r" (n) : "rm" (_size));
30 return (unsigned int)n;
31 #elif defined(_MSC_VER) && defined(_M_IX86)
37 static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0};
39 @@ -2481,12 +2481,22 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
41 unsigned long overflow = 0;
43 - __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1"
44 +#ifdef __ILP32__ /* x32 */
50 + __asm__ ("mul" LP_SUFF " %3\n\t"
53 : "=&a"(res), "=&d" (overflow)
60 if (UNEXPECTED(overflow)) {
61 zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);