From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 15 Mar 2015 12:03:01 +0000 (+0000)
Subject: toolchain: remove leftovers from old llvm-gcc experiments
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=808c4602508f6b007ff3f6b3fd2a66afb67deef3;p=openwrt%2Fstaging%2Fjow.git

toolchain: remove leftovers from old llvm-gcc experiments

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 44783
---

diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 7421c0a5e7..7c9bca530e 100644
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
@@ -69,10 +69,6 @@ define Build/Configure
 		oldconfig
 endef
 
-ifdef CONFIG_GCC_VERSION_LLVM
-  TARGET_CFLAGS += -fnested-functions
-endif
-
 LDLIBS:=m crypt
 ifdef CONFIG_BUSYBOX_USE_LIBRPC
   TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
diff --git a/toolchain/Makefile b/toolchain/Makefile
index 7f8d62f739..c250cba480 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -51,11 +51,6 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
   $(curdir)/$(LIBC)/utils/prepare:=$(curdir)/$(LIBC)/headers/prepare
 endif
 
-ifdef CONFIG_GCC_VERSION_LLVM
-  $(curdir)/builddirs += llvm
-  $(curdir)/gcc/minimal/compile += $(curdir)/llvm/install
-endif
-
 ifndef DUMP_TARGET_DB
 ifneq ($(ARCH),)
   $(TOOLCHAIN_DIR)/info.mk: .config
diff --git a/toolchain/llvm/Makefile b/toolchain/llvm/Makefile
deleted file mode 100644
index fef29c01a9..0000000000
--- a/toolchain/llvm/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=llvm
-PKG_VERSION:=r83568
-PKG_SOURCE_VERSION:=5687d8a26c08d089c60df2c92d048ab85bcdb2b9
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=git://repo.or.cz/llvm.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_HOST)
-
-include $(INCLUDE_DIR)/toolchain-build.mk
-
-ifeq ($(HOST_OS),Darwin)
-  DARWIN_VERSION=$(shell sw_vers -productVersion)
-  DARWIN_MAJVERS=$(firstword $(subst ., ,$(DARWIN_VERSION)))
-
-  HOST_MAKE_FLAGS += \
-	DARWIN_VERSION=$(DARWIN_VERSION) \
-	DARWIN_MAJVERS=$(DARWIN_MAJVERS)
-
-endif
-
-HOST_CONFIGURE_ARGS += \
-	--enable-optimized --enable-assertions
-
-define Host/Compile
-	@-$(MAKE) -C $(HOST_BUILD_DIR) $(HOST_MAKE_FLAGS) uninstall
-	$(MAKE) -C $(HOST_BUILD_DIR) $(HOST_MAKE_FLAGS)
-endef
-
-define Host/Install
-	rm -f $(BUILD_DIR_HOST)/llvm
-	ln -s llvm-$(PKG_VERSION) $(BUILD_DIR_HOST)/llvm
-	$(MAKE) -C $(HOST_BUILD_DIR) $(HOST_MAKE_FLAGS) install
-endef
-
-$(eval $(call HostBuild))
diff --git a/toolchain/llvm/patches/100-darwin_arch_auto.patch b/toolchain/llvm/patches/100-darwin_arch_auto.patch
deleted file mode 100644
index a48e131219..0000000000
--- a/toolchain/llvm/patches/100-darwin_arch_auto.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -618,16 +618,6 @@ ifdef UNIVERSAL
- 
-   # Building universal cannot compute dependencies automatically.
-   DISABLE_AUTO_DEPENDENCIES=1
--else
--  ifeq ($(TARGET_OS),Darwin)
--    ifeq ($(ARCH),x86_64)
--      TargetCommonOpts = -m64
--    else
--      ifeq ($(ARCH),x86)
--        TargetCommonOpts = -m32
--      endif
--    endif
--  endif
- endif
- 
- ifeq ($(HOST_OS),SunOS)
diff --git a/toolchain/llvm/patches/110-darwin_version_detect.patch b/toolchain/llvm/patches/110-darwin_version_detect.patch
deleted file mode 100644
index 7fd62f93ee..0000000000
--- a/toolchain/llvm/patches/110-darwin_version_detect.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -506,11 +506,13 @@ endif
- #--------------------------------------------------------------------
- 
- ifeq ($(HOST_OS),Darwin)
-+  ifndef DARWIN_VERSION
-   DARWIN_VERSION := `sw_vers -productVersion`
-   # Strip a number like 10.4.7 to 10.4
-   DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]).*/\1/')
-   # Get "4" out of 10.4 for later pieces in the makefile.
-   DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]).*/\1/')
-+  endif
- 
-   SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined -Wl,suppress \
-                     -dynamiclib
diff --git a/tools/Makefile b/tools/Makefile
index 93aa5b3e6c..3a9ff59e44 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -11,7 +11,7 @@ curdir:=tools
 # subdirectories to descend into
 tools-y :=
 
-ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN)$(CONFIG_GCC_LLVM),)
+ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
   BUILD_TOOLCHAIN := y
 endif
 ifdef CONFIG_GCC_USE_GRAPHITE