Remove autoconf support

Summary:
This patch is provided in preparation for removing autoconf on 1/26. The proposal to remove autoconf on 1/26 was discussed on the llvm-dev thread here: http://lists.llvm.org/pipermail/llvm-dev/2016-January/093875.html

"I felt a great disturbance in the [build system], as if millions of [makefiles] suddenly cried out in terror and were suddenly silenced. I fear something [amazing] has happened."
- Obi Wan Kenobi

Reviewers: chandlerc, grosbach, bob.wilson, tstellarAMD, echristo, whitequark

Subscribers: chfast, simoncook, emaste, jholewinski, tberghammer, jfb, danalbert, srhines, arsenm, dschuff, jyknight, dsanders, joker.eph, llvm-commits

Differential Revision: http://reviews.llvm.org/D16471

llvm-svn: 258861

44 files changed, 0 insertions, 1083 deletions

diff --git a/llvm/tools/Makefile b/llvm/tools/Makefile
deleted file mode 100644
index da9193bc5c3..00000000000
--- a/llvm/tools/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-##===- tools/Makefile --------------------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ..
-
-include $(LEVEL)/Makefile.config
-
-# Build clang if present.
-
-ifneq ($(CLANG_SRC_ROOT),)
-  OPTIONAL_PARALLEL_DIRS := $(CLANG_SRC_ROOT)
-else
-  OPTIONAL_PARALLEL_DIRS := clang
-endif
-
-# Build LLDB if present. Note LLDB must be built last as it depends on
-# the wider LLVM infrastructure (including Clang).
-OPTIONAL_DIRS := lldb
-
-# NOTE: The tools are organized into five groups of four consisting of one
-# large and three small executables. This is done to minimize memory load
-# in parallel builds.  Please retain this ordering.
-DIRS := llvm-config
-PARALLEL_DIRS := opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link \
-                 lli llvm-extract llvm-mc bugpoint llvm-bcanalyzer llvm-diff \
-                 llvm-objdump llvm-readobj llvm-rtdyld \
-                 llvm-dwarfdump llvm-cov llvm-size llvm-stress llvm-mcmarkup \
-                 llvm-profdata llvm-symbolizer obj2yaml yaml2obj llvm-c-test \
-                 llvm-cxxdump verify-uselistorder dsymutil llvm-pdbdump \
-                 llvm-split sancov sanstats llvm-dwp
-
-# If Intel JIT Events support is configured, build an extra tool to test it.
-ifeq ($(USE_INTEL_JITEVENTS), 1)
-  PARALLEL_DIRS += llvm-jitlistener
-endif
-
-# Let users override the set of tools to build from the command line.
-ifdef ONLY_TOOLS
-  OPTIONAL_PARALLEL_DIRS :=
-  OPTIONAL_DIRS := $(findstring lldb,$(ONLY_TOOLS))
-  PARALLEL_DIRS := $(filter-out lldb,$(ONLY_TOOLS))
-endif
-
-# These libraries build as dynamic libraries (.dylib /.so), they can only be
-# built if ENABLE_PIC is set.
-ifndef ONLY_TOOLS
-ifeq ($(ENABLE_PIC),1)
-  # gold only builds if binutils is around.  It requires "lto" to build before
-  # it so it is added to DIRS. llvm-lto also requires lto
-  DIRS += lto llvm-lto
-  ifdef BINUTILS_INCDIR
-    DIRS += gold
-  endif
-
-  PARALLEL_DIRS += bugpoint-passes
-endif
-
-ifdef LLVM_HAS_POLLY
-  PARALLEL_DIRS += polly
-endif
-endif
-
-# On Win32, loadable modules can be built with ENABLE_SHARED.
-ifneq ($(ENABLE_SHARED),1)
-  ifneq (,$(filter $(HOST_OS), Cygwin MingW))
-    PARALLEL_DIRS := $(filter-out bugpoint-passes, \
-                        $(PARALLEL_DIRS))
-  endif
-endif
-
-ifneq (,$(filter go,$(BINDINGS_TO_BUILD)))
-  PARALLEL_DIRS += llvm-go
-endif
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/bugpoint-passes/Makefile b/llvm/tools/bugpoint-passes/Makefile
deleted file mode 100644
index 61f96bc3385..00000000000
--- a/llvm/tools/bugpoint-passes/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-##===- tools/bugpoint-passes/Makefile -- -------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-LIBRARYNAME := BugpointPasses
-LOADABLE_MODULE := 1
-USEDLIBS :=
-
-# If we don't need RTTI or EH, there's no reason to export anything
-# from this plugin.
-ifneq ($(REQUIRES_RTTI), 1)
-ifneq ($(REQUIRES_EH), 1)
-EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/bugpoint.exports
-endif
-endif
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/bugpoint/Makefile b/llvm/tools/bugpoint/Makefile
deleted file mode 100644
index 174f8d25161..00000000000
--- a/llvm/tools/bugpoint/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-##===- tools/bugpoint/Makefile -----------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := bugpoint
-LINK_COMPONENTS := asmparser instrumentation scalaropts ipo linker bitreader \
-                   bitwriter irreader vectorize objcarcopts codegen
-
-# Support plugins.
-NO_DEAD_STRIP := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/dsymutil/Makefile b/llvm/tools/dsymutil/Makefile
deleted file mode 100644
index c4365e0196b..00000000000
--- a/llvm/tools/dsymutil/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/dsymutil/Makefile -----------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-dsymutil
-LINK_COMPONENTS := all-targets AsmPrinter DebugInfoDWARF MC Object Support
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/gold/Makefile b/llvm/tools/gold/Makefile
deleted file mode 100644
index aa006b0048f..00000000000
--- a/llvm/tools/gold/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-#===- tools/gold/Makefile ----------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-LIBRARYNAME := LLVMgold
-LINK_LIBS_IN_SHARED := 1
-SHARED_LIBRARY := 1
-LOADABLE_MODULE := 1
-
-EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/gold.exports
-
-# Include this here so we can get the configuration of the targets
-# that have been configured for construction. We have to do this 
-# early so we can set up LINK_COMPONENTS before including Makefile.rules
-include $(LEVEL)/Makefile.config
-
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) Linker BitWriter IPO
-
-# Because off_t is used in the public API, the largefile parts are required for
-# ABI compatibility.
-CXXFLAGS += -I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-LDFLAGS += -L$(SharedLibDir)/$(SharedPrefix)
-
-include $(LEVEL)/Makefile.common
-
diff --git a/llvm/tools/llc/Makefile b/llvm/tools/llc/Makefile
deleted file mode 100644
index cd34c80d840..00000000000
--- a/llvm/tools/llc/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#===- tools/llc/Makefile -----------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llc
-LINK_COMPONENTS := all-targets bitreader asmparser irreader mirparser transformutils
-
-# Support plugins.
-NO_DEAD_STRIP := 1
-
-include $(LEVEL)/Makefile.common
-
diff --git a/llvm/tools/lli/ChildTarget/Makefile b/llvm/tools/lli/ChildTarget/Makefile
deleted file mode 100644
index 0767ba1d724..00000000000
--- a/llvm/tools/lli/ChildTarget/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-##===- tools/lli/Makefile ------------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../../..
-TOOLNAME := lli-child-target
-
-include $(LEVEL)/Makefile.config
-
-LINK_COMPONENTS := support OrcJIT
-
-SOURCES := ChildTarget.cpp
-
-include $(LLVM_SRC_ROOT)/Makefile.rules
diff --git a/llvm/tools/lli/Makefile b/llvm/tools/lli/Makefile
deleted file mode 100644
index 70d8c80e5c0..00000000000
--- a/llvm/tools/lli/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-##===- tools/lli/Makefile ------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := lli
-
-PARALLEL_DIRS := ChildTarget
-
-include $(LEVEL)/Makefile.config
-
-LINK_COMPONENTS := mcjit orcjit instrumentation interpreter nativecodegen bitreader asmparser irreader selectiondag native
-
-# If Intel JIT Events support is confiured, link against the LLVM Intel JIT
-# Events interface library
-ifeq ($(USE_INTEL_JITEVENTS), 1)
-  LINK_COMPONENTS += debuginfodwarf inteljitevents object
-endif
-
-# If oprofile support is confiured, link against the LLVM oprofile interface
-# library
-ifeq ($(USE_OPROFILE), 1)
-  LINK_COMPONENTS += oprofilejit
-endif
-
-include $(LLVM_SRC_ROOT)/Makefile.rules
diff --git a/llvm/tools/llvm-ar/Makefile b/llvm/tools/llvm-ar/Makefile
deleted file mode 100644
index 824bb947300..00000000000
--- a/llvm/tools/llvm-ar/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-##===- tools/llvm-ar/Makefile ------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-ar
-TOOLALIAS = llvm-ranlib
-LINK_COMPONENTS := all-targets bitreader libdriver support object
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
-
-all-local::
-	$(Verb) $(AliasTool) $(notdir $(ToolBuildPath)) $(ToolDir)/llvm-lib$(EXEEXT)
diff --git a/llvm/tools/llvm-as/Makefile b/llvm/tools/llvm-as/Makefile
deleted file mode 100644
index dfd71b295a9..00000000000
--- a/llvm/tools/llvm-as/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-as/Makefile ------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-as
-LINK_COMPONENTS := asmparser bitwriter
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-bcanalyzer/Makefile b/llvm/tools/llvm-bcanalyzer/Makefile
deleted file mode 100644
index 2fc61dbd62a..00000000000
--- a/llvm/tools/llvm-bcanalyzer/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-bcanalyzer/Makefile ----------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-bcanalyzer
-LINK_COMPONENTS := bitreader
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-c-test/Makefile b/llvm/tools/llvm-c-test/Makefile
deleted file mode 100644
index 08be7c3619f..00000000000
--- a/llvm/tools/llvm-c-test/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-##===- tools/llvm-c-test -----------------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL = ../..
-TOOLNAME = llvm-c-test
-
-TOOL_NO_EXPORTS = 1
-NO_INSTALL = 1
-
-
-# If there is no shared lib, link all components...
-ifneq ($(ENABLE_SHARED),1)
-LINK_COMPONENTS = all
-endif
-
-include $(LEVEL)/Makefile.common
-
-CFLAGS += -std=c99 -Wall -Wstrict-prototypes
-
-# ...but if it is built - use it
-ifeq ($(ENABLE_SHARED),1)
-LIBS = -lLLVM-$(LLVMVersion)
-endif
diff --git a/llvm/tools/llvm-config/Makefile b/llvm/tools/llvm-config/Makefile
deleted file mode 100644
index 1376e1a922b..00000000000
--- a/llvm/tools/llvm-config/Makefile
+++ /dev/null
@@ -1,99 +0,0 @@
-##===- tools/llvm-config/Makefile---------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-config
-USEDLIBS := LLVMSupport.a
-
-# We generate sources in the build directory, make sure it is in the include
-# paths.
-INCLUDE_BUILD_DIR := 1
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-# Note that we have to use lazy expansion here.
-BUILDVARIABLES_SRCPATH = $(PROJ_SRC_ROOT)/tools/$(TOOLNAME)/BuildVariables.inc.in
-BUILDVARIABLES_OBJPATH = $(ObjDir)/BuildVariables.inc
-BUILT_SOURCES = $(BUILDVARIABLES_OBJPATH)
-
-include $(LEVEL)/Makefile.common
-
-# Combine preprocessor flags (except for -I) and CXX flags.
-SUB_CPPFLAGS := ${CPP.BaseFlags}
-SUB_CFLAGS   := ${CPP.BaseFlags} ${C.Flags}
-SUB_CXXFLAGS := ${CPP.BaseFlags} ${CXX.Flags}
-
-# Override LIBS with TARGET's LIBS for cross compilation.
-# FIXME: Host's llvm-config is not generated. It's for target's.
-ifneq ($(TARGET_LIBS), )
-  LLVM_SYSTEM_LIBS := $(TARGET_LIBS)
-else
-  LLVM_SYSTEM_LIBS := $(LIBS)
-endif
-
-ifneq ($(REQUIRES_RTTI), 1)
-  LLVM_HAS_RTTI := NO
-else
-  LLVM_HAS_RTTI := YES
-endif
-
-LLVM_DYLIB_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX)
-
-# This is blank for now.  We need to be careful about adding stuff here:
-# LDFLAGS tend not to be portable, and we don't currently require the
-# user to use libtool when linking against LLVM.
-SUB_LDFLAGS :=
-
-$(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir
-	$(Echo) "Building llvm-config BuildVariables.inc file."
-	$(Verb) $(ECHO) 's/@LLVM_SRC_ROOT@/$(subst /,\/,$(LLVM_SRC_ROOT))/' \
-	  > temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_OBJ_ROOT@/$(subst /,\/,$(LLVM_OBJ_ROOT))/' \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_CPPFLAGS@/$(subst /,\/,$(SUB_CPPFLAGS))/' \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_CFLAGS@/$(subst /,\/,$(SUB_CFLAGS))/' \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_CXXFLAGS@/$(subst /,\/,$(SUB_CXXFLAGS))/' \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_LDFLAGS@/$(subst /,\/,$(SUB_LDFLAGS))/' \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_BUILDMODE@/$(subst /,\/,$(BuildMode))/' \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_LIBDIR_SUFFIX@//' \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_SYSTEM_LIBS@/$(subst /,\/,$(LLVM_SYSTEM_LIBS))/' \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \
-	  >> temp.sed
-	$(if $(filter-out $(ENABLE_SHARED),0),\
-	  $(Verb) $(ECHO) 's/@LLVM_BUILD_LLVM_DYLIB@/ON/',\
-	  $(Verb) $(ECHO) 's/@LLVM_BUILD_LLVM_DYLIB@/OFF/') \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_ENABLE_SHARED@/OFF/' \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_DYLIB_COMPONENTS@/all/' \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_BUILD_SYSTEM@/autoconf/' \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_HAS_RTTI@/$(LLVM_HAS_RTTI)/' \
-	  >> temp.sed
-	$(Verb) $(ECHO) 's/@LLVM_DYLIB_VERSION@/$(LLVM_DYLIB_VERSION)/' \
-	  >> temp.sed
-	$(Verb) $(SED) -f temp.sed < $< > $@
-	$(Verb) $(RM) temp.sed
-
-# When cross-compiling, install a version of llvm-config that runs on the host.
-ifeq ($(LLVM_CROSS_COMPILING),1)
-install:: $(DESTDIR)$(PROJ_bindir)
-	$(Echo) Installing llvm-config-host
-	$(Verb) $(ProgInstall) $(BuildLLVMToolDir)/llvm-config \
-	  $(DESTDIR)$(PROJ_bindir)/$(program_prefix)llvm-config-host
-endif
diff --git a/llvm/tools/llvm-cov/Makefile b/llvm/tools/llvm-cov/Makefile
deleted file mode 100644
index 6e32b4d233d..00000000000
--- a/llvm/tools/llvm-cov/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-cov/Makefile -----------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-cov
-LINK_COMPONENTS := core support profiledata object
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-cxxdump/Makefile b/llvm/tools/llvm-cxxdump/Makefile
deleted file mode 100644
index 02e8e5f9010..00000000000
--- a/llvm/tools/llvm-cxxdump/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-##===- tools/llvm-cxxdump/Makefile -------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-cxxdump
-LINK_COMPONENTS := bitreader object all-targets
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
-
diff --git a/llvm/tools/llvm-diff/Makefile b/llvm/tools/llvm-diff/Makefile
deleted file mode 100644
index bd97a6a9f5e..00000000000
--- a/llvm/tools/llvm-diff/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-diff/Makefile ----------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-diff
-LINK_COMPONENTS := asmparser bitreader irreader
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-dis/Makefile b/llvm/tools/llvm-dis/Makefile
deleted file mode 100644
index aeeeed0d68c..00000000000
--- a/llvm/tools/llvm-dis/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-dis/Makefile ------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-dis
-LINK_COMPONENTS := bitreader analysis
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-dwarfdump/Makefile b/llvm/tools/llvm-dwarfdump/Makefile
deleted file mode 100644
index 00b18c60bb2..00000000000
--- a/llvm/tools/llvm-dwarfdump/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-dwarfdump/Makefile -----------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-dwarfdump
-LINK_COMPONENTS := DebugInfoDWARF Object
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-dwp/Makefile b/llvm/tools/llvm-dwp/Makefile
deleted file mode 100644
index 826371ecf91..00000000000
--- a/llvm/tools/llvm-dwp/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-##===- tools/llvm-dwp/Makefile -----------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-dwp
-LINK_COMPONENTS := all-targets AsmPrinter DebugInfoDWARF MC Object Support
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
-
diff --git a/llvm/tools/llvm-extract/Makefile b/llvm/tools/llvm-extract/Makefile
deleted file mode 100644
index d371c547592..00000000000
--- a/llvm/tools/llvm-extract/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-extract/Makefile -------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-extract
-LINK_COMPONENTS := ipo bitreader bitwriter asmparser irreader
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-go/Makefile b/llvm/tools/llvm-go/Makefile
deleted file mode 100644
index 4465b2a4a9d..00000000000
--- a/llvm/tools/llvm-go/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-##===- tools/llvm-go/Makefile ------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-include $(LEVEL)/Makefile.common
-
-all:: $(ToolDir)/llvm-go$(EXEEXT)
-
-$(ToolDir)/llvm-go$(EXEEXT): $(PROJ_SRC_DIR)/llvm-go.go
-	$(GO) build -o $@ $<
diff --git a/llvm/tools/llvm-jitlistener/Makefile b/llvm/tools/llvm-jitlistener/Makefile
deleted file mode 100644
index 4acb6a56171..00000000000
--- a/llvm/tools/llvm-jitlistener/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-##===- tools/llvm-jitlistener/Makefile ---------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-jitlistener
-
-include $(LEVEL)/Makefile.config
-
-LINK_COMPONENTS := mcjit interpreter nativecodegen bitreader asmparser irreader selectiondag Object
-
-# If Intel JIT Events support is configured, link against the LLVM Intel JIT
-# Events interface library.  If not, this tool will do nothing useful, but it
-# will build correctly.
-ifeq ($(USE_INTEL_JITEVENTS), 1)
-  LINK_COMPONENTS += debuginfodwarf inteljitevents
-endif
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LLVM_SRC_ROOT)/Makefile.rules
diff --git a/llvm/tools/llvm-link/Makefile b/llvm/tools/llvm-link/Makefile
deleted file mode 100644
index a08d2844cec..00000000000
--- a/llvm/tools/llvm-link/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-link/Makefile ----------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-link
-LINK_COMPONENTS := linker bitreader bitwriter asmparser irreader object
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-lto/Makefile b/llvm/tools/llvm-lto/Makefile
deleted file mode 100644
index f8ca7e1cac5..00000000000
--- a/llvm/tools/llvm-lto/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-lto/Makefile -----------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-lto
-LINK_COMPONENTS := lto ipo scalaropts linker bitreader bitwriter mcdisassembler support target vectorize all-targets
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-mc/Makefile b/llvm/tools/llvm-mc/Makefile
deleted file mode 100644
index b147fadb574..00000000000
--- a/llvm/tools/llvm-mc/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-mc/Makefile ------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-mc
-LINK_COMPONENTS := all-targets MCDisassembler MCParser MC support
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-mcmarkup/Makefile b/llvm/tools/llvm-mcmarkup/Makefile
deleted file mode 100644
index 5633a9c301a..00000000000
--- a/llvm/tools/llvm-mcmarkup/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-mcmarkup/Makefile ------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-mcmarkup
-LINK_COMPONENTS := support
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-nm/Makefile b/llvm/tools/llvm-nm/Makefile
deleted file mode 100644
index ec20cef4258..00000000000
--- a/llvm/tools/llvm-nm/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-nm/Makefile ------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-nm
-LINK_COMPONENTS := all-targets bitreader object
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-objdump/Makefile b/llvm/tools/llvm-objdump/Makefile
deleted file mode 100644
index 7c165230dde..00000000000
--- a/llvm/tools/llvm-objdump/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-objdump/Makefile -------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-objdump
-LINK_COMPONENTS := all-targets DebugInfoDWARF MC MCParser MCDisassembler Object
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-pdbdump/Makefile b/llvm/tools/llvm-pdbdump/Makefile
deleted file mode 100644
index 18aafc4076f..00000000000
--- a/llvm/tools/llvm-pdbdump/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-pdbdump/Makefile -------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-pdbdump
-LINK_COMPONENTS := DebugInfoPDB Object
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-profdata/Makefile b/llvm/tools/llvm-profdata/Makefile
deleted file mode 100644
index 6f8c16265f3..00000000000
--- a/llvm/tools/llvm-profdata/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-profdata/Makefile ------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-profdata
-LINK_COMPONENTS := profiledata support
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-readobj/Makefile b/llvm/tools/llvm-readobj/Makefile
deleted file mode 100644
index 958bd0c5b31..00000000000
--- a/llvm/tools/llvm-readobj/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-##===- tools/llvm-readobj/Makefile -----------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-readobj
-LINK_COMPONENTS := bitreader object all-targets
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
-
diff --git a/llvm/tools/llvm-rtdyld/Makefile b/llvm/tools/llvm-rtdyld/Makefile
deleted file mode 100644
index 3e868b98587..00000000000
--- a/llvm/tools/llvm-rtdyld/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-rtdyld/Makefile --------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-rtdyld
-LINK_COMPONENTS := all-targets support MC object RuntimeDyld MCJIT DebugInfoDWARF
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-shlib/Makefile b/llvm/tools/llvm-shlib/Makefile
deleted file mode 100644
index 19077a3858a..00000000000
--- a/llvm/tools/llvm-shlib/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-##===- tools/shlib/Makefile --------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-
-LIBRARYNAME = LLVM-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX)
-LIBRARYALIASNAME = LLVM-$(LLVMVersion)
-
-NO_BUILD_ARCHIVE := 1
-LINK_LIBS_IN_SHARED := 1
-SHARED_LIBRARY := 1
-SHARED_ALIAS := 1
-
-include $(LEVEL)/Makefile.config
-
-ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
-  EXPORTED_SYMBOL_FILE = $(ObjDir)/$(LIBRARYNAME).exports
-
-  ifeq (1,$(ENABLE_EMBED_STDCXX))
-    # It is needed to force static-stdc++.a linked.
-    SHLIB_FRAG_NAMES += stdc++.a.o
-  endif
-
-endif
-
-include $(LEVEL)/Makefile.common
-
-# Include all archives in libLLVM.(so|dylib) except the ones that have
-# their own dynamic libraries and TableGen.
-Archives := $(wildcard $(LibDir)/libLLVM*.a)
-SharedLibraries := $(wildcard $(LibDir)/libLLVM*$(SHLIBEXT))
-ExcludeFromLibLlvm := $(basename $(SharedLibraries)).a %/libLLVMTableGen.a
-IncludeInLibLlvm := $(filter-out $(ExcludeFromLibLlvm), $(Archives))
-LLVMLibsOptions := $(IncludeInLibLlvm:$(LibDir)/lib%.a=-l%)
-LLVMLibsPaths   := $(IncludeInLibLlvm)
-
-$(LibName.SO): $(LLVMLibsPaths)
-
-ifeq ($(HOST_OS),Darwin)
-    # set dylib internal version number to llvmCore submission number
-    ifdef LLVM_SUBMIT_VERSION
-        LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-current_version \
-                        -Wl,$(LLVM_SUBMIT_VERSION).$(LLVM_SUBMIT_SUBVERSION) \
-                        -Wl,-compatibility_version -Wl,1
-    endif
-    # Include everything from the .a's into the shared library.
-    LLVMLibsOptions    := $(LLVMLibsOptions) -all_load
-endif
-
-ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD OpenBSD GNU Bitrig))
-    # Include everything from the .a's into the shared library.
-    LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \
-                       -Wl,--no-whole-archive
-endif
-
-ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU))
-    # Add soname to the library.
-    LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
-endif
-
-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))
-    # Don't allow unresolved symbols.
-    LLVMLibsOptions += -Wl,--no-undefined
-endif
-
-ifeq ($(HOST_OS),SunOS)
-    # add -z allextract ahead of other libraries on Solaris
-    LLVMLibsOptions := -Wl,-z -Wl,allextract $(LLVMLibsOptions)
-endif
-
-ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
-
-SHLIB_STUBS := $(addprefix $(ObjDir)/, $(SHLIB_FRAG_NAMES))
-SHLIB_FRAGS := $(patsubst %.a.o, $(ObjDir)/%.syms.txt, $(LIBRARYNAME).a.o $(SHLIB_FRAG_NAMES))
-LLVMLibsOptions := $(SHLIB_STUBS) $(LLVMLibsOptions)
-
-$(LibName.SO): $(SHLIB_STUBS)
-
-%.syms.txt: %.a.o
-	$(Echo) Collecting global symbols of $(notdir $*)
-	$(Verb) $(NM_PATH) -g $< > $@
-
-$(ObjDir)/$(LIBRARYNAME).exports: $(SHLIB_FRAGS) $(ObjDir)/.dir
-	$(Echo) Generating exports for $(LIBRARYNAME)
-	$(Verb) ($(SED) -n \
-			-e "s/^.* T _\([^.][^.]*\)$$/\1/p" \
-			-e "s/^.* [BDR] _\([^.][^.]*\)$$/\1 DATA/p" \
-			$(SHLIB_FRAGS) \
-		 | sort -u) > $@
-
-$(ObjDir)/$(LIBRARYNAME).a.o: $(LLVMLibsPaths) $(ObjDir)/.dir
-	$(Echo) Linking all LLVMLibs together for $(LIBRARYNAME)
-	$(Verb) $(Link) -nostartfiles -Wl,-r -nodefaultlibs -o $@ \
-			-Wl,--whole-archive $(LLVMLibsPaths) \
-			-Wl,--no-whole-archive
-
-$(ObjDir)/stdc++.a.o: $(ObjDir)/.dir
-	$(Echo) Linking all libs together for static libstdc++.a
-	$(Verb) $(Link) -nostartfiles -Wl,-r -nodefaultlibs -o $@ \
-			-Wl,--whole-archive -lstdc++ \
-			-Wl,--no-whole-archive
-# FIXME: workaround to invalidate -lstdc++
-	$(Echo) Making dummy -lstdc++ to lib
-	$(Verb) $(AR) rc $(ToolDir)/libstdc++.dll.a
-# FIXME: Is install-local needed?
-
-clean-local::
-	$(Verb) $(RM) -f $(ToolDir)/libstdc++.dll.a
-
-endif
diff --git a/llvm/tools/llvm-size/Makefile b/llvm/tools/llvm-size/Makefile
deleted file mode 100644
index 0622eb10897..00000000000
--- a/llvm/tools/llvm-size/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-size/Makefile ----------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-size
-LINK_COMPONENTS := object
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-split/Makefile b/llvm/tools/llvm-split/Makefile
deleted file mode 100644
index ef1243dbf1f..00000000000
--- a/llvm/tools/llvm-split/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-split/Makefile ---------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-split
-LINK_COMPONENTS := transformutils bitwriter core irreader support
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-stress/Makefile b/llvm/tools/llvm-stress/Makefile
deleted file mode 100644
index 29245af7298..00000000000
--- a/llvm/tools/llvm-stress/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-##===- tools/llvm-stress/Makefile --------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-stress
-LINK_COMPONENTS := object
-LINK_COMPONENTS := bitreader bitwriter asmparser irreader instrumentation scalaropts ipo
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/llvm-symbolizer/Makefile b/llvm/tools/llvm-symbolizer/Makefile
deleted file mode 100644
index 8272d61280c..00000000000
--- a/llvm/tools/llvm-symbolizer/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/llvm-symbolizer/Makefile ----------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-symbolizer
-LINK_COMPONENTS := DebugInfoDWARF DebugInfoPDB Object Support Symbolize
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/lto/Makefile b/llvm/tools/lto/Makefile
deleted file mode 100644
index 530c05a4731..00000000000
--- a/llvm/tools/lto/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-##===- tools/lto/Makefile ----------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-LIBRARYNAME := LTO
-LINK_COMPONENTS := all-targets core lto mc mcdisassembler support
-LINK_LIBS_IN_SHARED := 1
-SHARED_LIBRARY := 1
-
-EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/lto.exports
-
-include $(LEVEL)/Makefile.common
-
-ifeq ($(HOST_OS),Darwin)
-    # Special hack to allow libLTO to have an offset version number.
-    ifdef LLVM_LTO_VERSION_OFFSET
-        LTO_LIBRARY_VERSION := $(shell expr $(LLVM_SUBMIT_VERSION) + \
-                                            $(LLVM_LTO_VERSION_OFFSET))
-    else
-        LTO_LIBRARY_VERSION := $(LLVM_SUBMIT_VERSION)
-    endif
-
-    # set dylib internal version number to llvmCore submission number
-    ifdef LLVM_SUBMIT_VERSION
-        LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-current_version \
-                        -Wl,$(LTO_LIBRARY_VERSION).$(LLVM_SUBMIT_SUBVERSION) \
-                        -Wl,-compatibility_version -Wl,1
-    endif
-
-    # If we're doing an Apple-style build, add the LTO object path.
-    ifeq ($(RC_XBS),YES)
-       TempFile        := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX)
-       LLVMLibsOptions := $(LLVMLibsOptions) \
-                          -Wl,-object_path_lto -Wl,$(TempFile)
-    endif
-endif
diff --git a/llvm/tools/obj2yaml/Makefile b/llvm/tools/obj2yaml/Makefile
deleted file mode 100644
index 6cbef6998dc..00000000000
--- a/llvm/tools/obj2yaml/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- utils/obj2yaml/Makefile ----------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL = ../..
-TOOLNAME = obj2yaml
-LINK_COMPONENTS := object
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/opt/Makefile b/llvm/tools/opt/Makefile
deleted file mode 100644
index 2422eb4e405..00000000000
--- a/llvm/tools/opt/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/opt/Makefile ----------------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := opt
-LINK_COMPONENTS := bitreader bitwriter asmparser irreader instrumentation scalaropts objcarcopts ipo vectorize all-targets codegen passes
-
-# Support plugins.
-NO_DEAD_STRIP := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/sancov/Makefile b/llvm/tools/sancov/Makefile
deleted file mode 100644
index 7dba1a7a594..00000000000
--- a/llvm/tools/sancov/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-##===- tools/sancov/Makefile ----------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := sancov
-LINK_COMPONENTS := all-targets DebugInfoDWARF DebugInfoPDB MC MCParser \
-  MCDisassembler Object Support Symbolize
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/sanstats/Makefile b/llvm/tools/sanstats/Makefile
deleted file mode 100644
index 73f71deb634..00000000000
--- a/llvm/tools/sanstats/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/sanstats/Makefile -----------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := sanstats
-LINK_COMPONENTS := Support Symbolize
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/verify-uselistorder/Makefile b/llvm/tools/verify-uselistorder/Makefile
deleted file mode 100644
index 90d2aa89128..00000000000
--- a/llvm/tools/verify-uselistorder/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- tools/verify-uselistorder/Makefile ------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := verify-uselistorder
-LINK_COMPONENTS := AsmParser BitReader BitWriter Core IRReader Support
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/yaml2obj/Makefile b/llvm/tools/yaml2obj/Makefile
deleted file mode 100644
index 912f0e31ae7..00000000000
--- a/llvm/tools/yaml2obj/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-##===- utils/yaml2obj/Makefile ----------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL = ../..
-TOOLNAME = yaml2obj
-LINK_COMPONENTS := object
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
-include $(LEVEL)/Makefile.common