com php-src: Merge the fix for #69703 to 5.5 per request from Julien: NEWS Zend/zend_alloc.c
| From: | Kalle Sommer Nielsen | Date: | Thu, 28 May 2015 14:54:02 +0000 |
| Subject: | com php-src: Merge the fix for #69703 to 5.5 per request from Julien: NEWS Zend/zend_alloc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86974@lists.php.net to get a copy of this message | ||
Commit: c4e9651b587e1ebcf3e2de7a2d3d586c0cc3e0c4
Author: Kalle Sommer Nielsen <kalle@php.net> Thu, 28 May 2015 16:54:02 +0200
Parents: 09b92a3a542455651016afe1bc9854e52b4673c3
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c4e9651b587e1ebcf3e2de7a2d3d586c0cc3e0c4
Log:
Merge the fix for #69703 to 5.5 per request from Julien
Bugs:
https://bugs.php.net/69703
Changed paths:
M NEWS
M Zend/zend_alloc.c
Diff:
diff --git a/NEWS b/NEWS
index d7579e4..7997ccf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-PHP NEWS
+PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2015, PHP 5.5.26
@@ -9,6 +9,8 @@ PHP NEWS
(Julien)
. Fixed bug #69628 (complex GLOB_BRACE fails on Windows).
(Christoph M. Becker)
+ . Fixed bug #69703 (Use __builtin_clzl on PowerPC).
+ (dja at axtens dot net, Kalle)
- GD:
. Fixed bug #69479 (GD fails to build with newer libvpx). (Remi)
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index cd422e2..7fe7ffb 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -678,7 +678,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size)
__asm {
bsr eax, _size
}
-#elif defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))
+#elif defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__) ||
defined(__powerpc__))
return (8 * SIZEOF_SIZE_T - 1) - __builtin_clzl(_size);
#else
unsigned int n = 0;
@@ -706,7 +706,7 @@ static inline unsigned int zend_mm_low_bit(size_t _size)
__asm {
bsf eax, _size
}
-#elif defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))
+#elif defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__) ||
defined(__powerpc__))
return __builtin_ctzl(_size);
#else
static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0};