Toolchain: replace all reference to linux with {embtk_os}

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

3 files changed, 78 insertions, 76 deletions

diff --git a/mk/arch/arm/arm.mk b/mk/arch/arm/arm.mk
index 4306ecc..52bd258 100644
--- a/mk/arch/arm/arm.mk
+++ b/mk/arch/arm/arm.mk
@@ -24,32 +24,32 @@
 
 LINUX_ARCH		:= arm
 GNU_TARGET_ARCH		:= arm
-EMBTK_MCU_FLAG		:= $(subst ",,$(strip $(CONFIG_EMBTK_ARM_MCU_STRING)))
+EMBTK_MCU_FLAG		:= $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_ARM_MCU_STRING))
 
 ifeq ($(CONFIG_EMBTK_CLIB_EGLIBC),y)
 # EGLIBC C library
 ifeq ($(CONFIG_EMBTK_ARCH_ARM_BIG_ENDIAN),y)
-GNU_TARGET		:= armeb-linux
-STRICT_GNU_TARGET	:= armeb-unknown-linux-gnueabi
+GNU_TARGET		:= armeb-$(embtk_os)
+STRICT_GNU_TARGET	:= armeb-unknown-$(embtk_os)-gnueabi
 else
-GNU_TARGET		:= armel-linux
-STRICT_GNU_TARGET	:= armel-unknown-linux-gnueabi
+GNU_TARGET		:= armel-$(embtk_os)
+STRICT_GNU_TARGET	:= armel-unknown-$(embtk_os)-gnueabi
 endif
 
 else
 # uClibc C library
 ifeq ($(CONFIG_EMBTK_ARCH_ARM_BIG_ENDIAN),y)
-GNU_TARGET		:= armeb-linux
-STRICT_GNU_TARGET	:= armeb-unknown-linux-uclibceabi
+GNU_TARGET		:= armeb-$(embtk_os)
+STRICT_GNU_TARGET	:= armeb-unknown-$(embtk_os)-uclibceabi
 else
-GNU_TARGET		:= armel-linux
-STRICT_GNU_TARGET	:= armel-unknown-linux-uclibceabi
+GNU_TARGET		:= armel-$(embtk_os)
+STRICT_GNU_TARGET	:= armel-unknown-$(embtk_os)-uclibceabi
 endif
 
 endif
 
 # GCC configure options
