php: remove Blackfin patch

And renumber remaining patches.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/php/0007-Call-apxs-with-correct-prefix.patch b/package/php/0006-Call-apxs-with-correct-prefix.patch
similarity index 100%
rename from package/php/0007-Call-apxs-with-correct-prefix.patch
rename to package/php/0006-Call-apxs-with-correct-prefix.patch

diff --git a/package/php/0006-avoid-bfin-gcc-segfault.patch b/package/php/0006-avoid-bfin-gcc-segfault.patch
deleted file mode 100644 (file)
index 7f8cb24..0000000
--- a/package/php/0006-avoid-bfin-gcc-segfault.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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)

diff --git a/package/php/0008-main-php_ini.c-build-empty-php_load_zend_extension_c.patch b/package/php/0007-main-php_ini.c-build-empty-php_load_zend_extension_c.patch
similarity index 100%
rename from package/php/0008-main-php_ini.c-build-empty-php_load_zend_extension_c.patch
rename to package/php/0007-main-php_ini.c-build-empty-php_load_zend_extension_c.patch