Remove Blackfin architecture

deleted file mode 100644
index eeefcefbee..0000000000
@@ -1,12 +0,0 @@
-BR2_bfin=y
-BR2_bf512=y
-BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
-BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-bfin-full-2017.11-rc1.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
-BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
-# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
-# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set
-BR2_TOOLCHAIN_EXTERNAL_CXX=y

index 1bce7ac577..64abfb3fd4 100644
@@ -15,9 +15,6 @@ support/config-fragments/autobuild/br-arm-cortex-m4-full.config,x86_64
 # Test a musl toolchain
 support/config-fragments/autobuild/br-x86-64-musl.config,x86_64
 
-# Test a noMMU toolchain with dynamic library support
-support/config-fragments/autobuild/br-bfin-full.config,x86_64
-
 # Test a MMU toolchain without dynamic library support
 support/config-fragments/autobuild/br-arm-full-static.config,x86_64
 

index 2e069b6005..54951276fa 100755
@@ -75,7 +75,7 @@ main() {
     # Default mode is to test the N first toolchains, which have been
     # chosen to be a good selection of toolchains.
     if [ ${mode} -eq 0 ] ; then
-        number=7
+        number=6
     elif [ ${mode} -gt 1 ] ; then
         printf "error: --all, --number and --random are mutually exclusive\n" >&2; exit 1
     fi

index 3229fcf12c..86f95bee8f 100644
@@ -139,7 +139,6 @@ freescale_t1040d4rdb_defconfig: *defconfig
 friendlyarm_nanopi_a64_defconfig: *defconfig
 friendlyarm_nanopi_neo2_defconfig: *defconfig
 galileo_defconfig: *defconfig
-gdb_bfin_bf512_defconfig: *defconfig
 grinn_chiliboard_defconfig: *defconfig
 grinn_liteboard_defconfig: *defconfig
 imx23evk_defconfig: *defconfig

87 lines not on this page · raw message

deleted file mode 100644
index b8ff250a04..0000000000
@@ -1,11 +0,0 @@
-Run the simulation with GDB for FDPIC:
-
- ./output/host/bin/bfin-buildroot-linux-uclibc-run --env operating --model bf512 output/images/vmlinux
-
-Run the simulation with GDB for FLAT:
-
- ./output/host/bin/bfin-buildroot-uclinux-uclibc-run --env operating --model bf512 output/images/vmlinux
-
-The login prompt will appear in the terminal that started GDB.
-
-Tested with GDB 7.9

deleted file mode 100755
index 8933d504ec..0000000000
@@ -1,4 +0,0 @@
-#!/bin/sh
-# no simulated network devices at the moment
-rm -f ${TARGET_DIR}/etc/init.d/S40network
-rm -rf ${TARGET_DIR}/etc/network/

deleted file mode 100644
index 6740647cb3..0000000000
@@ -1,33 +0,0 @@
-# Architecture
-BR2_bfin=y
-BR2_bf512=y
-
-# Filesystem
-BR2_TARGET_ROOTFS_INITRAMFS=y
-# BR2_TARGET_ROOTFS_TAR is not set
-
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/gdb/post-build.sh"
-
-# Linux headers same as kernel, a 4.14 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.14"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/gdb/bfin-bf512/linux.config"
-BR2_LINUX_KERNEL_VMLINUX=y
-
-# Serial port config
-BR2_TARGET_GENERIC_GETTY=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyBF0"
-
-# use minimal busybox with hush
-BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
-
-# compile gdb sim
-BR2_PACKAGE_HOST_GDB=y
-# BR2_PACKAGE_HOST_GDB_TUI is not set
-# BR2_PACKAGE_HOST_GDB_PYTHON is not set
-BR2_PACKAGE_HOST_GDB_SIM=y

index 2e3b1b6001..3a080cc565 100644
@@ -145,6 +145,14 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_bfin
+	bool "Blackfin architecture support removed"
+	select BR2_LEGACY
+	help
+	  Following the removal of Blackfin support for the upstream
+	  Linux kernel, Buildroot has removed support for this CPU
+	  architecture.
+
 config BR2_PACKAGE_KODI_ADSP_BASIC
 	bool "kodi-adsp-basic package removed"
 	select BR2_LEGACY

index 9d23fa51b8..9560643f9a 100644
@@ -1931,7 +1931,6 @@ N:	Wade Berrier <[email protected]>
 F:	package/ngrep/
 
 N:	Waldemar Brodkorb <[email protected]>
-F:	arch/Config.in.bfin
 F:	arch/Config.in.m68k
 F:	arch/Config.in.or1k
 F:	arch/Config.in.sparc

index 0724f28f45..e586c68146 100644
@@ -431,7 +431,6 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 	-e s/arceb/arc/ \
 	-e s/arm.*/arm/ -e s/sa110/arm/ \
 	-e s/aarch64.*/arm64/ \
-	-e s/bfin/blackfin/ \
 	-e s/or1k/openrisc/ \
 	-e s/parisc64/parisc/ \
 	-e s/powerpc64.*/powerpc/ \

index 65448e9339..a193cd0068 100644
@@ -78,16 +78,6 @@ config BR2_aarch64_be
 	  http://www.arm.com/products/processors/instruction-set-architectures/armv8-architecture.php
 	  http://en.wikipedia.org/wiki/ARM
 
-config BR2_bfin
-	bool "Blackfin"
-	select BR2_ARCH_HAS_FDPIC_SUPPORT
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
-	help
-	  The Blackfin is a family of 16 or 32-bit microprocessors
-	  developed, manufactured and marketed by Analog Devices.
-	  http://www.analog.com/
-	  http://en.wikipedia.org/wiki/Blackfin
-
 config BR2_csky
 	bool "csky"
 	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT

@@ -400,14 +390,14 @@ config BR2_BINFMT_FLAT_SEP_DATA
 	# big functions cannot be built in this mode. They cause build
 	# failures such as "Tried to convert PC relative branch to
 	# absolute jump" or "error: value -yyyyy out of range".
-	depends on BR2_bfin
+	depends on BR2_BROKEN
 	help
 	  Allow for the data and text segments to be separated and
 	  placed in different regions of memory.
 
 config BR2_BINFMT_FLAT_SHARED
 	bool "Shared binary"
-	depends on BR2_m68k || BR2_bfin
+	depends on BR2_m68k
 	# Even though this really generates shared binaries, there is no libdl
 	# and dlopen() cannot be used. So packages that require shared
 	# libraries cannot be built. Therefore, we don't select

@@ -427,10 +417,6 @@ if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be
 source "arch/Config.in.arm"
 endif
 
-if BR2_bfin
-source "arch/Config.in.bfin"
-endif
-
 if BR2_csky
 source "arch/Config.in.csky"
 endif

102 lines not on this page · raw message

index 3a080cc565..a752673fbb 100644
@@ -145,6 +145,13 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_BINFMT_FLAT_SEP_DATA
+	bool "binfmt FLAT with separate code and data removed"
+	select BR2_LEGACY
+	help
+	  This FLAT binary format was only used on Blackfin, which has
+	  been removed.
+
 config BR2_bfin
 	bool "Blackfin architecture support removed"
 	select BR2_LEGACY

index a193cd0068..a66ea0d03b 100644
@@ -383,18 +383,6 @@ config BR2_BINFMT_FLAT_ONE
 	help
 	  All segments are linked into one memory region.
 
-config BR2_BINFMT_FLAT_SEP_DATA
-	bool "Separate data and code region"
-	# this FLAT binary type technically exists on m68k, but fails
-	# to build numerous packages: due to architecture limitation,
-	# big functions cannot be built in this mode. They cause build
-	# failures such as "Tried to convert PC relative branch to
-	# absolute jump" or "error: value -yyyyy out of range".
-	depends on BR2_BROKEN
-	help
-	  Allow for the data and text segments to be separated and
-	  placed in different regions of memory.
-
 config BR2_BINFMT_FLAT_SHARED
 	bool "Shared binary"
 	depends on BR2_m68k

index be7a48f647..4325f7b3a9 100644
@@ -189,12 +189,6 @@ TARGET_CFLAGS += -mid-shared-library -mshared-library-id=0
 TARGET_FCFLAGS += -mid-shared-library -mshared-library-id=0
 TARGET_CXXFLAGS += -mid-shared-library -mshared-library-id=0
 endif
-ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y)
-TARGET_LDFLAGS += -msep-data
-TARGET_CFLAGS += -msep-data
-TARGET_FCFLAGS += -msep-data
-TARGET_CXXFLAGS += -msep-data
-endif
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 TARGET_CROSS = $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-

index 8d198f669a..cc552a3a36 100644
@@ -68,14 +68,6 @@ define UCLIBC_BINFMT_CONFIG
 	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
 endef
 endif
-ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y)
-define UCLIBC_BINFMT_CONFIG
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
-	$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
-endef
-endif
 ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
 define UCLIBC_BINFMT_CONFIG
 	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)

index cef8ccd3cd..b980745d1b 100644
@@ -202,10 +202,6 @@ config BR2_TARGET_UBOOT_FORMAT_KWB
 	bool "u-boot.kwb (Marvell)"
 	depends on BR2_arm
 
-config BR2_TARGET_UBOOT_FORMAT_LDR
-	bool "u-boot.ldr"
-	depends on BR2_bfin
-
 config BR2_TARGET_UBOOT_FORMAT_ELF
 	bool "u-boot.elf"
 

