diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-12-24 19:56:24 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-12-24 19:56:24 +0100 |
| commit | 18b42aaeaa708f4430bbc4c3cccfa071034ae959 (patch) | |
| tree | be594df6d490fb24e0101f69eed71a045ceb649c /mk | |
| parent | ad11504e4912aa7b5847c665a414cc0d7b992a66 (diff) | |
| download | embtoolkit-18b42aaeaa708f4430bbc4c3cccfa071034ae959.tar.gz embtoolkit-18b42aaeaa708f4430bbc4c3cccfa071034ae959.tar.bz2 embtoolkit-18b42aaeaa708f4430bbc4c3cccfa071034ae959.tar.xz | |
Toolchain: NEW: give ability to use GNU GLIBC as C library
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/arch/arm/arm.mk | 5 | ||||
| -rw-r--r-- | mk/arch/mips/mips.mk | 5 | ||||
| -rw-r--r-- | mk/targetsys.mk | 1 | ||||
| -rw-r--r-- | mk/toolchain.mk | 17 |
4 files changed, 16 insertions, 12 deletions
diff --git a/mk/arch/arm/arm.mk b/mk/arch/arm/arm.mk index 8fde02f..13674ab 100644 --- a/mk/arch/arm/arm.mk +++ b/mk/arch/arm/arm.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE. +# Copyright(C) 2009-2013 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 @@ -23,7 +23,8 @@ ################################################################################ __embtk_arm_endian := $(if $(CONFIG_EMBTK_TARGET_ARCH_BIG_ENDIAN),eb) -__embtk_arm_abi-$(CONFIG_EMBTK_CLIB_EGLIBC) := gnueabi +__embtk_arm_abi-$(CONFIG_EMBTK_CLIB_EGLIBC) := gnueabi +__embtk_arm_abi-$(CONFIG_EMBTK_CLIB_GLIBC) := gnueabi __embtk_arm_abi := $(or $(__embtk_arm_abi-y),$(embtk_clib)eabi) LINUX_ARCH := arm diff --git a/mk/arch/mips/mips.mk b/mk/arch/mips/mips.mk index 6bdbdc6..3c80963 100644 --- a/mk/arch/mips/mips.mk +++ b/mk/arch/mips/mips.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE. +# Copyright(C) 2009-2013 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 @@ -25,7 +25,8 @@ LINUX_ARCH := mips __embtk_mips_endian := $(if $(CONFIG_EMBTK_TARGET_ARCH_LITTLE_ENDIAN),el) -__embtk_mips_abi-$(CONFIG_EMBTK_CLIB_EGLIBC) := gnu +__embtk_mips_abi-$(CONFIG_EMBTK_CLIB_EGLIBC) := gnu +__embtk_mips_abi-$(CONFIG_EMBTK_CLIB_GLIBC) := gnu __embtk_mips_abi := $(or $(__embtk_mips_abi-y),$(embtk_clib)) __embtk_mips_64bit := $(if $(CONFIG_EMBTK_TARGET_ARCH_64BITS),64) diff --git a/mk/targetsys.mk b/mk/targetsys.mk index 286ae6a..06f19db 100644 --- a/mk/targetsys.mk +++ b/mk/targetsys.mk @@ -27,6 +27,7 @@ embtk_os-$(CONFIG_EMBTK_OS_LINUX) := linux embtk_os := $(or $(embtk_os-y),invalid-os) embtk_clib-$(CONFIG_EMBTK_CLIB_EGLIBC) := eglibc +embtk_clib-$(CONFIG_EMBTK_CLIB_GLIBC) := glibc embtk_clib-$(CONFIG_EMBTK_CLIB_UCLIBC) := uclibc embtk_clib := $(or $(embtk_clib-y),invalid-clib) embtk_clib_version := $(call embtk_get_pkgversion,$(embtk_clib)) diff --git a/mk/toolchain.mk b/mk/toolchain.mk index 37ad41d..ef32e35 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -190,8 +190,6 @@ __gcc3_toolchain-$(CONFIG_EMBTK_GCC_LANGUAGE_CPP) := gcc3_install __gcc3_toolchain-$(CONFIG_EMBTK_GCC_LANGUAGE_OBJECTIVEC) := gcc3_install __gcc3_toolchain-$(CONFIG_EMBTK_GCC_LANGUAGE_OBJECTIVECPP) := gcc3_install -__llvm_toolchain-$(CONFIG_EMTK_HAVE_LLVM) := llvm_install - # # Handle clang/llvm/uClibc based toolchain where linuxthread.old is used or non # threading is used at all. @@ -203,13 +201,16 @@ else __llvm_compiler-rt-$(CONFIG_EMTK_HAVE_COMPILER-RT) := compiler-rt_install endif -TOOLCHAIN_DEPS := linux_headers_install gmp_host_install -TOOLCHAIN_DEPS += mpfr_host_install mpc_host_install binutils_install -TOOLCHAIN_DEPS += $(__llvm_toolchain-y) -TOOLCHAIN_DEPS += gcc1_install $(embtk_clib)_headers_install -TOOLCHAIN_DEPS += gcc2_install $(embtk_clib)_install -TOOLCHAIN_DEPS += $(__gcc3_toolchain-y) $(__llvm_compiler-rt-y) +TOOLCHAIN_DEPS-y := linux_headers_install gmp_host_install +TOOLCHAIN_DEPS-y += mpfr_host_install mpc_host_install binutils_install +TOOLCHAIN_DEPS-$(CONFIG_EMTK_HAVE_LLVM) += llvm_install +TOOLCHAIN_DEPS-y += gcc1_install +TOOLCHAIN_DEPS-$(CONFIG_EMTK_CLIB_EGLIBC) += $(embtk_clib)_headers_install gcc2_install +TOOLCHAIN_DEPS-$(CONFIG_EMTK_CLIB_UCLIBC) += $(embtk_clib)_headers_install gcc2_install +TOOLCHAIN_DEPS-y += $(embtk_clib)_install +TOOLCHAIN_DEPS-y += $(__gcc3_toolchain-y) $(__llvm_compiler-rt-y) +TOOLCHAIN_DEPS := $(TOOLCHAIN_DEPS-y) TOOLCHAIN_ADDONS_NAME := toolchain-addons TOOLCHAIN_ADDONS_DEPS := $(TOOLCHAIN_ADDONS-y) TOOLCHAIN_ADDONS_BUILD_DIR := $(TOOLCHAIN_BUILD_DIR)/.addons |