summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2013-07-13 22:27:34 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-07-14 20:19:09 (GMT)
commitd8dad05fbb9b16af94c38669e39388f3a9e823e9 (patch)
tree416e62db2a32f2674e96c51937879cbece5f2b60
parent171df5276f837c177f94e9f70aa89224cc0c104e (diff)
downloadbuildroot-d8dad05fbb9b16af94c38669e39388f3a9e823e9.tar.gz
buildroot-d8dad05fbb9b16af94c38669e39388f3a9e823e9.tar.bz2
package/uClibc: drop ARM EABI conditions
... since we now only support EABI for ARM, we only need to force EABI unconditionally. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/uclibc/Config.in5
-rw-r--r--package/uclibc/uclibc.mk4
2 files changed, 1 insertions, 8 deletions
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index b9917a7..8d16e8c 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -182,11 +182,6 @@ config BR2_UCLIBC_ARM_TYPE
default ARM_CORTEXA8 if BR2_cortex_a8
default ARM_CORTEXA9 if BR2_cortex_a9
-config BR2_UCLIBC_ARM_ABI
- string
- depends on BR2_UCLIBC_TARGET_ARCH = "arm"
- default EABI if BR2_ARM_EABI
-
config BR2_UCLIBC_ARM_BX
bool
depends on BR2_UCLIBC_TARGET_ARCH = "arm"
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 421e323..8eca5fe 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -69,11 +69,9 @@ define UCLIBC_ARM_TYPE_CONFIG
$(call UCLIBC_OPT_SET,$(UCLIBC_ARM_TYPE),y,$(@D))
endef
-UCLIBC_ARM_ABI = CONFIG_ARM_$(call qstrip,$(BR2_UCLIBC_ARM_ABI))
-
define UCLIBC_ARM_ABI_CONFIG
$(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config
- $(call UCLIBC_OPT_SET,$(UCLIBC_ARM_ABI),y,$(@D))
+ $(call UCLIBC_OPT_SET,CONFIG_ARM_EABI,y,$(@D))
endef
ifeq ($(BR2_UCLIBC_ARM_BX),y)