Skip to contentSkip to conversation

binutils: remove blackfin conditionals

PATCH New Gustavo Zacarias 2 participants 5 messages Mar 17, 2015 – Mar 20, 2015

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/4 binutils: remove blackfin conditionals

Now that we don't support the internal blackfin toolchain any more remove unnecessary conditionals.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/binutils/Config.in.host | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
package/binutils/Config.in.host +1 -5
index 4049cf6..ec1bd17 100644
@@ -12,20 +12,16 @@ choice
 			   !BR2_powerpc64le && !BR2_nios2
 		bool "binutils 2.22"
 
-	# bfin disabled for newer binutils due to
-	# https://sourceware.org/bugzilla/show_bug.cgi?id=17334
 	config BR2_BINUTILS_VERSION_2_23_2
-		depends on !BR2_aarch64 && !BR2_bfin && !BR2_microblaze && \
+		depends on !BR2_aarch64 && !BR2_microblaze && \
 			   !BR2_powerpc64le && !BR2_nios2
 		bool "binutils 2.23.2"
 
 	config BR2_BINUTILS_VERSION_2_24
-		depends on !BR2_bfin
 		depends on !BR2_nios2 # supported, but broken on Nios-II
 		bool "binutils 2.24"
 
 	config BR2_BINUTILS_VERSION_2_25
-		depends on !BR2_bfin
 		bool "binutils 2.25"
 
 endchoice
Signature · 1 line
2.0.5
author
#1 lore raw

PATCH 2/4 gcc: remove blackfin conditionals

Now that we don't support the internal blackfin toolchain any more remove unnecessary conditionals.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/gcc/Config.in.host | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
package/gcc/Config.in.host +4 -5
index 1a5281c..6d514af 100644
@@ -10,7 +10,6 @@ choice
 	prompt "GCC compiler Version"
 	default BR2_GCC_VERSION_4_8_ARC if BR2_arc
 	default BR2_GCC_VERSION_4_9_X if BR2_microblaze || BR2_powerpc64le
-	default BR2_GCC_VERSION_4_5_X if BR2_bfin
 	default BR2_GCC_VERSION_4_8_X
 	help
 	  Select the version of gcc you wish to use.

@@ -40,7 +39,7 @@ choice
 		bool "gcc 4.7.x"
 		# Broken or unsupported architectures
 		depends on !BR2_microblaze && !BR2_aarch64 && !BR2_arc \
-			&& !BR2_bfin && !BR2_powerpc64le && !BR2_nios2
+			&& !BR2_powerpc64le && !BR2_nios2
 		# Broken or unsupported ARM cores
 		depends on !BR2_cortex_a12 && !BR2_pj4
 		# Broken or unsupported PPC cores

@@ -56,7 +55,7 @@ choice
 		bool "gcc 4.8.x"
 		# Broken or unsupported architectures
 		depends on !BR2_microblaze && !BR2_arc \
-			&& !BR2_bfin && !BR2_powerpc64le && !BR2_nios2
+			&& !BR2_powerpc64le && !BR2_nios2
 		# Broken or unsupported ARM cores
 		depends on !BR2_cortex_a12
 		# Broken or unsupported PPC cores

@@ -73,7 +72,7 @@ choice
 	config BR2_GCC_VERSION_4_9_X
 		bool "gcc 4.9.x"
 		# Broken or unsupported architectures
-		depends on !BR2_arc && !BR2_bfin
+		depends on !BR2_arc
 		# PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102
 		select BR2_GCC_NEEDS_MPC
 		select BR2_GCC_SUPPORTS_GRAPHITE

@@ -133,7 +132,7 @@ config BR2_GCC_ENABLE_LIBMUDFLAP
 	bool "Enable libmudflap support"
 	# There are architectures, or specific configurations for
 	# which mudflap is not supported.
-	depends on !BR2_bfin && !BR2_ARM_INSTRUCTIONS_THUMB && !BR2_powerpc_SPE
+	depends on !BR2_ARM_INSTRUCTIONS_THUMB && !BR2_powerpc_SPE
 	depends on !BR2_GCC_VERSION_4_9_X
 	help
 	  libmudflap is a gcc library used for the mudflap pointer
Signature · 1 line
2.0.5
author
#2 lore raw

PATCH 3/4 uclibc: remove blackfin bits

In reply to Gustavo Zacarias

Now that we don't support the internal blackfin toolchain any more remove unnecessary bits, conditionals and tweaks.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/uclibc/Config.in | 19 +++++++------------
 package/uclibc/uclibc.mk | 40 ----------------------------------------
 2 files changed, 7 insertions(+), 52 deletions(-)
package/uclibc/Config.in +7 -12
index 58c6884..f2e484d 100644
@@ -24,11 +24,9 @@ choice
 
 	config BR2_UCLIBC_VERSION_0_9_33
 		bool "uClibc 0.9.33.x"
-		select BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS \
-		       if !BR2_bfin
+		select BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS
 		select BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS_OLD
