Temporary revert r57567 and unbreak the build.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57578 91177308-0d34-0410-b5e6-96231b3b80d8

7 files changed, 8 insertions, 56 deletions

diff --git a/tools/llvmc2/Makefile b/tools/llvmc2/Makefile
index 22ca29e2ed..3012065e4c 100644
--- a/tools/llvmc2/Makefile
+++ b/tools/llvmc2/Makefile
@@ -11,7 +11,7 @@ LEVEL = ../..
 
 BUILTIN_PLUGINS = Base
 DRIVER_NAME = llvmc2
-DIRS = plugins driver
+DIRS = plugins driver 
 
 export BUILTIN_PLUGINS
 export DRIVER_NAME
diff --git a/tools/llvmc2/plugins/Base/PluginMain.cpp b/tools/llvmc2/plugins/Base/PluginMain.cpp
deleted file mode 100644
index add8acb4a5..0000000000
--- a/tools/llvmc2/plugins/Base/PluginMain.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "AutoGenerated.inc"
diff --git a/tools/llvmc2/plugins/Clang/PluginMain.cpp b/tools/llvmc2/plugins/Clang/PluginMain.cpp
deleted file mode 100644
index add8acb4a5..0000000000
--- a/tools/llvmc2/plugins/Clang/PluginMain.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "AutoGenerated.inc"
diff --git a/tools/llvmc2/plugins/Makefile b/tools/llvmc2/plugins/Makefile
index 104e909d42..568752e578 100644
--- a/tools/llvmc2/plugins/Makefile
+++ b/tools/llvmc2/plugins/Makefile
@@ -12,7 +12,7 @@ ifndef LLVMC_PLUGIN
 LEVEL = ../../..
 DIRS = $(BUILTIN_PLUGINS)
 
-# TOFIX: How to build DSO versions of plugins?
+# TOFIX: DSO versions of plugins are not built
 
 export BUILTIN_LLVMC_PLUGIN=1
 
@@ -22,28 +22,25 @@ else # LLVMC_PLUGIN
 
 LEVEL = ../../../..
 
-LIBRARYNAME := $(patsubst %,LLVMC%,$(LLVMC_PLUGIN))
+LIBRARYNAME = $(patsubst %,LLVMC%,$(LLVMC_PLUGIN))
+TOOLS_SOURCE = $(wildcard $(PROJ_SRC_DIR)/*.td)
 REQUIRES_EH = 1
 
 ifndef BUILTIN_LLVMC_PLUGIN
 LOADABLE_MODULE = 1
 endif
 
-# This probably breaks the build with $ObjDir != $SrcDir
-TOOLS_SOURCE := $(strip $(wildcard *.td))
-
-ifneq ($(TOOLS_SOURCE),)
-BUILD_AUTOGENERATED_INC = 1
+ifneq ($(TOOLS_SOURCE),"")
+BUILD_AUTOGENERATED_INC=1
 BUILT_SOURCES = AutoGenerated.inc
 endif
 
 include $(LEVEL)/Makefile.common
 
-# TOFIX: This probably should go into Makefile.rules
+# TOFIX: This should go into Makefile.rules
 
 ifdef BUILD_AUTOGENERATED_INC
-TD_COMMON :=$(strip $(wildcard \
-		$(LLVM_SRC_ROOT)/include/llvm/CompilerDriver/*.td))
+TD_COMMON = $(wildcard $(LLVM_SRC_ROOT)/include/llvm/CompilerDriver/*.td)
 
 $(ObjDir)/AutoGenerated.inc.tmp: $(TOOLS_SOURCE) $(ObjDir)/.dir \
 				$(TBLGEN) $(TD_COMMON)
diff --git a/tools/llvmc2/plugins/Simple/Makefile b/tools/llvmc2/plugins/Simple/Makefile
deleted file mode 100644
index a69df23cbd..0000000000
--- a/tools/llvmc2/plugins/Simple/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-##===- tools/llvmc2/plugins/Simple/Makefile ------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LLVMC_PLUGIN = Simple
-
-include ../Makefile
diff --git a/tools/llvmc2/plugins/Simple/PluginMain.cpp b/tools/llvmc2/plugins/Simple/PluginMain.cpp
deleted file mode 100644
index add8acb4a5..0000000000
--- a/tools/llvmc2/plugins/Simple/PluginMain.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "AutoGenerated.inc"
diff --git a/tools/llvmc2/plugins/Simple/Simple.td b/tools/llvmc2/plugins/Simple/Simple.td
deleted file mode 100644
index 2bc4011926..0000000000
--- a/tools/llvmc2/plugins/Simple/Simple.td
+++ /dev/null
@@ -1,30 +0,0 @@
-// A simple wrapper for gcc.
-// To compile, use this command:
-//
-//      $ cd $LLVMC2_DIR
-//      $ make DRIVER_NAME=mygcc BUILTIN_PLUGINS=Simple
-//
-// To build this plugin as a dynamic library:
-//
-//      $ cd $LLVMC2_DIR
-//      $ make BUILTIN_PLUGINS=""
-//      $ cd plugins/Simple
-//      $ make
-//
-// Run as:
-//
-//      $ llvmc2 -load $LLVM_DIR/Release/lib/LLVMCSimple.so
-
-include "llvm/CompilerDriver/Common.td"
-
-def gcc : Tool<
-[(in_language "c"),
- (out_language "executable"),
- (output_suffix "out"),
- (cmd_line "gcc $INFILE -o $OUTFILE"),
- (sink)
-]>;
-
-def LanguageMap : LanguageMap<[LangToSuffixes<"c", ["c"]>]>;
-
-def CompilationGraph : CompilationGraph<[Edge<root, gcc>]>;