Toolchain: rename clang -> clang_host

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

5 files changed, 42 insertions, 42 deletions

diff --git a/core/toolchain/llvm/clang-llvm.kconfig b/core/toolchain/llvm/clang-llvm.kconfig
index 1e29995..74e1516 100644
--- a/core/toolchain/llvm/clang-llvm.kconfig
+++ b/core/toolchain/llvm/clang-llvm.kconfig
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2012-2013 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
+# Copyright(C) 2012-2014 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,18 +31,18 @@ choice
 	help
 	 Version of llvm you wish
 
-	config EMBTK_CLANG_LLVM_VERSION_3_3
+	config EMBTK_CLANG_HOST_LLVM_VERSION_3_3
 		bool "clang/llvm-3.3"
 		select EMBTK_LLVM_VERSION_3_3
-		select EMBTK_CLANG_VERSION_3_3
-	config EMBTK_CLANG_LLVM_VERSION_3_2
+		select EMBTK_CLANG_HOST_VERSION_3_3
+	config EMBTK_CLANG_HOST_LLVM_VERSION_3_2
 		bool "clang/llvm-3.2"
 		select EMBTK_LLVM_VERSION_3_2
-		select EMBTK_CLANG_VERSION_3_2
-	config EMBTK_CLANG_LLVM_VERSION_GIT
+		select EMBTK_CLANG_HOST_VERSION_3_2
+	config EMBTK_CLANG_HOST_LLVM_VERSION_GIT
 		bool "Use clang/llvm git repository"
 		select EMBTK_LLVM_VERSION_GIT
-		select EMBTK_CLANG_VERSION_GIT
+		select EMBTK_CLANG_HOST_VERSION_GIT
 		help
 		 Answer Y here if you want to build your toolchain based on
 		 clang/llvm sources from its GIT repository.
diff --git a/core/toolchain/llvm/clang/clang.kconfig b/core/toolchain/llvm/clang/clang.kconfig
index 701fcfa..fa29626 100644
--- a/core/toolchain/llvm/clang/clang.kconfig
+++ b/core/toolchain/llvm/clang/clang.kconfig
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2012-2013 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
+# Copyright(C) 2012-2014 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,21 +23,21 @@
 # \date         October 2012
 ################################################################################
 
-config EMBTK_HAVE_CLANG
+config EMBTK_HOST_HAVE_CLANG
 	bool
 	default y
 
 #
 # clang version
 #
-config EMBTK_CLANG_VERSION_3_3
+config EMBTK_CLANG_HOST_VERSION_3_3
 	bool
-	select EMBTK_CLANG_NEED_PATCH
-config EMBTK_CLANG_VERSION_3_2
+	select EMBTK_CLANG_HOST_NEED_PATCH
+config EMBTK_CLANG_HOST_VERSION_3_2
 	bool
-	select EMBTK_CLANG_NEED_PATCH
+	select EMBTK_CLANG_HOST_NEED_PATCH
 
-config EMBTK_CLANG_VERSION_GIT
+config EMBTK_CLANG_HOST_VERSION_GIT
 	bool
 	help
 	 Answer Y here if you want to build your toolchain based on
@@ -46,35 +46,35 @@ config EMBTK_CLANG_VERSION_GIT
 #
 # GIT repository options
 #
-config EMBTK_CLANG_GIT_BRANCH
+config EMBTK_CLANG_HOST_GIT_BRANCH
 	string "clang branch to use"
 	default "master"
-	depends on EMBTK_CLANG_VERSION_GIT
+	depends on EMBTK_CLANG_HOST_VERSION_GIT
 	help
 	 The branch of the git repository to use, the default is master.
 
-config EMBTK_CLANG_GIT_REVISION
+config EMBTK_CLANG_HOST_GIT_REVISION
 	string "Clang specific revision to use instead of the latest"
-	depends on EMBTK_CLANG_VERSION_GIT
+	depends on EMBTK_CLANG_HOST_VERSION_GIT
 	help
 	 Chechout a specific revision instead of the latest.
 
-config EMBTK_CLANG_REFSPEC
+config EMBTK_CLANG_HOST_REFSPEC
 	string
 	default "toolchain"
 
 #
 # Versions strings for tarball packages.
 #
-config EMBTK_CLANG_VERSION_STRING
+config EMBTK_CLANG_HOST_VERSION_STRING
 	string
-	default "3.3"		if EMBTK_CLANG_VERSION_3_3
-	default "3.2"		if EMBTK_CLANG_VERSION_3_2
-	default "git"		if EMBTK_CLANG_VERSION_GIT
+	default "3.3"		if EMBTK_CLANG_HOST_VERSION_3_3
+	default "3.2"		if EMBTK_CLANG_HOST_VERSION_3_2
+	default "git"		if EMBTK_CLANG_HOST_VERSION_GIT
 
 
-config EMBTK_CLANG_NEED_PATCH
+config EMBTK_CLANG_HOST_NEED_PATCH
 	bool
