summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-12-31 11:10:27 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-12-31 11:10:27 +0100
commit283bb142d6d6e08ed5b08f0a0d2785ae8898f858 (patch)
tree9c06877ce961ae8b22c18089e9e7795788febb2e
parent342292f7aa0533ec8438dfdb38ba8d794d0384ce (diff)
downloadembtoolkit-283bb142d6d6e08ed5b08f0a0d2785ae8898f858.tar.gz
embtoolkit-283bb142d6d6e08ed5b08f0a0d2785ae8898f858.tar.bz2
embtoolkit-283bb142d6d6e08ed5b08f0a0d2785ae8898f858.tar.xz
Toolchain: clang/llvm: are now able to handle default float abi, use it for ARM
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--mk/arch/arm/arm.mk1
-rw-r--r--mk/llvm/llvm.mk1
-rw-r--r--mk/toolchain.mk2
3 files changed, 2 insertions, 2 deletions
diff --git a/mk/arch/arm/arm.mk b/mk/arch/arm/arm.mk
index ca1b27f..f3e82d7 100644
--- a/mk/arch/arm/arm.mk
+++ b/mk/arch/arm/arm.mk
@@ -45,6 +45,7 @@ GCC3_CONFIGURE_EXTRA_OPTIONS += $(strip $(if $(CONFIG_EMBTK_GCC_LANGUAGE_JAVA),
GCC_WITH_FLOAT-$(CONFIG_EMBTK_SOFTFLOAT) := soft
GCC_WITH_FLOAT-$(CONFIG_EMBTK_HARDFLOAT) := softfp
GCC_WITH_FLOAT := --with-float=$(GCC_WITH_FLOAT-y)
+LLVM_WITH_FLOAT := --with-default-float=$(GCC_WITH_FLOAT-y)
GCC_WITH_FPU-$(CONFIG_EMBTK_ARCH_ARM_FPU_VFP) := vfp
GCC_WITH_FPU-$(CONFIG_EMBTK_ARCH_ARM_FPU_VFPV3) := vfpv3
diff --git a/mk/llvm/llvm.mk b/mk/llvm/llvm.mk
index 091ae01..7771f25 100644
--- a/mk/llvm/llvm.mk
+++ b/mk/llvm/llvm.mk
@@ -38,6 +38,7 @@ __embtk_binutils_inc := $(call __embtk_pkg_srcdir,binutils)/include
LLVM_CONFIGURE_OPTS := --target=$(STRICT_GNU_TARGET)
LLVM_CONFIGURE_OPTS += --enable-targets=$(LINUX_ARCH)
LLVM_CONFIGURE_OPTS += --with-default-cpu=$(EMBTK_MCU_FLAG)
+LLVM_CONFIGURE_OPTS += $(LLVM_WITH_FLOAT)
LLVM_CONFIGURE_OPTS += --with-default-sysroot=$(embtk_sysroot)
LLVM_CONFIGURE_OPTS += --enable-optimized
LLVM_CONFIGURE_OPTS += --with-bug-report-url=$(EMBTK_BUGURL)
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index b0b21f6..e2e8b04 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -67,8 +67,6 @@ __TARGET_CFLAGS += $(if $(CONFIG_EMBTK_TARGET_WITH_DEBUG_DATA),-g)
# cflags for clang
__clang_cflags := -Qunused-arguments -fcolor-diagnostics
__clang_cflags += -Wl,--hash-style=sysv
-__clang_cflags += $(if $(CONFIG_EMBTK_SOFTFLOAT),-mfloat-abi=soft)
-__clang_cflags += $(if $(CONFIG_EMBTK_HARDFLOAT),-mfloat-abi=hard)
__TARGET_CFLAGS += $(if $(CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN),$(__clang_cflags))
__TARGET_CFLAGS += $(if $(CONFIG_EMBTK_LLVM_DEFAULT_TOOLCHAIN),$(__clang_cflags))