index 24d3e4ef54..03bd7ea743 100644
@@ -61,10 +61,6 @@ UBOOT_BINS += u-boot.ais
 UBOOT_MAKE_TARGET += u-boot.ais
 endif
 
-ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
-UBOOT_BINS += u-boot.ldr
-endif
-
 ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
 UBOOT_BINS += u-boot-nand.bin
 endif

index d9c5b62863..563db423b1 100644
@@ -194,7 +194,7 @@ choice
 
 config BR2_LINUX_KERNEL_UIMAGE
 	bool "uImage"
-	depends on BR2_arc || BR2_arm || BR2_armeb || BR2_bfin || \
+	depends on BR2_arc || BR2_arm || BR2_armeb || \
 		   BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
 		   BR2_sh || BR2_mips || BR2_mipsel || \
 		   BR2_mips64 || BR2_mips64el || BR2_xtensa

index 1bd01ecefc..fc3912654b 100644
@@ -65,12 +65,6 @@ HOST_BINUTILS_CONF_ENV += MAKEINFO=true
 HOST_BINUTILS_MAKE_OPTS += MAKEINFO=true
 HOST_BINUTILS_INSTALL_OPTS += MAKEINFO=true install
 
-# gcc bug with Os/O1/O2/O3, PR77311
-# error: unable to find a register to spill in class 'CCREGS'
-ifeq ($(BR2_bfin),y)
-BINUTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0"
-endif
-
 # Workaround a build issue with -Os for ARM Cortex-M cpus.
 # (Binutils 2.25.1 and 2.26.1)
 # https://sourceware.org/bugzilla/show_bug.cgi?id=20552

index 309ddf572a..425835d4b1 100644
@@ -63,13 +63,6 @@ config BR2_GCC_VERSION_7_X
 
 endchoice
 
-# Indicates if GCC for architecture supports --with-{arch,cpu,..}  to
-# set default CFLAGS, otherwise values will be used by toolchain
-# wrapper.
-config BR2_GCC_ARCH_HAS_CONFIGURABLE_DEFAULTS
-	bool
-	default y if !BR2_bfin
-
 config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 	bool
 	default y

index b7b27aec13..9897d18682 100644
@@ -76,10 +76,6 @@ HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4a,m4a-nofpu"
 HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4*
 endif
 
-ifeq ($(BR2_bfin),y)
-HOST_GCC_FINAL_CONF_OPTS += --disable-symvers
-endif
-
 # libcilkrts does not support v8
 ifeq ($(BR2_sparc),y)
 HOST_GCC_FINAL_CONF_OPTS += --disable-libcilkrts

59 lines not on this page · raw message

index af020f40c5..6eea73b071 100644
@@ -2,7 +2,6 @@ config BR2_PACKAGE_GDB_ARCH_SUPPORTS
 	bool
 	default y
 	depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT)
-	depends on !BR2_bfin
 	depends on !BR2_microblaze
 	depends on !BR2_nios2
 	depends on !BR2_or1k

index 5ca464ad46..ca71349cb3 100644
@@ -215,16 +215,8 @@ else
 HOST_GDB_CONF_OPTS += --without-python
 endif
 
-# workaround a bug if in-tree build is used for bfin sim
-define HOST_GDB_BFIN_SIM_WORKAROUND
-	$(RM) $(@D)/sim/common/tconfig.h
-endef
-
 ifeq ($(BR2_PACKAGE_HOST_GDB_SIM),y)
 HOST_GDB_CONF_OPTS += --enable-sim
-ifeq ($(BR2_bfin),y)
-HOST_GDB_PRE_CONFIGURE_HOOKS += HOST_GDB_BFIN_SIM_WORKAROUND
-endif
 else
 HOST_GDB_CONF_OPTS += --disable-sim
 endif

index 0e24b25441..0747cc8d7c 100644
@@ -53,7 +53,7 @@ config BR2_PTHREADS_NATIVE
 
 config BR2_PTHREADS
 	bool "linuxthreads"
-	depends on BR2_bfin || BR2_m68k || BR2_microblaze || BR2_or1k || BR2_arm || BR2_armeb || BR2_xtensa
+	depends on BR2_m68k || BR2_microblaze || BR2_or1k || BR2_arm || BR2_armeb || BR2_xtensa
 	select BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PTHREADS_NONE

@@ -95,7 +95,6 @@ config BR2_UCLIBC_TARGET_ARCH
 	string
 	default "arc"	   if BR2_arcle || BR2_arceb
 	default "arm"	   if BR2_arm	|| BR2_armeb
-	default "bfin"	   if BR2_bfin
 	default "m68k"	   if BR2_m68k
 	default "microblaze"   if BR2_microblaze
 	default "mips"	   if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el

index b33eaffd52..5d6c85f995 100644
@@ -426,7 +426,6 @@ config BR2_TOOLCHAIN_HAS_MNAN_OPTION
 config BR2_TOOLCHAIN_HAS_SYNC_1
 	bool
 	default y
-	depends on !BR2_bfin
 	depends on !BR2_m68k_cf
 	depends on !BR2_microblaze
 	depends on !BR2_sparc

index 0ab7e8db97..2f6624d217 100644
@@ -29,7 +29,7 @@ config BR2_TOOLCHAIN_BUILDROOT_UCLIBC
 	bool "uClibc-ng"
 	depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle   || BR2_arceb  || \
 		   BR2_arm     || BR2_armeb    || \
-		   BR2_bfin    || BR2_i386   || BR2_m68k   || BR2_microblaze || \
+		   BR2_i386    || BR2_m68k   || BR2_microblaze || \
 		   BR2_mips    || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
 		   BR2_or1k    || BR2_powerpc || BR2_sh2a   || BR2_sh4	   || \
 		   BR2_sh4eb   || BR2_sparc   || BR2_xtensa || BR2_x86_64

deleted file mode 100644
index 73ee6c5faa..0000000000
@@ -1,60 +0,0 @@
-From ae9c3e354440c4a0f105a9eabfb2f77be085ebc1 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Thu, 18 Aug 2016 17:59:16 +0200
-Subject: [PATCH] libgcc/mkmap-symver: support skip_underscore
-
-Some platforms, such as Blackfin, have a special prefix for assembly
-symbols as opposed to C symbols. For this reason, a function named
-"foo()" in C will in fact be visible as a symbol called "_foo" in the
-ELF binary.
-
-The current linker version script logic in libgcc doesn't take into
-account this situation properly. The Blackfin specific
-libgcc/config/bfin/libgcc-glibc.ver has an additional "_" in front of
-every symbol so that it matches the output of "nm" (which gets parsed to
-produce the final linker version script). But due to this additional
-"_", ld no longer matches with the symbols since "ld" does the matching
-with the original symbol name, not the one prefixed with "_".
-
-Due to this, none of the symbols in libgcc/config/bfin/libgcc-glibc.ver
-are actually matched with symbols in libgcc. This causes all libgcc
-symbols to be left as "LOCAL", which causes lots of "undefined
-reference" whenever some C or C++ code that calls a function of libgcc
-is compiled.
-
-To address this, this commit introduces a "skip_underscore" variable to
-the mkmap-symver script. It tells mkmap-symver to ignore the leading
-underscore from the "nm" output.
-
-Note that this new argument is different from the existing
-"leading_underscore" argument, which *adds* an additional underscore to
-the generated linker version script.
-
-Having this functionality paves the way to using the generic linker
-version information for Blackfin, instead of using a custom one.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- libgcc/mkmap-symver.awk | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libgcc/mkmap-symver.awk b/libgcc/mkmap-symver.awk
-index 266832a..30bb179 100644
---- a/libgcc/mkmap-symver.awk
-+++ b/libgcc/mkmap-symver.awk
-@@ -47,7 +47,11 @@ state == "nm" && ($1 == "U" || $2 == "U") {
- 
- state == "nm" && NF == 3 {
-   split ($3, s, "@")
--  def[s[1]] = 1;
-+  if (skip_underscore)
-+      symname = substr(s[1], 2);
-+  else
-+      symname = s[1];
-+  def[symname] = 1;
-   sawsymbol = 1;
-   next;
- }
--- 
-2.7.4
-

1,944 lines not on this page · raw message

59 lines not on this page · raw message

deleted file mode 100644
index e2828a5106..0000000000
@@ -1,17 +0,0 @@
-enable _REENTRANT when -lpthread is used
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
-
-diff -Nur gcc-6.2.0.orig/gcc/config/bfin/linux.h gcc-6.2.0/gcc/config/bfin/linux.h
---- gcc-6.2.0.orig/gcc/config/bfin/linux.h	2016-01-04 15:30:50.000000000 +0100
-+++ gcc-6.2.0/gcc/config/bfin/linux.h	2016-09-30 20:48:17.446636819 +0200
-@@ -38,6 +38,9 @@
-   "%{static:--start-group} %{mfast-fp:-lbffastfp} %G %L %{static:--end-group} \
-    %{!static:%{mfast-fp:-lbffastfp} %G}"
- 
-+#undef CPP_SPEC
-+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
-+
- #undef LINK_SPEC
- #define LINK_SPEC "\
-   %{mfdpic: -m elf32bfinfd -z text} %{shared} %{pie} \

deleted file mode 100644
index da9d586551..0000000000
@@ -1,21 +0,0 @@
-Fixes: LINKER BUG: .rofixup section size mismatch
-
-Workaround from adi-toolchain commit:
-af414ec1fb628ddb1562f062f3db49823ca14ca2
-[#6798] binutils-2.21/bfd: temp workaround for rofixup mismatch errors.
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
-
-diff -Nur binutils-2.26.1.orig/bfd/elf32-bfin.c binutils-2.26.1/bfd/elf32-bfin.c
---- binutils-2.26.1.orig/bfd/elf32-bfin.c	2015-11-13 09:27:40.000000000 +0100
-+++ binutils-2.26.1/bfd/elf32-bfin.c	2016-07-31 00:50:48.357995132 +0200
-@@ -4879,7 +4879,8 @@
- 
- 	case R_BFIN_FUNCDESC:
- 	  picrel->fd++;
--	  picrel->relocsfd++;
-+	  if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
-+	    picrel->relocsfd++;
- 	  break;
- 
-         /* This relocation describes the C++ object vtable hierarchy.

deleted file mode 100644
index 5733b219d7..0000000000
@@ -1,21 +0,0 @@
-Fixes: LINKER BUG: .rofixup section size mismatch
-
-Workaround from adi-toolchain commit:
-af414ec1fb628ddb1562f062f3db49823ca14ca2
-[#6798] binutils-2.21/bfd: temp workaround for rofixup mismatch errors.
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
-
-diff -Nur binutils-2.26.1.orig/bfd/elf32-bfin.c binutils-2.26.1/bfd/elf32-bfin.c
---- binutils-2.26.1.orig/bfd/elf32-bfin.c	2015-11-13 09:27:40.000000000 +0100
-+++ binutils-2.26.1/bfd/elf32-bfin.c	2016-07-31 00:50:48.357995132 +0200
-@@ -4845,7 +4845,8 @@
- 
- 	case R_BFIN_FUNCDESC:
- 	  picrel->fd++;
--	  picrel->relocsfd++;
-+	  if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
-+	    picrel->relocsfd++;
- 	  break;
- 
-         /* This relocation describes the C++ object vtable hierarchy.

deleted file mode 100644
index e5409efe14..0000000000
@@ -1,31 +0,0 @@
-From 122de3b633f4273826a2d01702d7c515f93ec2be Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <[email protected]>
-Date: Sat, 29 Jul 2017 14:08:20 +0200
-Subject: [PATCH] Fixes: LINKER BUG: .rofixup section size mismatch
-
-Workaround from adi-toolchain commit:
-af414ec1fb628ddb1562f062f3db49823ca14ca2
-[#6798] binutils-2.21/bfd: temp workaround for rofixup mismatch errors.
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
----
- bfd/elf32-bfin.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
-index b3e09bd..660eec5 100644
---- a/bfd/elf32-bfin.c
-+++ b/bfd/elf32-bfin.c
-@@ -4845,7 +4845,8 @@ bfinfdpic_check_relocs (bfd *abfd, struct bfd_link_info *info,
- 
- 	case R_BFIN_FUNCDESC:
- 	  picrel->fd++;
--	  picrel->relocsfd++;
-+	  if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
-+	    picrel->relocsfd++;
- 	  break;
- 
-         /* This relocation describes the C++ object vtable hierarchy.
--- 
-2.9.4
-

deleted file mode 100644
index 0ce2cf2288..0000000000
@@ -1,31 +0,0 @@
-From c3bd478ac1b7e83765230505eb08a0acf2fe3867 Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <[email protected]>
-Date: Sat, 29 Jul 2017 14:08:20 +0200
-Subject: [PATCH] Fixes: LINKER BUG: .rofixup section size mismatch
-
-Workaround from adi-toolchain commit:
-af414ec1fb628ddb1562f062f3db49823ca14ca2
-[#6798] binutils-2.21/bfd: temp workaround for rofixup mismatch errors.
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
----
- bfd/elf32-bfin.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
-index 478b8d4731..a38519b585 100644
---- a/bfd/elf32-bfin.c
-+++ b/bfd/elf32-bfin.c
-@@ -4655,7 +4655,8 @@ bfinfdpic_check_relocs (bfd *abfd, struct bfd_link_info *info,
- 
- 	case R_BFIN_FUNCDESC:
- 	  picrel->fd++;
--	  picrel->relocsfd++;
-+	  if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
-+	    picrel->relocsfd++;
- 	  break;
- 
- 	/* This relocation describes the C++ object vtable hierarchy.
--- 
-2.14.3
-

index a6f082cc5c..2600a789b0 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_ACPITOOL
 	bool "acpitool"
-	depends on !BR2_bfin
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP

@@ -11,6 +10,5 @@ config BR2_PACKAGE_ACPITOOL
 	  http://acpitool.sourceforge.net
 
 comment "acpitool needs a toolchain w/ threads, C++, dynamic library"
-	depends on !BR2_bfin
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
 		|| !BR2_INSTALL_LIBSTDCPP

index 3235502089..89f7193007 100644
@@ -62,12 +62,6 @@ else
 ALSA_LIB_CONF_OPTS += --disable-python
 endif
 
-ifeq ($(BR2_bfin),y)
-# blackfin external toolchains don't have versionsort. Fake it using alphasort
-# instead
-ALSA_LIB_CFLAGS += -Dversionsort=alphasort
-endif
-
 ALSA_LIB_CONF_ENV = \
 	CFLAGS="$(ALSA_LIB_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS) -lm"

index 9483f181cf..47c7cd9ffd 100644
@@ -2,7 +2,6 @@ comment "armadillo needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 	depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el)
 	depends on !BR2_powerpc
-	depends on !BR2_bfin
 	depends on !BR2_m68k_cf
 
 comment "armadillo needs a glibc toolchain w/ C++"

@@ -14,7 +13,6 @@ config BR2_PACKAGE_ARMADILLO
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) # clapack
 	depends on !BR2_powerpc || BR2_TOOLCHAIN_USES_GLIBC # clapack
-	depends on !BR2_bfin # clapack
 	depends on !BR2_m68k_cf # clapack
 	select BR2_PACKAGE_CLAPACK
 	help

index 9a2e342a1e..647b2163ea 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_ATEST
 	bool "atest"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
-	depends on !BR2_bfin # libev
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_LIBEV
 	help

@@ -11,5 +10,4 @@ config BR2_PACKAGE_ATEST
 	  https://github.com/amouiche/atest
 
 comment "atest needs a toolchain w/ threads"
-	depends on !BR2_bfin
 	depends on !BR2_TOOLCHAIN_HAS_THREADS

index 3757f17a1e..a5680b0028 100644
@@ -3,7 +3,6 @@ config BR2_PACKAGE_AVRDUDE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR # elfutils
 	depends on !BR2_STATIC_LIBS # elfutils
-	depends on !BR2_bfin # elfutils
 	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
 	select BR2_PACKAGE_ELFUTILS
 	select BR2_PACKAGE_LIBUSB

@@ -18,4 +17,3 @@ config BR2_PACKAGE_AVRDUDE
 comment "avrdude needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS \
 		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
-	depends on !BR2_bfin

index ca8fe68eea..e5c5f89a4d 100644
@@ -59,7 +59,6 @@ config BR2_PACKAGE_BUSYBOX_SELINUX
 config BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES
 	bool "Individual binaries"
 	depends on !BR2_STATIC_LIBS
-	depends on !BR2_bfin # libbusybox.so link issue
 	help
 	  By default (i.e with this option disabled), Busybox is
 	  installed as a single binary in /bin/busybox and all applets

@@ -70,7 +69,6 @@ config BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES
 
 comment "Busybox individual binaries need a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
-	depends on !BR2_bfin
 
 config BR2_PACKAGE_BUSYBOX_WATCHDOG
 	bool "Install the watchdog daemon startup script"

index e5be0b6441..af7834d985 100644
@@ -8,10 +8,6 @@ config BR2_PACKAGE_CLAPACK
 	# _fpu_control is used on PowerPC, but not available with
 	# uClibc or musl
 	depends on !BR2_powerpc || BR2_TOOLCHAIN_USES_GLIBC
-	# disable clapack on blackfin, it triggers "undefined symbol" failure
-	# because of the "_" symbol prefix:
-	# http://autobuild.buildroot.net/results/a28df0ba10803e6e54c2f8160bbd8190cba4d690/
-	depends on !BR2_bfin
 	# assembler: Error: value out of range
 	depends on !BR2_m68k_cf
 	help

index c358531edc..5597faea4f 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_DVBLAST
 	bool "dvblast"
-	depends on !BR2_bfin  # libev
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep()
 	select BR2_PACKAGE_BITSTREAM
 	select BR2_PACKAGE_LIBEV

@@ -12,5 +11,4 @@ config BR2_PACKAGE_DVBLAST
 	  http://www.videolan.org/projects/dvblast.html
 
 comment "dvblast needs a toolchain w/ NPTL"
-	depends on !BR2_bfin  # libev
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL

index ad86c313d6..6c8bd0b058 100644
@@ -1,5 +1,4 @@
 comment "elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library"
-	depends on !BR2_bfin
 	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \
 		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
 

@@ -9,9 +8,6 @@ config BR2_PACKAGE_ELFUTILS
 	depends on !BR2_STATIC_LIBS
 	# Only glibc and uClibc implement the myriad of required GNUisms
 	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC
-	# build issue caused by the _ prefix used on blackfin for
-	# assembly symbols
-	depends on !BR2_bfin
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
 	help

index ede72f3b1d..8d94d2bcf8 100644
@@ -38,7 +38,6 @@ config BR2_PACKAGE_GPTFDISK_SGDISK
 config BR2_PACKAGE_GPTFDISK_CGDISK
 	bool "ncurses cgdisk"
 	depends on BR2_USE_WCHAR # ncurses wchar
-	depends on !(BR2_bfin && BR2_BINFMT_FLAT) # ncurses wchar support
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_NCURSES_WCHAR # needed because of UTF-16
 	help

index 939fc7a7fa..7bbd56a602 100644
@@ -318,7 +318,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VP8
 	bool "vp8"
-	depends on !BR2_bfin # libvpx
 	select BR2_PACKAGE_LIBVPX
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR

index 097f32d779..eea3a3eda8 100644
@@ -359,14 +359,12 @@ comment "taglib needs a toolchain w/ C++, wchar"
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
 	bool "vpx (webm)"
-	depends on !BR2_bfin # libvpx
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libvpx
 	select BR2_PACKAGE_LIBVPX
 	help
 	  VP8 plugin
 
 comment "libvpx needs a toolchain w/ threads"
-	depends on !BR2_bfin
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK

index 0143b53ae6..2938da0ee0 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_IPRUTILS
 	bool "iprutils"
 	depends on BR2_USE_MMU # fork()
-	depends on !BR2_bfin # pciutils
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBSYSFS
 	select BR2_PACKAGE_PCIUTILS

index c44ef13ca7..163a75e8f2 100644
@@ -1,7 +1,5 @@
 config BR2_PACKAGE_LEVELDB
 	bool "leveldb"
-	# Missing/broken atomic pointer support
-	depends on !BR2_bfin
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_SNAPPY

@@ -13,5 +11,4 @@ config BR2_PACKAGE_LEVELDB
 	  https://github.com/google/leveldb
 
 comment "leveldb needs a toolchain w/ C++, threads"
-	depends on !BR2_bfin
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

index 47fce04fef..a163ce9b6f 100644
@@ -5,7 +5,6 @@ config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
 	depends on !BR2_microblaze
 	depends on !BR2_arc
 	depends on !BR2_xtensa
-	depends on !BR2_bfin
 
 config BR2_PACKAGE_LIBBSD
 	bool "libbsd"

index db8d263df0..71abe7737d 100644
@@ -1,7 +1,5 @@
 config BR2_PACKAGE_LIBEV
 	bool "libev"
-	# needs memory fences
-	depends on !BR2_bfin
 	help
 	  Userspace library for handling asynchronous notifications
 

index 4b462cb633..9bffd035b7 100644
@@ -5,8 +5,6 @@ config BR2_PACKAGE_LIBFREEIMAGE
 	depends on BR2_USE_WCHAR
 	# compiler issue: "Error: invalid register number `63'"
 	depends on !BR2_arc
-	# Numerous build issues
-	depends on !BR2_bfin
 	help
 	  FreeImage is an Open Source library project for developers who
 	  would like to support popular graphics image formats like PNG,

@@ -17,5 +15,4 @@ config BR2_PACKAGE_LIBFREEIMAGE
 
 comment "libfreeimage needs a toolchain w/ C++, dynamic library, wchar"
 	depends on !BR2_arc
-	depends on !BR2_bfin
 	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR

index 81785b91bc..1cda434819 100644
@@ -11,11 +11,10 @@ LIBMICROHTTPD_INSTALL_STAGING = YES
 LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples
 LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99
 
-# gcc on arc and bfin doesn't define _REENTRANT when -pthread is
-# passed while it should. Compensate this deficiency here otherwise
-# libmicrohttpd configure script doesn't find that thread support is
-# enabled.
-ifeq ($(BR2_arc)$(BR2_bfin),y)
+# gcc on arc doesn't define _REENTRANT when -pthread is passed while
+# it should. Compensate this deficiency here otherwise libmicrohttpd
+# configure script doesn't find that thread support is enabled.
+ifeq ($(BR2_arc),y)
 LIBMICROHTTPD_CFLAGS += -D_REENTRANT
 endif
 

index ba1ea55933..1d95155248 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
 	def_bool y
-	depends on !BR2_arc && !BR2_xtensa && !BR2_bfin
+	depends on !BR2_arc && !BR2_xtensa
 
 if BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
 

index 67a4c578f4..6b0400c0a2 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBVPX
 	bool "libvpx"
-	depends on !BR2_bfin
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  A high-quality, open video format that's freely available to

@@ -9,5 +8,4 @@ config BR2_PACKAGE_LIBVPX
 	  http://webmproject.org
 
 comment "libvpx needs a toolchain w/ threads"
-	depends on !BR2_bfin
 	depends on !BR2_TOOLCHAIN_HAS_THREADS

index d89dde8d00..868ba6a10f 100644
@@ -19,12 +19,6 @@ LIBXSLT_CONF_OPTS = \
 LIBXSLT_CONFIG_SCRIPTS = xslt-config
 LIBXSLT_DEPENDENCIES = libxml2
 
-# GCC bug with Os/O2/O3, PR77311
-# error: unable to find a register to spill in class 'CCREGS'
-ifeq ($(BR2_bfin),y)
-LIBXSLT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O1"
-endif
-
 # If we have enabled libgcrypt then use it, else disable crypto support.
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 LIBXSLT_DEPENDENCIES += libgcrypt

index e3ccd850f9..5c5148af17 100644
@@ -7,7 +7,6 @@ config BR2_PACKAGE_LINUX_TOOLS
 
 config BR2_PACKAGE_LINUX_TOOLS_CPUPOWER
 	bool "cpupower"
-	depends on !BR2_bfin # pciutils
 	select BR2_PACKAGE_LINUX_TOOLS
 	select BR2_PACKAGE_PCIUTILS
 	help

index 0cb4c22a92..52f82e1128 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUA_EV
 	bool "lua-ev"
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
-	depends on !BR2_bfin # libev
 	select BR2_PACKAGE_LIBEV
 	help
 	  Get access to the libev library from Lua.

index 00649d4fb6..b5dc47279d 100644
@@ -2,8 +2,6 @@ config BR2_PACKAGE_MICROPYTHON
 	bool "micropython"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
-	# libffi doesn't provide the closure implementation on Blackfin
-	depends on !BR2_bfin
 	select BR2_PACKAGE_LIBFFI
 	help
 	  Micro Python is a lean and fast implementation of the Python

@@ -14,4 +12,3 @@ config BR2_PACKAGE_MICROPYTHON
 
 comment "micropython needs a toolchain w/ threads, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-	depends on !BR2_bfin

index 15c903ae7b..4db1551ed4 100644
@@ -2,7 +2,7 @@ config BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
 	bool
 	default y
 	# Those architectures are not supported by MPlayer
-	depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
+	depends on !(BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
 		|| BR2_m68k || BR2_microblaze || BR2_nios2 || BR2_or1k)
 	# Broken support for <ARMv5
 	depends on !BR2_ARM_CPU_ARMV4

index 297b2ee415..9f7753b06a 100644
@@ -13,8 +13,6 @@ if BR2_PACKAGE_NCURSES
 config BR2_PACKAGE_NCURSES_WCHAR
 	bool "enable wide char support"
 	depends on BR2_USE_WCHAR
-	# Build broken @ curses.priv.h with bad declarations
-	depends on !(BR2_bfin && BR2_BINFMT_FLAT)
 	help
 	  Enable wide char & UTF-8 support in ncurses libraries
 

index d46df6c0d6..a082f23997 100644
@@ -1,7 +1,5 @@
 config BR2_PACKAGE_PCIUTILS
 	bool "pciutils"
-	# PCI not supported on Blackfin
-	depends on !BR2_bfin
 	help
 	  Various utilities dealing with the PCI bus.
 	  Provides things like setpci and lspci.

index b908ea220c..75e31b7e1e 100644
@@ -5,7 +5,7 @@ config BR2_PACKAGE_POCO
 	# pthread_condattr_setclock
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS # dlopen()
-	depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \
+	depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \
 		|| BR2_or1k || BR2_xtensa)
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_PCRE

@@ -82,5 +82,5 @@ endif # BR2_PACKAGE_POCO
 comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library"
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
 		|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
-	depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \
+	depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \
 		|| BR2_or1k || BR2_xtensa)

index 714b16295a..0f323a7bfb 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_POWERTOP
 	bool "powertop"
-	depends on !BR2_bfin # pciutils
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
 	depends on BR2_USE_WCHAR

@@ -14,6 +13,5 @@ config BR2_PACKAGE_POWERTOP
 	  https://01.org/powertop/
 
 comment "powertop needs a toolchain w/ C++, threads, wchar"
-	depends on !BR2_bfin
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_USE_WCHAR

index d95d415bba..c0c414ae83 100644
@@ -24,12 +24,6 @@ else
 PTPD2_CONF_OPTS += --disable-snmp
 endif
 
-# GCC bug with Os/O1/O2/O3
-# internal compiler error: in gen_add2_insn,@optabs.c:4454
-ifeq ($(BR2_bfin),y)
-PTPD2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0"
-endif
-
 define PTPD2_INSTALL_INIT_SYSV
 	$(INSTALL) -m 755 -D package/ptpd2/S65ptpd2 \
 		$(TARGET_DIR)/etc/init.d/S65ptpd2

index c3a7e7738e..f6f4a2b870 100644
@@ -22,7 +22,6 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p
 #       -------         ----
 #       arm             arm
 #       armeb           armeb
-#       bfin            not supported
 #       i486            i386
 #       i586            i386
 #       i686            i386

index 09f79009ed..b051145f45 100644
@@ -16,9 +16,4 @@ RIEMANN_C_CLIENT_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_GNUTLS),gnutls) \
 	$(if $(BR2_PACKAGE_JSON_C),json-c)
 
-ifeq ($(BR2_bfin),y)
-# ld symbol versioning not working on bfin
-RIEMANN_C_CLIENT_CONF_ENV += ac_cv_prog_ld_version_script=no
-endif
-
 $(eval $(autotools-package))

index 4bf1a14cee..365b8cead2 100644
@@ -40,13 +40,6 @@ RUBY_CONF_ENV += \
 	ac_cv_func_isnan=yes
 endif
 
-ifeq ($(BR2_bfin),y)
-RUBY_CONF_ENV += ac_cv_func_dl_iterate_phdr=no
-# Blackfin doesn't have FFI closure support, needed by the fiddle
-# extension.
-RUBY_CONF_OPTS += --with-out-ext=fiddle
-endif
-
 ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
 RUBY_CONF_ENV += stack_protector=no
 endif

index 4b74eda641..f4db4b9b99 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SG3_UTILS
 	bool "sg3-utils"
-	depends on !BR2_bfin # symbol prefixing problems
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Low level utilities for devices that use a SCSI command set.

@@ -16,5 +15,4 @@ config BR2_PACKAGE_SG3_UTILS_PROGS
 endif
 
 comment "sg3-utils needs a toolchain w/ threads"
-	depends on !BR2_bfin
 	depends on !BR2_TOOLCHAIN_HAS_THREADS

index de37b61483..5db644400c 100644
@@ -37,7 +37,7 @@ config BR2_PACKAGE_TVHEADEND_TRANSCODING
 	select BR2_PACKAGE_FFMPEG_AVRESAMPLE
 	select BR2_PACKAGE_FFMPEG_GPL # needed for x264 support
 	select BR2_PACKAGE_FFMPEG_SWSCALE
-	select BR2_PACKAGE_LIBVPX if !BR2_bfin # libvpx
+	select BR2_PACKAGE_LIBVPX
 	select BR2_PACKAGE_X264
 	help
 	  Enable transcoding support.

index e0118c1112..f3d8ea4baf 100644
@@ -2,7 +2,7 @@ config BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS
 	bool
 	default y
 	depends on BR2_i386 || BR2_x86_64 || (BR2_arm && !BR2_ARM_CPU_ARMV7M) || \
-		BR2_bfin || BR2_powerpc
+		BR2_powerpc
 
 comment "xenomai needs an glibc or uClibc toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL

deleted file mode 100644
index 0e8dd3ad65..0000000000
@@ -1,55 +0,0 @@
-Fix build on platforms where __USER_LABEL_PREFIX__ is not empty
-
-On most platforms, a C language symbol and its assembly equivalent are
-identical. However, on the Blackfin architecture, this isn't the case,
-the corresponding C language symbol in assembly is prepended with a
-"_". Blackfin therefore has __USER_LABEL_PREFIX__ defined to "_".
-
-Cairo already has some code to cope with __USER_LABEL_PREFIX__, but
-this code isn't completely correct: it prepends both assembly symbols
-and C symbols with __USER_LABEL_PREFIX__, which cannot work.
-
-This patch fixes that by using the existing slim_hidden_asmname() to
-define assembly symbols, and introduce a new slim_hidden_realname()
-for C symbols.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: b/src/cairo-compiler-private.h
-===================================================================
---- a/src/cairo-compiler-private.h
-+++ b/src/cairo-compiler-private.h
-@@ -93,12 +93,13 @@
- 	__asm__ (slim_hidden_asmname (internal))
- # define slim_hidden_def1(name, internal)				\
-   extern __typeof (name) EXT_##name __asm__(slim_hidden_asmname(name))	\
--	__attribute__((__alias__(slim_hidden_asmname(internal))))
-+	__attribute__((__alias__(slim_hidden_realname(internal))))
- # define slim_hidden_ulp		slim_hidden_ulp1(__USER_LABEL_PREFIX__)
- # define slim_hidden_ulp1(x)		slim_hidden_ulp2(x)
- # define slim_hidden_ulp2(x)		#x
- # define slim_hidden_asmname(name)	slim_hidden_asmname1(name)
- # define slim_hidden_asmname1(name)	slim_hidden_ulp #name
-+# define slim_hidden_realname(name)     #name
- #else
- # define slim_hidden_proto(name)		int _cairo_dummy_prototype(void)
- # define slim_hidden_proto_no_warn(name)	int _cairo_dummy_prototype(void)
-Index: b/util/cairo-script/cairo-script-private.h
-===================================================================
---- a/util/cairo-script/cairo-script-private.h
-+++ b/util/cairo-script/cairo-script-private.h
-@@ -109,12 +109,13 @@
- 	__asm__ (slim_hidden_asmname (internal))
- # define slim_hidden_def1(name, internal)				\
-   extern __typeof (name) EXT_##name __asm__(slim_hidden_asmname(name))	\
--	__attribute__((__alias__(slim_hidden_asmname(internal))))
-+	__attribute__((__alias__(slim_hidden_realname(internal))))
- # define slim_hidden_ulp		slim_hidden_ulp1(__USER_LABEL_PREFIX__)
- # define slim_hidden_ulp1(x)		slim_hidden_ulp2(x)
- # define slim_hidden_ulp2(x)		#x
- # define slim_hidden_asmname(name)	slim_hidden_asmname1(name)
- # define slim_hidden_asmname1(name)	slim_hidden_ulp #name
-+# define slim_hidden_realname(name)     #name
- #else
- # define slim_hidden_proto(name)		int _csi_dummy_prototype(void)
- # define slim_hidden_proto_no_warn(name)	int _csi_dummy_prototype(void)

similarity index 100%
rename from package/cairo/0003-fix-nofork-build.patch
rename to package/cairo/0001-fix-nofork-build.patch

similarity index 100%
rename from package/cairo/0005-fix-gcc-49-build.patch
rename to package/cairo/0002-fix-gcc-49-build.patch

deleted file mode 100644
index 1d8a4f015d..0000000000
@@ -1,26 +0,0 @@
-Fix bfin compile error
-
-See gcc bug report:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77311
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
-
-diff -Nur ffmpeg-2.8.7.orig/libavcodec/hevcdsp_template.c ffmpeg-2.8.7/libavcodec/hevcdsp_template.c
---- ffmpeg-2.8.7.orig/libavcodec/hevcdsp_template.c	2016-03-29 04:25:16.000000000 +0200
-+++ ffmpeg-2.8.7/libavcodec/hevcdsp_template.c	2016-08-12 21:32:36.728178969 +0200
-@@ -1517,7 +1517,14 @@
- #define TQ2 pix[2  * xstride + 3 * ystride]
- #define TQ3 pix[3  * xstride + 3 * ystride]
- 
--static void FUNC(hevc_loop_filter_luma)(uint8_t *_pix,
-+// Blackfin gcc 6.1.x fails with
-+// unable to find a register to spill in class CCREGS
-+#if defined(__bfin__)
-+#define disable_opt __attribute__ ((optimize("O1")))
-+#else
-+#define disable_opt 
-+#endif
-+static void disable_opt FUNC(hevc_loop_filter_luma)(uint8_t *_pix,
-                                         ptrdiff_t _xstride, ptrdiff_t _ystride,
-                                         int beta, int *_tc,
-                                         uint8_t *_no_p, uint8_t *_no_q)

similarity index 100%
rename from package/ffmpeg/0002-ffmpeg-pthreads.patch
rename to package/ffmpeg/0001-ffmpeg-pthreads.patch

similarity index 100%
rename from package/gdb/7.11.1/0002-Sync-proc_service-definition-with-GLIBC.patch
rename to package/gdb/7.11.1/0001-Sync-proc_service-definition-with-GLIBC.patch

155 lines not on this page · raw message

similarity index 100%
rename from package/gdb/7.11.1/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
rename to package/gdb/7.11.1/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch

similarity index 100%
rename from package/gdb/7.11.1/0004-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
rename to package/gdb/7.11.1/0003-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch

similarity index 100%
rename from package/gdb/7.11.1/0005-Fix-gdbserver-build-on-uClibc-noMMU.patch
rename to package/gdb/7.11.1/0004-Fix-gdbserver-build-on-uClibc-noMMU.patch

similarity index 100%
rename from package/gdb/7.11.1/0006-use-asm-sgidefs.h.patch
rename to package/gdb/7.11.1/0005-use-asm-sgidefs.h.patch

deleted file mode 100644
index 20b7fb2341..0000000000
@@ -1,372 +0,0 @@
-From 4d913bb73965fdb9c756e8d5916a829b60aa3a44 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Thu, 4 Aug 2016 23:44:24 +0200
-Subject: [PATCH] Revert "sim: unify SIM_CPU definition"
-
-This reverts commit 20bca71d82598a015de0991196e45f0b5f7ead81.
-
-This change causes a redefinition of SIM_CPU on the Blackfin
-architecture, as it is defined in both the common sim/common/sim-base.h
-and the architecture specific sim/bfin/sim-main.h.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- sim/arm/sim-main.h        |  3 +++
- sim/avr/sim-main.h        |  2 ++
- sim/bfin/sim-main.h       |  2 --
- sim/common/sim-base.h     |  2 --
- sim/cr16/sim-main.h       |  2 ++
- sim/cris/sim-main.h       |  5 +++++
- sim/d10v/sim-main.h       |  2 ++
- sim/frv/sim-main.h        | 10 ++++++++++
- sim/ft32/sim-main.h       |  2 ++
- sim/h8300/sim-main.h      |  3 +++
- sim/iq2000/sim-main.h     |  5 +++++
- sim/lm32/sim-main.h       |  5 +++++
- sim/m32r/sim-main.h       |  5 +++++
- sim/m68hc11/sim-main.h    |  3 +++
- sim/mcore/sim-main.h      |  2 ++
- sim/microblaze/sim-main.h |  3 +++
- sim/mips/sim-main.h       |  3 +++
- sim/mn10300/sim-main.h    |  2 ++
- sim/moxie/sim-main.h      |  3 +++
- sim/msp430/sim-main.h     |  3 +++
- sim/sh/sim-main.h         |  3 +++
- sim/sh64/sim-main.h       |  5 +++++
- sim/v850/sim-main.h       |  3 +++
- 23 files changed, 74 insertions(+), 4 deletions(-)
-
-diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h
-index 9a37b98..ae622bd 100644
---- a/sim/arm/sim-main.h
-+++ b/sim/arm/sim-main.h
-@@ -20,6 +20,9 @@
- #define SIM_MAIN_H
- 
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- #include "bfd.h"
- 
-diff --git a/sim/avr/sim-main.h b/sim/avr/sim-main.h
-index e0cac22..52904e3 100644
---- a/sim/avr/sim-main.h
-+++ b/sim/avr/sim-main.h
-@@ -23,6 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
- extern unsigned int pc;
- 
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- 
- struct _sim_cpu {
-diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h
-index 806fe15..53e1774 100644
---- a/sim/bfin/sim-main.h
-+++ b/sim/bfin/sim-main.h
-@@ -24,8 +24,6 @@
- #include "sim-basics.h"
- #include "sim-signal.h"
- 
--/* TODO: Delete this.  Need to convert bu32/etc... to common sim types
--         and unwind the bfin-sim.h/machs.h include below first though.  */
- typedef struct _sim_cpu SIM_CPU;
- 
- #include "bfin-sim.h"
-diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
-index 21f61f4..e90e07c 100644
---- a/sim/common/sim-base.h
-+++ b/sim/common/sim-base.h
-@@ -72,8 +72,6 @@ typedef address_word sim_cia;
- #define INVALID_INSTRUCTION_ADDRESS ((address_word)0 - 1)
- #endif
- 
--/* TODO: Probably should just delete SIM_CPU.  */
--typedef struct _sim_cpu SIM_CPU;
- typedef struct _sim_cpu sim_cpu;
- 
- #include "sim-module.h"
-diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h
-index a63b93e..1a80229 100644
---- a/sim/cr16/sim-main.h
-+++ b/sim/cr16/sim-main.h
-@@ -24,6 +24,8 @@
- typedef long int           word;
- typedef unsigned long int  uword;
- 
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- #include "bfd.h"
- 
-diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
-index 4dc04a2..fec0039 100644
---- a/sim/cris/sim-main.h
-+++ b/sim/cris/sim-main.h
-@@ -24,6 +24,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- #ifndef SIM_MAIN_H
- #define SIM_MAIN_H
- 
-+#define USING_SIM_BASE_H
-+
-+struct _sim_cpu;
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "symcat.h"
- #include "sim-basics.h"
- #include "cgen-types.h"
-diff --git a/sim/d10v/sim-main.h b/sim/d10v/sim-main.h
-index 0b87811..a7d59dd 100644
---- a/sim/d10v/sim-main.h
-+++ b/sim/d10v/sim-main.h
-@@ -24,6 +24,8 @@
- typedef long int           word;
- typedef unsigned long int  uword;
- 
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- #include "bfd.h"
- 
-diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
-index d5a67cb..fd12c4f 100644
---- a/sim/frv/sim-main.h
-+++ b/sim/frv/sim-main.h
-@@ -19,6 +19,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
- /* Main header for the frv.  */
- 
-+#define USING_SIM_BASE_H /* FIXME: quick hack */
-+
-+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-+typedef struct _sim_cpu SIM_CPU;
-+
-+/* Set the mask of unsupported traces.  */
-+#define WITH_TRACE \
-+  (~(TRACE_alu | TRACE_decode | TRACE_memory | TRACE_model | TRACE_fpu \
-+     | TRACE_branch | TRACE_debug))
-+
- /* sim-basics.h includes config.h but cgen-types.h must be included before
-    sim-basics.h and cgen-types.h needs config.h.  */
- #include "config.h"
-diff --git a/sim/ft32/sim-main.h b/sim/ft32/sim-main.h
-index b27a690..a270a5d 100644
---- a/sim/ft32/sim-main.h
-+++ b/sim/ft32/sim-main.h
-@@ -25,6 +25,8 @@
- #include "sim-base.h"
- #include "bfd.h"
- 
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "ft32-sim.h"
- 
- struct _sim_cpu {
-diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h
-index 6dbc1ac..e95c4d9 100644
---- a/sim/h8300/sim-main.h
-+++ b/sim/h8300/sim-main.h
-@@ -87,6 +87,9 @@ enum h8_typecodes {
- };
- 
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- 
- /* Structure used to describe addressing */
-diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h
-index 992520a..ce3baba 100644
---- a/sim/iq2000/sim-main.h
-+++ b/sim/iq2000/sim-main.h
-@@ -4,6 +4,11 @@
- #ifndef SIM_MAIN_H
- #define SIM_MAIN_H
- 
-+#define USING_SIM_BASE_H /* FIXME: quick hack */
-+
-+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-+typedef struct _sim_cpu SIM_CPU;
-+
- /* sim-basics.h includes config.h but cgen-types.h must be included before
-    sim-basics.h and cgen-types.h needs config.h.  */
- #include "config.h"
-diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
-index 4894e8d..210bb8b 100644
---- a/sim/lm32/sim-main.h
-+++ b/sim/lm32/sim-main.h
-@@ -23,6 +23,11 @@
- #ifndef SIM_MAIN_H
- #define SIM_MAIN_H
- 
-+#define USING_SIM_BASE_H	/* FIXME: quick hack */
-+
-+struct _sim_cpu;		/* FIXME: should be in sim-basics.h */
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "symcat.h"
- #include "sim-basics.h"
- #include "cgen-types.h"
-diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
-index cd39e98..74bb513 100644
---- a/sim/m32r/sim-main.h
-+++ b/sim/m32r/sim-main.h
-@@ -3,6 +3,11 @@
- #ifndef SIM_MAIN_H
- #define SIM_MAIN_H
- 
-+#define USING_SIM_BASE_H /* FIXME: quick hack */
-+
-+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "symcat.h"
- #include "sim-basics.h"
- #include "cgen-types.h"
-diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
-index d1fc582..4f41db9 100644
---- a/sim/m68hc11/sim-main.h
-+++ b/sim/m68hc11/sim-main.h
-@@ -25,6 +25,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- #define SIM_HANDLES_LMA 1
- 
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-signal.h"
- #include "sim-base.h"
- 
-diff --git a/sim/mcore/sim-main.h b/sim/mcore/sim-main.h
-index be50ec1..25698c1 100644
---- a/sim/mcore/sim-main.h
-+++ b/sim/mcore/sim-main.h
-@@ -24,6 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- typedef long int           word;
- typedef unsigned long int  uword;
- 
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- #include "bfd.h"
- 
-diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h
-index 6781374..6b7b776 100644
---- a/sim/microblaze/sim-main.h
-+++ b/sim/microblaze/sim-main.h
-@@ -20,6 +20,9 @@
- 
- #include "microblaze.h"
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- 
- /* The machine state.
-diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
-index 8d698ad..9729804 100644
---- a/sim/mips/sim-main.h
-+++ b/sim/mips/sim-main.h
-@@ -29,6 +29,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR))
- 
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- #include "bfd.h"
- 
-diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
-index 847506e..2ddbfb9 100644
---- a/sim/mn10300/sim-main.h
-+++ b/sim/mn10300/sim-main.h
-@@ -42,6 +42,8 @@
- #include "itable.h"
- #include "idecode.h"
- 
-+typedef struct _sim_cpu SIM_CPU;
-+
- #define WITH_WATCHPOINTS 1
- 
- #define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR)  \
-diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h
-index b1a64fc..c60437e 100644
---- a/sim/moxie/sim-main.h
-+++ b/sim/moxie/sim-main.h
-@@ -21,6 +21,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- #define SIM_MAIN_H
- 
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- #include "bfd.h"
- 
-diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h
-index 19c8cca..37bb42d 100644
---- a/sim/msp430/sim-main.h
-+++ b/sim/msp430/sim-main.h
-@@ -23,6 +23,9 @@
- 
- #include "sim-basics.h"
- #include "sim-signal.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "msp430-sim.h"
- #include "sim-base.h"
- 
-diff --git a/sim/sh/sim-main.h b/sim/sh/sim-main.h
-index e67df28..e2e17d7 100644
---- a/sim/sh/sim-main.h
-+++ b/sim/sh/sim-main.h
-@@ -20,6 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- #define SIM_MAIN_H
- 
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- 
- typedef struct
-diff --git a/sim/sh64/sim-main.h b/sim/sh64/sim-main.h
-index 7b24ab0..8fb595e 100644
---- a/sim/sh64/sim-main.h
-+++ b/sim/sh64/sim-main.h
-@@ -3,6 +3,11 @@
- #ifndef SIM_MAIN_H
- #define SIM_MAIN_H
- 
-+#define USING_SIM_BASE_H /* FIXME: quick hack */
-+
-+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-+typedef struct _sim_cpu SIM_CPU;
-+
- /* sim-basics.h includes config.h but cgen-types.h must be included before
-    sim-basics.h and cgen-types.h needs config.h.  */
- #include "config.h"
-diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h
-index 5127d28..16cbd97 100644
---- a/sim/v850/sim-main.h
-+++ b/sim/v850/sim-main.h
-@@ -16,6 +16,9 @@
- #include "sim-basics.h"
- #include "sim-signal.h"
- #include "sim-fpu.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- 
- #include "simops.h"
--- 
-2.7.4
-

similarity index 100%
rename from package/gdb/7.10.1/0007-Sync-proc_service-definition-with-GLIBC.patch
rename to package/gdb/7.10.1/0006-Sync-proc_service-definition-with-GLIBC.patch

similarity index 100%
rename from package/gdb/7.10.1/0008-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
rename to package/gdb/7.10.1/0007-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch

similarity index 100%
rename from package/gdb/7.10.1/0009-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
rename to package/gdb/7.10.1/0008-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch

similarity index 100%
rename from package/gdb/7.10.1/0010-Fix-gdbserver-build-on-uClibc-noMMU.patch
rename to package/gdb/7.10.1/0009-Fix-gdbserver-build-on-uClibc-noMMU.patch

similarity index 100%
rename from package/gdb/7.10.1/0011-use-asm-sgidefs.h.patch
rename to package/gdb/7.10.1/0010-use-asm-sgidefs.h.patch

deleted file mode 100644
index 888d862341..0000000000
@@ -1,23 +0,0 @@
-Don't use -Wdouble-promotion gcc option
-
-The warning flag isn't recognized for older GCC versions (blackfin),
-so just disable it.
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-[Gustavo: update for 1.3.5]
-Signed-off-by: Bernd Kuhls <[email protected]>
-[Bernd: update for 1.3.10]
-
-diff -Nura graphite2-1.3.5.orig/src/CMakeLists.txt graphite2-1.3.5/src/CMakeLists.txt
---- graphite2-1.3.5.orig/src/CMakeLists.txt	2016-02-15 11:46:45.941906112 -0300
-+++ graphite2-1.3.5/src/CMakeLists.txt	2016-02-15 11:46:54.237194222 -0300
-@@ -111,9 +111,6 @@
-     if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
-         add_definitions(-mfpmath=sse -msse2)
-     endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
--    if (CMAKE_COMPILER_IS_GNUCXX)
--        add_definitions(-Wdouble-promotion)
--    endif (CMAKE_COMPILER_IS_GNUCXX)
-     message(STATUS "Compiler ID is: ${CMAKE_CXX_COMPILER_ID}")
-     if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-         add_definitions(-Wimplicit-fallthrough)

deleted file mode 100644
index 1e9537503b..0000000000
@@ -1,116 +0,0 @@
-detect and add compiler symbol prefix to the assembly code
-
-Some compiler, such as Blackfin GNU compiler, prefix a charater to any
-C symbol in generated assembly code. If any assembly symbol is invoked
-from C code, it needs to be prefixed as well.
-
-Note: since autoreconf doesn't work with this package because automake
-isn't support
-
-[Ryan: add information about why patching configure is ok]
-[Gustavo: update for ICU4C 54.1]
-
-Signed-off-by: Sonic Zhang <[email protected]>
-Signed-off-by: Ryan Barnett <[email protected]>
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura icu.orig/source/configure icu/source/configure
---- icu.orig/source/configure	2014-12-18 15:49:43.038628644 -0300
-+++ icu/source/configure	2014-12-18 15:56:05.793832186 -0300
-@@ -637,6 +637,7 @@
- ICUDATA_CHAR
- SAMPLES_TRUE
- TESTS_TRUE
-+SYMBOL_PREFIX
- ICULIBSUFFIXCNAME
- U_HAVE_LIB_SUFFIX
- ICULIBSUFFIX
-@@ -7414,6 +7415,17 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_UTF16_STRING_RESULT" >&5
- $as_echo "$CHECK_UTF16_STRING_RESULT" >&6; }
- 
-+# Check compiler generated symbol profix
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol prefix" >&5
-+$as_echo "checking for symbol prefix... " >&6; }
-+   SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \
-+                  | ${CPP-${CC-gcc} -E} - 2>&1 \
-+                  | ${EGREP-grep} "^PREFIX=" \
-+                  | sed -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"`
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYMBOL_PREFIX" >&5
-+$as_echo "$SYMBOL_PREFIX" >&6; }
-+
- # Enable/disable extras
- # Check whether --enable-extras was given.
- if test "${enable_extras+set}" = set; then :
-diff -Nura icu.orig/source/data/Makefile.in icu/source/data/Makefile.in
---- icu.orig/source/data/Makefile.in	2014-12-18 15:49:42.908624160 -0300
-+++ icu/source/data/Makefile.in	2014-12-18 16:01:32.751110913 -0300
-@@ -182,11 +182,11 @@
- packagedata: icupkg.inc $(PKGDATA_LIST) build-local
- ifneq ($(ENABLE_STATIC),)
- ifeq ($(PKGDATA_MODE),dll)
--	$(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) -m static $(PKGDATA_VERSIONING) $(PKGDATA_LIST)
-+	$(PKGDATA_INVOKE) $(PKGDATA) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) -m static $(PKGDATA_VERSIONING) $(PKGDATA_LIST)
- endif
- endif
- ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
--	$(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) $(PKGDATA_LIBNAME) $(PKGDATA_LIST)
-+	$(PKGDATA_INVOKE) $(PKGDATA) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) $(PKGDATA_LIBNAME) $(PKGDATA_LIST)
- else
- 	$(INSTALL_DATA) $(ICUDATA_SOURCE_ARCHIVE) $(OUTDIR)
- endif
-@@ -209,11 +209,11 @@
- endif
- ifneq ($(ENABLE_STATIC),)
- ifeq ($(PKGDATA_MODE),dll)
--	$(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_LIBDIR)
-+	$(PKGDATA_INVOKE) $(PKGDATA) -m static -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_LIBDIR)
- endif
- endif
- ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
--	$(PKGDATA_INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_DIR)
-+	$(PKGDATA_INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_DIR)
- else
- 	$(INSTALL_DATA) $(ICUDATA_SOURCE_ARCHIVE) $(DESTDIR)$(ICUPKGDATA_DIR)
- endif
-@@ -224,7 +224,7 @@
- #### 390 support
- install390: package390
- 	$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(libdir)
--	$(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING) -I $(DESTDIR)$(ICUPKGDATA_DIR)
-+	$(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING) -I $(DESTDIR)$(ICUPKGDATA_DIR)
- ifeq ($(PKGDATA_MODE),dll)
- 	$(INSTALL-L) $(ICUPKGDATA_OUTDIR)/$(FINAL_IMPORT_LIB) $(DESTDIR)$(ICUPKGDATA_DIR)/$(FINAL_IMPORT_LIB)
- endif
-@@ -232,7 +232,7 @@
- #### $(LIB_ICUDATA_NAME)$(STUB_SUFFIX) is the subset data for batch mode
- package390: $(OUTTMPDIR)/icudata390.lst $(PKGDATA_LIST) ./icupkg.inc packagedata
- 	ln -s $(ICUDATA_NAME) $(OUTDIR)/build/$(ICUDATA_NAME)$(STUB_SUFFIX)
--	$(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING)
-+	$(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING)
- 	cp $(ICUPKGDATA_OUTDIR)/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO) $(top_builddir)/stubdata/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO)
- 
- 
-diff -Nura icu.orig/source/extra/uconv/Makefile.in icu/source/extra/uconv/Makefile.in
---- icu.orig/source/extra/uconv/Makefile.in	2014-12-18 15:49:42.986626850 -0300
-+++ icu/source/extra/uconv/Makefile.in	2014-12-18 15:57:40.558101179 -0300
-@@ -58,7 +58,8 @@
- ## Static mode
- ifeq ($(UCONVMSG_MODE),static)
- DEFS += -DUCONVMSG_LINK=$(MSGNAME)
--UCONVMSG_LIB = $(RESDIR)/$(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(MSGNAME).$(A)
-+UCONVMSG_LIB = $(RESDIR)/$(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)@SYMBOL_PREFIX@$(MSGNAME).$(A)
-+
- LIBS += $(UCONVMSG_LIB)
- PKGMODE=static
- INSTALLTO=$(libdir)
-@@ -152,7 +153,7 @@
- endif
- 
- $(UCONVMSG_LIB): $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc
--	$(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
-+	$(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p @SYMBOL_PREFIX@$(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
- 
- $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
- 	@-$(RMV) $@

similarity index 100%
rename from package/icu/0004-link-icudata-as-data-only.patch
rename to package/icu/0003-link-icudata-as-data-only.patch

similarity index 100%
rename from package/icu/0005-fix-static-linking-with-icu-uc.patch
rename to package/icu/0004-fix-static-linking-with-icu-uc.patch

similarity index 100%
rename from package/libselinux/0002-fix-musl-build.patch
rename to package/libselinux/0001-fix-musl-build.patch

deleted file mode 100644
index 5d00c6983b..0000000000
@@ -1,24 +0,0 @@
-Do not make symbols hidden on Blackfin
-
-The libselinux logic to hide internal symbols from the DSO doesn't
-work properly on Blackfin due to the USER_LABEL_PREFIX not being
-handled properly. A real fix is not that simple, so this patch simply
-disables the internal symbol hiding mechanism. This means that those
-symbols are visible in the final DSO, which is not a problem for
-proper execution, it just isn't as clean.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: b/src/dso.h
-===================================================================
---- a/src/dso.h
-+++ b/src/dso.h
-@@ -1,7 +1,7 @@
- #ifndef _SELINUX_DSO_H
- #define _SELINUX_DSO_H	1
- 
--#ifdef SHARED
-+#if defined(SHARED) && !defined(__bfin__)
- # define hidden __attribute__ ((visibility ("hidden")))
- # define hidden_proto(fct) __hidden_proto (fct, fct##_internal)
- # define __hidden_proto(fct, internal)	\

similarity index 100%
rename from package/libselinux/0003-libselinux-build-follow-standard-semantics-for-DESTD.patch
rename to package/libselinux/0002-libselinux-build-follow-standard-semantics-for-DESTD.patch

similarity index 100%
rename from package/libselinux/0004-revert-ln-relative.patch
rename to package/libselinux/0003-revert-ln-relative.patch

deleted file mode 100644
index de772225ba..0000000000
@@ -1,55 +0,0 @@
-From 473fdecd9a580b45251480b8ccbbb1927c598310 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <[email protected]>
-Date: Thu, 26 May 2016 16:27:13 -0300
-Subject: [PATCH] Don't append prefix to symbol names in version script
-
-Even if Blackfin GNU toolchain add prefix '_' to all symbols,
-symbol prefix is not accepted in the link flag --version-script.
-Don't append prefix in the symbols in the version script file.
-
-Original patch by: Sonic Zhang <[email protected]>
-
-[Gustavo: update for 1.6.22]
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-[Julien: update for 1.6.25]
-Signed-off-by: Julien Boibessot <[email protected]>
-
-[Bernd: update for 1.6.29]
-Signed-off-by: Bernd Kuhls <[email protected]>
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
----
- Makefile.am | 2 +-
- Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 3430dca..db6a7a2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -245,7 +245,7 @@ contrib/tools/pngfix.o: pnglibconf.h
- # interfering with the symbol file format.
- SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG at PNGLIB_MAJOR@@PNGLIB_MINOR at _0'\
- 		-DPNGLIB_VERSION='@PNGLIB_VERSION@'\
--		-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'\
-+		-DSYMBOL_PREFIX=''\
- 		-DPNG_NO_USE_READ_MACROS -DPNG_BUILDING_SYMBOL_TABLE
- 
- if DO_PNG_PREFIX
-diff --git a/Makefile.in b/Makefile.in
-index 4e67782..5f468d9 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -766,7 +766,7 @@ SUFFIXES = .chk .out
- # interfering with the symbol file format.
- SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG at PNGLIB_MAJOR@@PNGLIB_MINOR at _0' \
- 	-DPNGLIB_VERSION='@PNGLIB_VERSION@' \
--	-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)' -DPNG_NO_USE_READ_MACROS \
-+	-DSYMBOL_PREFIX='' -DPNG_NO_USE_READ_MACROS \
- 	-DPNG_BUILDING_SYMBOL_TABLE $(am__append_9)
- 
- # EXT_LIST is a list of the possibly library directory extensions, this exists
--- 
-2.7.3
-

similarity index 100%
rename from package/libsemanage/0002-libsemanage-build-follow-standard-semantics-for-DESTD.patch
rename to package/libsemanage/0001-libsemanage-build-follow-standard-semantics-for-DESTD.patch

deleted file mode 100644
index 7ce960665c..0000000000
@@ -1,25 +0,0 @@
-Do not make symbols hidden on Blackfin
-
-The libselinux logic to hide internal symbols from the DSO doesn't
-work properly on Blackfin due to the USER_LABEL_PREFIX not being
-handled properly. A real fix is not that simple, so this patch simply
-disables the internal symbol hiding mechanism. This means that those
-symbols are visible in the final DSO, which is not a problem for
-proper execution, it just isn't as clean.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Signed-off-by: Adam Duskett <[email protected]>
-
-Index: b/src/dso.h
-===================================================================
---- a/src/dso.h
-+++ b/src/dso.h
-@@ -1,7 +1,7 @@
- #ifndef _SEPOL_DSO_H
- #define _SEPOL_DSO_H	1
- 
--#ifdef SHARED
-+#if defined(SHARED) && !defined(__bfin__)
- # define hidden __attribute__ ((visibility ("hidden")))
- # define hidden_proto(fct) __hidden_proto (fct, fct##_internal)
- # define __hidden_proto(fct, internal)	\

similarity index 100%
rename from package/libsepol/0003-support-static-only.patch
rename to package/libsepol/0002-support-static-only.patch

deleted file mode 100644
index 3c3bd4827f..0000000000
@@ -1,26 +0,0 @@
-Do not make symbols hidden on Blackfin
-
-The libselinux logic to hide internal symbols from the DSO doesn't
-work properly on Blackfin due to the USER_LABEL_PREFIX not being
-handled properly. A real fix is not that simple, so this patch simply
-disables the internal symbol hiding mechanism. This means that those
-symbols are visible in the final DSO, which is not a problem for
-proper execution, it just isn't as clean.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Signed-off-by: Adam Duskett <[email protected]>
-
-Index: b/src/dso.h
-===================================================================
---- a/src/dso.h
-+++ b/src/dso.h
-@@ -5,7 +5,7 @@
-     #define DISABLE_SYMVER 1
- #endif
- 
--#ifdef SHARED
-+#if defined(SHARED) && !defined(__bfin__)
- # define hidden __attribute__ ((visibility ("hidden")))
- # define hidden_proto(fct) __hidden_proto (fct, fct##_internal)
- # define __hidden_proto(fct, internal)	\
-

similarity index 100%
rename from package/libsepol/0004-revert-ln-relative.patch
rename to package/libsepol/0003-revert-ln-relative.patch

deleted file mode 100644
index 76addb652f..0000000000
@@ -1,19 +0,0 @@
-Add support for blackfin arch.
-
-Fixes compilation error:
-../../../../CPP/myWindows/mySplitCommandLine.cpp:99:8: error: #error ENDIANNESS
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-(Patch sent upstream: https://sourceforge.net/p/p7zip/patches/33/
-
-diff -uNr p7zip_15.14.1.org/C/CpuArch.h p7zip_15.14.1/C/CpuArch.h
---- p7zip_15.14.1.org/C/CpuArch.h	2016-02-17 07:27:16.000000000 +0100
-+++ p7zip_15.14.1/C/CpuArch.h	2016-06-08 19:47:49.000000000 +0200
-@@ -66,6 +66,7 @@
-     || defined(__MIPSEL__) \
-     || defined(__MIPSEL) \
-     || defined(_MIPSEL) \
-+    || defined(__BFIN__) \
-     || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
-   #define MY_CPU_LE
- #endif

deleted file mode 100644
index abefcff274..0000000000
@@ -1,57 +0,0 @@
-From 0a337328411d5b3f37b169a83b6fee3f1726130f Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Thu, 26 May 2016 15:57:33 +0200
-Subject: [PATCH] Support architectures with non-empty __USER_LABEL_PREFIX__
-
-On some architectures (like Blackfin), a C symbol does not directly
-match with assembly symbols. The C symbol references are in fact all
-prefixed by a so-called "user label prefix". So when a symbol defined
-in an assembly file needs to be referenced from C, this symbol should
-be prefixed by the "user label prefix".
-
-This commit updates dtddata.S to take into account
-__USER_LABEL_PREFIX__ when it exists.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- src/dtddata.S | 19 +++++++++++++------
- 1 file changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/src/dtddata.S b/src/dtddata.S
-index ce51133..ad2a4db 100644
---- a/src/dtddata.S
-+++ b/src/dtddata.S
-@@ -30,17 +30,24 @@
- 
- /* from: http://www.linuxjournal.com/content/embedding-file-executable-aka-hello-world-version-5967#comment-348129 */
- 
-+#ifdef __USER_LABEL_PREFIX__
-+#define CONCAT1(a, b) CONCAT2(a, b)
-+#define CONCAT2(a, b) a ## b
-+#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-+#else
-+#endif
-+
- .macro binfile name file
- 	.p2align 2
--	.globl \name\()_begin
--\name\()_begin:
-+	.globl SYM(\name\()_begin)
-+SYM(\name\()_begin):
- 	.incbin "\file"
--\name\()_end:
-+SYM(\name\()_end):
- 	.byte 0
- 	.p2align 2
--	.globl \name\()_len
--\name\()_len:
--	.int (\name\()_end - \name\()_begin)
-+	.globl SYM(\name\()_len)
-+SYM(\name\()_len):
-+	.int (SYM(\name\()_end) - SYM(\name\()_begin))
- .endm
- 
- .section .rodata
--- 
-2.7.4
-

similarity index 100%
rename from package/wayland/0002-configure-add-option-to-disable-tests.patch
rename to package/wayland/0001-configure-add-option-to-disable-tests.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

deleted file mode 100644
index 7f8cb24e7a..0000000000
@@ -1,17 +0,0 @@
-Avoid gcc segmentation fault
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
-Signed-off-by: Adam Duskett <[email protected]>
-[aduskett at 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)

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