-config EMBTK_CLANG_NEED_AUTORECONF
+config EMBTK_CLANG_HOST_NEED_AUTORECONF
 	bool
 
diff --git a/core/toolchain/llvm/clang/clang.mk b/core/toolchain/llvm/clang/clang.mk
index 0a5484b..ce5561a 100644
--- a/core/toolchain/llvm/clang/clang.mk
+++ b/core/toolchain/llvm/clang/clang.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2012 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
+# Copyright(C) 2012-2014 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,17 +23,17 @@
 # \date         October 2012
 ################################################################################
 
-CLANG_NAME		:= clang
-CLANG_VERSION		:= $(call embtk_get_pkgversion,clang)
-CLANG_SITE		:= http://llvm.org/releases/$(CLANG_VERSION)
-#CLANG_GIT_SITE		:= http://llvm.org/git/clang.git
-CLANG_GIT_SITE		:= git://www.embtoolkit.org/clang.git
-CLANG_PACKAGE		:= clang-$(CLANG_VERSION).src.tar.gz
-CLANG_SRC_DIR		:= $(embtk_toolsb)/clang-$(CLANG_VERSION).src
-CLANG_BUILD_DIR		:= $(embtk_toolsb)/clang-build
+CLANG_HOST_NAME		:= clang
+CLANG_HOST_VERSION	:= $(call embtk_get_pkgversion,clang_host)
+CLANG_HOST_SITE		:= http://llvm.org/releases/$(CLANG_HOST_VERSION)
+#CLANG_HOST_GIT_SITE	:= http://llvm.org/git/clang.git
+CLANG_HOST_GIT_SITE	:= git://www.embtoolkit.org/clang.git
+CLANG_HOST_PACKAGE	:= clang-$(CLANG_HOST_VERSION).src.tar.gz
+CLANG_HOST_SRC_DIR	:= $(embtk_toolsb)/clang-$(CLANG_HOST_VERSION).src
+CLANG_HOST_BUILD_DIR	:= $(embtk_toolsb)/clang-$(CLANG_HOST_VERSION)-build
 
-define embtk_install_clang
+define embtk_install_clang_host
 	$(call embtk_pinfo,"Compile/Install of clang will be done within llvm...")
-	$(call embtk_download_pkg,clang)
-	$(call embtk_decompress_pkg,clang)
+	$(call embtk_download_pkg,clang_host)
+	$(call embtk_decompress_pkg,clang_host)
 endef
diff --git a/core/toolchain/llvm/compiler-rt/compiler-rt.mk b/core/toolchain/llvm/compiler-rt/compiler-rt.mk
index bf26237..827a22e 100644
--- a/core/toolchain/llvm/compiler-rt/compiler-rt.mk
+++ b/core/toolchain/llvm/compiler-rt/compiler-rt.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2012-2013 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
+# Copyright(C) 2012-2014 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ ifeq ($(TARGETCXX),$(TARGETGCXX))
 __embtk_compiler-rt_cflags	:= $(filter-out $(__clang_cflags),$(__embtk_compiler-rt_cflags))
 endif
 
-ifeq ($(CONFIG_EMBTK_CLANG_VERSION_3_3),y)
+ifeq ($(CONFIG_EMBTK_CLANG_HOST_VERSION_3_3),y)
 __embtk_compiler-rt_cflags += -DASAN_INTERFACE_VERSION=3
 endif
 
diff --git a/core/toolchain/llvm/llvm/llvm.mk b/core/toolchain/llvm/llvm/llvm.mk
index 12f0fbc..24fb2f7 100644
--- a/core/toolchain/llvm/llvm/llvm.mk
+++ b/core/toolchain/llvm/llvm/llvm.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2012 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
+# Copyright(C) 2012-2014 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@ LLVM_PACKAGE		:= llvm-$(LLVM_VERSION).src.tar.gz
 LLVM_SRC_DIR		:= $(embtk_toolsb)/llvm-$(LLVM_VERSION).src
 LLVM_BUILD_DIR		:= $(embtk_toolsb)/llvm-build
 
-LLVM_DEPS		:= binutils_install clang_install
+LLVM_DEPS		:= binutils_install clang_host_install
 
 LLVM_WITH_HASHSTYLE	:= $(if $(CONFIG_EMBTK_CLIB_UCLIBC),--with-default-hash-style=sysv)
 
@@ -64,7 +64,7 @@ endef
 
 define embtk_beforeinstall_llvm
 	[ -e $(call __embtk_pkg_srcdir,llvm)/tools/clang ] ||			\
-		ln -sf $(call __embtk_pkg_srcdir,clang)				\
+		ln -sf $(call __embtk_pkg_srcdir,clang_host)			\
 				$(call __embtk_pkg_srcdir,llvm)/tools/clang
 	mkdir -p $(embtk_tools)/bin/clang-scan-build
 	cp -R $(call __embtk_pkg_srcdir,llvm)/tools/clang/tools/scan-build/*	\