Toolchain: llvm/clang: add v3.5.0 and drop v3.3 support

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

5 files changed, 21 insertions, 17 deletions

diff --git a/core/toolchain/llvm/clang-llvm.kconfig b/core/toolchain/llvm/clang-llvm.kconfig
index 3e48bf9..a91e3bd 100644
--- a/core/toolchain/llvm/clang-llvm.kconfig
+++ b/core/toolchain/llvm/clang-llvm.kconfig
@@ -31,14 +31,16 @@ choice
 	help
 	 Version of llvm you wish
 
+	config EMBTK_CLANG_HOST_LLVM_HOST_VERSION_3_5_0
+		bool "clang/llvm-3.5.0"
+		select EMBTK_LLVM_HOST_VERSION_3_5_0
+		select EMBTK_CLANG_HOST_VERSION_3_5_0
+
 	config EMBTK_CLANG_HOST_LLVM_HOST_VERSION_3_4_1
 		bool "clang/llvm-3.4.1"
 		select EMBTK_LLVM_HOST_VERSION_3_4_1
 		select EMBTK_CLANG_HOST_VERSION_3_4_1
-	config EMBTK_CLANG_HOST_LLVM_HOST_VERSION_3_3
-		bool "clang/llvm-3.3"
-		select EMBTK_LLVM_HOST_VERSION_3_3
-		select EMBTK_CLANG_HOST_VERSION_3_3
+
 	config EMBTK_CLANG_HOST_LLVM_HOST_VERSION_GIT
 		bool "Use clang/llvm git repository"
 		select EMBTK_LLVM_HOST_VERSION_GIT
diff --git a/core/toolchain/llvm/clang/clang.kconfig b/core/toolchain/llvm/clang/clang.kconfig
index 2988b67..b56c6e6 100644
--- a/core/toolchain/llvm/clang/clang.kconfig
+++ b/core/toolchain/llvm/clang/clang.kconfig
@@ -30,10 +30,11 @@ config EMBTK_HOST_HAVE_CLANG
 #
 # clang version
 #
-config EMBTK_CLANG_HOST_VERSION_3_4_1
+config EMBTK_CLANG_HOST_VERSION_3_5_0
 	bool
 	select EMBTK_CLANG_HOST_NEED_PATCH
-config EMBTK_CLANG_HOST_VERSION_3_3
+
+config EMBTK_CLANG_HOST_VERSION_3_4_1
 	bool
 	select EMBTK_CLANG_HOST_NEED_PATCH
 
@@ -59,7 +60,7 @@ config EMBTK_CLANG_HOST_GIT_REVISION
 	help
 	 Chechout a specific revision instead of the latest.
 
-config EMBTK_CLANG_HOST_REFSPEC
+config EMBTK_CLANG_HOST_CATEGORY
 	string
 	default "toolchain"
 
@@ -68,8 +69,8 @@ config EMBTK_CLANG_HOST_REFSPEC
 #
 config EMBTK_CLANG_HOST_VERSION_STRING
 	string
+	default "3.5.0"		if EMBTK_CLANG_HOST_VERSION_3_5_0
 	default "3.4.1"		if EMBTK_CLANG_HOST_VERSION_3_4_1
-	default "3.2"		if EMBTK_CLANG_HOST_VERSION_3_2
 	default "git"		if EMBTK_CLANG_HOST_VERSION_GIT
 
 
diff --git a/core/toolchain/llvm/clang/clang.mk b/core/toolchain/llvm/clang/clang.mk
index 8b8994c..ea1ee3e 100644
--- a/core/toolchain/llvm/clang/clang.mk
+++ b/core/toolchain/llvm/clang/clang.mk
@@ -24,11 +24,11 @@
 ################################################################################
 
 CLANG_HOST_NAME		:= clang