-GCC_WITH_CPU := --with-cpu=$(subst ",,$(strip $(CONFIG_EMBTK_ARM_MCU_STRING)))
+GCC_WITH_CPU := --with-cpu=$(EMBTK_MCU_FLAG)
 
 # GCC extra configure options for arm
 GCC3_CONFIGURE_EXTRA_OPTIONS += $(strip $(if $(CONFIG_EMBTK_GCC_LANGUAGE_JAVA),	\
diff --git a/mk/arch/mips/mips.mk b/mk/arch/mips/mips.mk
index 6f671e3..34484e2 100644
--- a/mk/arch/mips/mips.mk
+++ b/mk/arch/mips/mips.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2012 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
@@ -28,90 +28,90 @@ ifeq ($(CONFIG_EMBTK_CLIB_EGLIBC),y)
 #we use EGLIBC C library
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS1_LITTLE),y)
-GNU_TARGET := mipsel-linux
-STRICT_GNU_TARGET := mipsel-unknown-linux-gnu
+GNU_TARGET := mipsel-$(embtk_os)
+STRICT_GNU_TARGET := mipsel-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips1
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS1_BIG),y)
-GNU_TARGET := mips-linux
-STRICT_GNU_TARGET := mips-unknown-linux-gnu
+GNU_TARGET := mips-$(embtk_os)
+STRICT_GNU_TARGET := mips-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips1
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS2_LITTLE),y)
-GNU_TARGET := mipsel-linux
-STRICT_GNU_TARGET := mipsel-unknown-linux-gnu
+GNU_TARGET := mipsel-$(embtk_os)
+STRICT_GNU_TARGET := mipsel-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips2
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS2_BIG),y)
-GNU_TARGET := mips-linux
-STRICT_GNU_TARGET := mips-unknown-linux-gnu
+GNU_TARGET := mips-$(embtk_os)
+STRICT_GNU_TARGET := mips-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips2
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS3_LITTLE),y)
-GNU_TARGET := mips64el-linux
-STRICT_GNU_TARGET := mips64el-unknown-linux-gnu
+GNU_TARGET := mips64el-$(embtk_os)
+STRICT_GNU_TARGET := mips64el-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips3
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS3_BIG),y)
-GNU_TARGET := mips64-linux
-STRICT_GNU_TARGET := mips64-unknown-linux-gnu
+GNU_TARGET := mips64-$(embtk_os)
+STRICT_GNU_TARGET := mips64-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips3
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS4_LITTLE),y)
-GNU_TARGET := mips64el-linux
-STRICT_GNU_TARGET := mips64el-unknown-linux-gnu
+GNU_TARGET := mips64el-$(embtk_os)
+STRICT_GNU_TARGET := mips64el-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips4
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS4_BIG),y)
-GNU_TARGET := mips64-linux
-STRICT_GNU_TARGET := mips64-unknown-linux-gnu
+GNU_TARGET := mips64-$(embtk_os)
+STRICT_GNU_TARGET := mips64-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips4
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS32_LITTLE),y)
-GNU_TARGET := mipsel-linux
-STRICT_GNU_TARGET := mipsisa32el-unknown-linux-gnu
+GNU_TARGET := mipsel-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa32el-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips32
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS32_BIG),y)
-GNU_TARGET := mips-linux
-STRICT_GNU_TARGET := mipsisa32-unknown-linux-gnu
+GNU_TARGET := mips-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa32-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips32
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS32R2_LITTLE),y)
-GNU_TARGET := mipsel-linux
-STRICT_GNU_TARGET := mipsisa32r2el-unknown-linux-gnu
+GNU_TARGET := mipsel-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa32r2el-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips32r2
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS32R2_BIG),y)
-GNU_TARGET := mips-linux
-STRICT_GNU_TARGET := mipsisa32r2-unknown-linux-gnu
+GNU_TARGET := mips-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa32r2-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips32r2
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS64_LITTLE),y)
-GNU_TARGET := mips64el-linux
-STRICT_GNU_TARGET := mipsisa64el-unknown-linux-gnu
+GNU_TARGET := mips64el-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa64el-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips64
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS64_BIG),y)
-GNU_TARGET := mips64-linux
-STRICT_GNU_TARGET := mipsisa64-unknown-linux-gnu
+GNU_TARGET := mips64-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa64-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips64
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS64R2_LITTLE),y)
-GNU_TARGET := mips64el-linux
-STRICT_GNU_TARGET := mipsisa64r2el-unknown-linux-gnu
+GNU_TARGET := mips64el-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa64r2el-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips64r2
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS64R2_BIG),y)
-GNU_TARGET := mips64-linux
-STRICT_GNU_TARGET := mipsisa64r2-unknown-linux-gnu
+GNU_TARGET := mips64-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa64r2-unknown-$(embtk_os)-gnu
 GNU_TARGET_ARCH := mips64r2
 endif
 
