5 files changed, 86 insertions, 13 deletions
diff --git a/toolchain/Makefile b/toolchain/Makefile
index b80782081..5e19998eb 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -12,7 +12,16 @@
 
 include $(ADK_TOPDIR)/rules.mk
 
-TARGETS:=binutils gmp mpfr mpc libelf gcc
+TARGETS:=binutils gmp mpfr mpc libelf
+
+ifeq ($(ADK_BUILD_COMPILER_GCC),y)
+TARGETS+=gcc
+COMPILER:=gcc
+endif
+ifeq ($(ADK_BUILD_COMPILER_LLVM),y)
+TARGETS+=llvm
+COMPILER:=llvm
+endif
 
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 TARGETS+=glibc
@@ -47,7 +56,7 @@ endif
 
 DOWNLOAD:=kernel-headers-download $(patsubst %,%-download,$(TARGETS))
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
-FINAL:=$(patsubst %,%-final,gcc)
+FINAL:=$(patsubst %,%-final,$(COMPILER))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 
 install: $(TARGETS_INSTALL)
@@ -55,14 +64,14 @@ clean: $(TARGETS_CLEAN)
 download: $(DOWNLOAD)
 final: $(FINAL)
 
-gcc-configure: binutils-install gmp-install mpfr-install mpc-install libelf-install
+$(COMPILER)-configure: binutils-install gmp-install mpfr-install mpc-install libelf-install
 ifeq ($(ADK_TARGET_LIB_NEWLIB),y)
-$(CLIB)-install: gcc-configure
+$(CLIB)-install: $(COMPILER)-configure
 else
-$(CLIB)-install: gcc-configure kernel-headers-configure
+$(CLIB)-install: $(COMPILER)-configure kernel-headers-configure
 endif
-gcc-install: $(ELF2FLT) $(CLIB)-install
-gcc-final: gcc-install $(GDB)
+$(COMPILER)-install: $(ELF2FLT) $(CLIB)-install
+$(COMPILER)-final: $(COMPILER)-install $(GDB)
 
 %-download:
 	$(START_TRACE) "toolchain/$(patsubst %-download,%,$@)/download.. "