-CLANG_HOST_VERSION	:= $(call embtk_get_pkgversion,clang_host)
+CLANG_HOST_VERSION	:= $(call embtk_pkg_version,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_PACKAGE	:= clang-$(CLANG_HOST_VERSION).src.tar.xz
 CLANG_HOST_SRC_DIR	:= $(embtk_toolsb)/clang-$(CLANG_HOST_VERSION).src
 CLANG_HOST_BUILD_DIR	:= $(embtk_toolsb)/clang-$(CLANG_HOST_VERSION)-build
 CLANG_HOST_KEEP_SRC_DIR	:= y
diff --git a/core/toolchain/llvm/llvm/llvm.kconfig b/core/toolchain/llvm/llvm/llvm.kconfig
index 6a7e049..46b69ae 100644
--- a/core/toolchain/llvm/llvm/llvm.kconfig
+++ b/core/toolchain/llvm/llvm/llvm.kconfig
@@ -30,10 +30,11 @@ config EMBTK_HOST_HAVE_LLVM
 #
 # llvm version
 #
-config EMBTK_LLVM_HOST_VERSION_3_4_1
+config EMBTK_LLVM_HOST_VERSION_3_5_0
 	bool
 	select EMBTK_LLVM_HOST_NEED_PATCH
-config EMBTK_LLVM_HOST_VERSION_3_3
+
+config EMBTK_LLVM_HOST_VERSION_3_4_1
 	bool
 	select EMBTK_LLVM_HOST_NEED_PATCH
 
@@ -59,7 +60,7 @@ config EMBTK_LLVM_HOST_GIT_REVISION
 	help
 	 Chechout a specific revision instead of the latest.
 
-config EMBTK_LLVM_HOST_REFSPEC
+config EMBTK_LLVM_HOST_CATEGORY
 	string
 	default "toolchain"
 
@@ -68,8 +69,8 @@ config EMBTK_LLVM_HOST_REFSPEC
 #
 config EMBTK_LLVM_HOST_VERSION_STRING
 	string
+	default "3.5.0"		if EMBTK_LLVM_HOST_VERSION_3_5_0
 	default "3.4.1"		if EMBTK_LLVM_HOST_VERSION_3_4_1
-	default "3.3"		if EMBTK_LLVM_HOST_VERSION_3_3
 	default "git"		if EMBTK_LLVM_HOST_VERSION_GIT
 
 
diff --git a/core/toolchain/llvm/llvm/llvm.mk b/core/toolchain/llvm/llvm/llvm.mk
index 228c5ed..656d651 100644
--- a/core/toolchain/llvm/llvm/llvm.mk
+++ b/core/toolchain/llvm/llvm/llvm.mk
@@ -24,13 +24,13 @@
 ################################################################################
 
 LLVM_HOST_NAME		:= llvm
-LLVM_HOST_VERSION	:= $(call embtk_get_pkgversion,llvm_host)
+LLVM_HOST_VERSION	:= $(call embtk_pkg_version,llvm_host)
 LLVM_HOST_SITE		:= http://llvm.org/releases/$(LLVM_HOST_VERSION)
 #LLVM_HOST_GIT_SITE	:= http://llvm.org/git/llvm.git
 LLVM_HOST_GIT_SITE	:= git://www.embtoolkit.org/llvm.git
-LLVM_HOST_PACKAGE	:= llvm-$(LLVM_HOST_VERSION).src.tar.gz
+LLVM_HOST_PACKAGE	:= llvm-$(LLVM_HOST_VERSION).src.tar.xz
 LLVM_HOST_SRC_DIR	:= $(embtk_toolsb)/llvm-$(LLVM_HOST_VERSION).src
-LLVM_HOST_BUILD_DIR	:= $(embtk_toolsb)/llvm-build
+LLVM_HOST_BUILD_DIR	:= $(embtk_toolsb)/llvm-$(LLVM_HOST_VERSION)-build
 
 LLVM_HOST_DEPS			:= clang_host_install