@@ -119,90 +119,90 @@ else
 #We use uClibc C library
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS1_LITTLE),y)
-GNU_TARGET := mipsel-linux
-STRICT_GNU_TARGET := mipsel-unknown-linux-uclibc
+GNU_TARGET := mipsel-$(embtk_os)
+STRICT_GNU_TARGET := mipsel-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips1
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS1_BIG),y)
-GNU_TARGET := mips-linux
-STRICT_GNU_TARGET := mips-unknown-linux-uclibc
+GNU_TARGET := mips-$(embtk_os)
+STRICT_GNU_TARGET := mips-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips1
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS2_LITTLE),y)
-GNU_TARGET := mipsel-linux
-STRICT_GNU_TARGET := mipsel-unknown-linux-uclibc
+GNU_TARGET := mipsel-$(embtk_os)
+STRICT_GNU_TARGET := mipsel-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips2
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS2_BIG),y)
-GNU_TARGET := mips-linux
-STRICT_GNU_TARGET := mips-unknown-linux-uclibc
+GNU_TARGET := mips-$(embtk_os)
+STRICT_GNU_TARGET := mips-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips2
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS3_LITTLE),y)
-GNU_TARGET := mips64el-linux
-STRICT_GNU_TARGET := mips64el-unknown-linux-uclibc
+GNU_TARGET := mips64el-$(embtk_os)
+STRICT_GNU_TARGET := mips64el-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips3
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS3_BIG),y)
-GNU_TARGET := mips64-linux
-STRICT_GNU_TARGET := mips64-unknown-linux-uclibc
+GNU_TARGET := mips64-$(embtk_os)
+STRICT_GNU_TARGET := mips64-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips3
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS4_LITTLE),y)
-GNU_TARGET := mips64el-linux
-STRICT_GNU_TARGET := mips64el-unknown-linux-uclibc
+GNU_TARGET := mips64el-$(embtk_os)
+STRICT_GNU_TARGET := mips64el-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips4
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS4_BIG),y)
-GNU_TARGET := mips64-linux
-STRICT_GNU_TARGET := mips64-unknown-linux-uclibc
+GNU_TARGET := mips64-$(embtk_os)
+STRICT_GNU_TARGET := mips64-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips4
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS32_LITTLE),y)
-GNU_TARGET := mipsel-linux
-STRICT_GNU_TARGET := mipsisa32el-unknown-linux-uclibc
+GNU_TARGET := mipsel-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa32el-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips32
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS32_BIG),y)
-GNU_TARGET := mips-linux
-STRICT_GNU_TARGET := mipsisa32-unknown-linux-uclibc
+GNU_TARGET := mips-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa32-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips32
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS32R2_LITTLE),y)
-GNU_TARGET := mipsel-linux
-STRICT_GNU_TARGET := mipsisa32r2el-unknown-linux-uclibc
+GNU_TARGET := mipsel-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa32r2el-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips32r2
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS32R2_BIG),y)
-GNU_TARGET := mips-linux
-STRICT_GNU_TARGET := mipsisa32r2-unknown-linux-uclibc
+GNU_TARGET := mips-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa32r2-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips32r2
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS64_LITTLE),y)
-GNU_TARGET := mips64el-linux
-STRICT_GNU_TARGET := mipsisa64el-unknown-linux-uclibc
+GNU_TARGET := mips64el-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa64el-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips64
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS64_BIG),y)
-GNU_TARGET := mips64-linux
-STRICT_GNU_TARGET := mipsisa64-unknown-linux-uclibc
+GNU_TARGET := mips64-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa64-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips64
 endif
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS64R2_LITTLE),y)
-GNU_TARGET := mips64el-linux
-STRICT_GNU_TARGET := mipsisa64r2el-unknown-linux-uclibc
+GNU_TARGET := mips64el-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa64r2el-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips64r2
 endif
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS64R2_BIG),y)
-GNU_TARGET := mips64-linux
-STRICT_GNU_TARGET := mipsisa64r2-unknown-linux-uclibc
+GNU_TARGET := mips64-$(embtk_os)
+STRICT_GNU_TARGET := mipsisa64r2-unknown-$(embtk_os)-uclibc
 GNU_TARGET_ARCH := mips64r2
 endif
 
diff --git a/mk/target-mcu.mk b/mk/target-mcu.mk
index 5b5daf3..04cb396 100644
--- a/mk/target-mcu.mk
+++ b/mk/target-mcu.mk
@@ -18,11 +18,13 @@
 #
 # \file         target_mcu.mk
 # \brief	target_mcu.mk of Embtoolkit. Here we define LINUX_ARCH,
-# \brief	GNU_ARCH and GNU_TARGET.
+# \brief	GNU_ARCH, GNU_TARGET and EMBTK_OS
 # \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         May 2009
 ################################################################################
 
+embtk_os	:= linux
+
 #ARM
 ifeq ($(CONFIG_EMBTK_ARCH_ARM),y)
 include $(EMBTK_ROOT)/mk/arch/arm/arm.mk