From 8e9760d0297d16f96e01c2fe497970c97b967d2c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 9 Oct 2019 18:05:34 +0200 Subject: remove experimental llvm support --- target/config/Config.in.compiler | 17 -------- toolchain/Makefile | 11 ----- toolchain/llvm/Makefile | 89 ---------------------------------------- toolchain/llvm/Makefile.inc | 10 ----- 4 files changed, 127 deletions(-) delete mode 100644 toolchain/llvm/Makefile delete mode 100644 toolchain/llvm/Makefile.inc diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index 0020e6b92..b44da2882 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -7,25 +7,8 @@ prompt "Compiler" config ADK_BUILD_COMPILER_GCC bool "gcc" -config ADK_BUILD_COMPILER_LLVM - bool "llvm" - depends on ADK_EXPERIMENTAL - endchoice -choice -prompt "LLVM version" -depends on ADK_BUILD_COMPILER_LLVM - -config ADK_TOOLCHAIN_LLVM - bool "6.0.0" - -endchoice - -config ADK_TOOLCHAIN_LLVM_VERSION - string - default "6.0.0" if ADK_TOOLCHAIN_LLVM - choice prompt "GCC version" depends on ADK_BUILD_COMPILER_GCC diff --git a/toolchain/Makefile b/toolchain/Makefile index ea77cc9e2..a7302bdb2 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -17,12 +17,6 @@ TARGETS:=binutils gmp mpfr mpc TARGETS+=gcc COMPILER:=gcc endif -ifeq ($(ADK_BUILD_COMPILER_LLVM),y) -TARGETS:=binutils -TARGETS+=llvm -COMPILER:=llvm -endif - ifeq ($(ADK_TARGET_LIB_GLIBC),y) TARGETS+=glibc CLIB:=glibc @@ -67,12 +61,7 @@ clean: $(TARGETS_CLEAN) download: $(DOWNLOAD) final: $(FINAL) - -ifeq ($(ADK_BUILD_COMPILER_LLVM),y) -$(COMPILER)-configure: binutils-install -else $(COMPILER)-configure: binutils-install gmp-install mpfr-install mpc-install -endif ifeq ($(ADK_TARGET_LIB_NEWLIB),y) $(CLIB)-install: $(COMPILER)-configure diff --git a/toolchain/llvm/Makefile b/toolchain/llvm/Makefile deleted file mode 100644 index de6492454..000000000 --- a/toolchain/llvm/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -# 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_VERSION:= $(ADK_TOOLCHAIN_LLVM_VERSION) -LLVM_TRIPLE:= $(ADK_TARGET_ARCH)-linux - -ifeq ($(ADK_TARGET_ARCH_AARCH64),y) -LLVM_TARGETS:=AArch64 -endif -ifeq ($(ADK_TARGET_ARCH_ARM),y) -LLVM_TARGETS:=ARM -ifeq ($(ADK_TARGET_SOFT_FLOAT),y) -LLVM_TRIPLE:=arm-linux-eabi -endif -ifeq ($(ADK_TARGET_HARD_FLOAT),y) -LLVM_TRIPLE:=arm-linux-eabihf -endif -endif -ifeq ($(ADK_TARGET_ARCH_MIPS)$(ADK_TARGET_ARCH_MIPS64),y) -LLVM_TARGETS:=Mips -endif -ifeq ($(ADK_TARGET_ARCH_PPC)$(ADK_TARGET_ARCH_PPC64),y) -LLVM_TARGETS:=PowerPC -endif -ifeq ($(ADK_TARGET_ARCH_SPARC)$(ADK_TARGET_ARCH_SPARC64),y) -LLVM_TARGETS:=Sparc -endif -ifeq ($(ADK_TARGET_ARCH_S390),y) -LLVM_TARGETS:=SystemZ -endif -ifeq ($(ADK_TARGET_ARCH_X86)$(ADK_TARGET_ARCH_X86_64),y) -LLVM_TARGETS:=X86 -endif - -$(BUILD_DIR_INITIAL)/.configured: - (cd $(DL_DIR); \ - for file in cfe lld compiler-rt libcxx libcxxabi; do \ - if [ ! -f $${file}-$(LLVM_VERSION).src.tar.xz ]; then \ - wget http://llvm.org/releases/$(LLVM_VERSION)/$${file}-$(LLVM_VERSION).src.tar.xz ; \ - fi; \ - done; \ - ) - (cd $(WRKBUILD)/tools && tar xvf $(DL_DIR)/cfe-$(LLVM_VERSION).src.tar.xz && mv cfe-$(LLVM_VERSION).src clang) - (cd $(WRKBUILD)/tools && tar xvf $(DL_DIR)/lld-$(LLVM_VERSION).src.tar.xz && mv lld-$(LLVM_VERSION).src lld) - (cd $(WRKBUILD)/projects && tar xvf $(DL_DIR)/compiler-rt-$(LLVM_VERSION).src.tar.xz && mv compiler-rt-$(LLVM_VERSION).src compiler-rt) - (cd $(WRKBUILD)/projects && tar xvf $(DL_DIR)/libcxx-$(LLVM_VERSION).src.tar.xz && mv libcxx-$(LLVM_VERSION).src libcxx) - (cd $(WRKBUILD)/projects && tar xvf $(DL_DIR)/libcxxabi-$(LLVM_VERSION).src.tar.xz && mv libcxxabi-$(LLVM_VERSION).src libcxxabi) - mkdir -p $(BUILD_DIR_INITIAL) - cd $(BUILD_DIR_INITIAL); \ - PATH='$(HOST_PATH)' \ - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$(TOOLCHAIN_DIR)/usr \ - -DCMAKE_CXX_FLAGS="-std=c++11" \ - -DLLVM_ENABLE_EH=ON \ - -DLLVM_ENABLE_RTTI=ON \ - -DLLVM_DEFAULT_TARGET_TRIPLE=$(LLVM_TRIPLE) \ - -DLLVM_TARGETS_TO_BUILD=$(LLVM_TARGETS) \ - $(WRKBUILD) - touch $@ - -$(BUILD_DIR_INITIAL)/.compiled: $(BUILD_DIR_INITIAL)/.configured - PATH='$(TARGET_PATH)' \ - $(MAKE) -j$(ADK_MAKE_JOBS) -C $(BUILD_DIR_INITIAL) all - touch $@ - -$(WRKBUILD)/.configured: $(BUILD_DIR_INITIAL)/.compiled - PATH='$(TARGET_PATH)' \ - $(MAKE) -j$(ADK_MAKE_JOBS) -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 deleted file mode 100644 index 4d74cd4ff..000000000 --- a/toolchain/llvm/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -# 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:= 6.0.0 -PKG_HASH:= 1ff53c915b4e761ef400b803f07261ade637b0c269d99569f18040f3dcee4408 -PKG_SITES:= http://llvm.org/releases/6.0.0/ -PKG_RELEASE:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.src.tar.xz -WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.src -- cgit v1.2.3