arch: drop BR2_BINFMT_FLAT_SEP_DATA support

This was only used by Blackfin, so there's no good reason to keep it.

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

diff --git a/Config.in.legacy b/Config.in.legacy
index 3d20950af57bd2760fc5d5085ed58c9bf8ceecb1..eeefea191c589532d2e4d2a681a8fe72843d5ef7 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -162,6 +162,13 @@ config BR2_PACKAGE_IQVLINUX
          See https://sourceforge.net/p/e1000/bugs/589/ for the
          discussion.
 
+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

diff --git a/arch/Config.in b/arch/Config.in
index a193cd00680df01a50c6dc364563e986e8e2732a..a66ea0d03b90efcd7c6347830cc01371b44065cf 100644 (file)
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -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

diff --git a/package/Makefile.in b/package/Makefile.in
index be7a48f6473e6835695da953f2e9e5a285ed51d5..4325f7b3a905af5fdb62a840cad2cc79d27983ec 100644 (file)
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -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)-

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 25e86534fdb86fca2d07e8e51db96c86bca828f3..afcf7deb82a93f100ba61587657500b3ee0c1997 100644 (file)
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -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)