diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-21 15:12:39 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-21 15:12:39 +0200 |
| commit | 4e9b318e91c9c99659fbe815fad687f57cd3ad45 (patch) | |
| tree | 7b82d5ec6727d896424d79f5e85611aa08256b2f | |
| parent | 6aa60425361e75c8eb69682353dc67e9d6aaf476 (diff) | |
| download | embtoolkit-4e9b318e91c9c99659fbe815fad687f57cd3ad45.tar.gz embtoolkit-4e9b318e91c9c99659fbe815fad687f57cd3ad45.tar.bz2 embtoolkit-4e9b318e91c9c99659fbe815fad687f57cd3ad45.tar.xz | |
Build system: fix target abi definition
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/arch/arm/arm.mk | 6 | ||||
| -rw-r--r-- | mk/arch/mips/mips.mk | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/mk/arch/arm/arm.mk b/mk/arch/arm/arm.mk index 50d683f..ca1b27f 100644 --- a/mk/arch/arm/arm.mk +++ b/mk/arch/arm/arm.mk @@ -23,14 +23,14 @@ ################################################################################ __embtk_arm_endian := $(if $(CONFIG_EMBTK_TARGET_ARCH_LITTLE_ENDIAN),el,eb) -__embtk_arm_clib-(CONFIG_EMBTK_CLIB_EGLIBC) := gnueabi -__embtk_arm_clib := $(or $(__embtk_arm_clib-y),$(embtk_clib)eabi) +__embtk_arm_abi-$(CONFIG_EMBTK_CLIB_EGLIBC) := gnueabi +__embtk_arm_abi := $(or $(__embtk_arm_abi-y),$(embtk_clib)eabi) LINUX_ARCH := arm GNU_TARGET_ARCH := arm EMBTK_MCU_FLAG := $(call __embtk_mk_uquote,$(CONFIG_EMBTK_ARM_MCU_STRING)) GNU_TARGET := arm$(__embtk_arm_endian)-$(embtk_os) -STRICT_GNU_TARGET := arm$(__embtk_arm_endian)-unknown-$(embtk_os)-$(__embtk_arm_clib) +STRICT_GNU_TARGET := arm$(__embtk_arm_endian)-unknown-$(embtk_os)-$(__embtk_arm_abi) # # GCC configure options diff --git a/mk/arch/mips/mips.mk b/mk/arch/mips/mips.mk index e844979..7623e4c 100644 --- a/mk/arch/mips/mips.mk +++ b/mk/arch/mips/mips.mk @@ -25,54 +25,54 @@ LINUX_ARCH := mips __embtk_mips_endian := $(if $(CONFIG_EMBTK_TARGET_ARCH_LITTLE_ENDIAN),el) -__embtk_mips_clib-(CONFIG_EMBTK_CLIB_EGLIBC) := gnu -__embtk_mips_clib := $(or $(__embtk_mips_clib-y),$(embtk_clib)) +__embtk_mips_abi-$(CONFIG_EMBTK_CLIB_EGLIBC) := gnu +__embtk_mips_abi := $(or $(__embtk_mips_abi-y),$(embtk_clib)) ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS1),y) GNU_TARGET := mips$(__embtk_mips_endian)-$(embtk_os) -STRICT_GNU_TARGET := mips$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_clib) +STRICT_GNU_TARGET := mips$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_abi) GNU_TARGET_ARCH := mips1 endif ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS2),y) GNU_TARGET := mips$(__embtk_mips_endian)-$(embtk_os) -STRICT_GNU_TARGET := mips$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_clib) +STRICT_GNU_TARGET := mips$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_abi) GNU_TARGET_ARCH := mips2 endif ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS3),y) GNU_TARGET := mips64$(__embtk_mips_endian)-$(embtk_os) -STRICT_GNU_TARGET := mips64$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_clib) +STRICT_GNU_TARGET := mips64$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_abi) GNU_TARGET_ARCH := mips3 endif ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS4),y) GNU_TARGET := mips64$(__embtk_mips_endian)-$(embtk_os) -STRICT_GNU_TARGET := mips64$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_clib) +STRICT_GNU_TARGET := mips64$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_abi) GNU_TARGET_ARCH := mips4 endif ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS32),y) GNU_TARGET := mips$(__embtk_mips_endian)-$(embtk_os) -STRICT_GNU_TARGET := mipsisa32$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_clib) +STRICT_GNU_TARGET := mipsisa32$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_abi) GNU_TARGET_ARCH := mips32 endif ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS32R2),y) GNU_TARGET := mips$(__embtk_mips_endian)-$(embtk_os) -STRICT_GNU_TARGET := mipsisa32r2$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_clib) +STRICT_GNU_TARGET := mipsisa32r2$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_abi) GNU_TARGET_ARCH := mips32r2 endif ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS64),y) GNU_TARGET := mips64$(__embtk_mips_endian)-$(embtk_os) -STRICT_GNU_TARGET := mipsisa64$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_clib) +STRICT_GNU_TARGET := mipsisa64$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_abi) GNU_TARGET_ARCH := mips64 endif ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS64R2),y) GNU_TARGET := mips64$(__embtk_mips_endian)-$(embtk_os) -STRICT_GNU_TARGET := mipsisa64r2$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_clib) +STRICT_GNU_TARGET := mipsisa64r2$(__embtk_mips_endian)-unknown-$(embtk_os)-$(__embtk_mips_abi) GNU_TARGET_ARCH := mips64r2 endif |