diff --git a/toolchain/llvm/Makefile b/toolchain/llvm/Makefile
new file mode 100644
index 000000000..52228f221
--- /dev/null
+++ b/toolchain/llvm/Makefile
@@ -0,0 +1,50 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+include ../rules.mk
+include Makefile.inc
+
+include ${ADK_TOPDIR}/mk/buildhlp.mk
+
+BUILD_DIR_INITIAL:=	$(WRKBUILD)-initial
+BUILD_DIR_FINAL:=	$(WRKBUILD)-final
+
+LLVM_TARGETS:=ARM
+
+$(BUILD_DIR_INITIAL)/.configured:
+	(cd $(DL_DIR) && wget http://llvm.org/releases/3.8.0/cfe-3.8.0.src.tar.xz)
+	(cd $(DL_DIR) && wget http://llvm.org/releases/3.8.0/compiler-rt-3.8.0.src.tar.xz)
+	(cd $(WRKBUILD)/tools && tar xvf $(DL_DIR)/cfe-3.8.0.src.tar.xz && mv cfe-3.8.0.src clang)
+	(cd $(WRKBUILD)/projects && tar xvf $(DL_DIR)/compiler-rt-3.8.0.src.tar.xz && mv compiler-rt-3.8.0.src compiler-rt)
+	mkdir -p $(BUILD_DIR_INITIAL)
+	cd $(BUILD_DIR_INITIAL); \
+		PATH='$(HOST_PATH)' \
+		cmake -DCMAKE_BUILD_TYPE=Release \
+			-DCMAKE_INSTALL_PREFIX=$(TOOLCHAIN_DIR)/usr \
+			-DLLVM_DEFAULT_TARGET_TRIPLE="arm-none-eabi" \
+			-DCMAKE_CXX_FLAGS="-std=c++11" \
+			-DLLVM_TARGETS_TO_BUILD=$(LLVM_TARGETS) \
+			$(WRKBUILD)
+	touch $@
+
+$(BUILD_DIR_INITIAL)/.compiled: $(BUILD_DIR_INITIAL)/.configured
+	PATH='$(TARGET_PATH)' \
+		$(MAKE) -C $(BUILD_DIR_INITIAL) all
+	touch $@
+
+$(WRKBUILD)/.configured: $(BUILD_DIR_INITIAL)/.compiled
+	PATH='$(TARGET_PATH)' \
+		$(MAKE) -C $(BUILD_DIR_INITIAL) install
+	touch $@
+
+$(WRKBUILD)/.compiled:
+	touch $@
+
+$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
+	touch $@
+
+$(WRKBUILD)/.final:
+	touch $@
+
+include ${ADK_TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/llvm/Makefile.inc b/toolchain/llvm/Makefile.inc
new file mode 100644
index 000000000..1c66bedc5
--- /dev/null
+++ b/toolchain/llvm/Makefile.inc
@@ -0,0 +1,10 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+PKG_NAME:=		llvm
+PKG_VERSION:=		3.8.0
+PKG_HASH:=		555b028e9ee0f6445ff8f949ea10e9cd8be0d084840e21fbbe1d31d51fc06e46
+PKG_SITES:=		http://llvm.org/releases/3.8.0/
+PKG_RELEASE:=		1
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.src.tar.xz
+WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.src
diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index 1bbb2d190..c2ad85706 100644
--- a/toolchain/musl/Makefile
+++ b/toolchain/musl/Makefile
@@ -22,7 +22,9 @@ TARGET_LDFLAGS:=	$(filter-out -fstack-protector-all,$(TARGET_LDFLAGS))
 TARGET_CFLAGS:=         $(filter-out -ffast-math,$(TARGET_CFLAGS))
 
 $(WRKBUILD)/.configured:
-	(cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \
+	(cd $(WRKBUILD); PATH='$(HOST_PATH)' \
+		CROSS_COMPILE='$(TARGET_CROSS)' \
+		CC='$(TARGET_CC)' \
 		CFLAGS='$(TARGET_CFLAGS)' \
 		./configure --prefix=/usr \
 		--target=$(GNU_TARGET_NAME) \
@@ -31,14 +33,13 @@ $(WRKBUILD)/.configured:
 	touch $@
 
 $(WRKBUILD)/.compiled:
-	$(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' all
+	PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \
+		CC='$(TARGET_CC)' CFLAGS='$(TARGET_CFLAGS)' all
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
-	$(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' DESTDIR=$(STAGING_TARGET_DIR) install
-	touch $@
-
-$(WRKBUILD)/.final:
+	PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \
+		CC='$(TARGET_CC)' CFLAGS='$(TARGET_CFLAGS)' DESTDIR=$(STAGING_TARGET_DIR) install
 	touch $@
 
 include ${ADK_TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile
index 80b6e1b28..91722f968 100644
--- a/toolchain/uclibc-ng/Makefile
+++ b/toolchain/uclibc-ng/Makefile
@@ -16,6 +16,7 @@ TARGET_LDFLAGS:=$(filter-out -fstack-protector-all,$(TARGET_LDFLAGS))
 # don't use fast-math for C library
 TARGET_CFLAGS:=	$(filter-out -ffast-math,$(TARGET_CFLAGS))
 
+ifeq ($(ADK_BUILD_COMPILER_GCC),y)
 ifeq ($(ADK_TARGET_HARD_FLOAT),y)
 ifeq ($(ADK_TARGET_ARCH_ARM),y)
 TARGET_CFLAGS+=		-Wa,-mfloat-abi=hard
@@ -33,6 +34,7 @@ ifeq ($(ADK_TARGET_ARCH_MIPS),y)
 TARGET_CFLAGS+=		-Wa,-msoft-float
 endif
 endif
+endif
 
 ifeq (${ADK_MAKE_PARALLEL},y)
 UCLIBC_MAKEOPTS+=	-j${ADK_MAKE_JOBS}
@@ -270,6 +272,7 @@ endif
 endif
 	echo N|PATH='$(HOST_PATH)' $(MAKE) $(UCLIBC_MAKEOPTS) -C $(WRKBUILD) \
 		HOSTCC="$(HOST_CC)" \
+		CC='$(TARGET_CC)' \
 		PREFIX=$(STAGING_TARGET_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \