diff options
| author | Adam Duskett <aduskett@gmail.com> | 2018-02-02 07:50:39 -0500 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-02-02 21:36:38 +0100 |
| commit | 9a7eca9baaf9930ef0c975621a8b941bfa11efe3 (patch) | |
| tree | 456e200c1d341b9dbf0a64bf2ba2ae400d251970 /package/php/0006-avoid-bfin-gcc-segfault.patch | |
| parent | 5c7fd2ad10e2a383e8b87f23bc115887fd9b9b6c (diff) | |
| download | buildroot-9a7eca9baaf9930ef0c975621a8b941bfa11efe3.tar.gz buildroot-9a7eca9baaf9930ef0c975621a8b941bfa11efe3.zip | |
php: bump version to 7.2.2
Additional changes:
- Fix ordering of patches.
- Update patches to apply cleanly against 7.2.2
- Updates License sha256sum
Signed-off-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/php/0006-avoid-bfin-gcc-segfault.patch')
| -rw-r--r-- | package/php/0006-avoid-bfin-gcc-segfault.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/package/php/0006-avoid-bfin-gcc-segfault.patch b/package/php/0006-avoid-bfin-gcc-segfault.patch new file mode 100644 index 0000000000..7f8cb24e7a --- /dev/null +++ b/package/php/0006-avoid-bfin-gcc-segfault.patch @@ -0,0 +1,17 @@ +Avoid gcc segmentation fault + +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> +Signed-off-by: Adam Duskett <aduskett@gmail.com> +[aduskett@gmail.com: Update for 7.2.2] +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 +@@ -95,7 +95,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) |
