6668a0ed5c
Fixes: http://autobuild.buildroot.net/results/8326f24511d3b109d22a76660adc017bbcaca197 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
17 lines
804 B
Diff
17 lines
804 B
Diff
Avoid gcc segmentation fault
|
|
|
|
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
|
|
|
diff -Nur php-7.0.12.orig/Zend/zend_portability.h php-7.0.12/Zend/zend_portability.h
|
|
--- php-7.0.12.orig/Zend/zend_portability.h 2016-10-13 16:04:17.000000000 +0200
|
|
+++ php-7.0.12/Zend/zend_portability.h 2016-11-08 02:49:39.118388999 +0100
|
|
@@ -97,7 +97,7 @@
|
|
|
|
#if defined(ZEND_WIN32) && !defined(__clang__)
|
|
# define ZEND_ASSUME(c) __assume(c)
|
|
-#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT
|
|
+#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT && !defined(__bfin__)
|
|
# define ZEND_ASSUME(c) do { \
|
|
if (__builtin_expect(!(c), 0)) __builtin_unreachable(); \
|
|
} while (0)
|