From 59d694c6466eabbd15f367c9f69bcea4532fcd92 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Wed, 2 Apr 2014 18:00:58 +0200 Subject: Toolchain: rename llvm -> llvm_host Signed-off-by: Abdoulaye Walsimou Gaye --- core/mk/arch/arm/arm.mk | 10 +++++----- core/mk/arch/mips/mips.mk | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'core/mk') diff --git a/core/mk/arch/arm/arm.mk b/core/mk/arch/arm/arm.mk index f3a3e48..b8d9e1f 100644 --- a/core/mk/arch/arm/arm.mk +++ b/core/mk/arch/arm/arm.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2013 Abdoulaye Walsimou GAYE. +# Copyright(C) 2009-2014 Abdoulaye Walsimou GAYE. # # This program is free software; you can distribute it and/or modify it # under the terms of the GNU General Public License @@ -37,7 +37,7 @@ STRICT_GNU_TARGET := arm$(__embtk_arm_endian)-unknown-$(embtk_os)-$(__embtk_arm_ # GCC/LLVM configure options # GCC_WITH_CPU := --with-cpu=$(EMBTK_MCU_FLAG) -LLVM_WITH_CPU := --with-default-cpu=$(EMBTK_MCU_FLAG) +LLVM_HOST_WITH_CPU := --with-default-cpu=$(EMBTK_MCU_FLAG) # GCC extra configure options for arm GCC3_CONFIGURE_EXTRA_OPTIONS += $(strip $(if $(CONFIG_EMBTK_GCC_LANGUAGE_JAVA), \ @@ -46,8 +46,8 @@ GCC3_CONFIGURE_EXTRA_OPTIONS += $(strip $(if $(CONFIG_EMBTK_GCC_LANGUAGE_JAVA), # Hard or soft floating point for GCC/LLVM? 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_FLOAT := --with-float=$(GCC_WITH_FLOAT-y) +LLVM_HOST_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 @@ -63,7 +63,7 @@ GCC_WITH_FPU-$(CONFIG_EMBTK_ARCH_ARM_FPU_NEON) := neon GCC_WITH_FPU-$(CONFIG_EMBTK_ARCH_ARM_FPU_NEON_FP16) := neon-fp16 GCC_WITH_FPU-$(CONFIG_EMBTK_ARCH_ARM_FPU_NEON_VFPV4) := neon-vfpv4 GCC_WITH_FPU := $(if $(GCC_WITH_FPU-y),--with-fpu=$(GCC_WITH_FPU-y)) -LLVM_WITH_FPU := $(if $(GCC_WITH_FPU-y),--with-default-fpu=$(GCC_WITH_FPU-y)) +LLVM_HOST_WITH_FPU := $(if $(GCC_WITH_FPU-y),--with-default-fpu=$(GCC_WITH_FPU-y)) # Hard or soft floating point? EMBTK_TARGET_FLOAT_CFLAGS := $(strip $(if $(CONFIG_EMBTK_SOFTFLOAT), \ diff --git a/core/mk/arch/mips/mips.mk b/core/mk/arch/mips/mips.mk index 6914579..a3653ac 100644 --- a/core/mk/arch/mips/mips.mk +++ b/core/mk/arch/mips/mips.mk @@ -94,12 +94,12 @@ GCC_WITH_ARCH := --with-arch=$(GNU_TARGET_ARCH) # Hard or soft floating point for GCC? ifeq ($(CONFIG_EMBTK_HARDFLOAT),y) GCC_WITH_FLOAT := --with-float=hard -LLVM_WITH_FLOAT := --with-default-float=hard +LLVM_HOST_WITH_FLOAT := --with-default-float=hard EMBTK_TARGET_FLOAT_CFLAGS := -mhard-float __xtools_env_float := hf else GCC_WITH_FLOAT := --with-float=soft -LLVM_WITH_FLOAT := --with-default-float=soft +LLVM_HOST_WITH_FLOAT := --with-default-float=soft EMBTK_TARGET_FLOAT_CFLAGS := -msoft-float __xtools_env_float := sf endif @@ -107,13 +107,13 @@ endif # ABI part ifeq ($(CONFIG_EMBTK_ARCH_MIPS_ABI_O32),y) GCC_WITH_ABI := --with-abi=32 -LLVM_WITH_ABI := --with-default-abi=o32 +LLVM_HOST_WITH_ABI := --with-default-abi=o32 EMBTK_TARGET_ABI := -mabi=32 __xtools_env_abi := o32 else ifeq ($(CONFIG_EMBTK_ARCH_MIPS_ABI_N32),y) GCC_WITH_ABI := --with-abi=n32 -LLVM_WITH_ABI := --with-default-abi=n32 +LLVM_HOST_WITH_ABI := --with-default-abi=n32 EMBTK_TARGET_ABI := -mabi=n32 __xtools_env_abi := n32 @@ -127,7 +127,7 @@ __xtools_env_abi := n32 else GCC_WITH_ABI := --with-abi=64 -LLVM_WITH_ABI := --with-default-abi=n64 +LLVM_HOST_WITH_ABI := --with-default-abi=n64 EMBTK_TARGET_ABI := -mabi=64 __xtools_env_abi := n64 endif -- cgit v1.2.3