From: Thomas Petazzoni Date: Fri, 18 Mar 2016 21:08:07 +0000 (+0100) Subject: uclibc: remove USE_BX handling X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0bbe85e6ea9ccf9f22bead7c45eaa3a4684200e8;p=buildroot.git uclibc: remove USE_BX handling Now that uClibc is capable of figuring out by itself whether 'bx' can be used or not, we can simplify the logic in Buildroot. Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 16bf89c627..e7229085c0 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -139,11 +139,6 @@ config BR2_UCLIBC_ARC_TYPE default "ARC_CPU_700" if BR2_arc770d default "ARC_CPU_HS" if BR2_archs38 -config BR2_UCLIBC_ARM_BX - bool - depends on BR2_UCLIBC_TARGET_ARCH = "arm" - default y if (BR2_ARM_CPU_HAS_THUMB || BR2_ARM_CPU_HAS_THUMB2) - config BR2_UCLIBC_MIPS_ABI string depends on BR2_UCLIBC_TARGET_ARCH = "mips" diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 88a4a8cf42..c981d80118 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -80,16 +80,6 @@ ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_TOOLCHAIN_HAS_THREADS),yy) UCLIBC_EXTRA_CFLAGS += -marm endif -ifeq ($(BR2_UCLIBC_ARM_BX),y) -define UCLIBC_ARM_BX_CONFIG - $(call KCONFIG_ENABLE_OPT,USE_BX,$(@D)/.config) -endef -else -define UCLIBC_ARM_BX_CONFIG - $(call KCONFIG_DISABLE_OPT,USE_BX,$(@D)/.config) -endef -endif - endif # arm # @@ -362,7 +352,6 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(UCLIBC_ARC_TYPE_CONFIG) $(UCLIBC_ARC_PAGE_SIZE_CONFIG) $(UCLIBC_ARM_ABI_CONFIG) - $(UCLIBC_ARM_BX_CONFIG) $(UCLIBC_MIPS_ABI_CONFIG) $(UCLIBC_MIPS_ISA_CONFIG) $(UCLIBC_SH_TYPE_CONFIG)