-		select BR2_UCLIBC_VERSION_SUPPORTS_NPTL \
-		       if !BR2_bfin && !BR2_x86_i386
+		select BR2_UCLIBC_VERSION_SUPPORTS_NPTL if !BR2_x86_i386
 		depends on !(BR2_arc || BR2_xtensa)
 
 	config BR2_UCLIBC_VERSION_ARC_GIT

@@ -39,12 +37,11 @@ choice
 
 	config BR2_UCLIBC_VERSION_NG
 		bool "uClibc-ng"
-		select BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS \
-		       if BR2_bfin || BR2_m68k
+		select BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS if BR2_m68k
 		select BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS_OLD \
-		       if BR2_bfin || BR2_m68k || BR2_arm || BR2_armeb
+		       if BR2_m68k || BR2_arm || BR2_armeb
 		select BR2_UCLIBC_VERSION_SUPPORTS_NPTL \
-		       if !BR2_arc && !BR2_bfin && !BR2_m68k && !BR2_x86_i386
+		       if !BR2_arc && !BR2_m68k && !BR2_x86_i386
 
 	config BR2_UCLIBC_VERSION_XTENSA_GIT
 		bool "uClibc Git Xtensa"

@@ -53,10 +50,10 @@ choice
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
 		bool "daily snapshot"
-		select BR2_UCLIBC_SUPPORTS_LINUXTHREADS if !BR2_bfin && !BR2_xtensa
+		select BR2_UCLIBC_SUPPORTS_LINUXTHREADS if !BR2_xtensa
 		select BR2_UCLIBC_SUPPORTS_LINUXTHREADS_OLD
 		select BR2_UCLIBC_VERSION_SUPPORTS_NPTL \
-		       if !BR2_bfin && !BR2_x86_i386 && !BR2_xtensa
+		       if !BR2_x86_i386 && !BR2_xtensa
 		depends on !(BR2_arc)
 
 endchoice

@@ -167,7 +164,6 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 
 config BR2_UCLIBC_INSTALL_UTILS
 	bool "Compile and install uClibc utilities"
-	depends on !BR2_bfin
 	default y
 	help
 	  Enabling this option will compile and install the getconf,

@@ -200,7 +196,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 "mips"	   if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	default "powerpc"  if BR2_powerpc
package/uclibc/uclibc.mk +0 -40
index 13994ad..72a46d9 100644
@@ -157,45 +157,6 @@ endef
 endif # powerpc
 
 #
-# Blackfin definitions
-#
-
-ifeq ($(UCLIBC_TARGET_ARCH),bfin)
-ifeq ($(BR2_BINFMT_FDPIC),y)
-define UCLIBC_BFIN_CONFIG
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
-	$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
-endef
-endif
-ifeq ($(BR2_BINFMT_FLAT_ONE),y)
-define UCLIBC_BFIN_CONFIG
-	$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
-	$(call KCONFIG_DISABLE_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_SEP_DATA),y)
-define UCLIBC_BFIN_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_BFIN_CONFIG
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
-	$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
-endef
-endif
-endif # bfin
-
-#
 # x86 definitions
 #
 ifeq ($(UCLIBC_TARGET_ARCH),i386)

@@ -418,7 +379,6 @@ define UCLIBC_KCONFIG_FIXUP_CMDS
 	$(UCLIBC_SH_TYPE_CONFIG)
 	$(UCLIBC_SPARC_TYPE_CONFIG)
 	$(UCLIBC_POWERPC_TYPE_CONFIG)
-	$(UCLIBC_BFIN_CONFIG)
 	$(UCLIBC_X86_TYPE_CONFIG)
 	$(UCLIBC_ENDIAN_CONFIG)
 	$(UCLIBC_LARGEFILE_CONFIG)
Signature · 1 line
2.0.5
author
#3 lore raw

PATCH 4/4 elf2flt: disable for blackfin

In reply to Gustavo Zacarias

Now that we don't support the internal blackfin toolchain any more it makes no sense to have this enabled.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/elf2flt/Config.in.host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/elf2flt/Config.in.host +1 -1
index 605ce20..eb86b11 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_HOST_ELF2FLT
 	bool "Enable elf2flt support?"
-	depends on BR2_arm || BR2_bfin || BR2_sh || BR2_sparc
+	depends on BR2_arm || BR2_sh || BR2_sparc
 	depends on !BR2_USE_MMU
 	help
 	  uCLinux uses a Binary Flat format commonly known as BFLT. It
Signature · 1 line
2.0.5
#4 lore raw

PATCH 1/4 binutils: remove blackfin conditionals

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 7 lines · Gustavo Zacarias

Now that we don't support the internal blackfin toolchain any more remove unnecessary conditionals.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/binutils/Config.in.host | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

All four patches applied. There were some minor conflicts when applying the uClibc patch due to another patch that was merged in the mean time, but I fixed that up while applying (hopefully in the correct way).

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com