aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Christopher <echristo@apple.com>2011-09-19 23:22:41 +0000
committerEric Christopher <echristo@apple.com>2011-09-19 23:22:41 +0000
commitf11750633d31a474b8092d7103f50ca5af275d8d (patch)
tree6c635335e5c14c8f5556b91bff582b856a3b0d47
parent9546de68aac116cdf6f0af5a2972101acc476e0c (diff)
Remove llvmc and assorted build machinery for it.
The problems that llvmc solved have largely been subsumed with the tasks that the clang driver can accomplish, but llvmc lacks flexibility and depends too heavily on the EOL'd llvm-gcc. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@140093 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Makefile3
-rw-r--r--autoconf/configure.ac3
-rwxr-xr-xconfigure4
-rw-r--r--test/LLVMC/Alias.td24
-rw-r--r--test/LLVMC/AppendCmdHook.td29
-rw-r--r--test/LLVMC/C++/dash-x.cpp10
-rw-r--r--test/LLVMC/C++/dg.exp5
-rw-r--r--test/LLVMC/C++/filelist.cpp3
-rw-r--r--test/LLVMC/C++/hello.cpp9
-rw-r--r--test/LLVMC/C++/just-compile.cpp10
-rw-r--r--test/LLVMC/C++/together.cpp10
-rw-r--r--test/LLVMC/C++/unknown_suffix.unk9
-rw-r--r--test/LLVMC/C/dg.exp5
-rw-r--r--test/LLVMC/C/emit-llvm-opt.c9
-rw-r--r--test/LLVMC/C/emit-llvm.c8
-rw-r--r--test/LLVMC/C/hello.c13
-rw-r--r--test/LLVMC/C/include.c10
-rw-r--r--test/LLVMC/C/opt-test.c13
-rw-r--r--test/LLVMC/C/sink.c13
-rw-r--r--test/LLVMC/C/wall.c13
-rw-r--r--test/LLVMC/EmptyCompilationGraph.td8
-rw-r--r--test/LLVMC/EnvParentheses.td18
-rw-r--r--test/LLVMC/ForwardAs.td21
-rw-r--r--test/LLVMC/ForwardTransformedValue.td27
-rw-r--r--test/LLVMC/ForwardValue.td24
-rw-r--r--test/LLVMC/HookWithArguments.td20
-rw-r--r--test/LLVMC/HookWithInFile.td16
-rw-r--r--test/LLVMC/Init.td25
-rw-r--r--test/LLVMC/LanguageMap.td29
-rw-r--r--test/LLVMC/MultiValuedOption.td24
-rw-r--r--test/LLVMC/MultipleCompilationGraphs.td10
-rw-r--r--test/LLVMC/MultipleOutputLanguages.td27
-rw-r--r--test/LLVMC/NoActions.td16
-rw-r--r--test/LLVMC/NoCompilationGraph.td6
-rw-r--r--test/LLVMC/ObjC++/dg.exp5
-rw-r--r--test/LLVMC/ObjC++/hello.mm8
-rw-r--r--test/LLVMC/ObjC/dg.exp5
-rw-r--r--test/LLVMC/ObjC/hello.m12
-rw-r--r--test/LLVMC/OneOrMore.td25
-rw-r--r--test/LLVMC/OptionPreprocessor.td67
-rw-r--r--test/LLVMC/OutputSuffixHook.td24
-rw-r--r--test/LLVMC/TestWarnings.td8
-rw-r--r--test/LLVMC/dg.exp3
-rw-r--r--test/LLVMC/test_data/false.c10
-rw-r--r--test/LLVMC/test_data/false.cpp16
-rw-r--r--test/LLVMC/test_data/false2.cpp5
-rw-r--r--test/LLVMC/test_data/together.c5
-rw-r--r--tools/Makefile2
-rw-r--r--tools/llvmc/CMakeLists.txt8
-rw-r--r--tools/llvmc/Makefile18
-rw-r--r--tools/llvmc/doc/LLVMC-Reference.rst747
-rw-r--r--tools/llvmc/doc/LLVMC-Tutorial.rst127
-rw-r--r--tools/llvmc/doc/Makefile33
-rw-r--r--tools/llvmc/doc/img/lines.gifbin91 -> 0 bytes
-rw-r--r--tools/llvmc/examples/CMakeLists.txt4
-rw-r--r--tools/llvmc/examples/Hello/CMakeLists.txt4
-rw-r--r--tools/llvmc/examples/Hello/Hello.cpp29
-rw-r--r--tools/llvmc/examples/Hello/Makefile14
-rw-r--r--tools/llvmc/examples/Makefile14
-rw-r--r--tools/llvmc/examples/Simple/CMakeLists.txt10
-rw-r--r--tools/llvmc/examples/Simple/Makefile15
-rw-r--r--tools/llvmc/examples/Simple/Simple.cpp2
-rw-r--r--tools/llvmc/examples/Simple/Simple.td41
-rw-r--r--tools/llvmc/examples/Skeleton/AutoGenerated.td7
-rw-r--r--tools/llvmc/examples/Skeleton/CMakeLists.txt11
-rw-r--r--tools/llvmc/examples/Skeleton/Hooks.cpp12
-rw-r--r--tools/llvmc/examples/Skeleton/Main.cpp15
-rw-r--r--tools/llvmc/examples/Skeleton/Makefile20
-rw-r--r--tools/llvmc/examples/Skeleton/README6
-rw-r--r--tools/llvmc/examples/mcc16/CMakeLists.txt11
-rw-r--r--tools/llvmc/examples/mcc16/Hooks.cpp112
-rw-r--r--tools/llvmc/examples/mcc16/Main.cpp57
-rw-r--r--tools/llvmc/examples/mcc16/Makefile15
-rw-r--r--tools/llvmc/examples/mcc16/PIC16.td234
-rw-r--r--tools/llvmc/examples/mcc16/README75
-rw-r--r--tools/llvmc/src/AutoGenerated.td17
-rw-r--r--tools/llvmc/src/Base.td.in461
-rw-r--r--tools/llvmc/src/CMakeLists.txt19
-rw-r--r--tools/llvmc/src/Clang.td87
-rw-r--r--tools/llvmc/src/Hooks.cpp193
-rw-r--r--tools/llvmc/src/Main.cpp16
-rw-r--r--tools/llvmc/src/Makefile14
82 files changed, 2 insertions, 3115 deletions
diff --git a/Makefile b/Makefile
index 88e63e9c02..610deba36b 100644
--- a/Makefile
+++ b/Makefile
@@ -187,8 +187,7 @@ FilesToConfig := \
include/llvm/Config/AsmPrinters.def \
include/llvm/Config/AsmParsers.def \
include/llvm/Config/Disassemblers.def \
- include/llvm/Support/DataTypes.h \
- tools/llvmc/src/Base.td
+ include/llvm/Support/DataTypes.h
FilesToConfigPATH := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
all-local:: $(FilesToConfigPATH)
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 0883ed516d..027d020959 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -1756,9 +1756,6 @@ if test -f ${srcdir}/tools/clang/README.txt; then
AC_CONFIG_FILES([tools/clang/docs/doxygen.cfg])
fi
-dnl Configure llvmc's Base plugin
-AC_CONFIG_FILES([tools/llvmc/src/Base.td])
-
dnl Do the first stage of configuration for llvm-config.in.
AC_CONFIG_FILES([tools/llvm-config/llvm-config.in])
diff --git a/configure b/configure
index 4bbc446ab3..6fd7d999bc 100755
--- a/configure
+++ b/configure
@@ -21605,9 +21605,6 @@ if test -f ${srcdir}/tools/clang/README.txt; then
fi
-ac_config_files="$ac_config_files tools/llvmc/src/Base.td"
-
-
ac_config_files="$ac_config_files tools/llvm-config/llvm-config.in"
@@ -22227,7 +22224,6 @@ do
"llvm.spec") CONFIG_FILES="$CONFIG_FILES llvm.spec" ;;
"docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;;
"tools/clang/docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES tools/clang/docs/doxygen.cfg" ;;
- "tools/llvmc/src/Base.td") CONFIG_FILES="$CONFIG_FILES tools/llvmc/src/Base.td" ;;
"tools/llvm-config/llvm-config.in") CONFIG_FILES="$CONFIG_FILES tools/llvm-config/llvm-config.in" ;;
"setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;;
"Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
diff --git a/test/LLVMC/Alias.td b/test/LLVMC/Alias.td
deleted file mode 100644
index 5d37889304..0000000000
--- a/test/LLVMC/Alias.td
+++ /dev/null
@@ -1,24 +0,0 @@
-// Test alias generation.
-// RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
-// RUN: FileCheck -input-file %t %s
-// RUN: %compile_cxx %t
-// XFAIL: vg_leak
-
-include "llvm/CompilerDriver/Common.td"
-
-def OptList : OptionList<[
-
-(switch_option "dummy1", (help "none")),
-// CHECK: cl::alias Alias_dummy2
-(alias_option "dummy2", "dummy1")
-]>;
-
-def dummy_tool : Tool<[
-(command "dummy_cmd"),
-(in_language "dummy_lang"),
-(out_language "dummy_lang"),
-(actions (case
- (switch_on "dummy1"), (forward "dummy1")))
-]>;
-
-def DummyGraph : CompilationGraph<[(edge "root", "dummy_tool")]>;
diff --git a/test/LLVMC/AppendCmdHook.td b/test/LLVMC/AppendCmdHook.td
deleted file mode 100644
index c85f002e6e..0000000000
--- a/test/LLVMC/AppendCmdHook.td
+++ /dev/null
@@ -1,29 +0,0 @@
-// Check that hooks can be invoked from 'append_cmd'.
-// RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
-// RUN: FileCheck -input-file %t %s
-// RUN: %compile_cxx %t
-// XFAIL: vg_leak
-
-include "llvm/CompilerDriver/Common.td"
-
-// CHECK: std::string MyHook()
-
-def OptList : OptionList<[
-(switch_option "dummy1", (help "none")),
-(switch_option "dummy2", (help "none"))
-]>;
-
-def dummy_tool : Tool<[
-(command "dummy_cmd"),
-(in_language "dummy_lang"),
-(out_language "dummy_lang"),
-(actions (case
- // CHECK: , "-arg1"));
- // CHECK: , "-arg2"));
- (switch_on "dummy1"), (append_cmd "-arg1 -arg2"),
- // CHECK: , "-arg3"));
- // CHECK: hooks::MyHook()
- (switch_on "dummy2"), (append_cmd "-arg3 $CALL(MyHook)")))
-]>;
-
-def DummyGraph : CompilationGraph<[(edge "root", "dummy_tool")]>;
diff --git a/test/LLVMC/C++/dash-x.cpp b/test/LLVMC/C++/dash-x.cpp
deleted file mode 100644
index 7d4cf19fa4..0000000000
--- a/test/LLVMC/C++/dash-x.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// Test that we can compile .c files as C++ and vice versa
-// RUN: llvmc %s -x c++ %p/../test_data/false.c -x c %p/../test_data/false.cpp -x lisp -x whatnot -x none %p/../test_data/false2.cpp -o %t
-// RUN: %abs_tmp | grep hello
-// XFAIL: vg
-
-extern int test_main();
-
-int main() {
- test_main();
-}
diff --git a/test/LLVMC/C++/dg.exp b/test/LLVMC/C++/dg.exp
deleted file mode 100644
index 209345540c..0000000000
--- a/test/LLVMC/C++/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if [ llvm_gcc_supports c++ ] then {
- RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{unk,ll,c,cpp}]]
-}
diff --git a/test/LLVMC/C++/filelist.cpp b/test/LLVMC/C++/filelist.cpp
deleted file mode 100644
index 6f5f6f7ae8..0000000000
--- a/test/LLVMC/C++/filelist.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// Test that the -filelist option works correctly with -linker=c++.
-// RUN: llvmc --dry-run -filelist DUMMY -linker c++ |& grep llvm-g++
-// XFAIL: vg
diff --git a/test/LLVMC/C++/hello.cpp b/test/LLVMC/C++/hello.cpp
deleted file mode 100644
index 8f38306e9e..0000000000
--- a/test/LLVMC/C++/hello.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// Test that we can compile C++ code.
-// RUN: llvmc %s -o %t
-// RUN: %abs_tmp | grep hello
-// XFAIL: vg
-#include <iostream>
-
-int main() {
- std::cout << "hello" << '\n';
-}
diff --git a/test/LLVMC/C++/just-compile.cpp b/test/LLVMC/C++/just-compile.cpp
deleted file mode 100644
index 771c9822da..0000000000
--- a/test/LLVMC/C++/just-compile.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// Test that the -c flag works.
-// RUN: llvmc -c %s -o %t.o
-// RUN: llvmc --linker=c++ %t.o -o %t
-// RUN: %abs_tmp | grep hello
-// XFAIL: vg
-#include <iostream>
-
-int main() {
- std::cout << "hello" << '\n';
-}
diff --git a/test/LLVMC/C++/together.cpp b/test/LLVMC/C++/together.cpp
deleted file mode 100644
index 925215a4db..0000000000
--- a/test/LLVMC/C++/together.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// Check that we can compile files of different types together.
-// RUN: llvmc %s %p/../test_data/together.c -o %t
-// RUN: %abs_tmp | grep hello
-// XFAIL: vg
-
-extern "C" void test();
-
-int main() {
- test();
-}
diff --git a/test/LLVMC/C++/unknown_suffix.unk b/test/LLVMC/C++/unknown_suffix.unk
deleted file mode 100644
index bf4aea2862..0000000000
--- a/test/LLVMC/C++/unknown_suffix.unk
+++ /dev/null
@@ -1,9 +0,0 @@
-// Test that the -x option works for files with unknown suffixes.
-// RUN: llvmc -x c++ %s -o %t
-// RUN: %abs_tmp | grep hello
-// XFAIL: vg
-#include <iostream>
-
-int main() {
- std::cout << "hello" << '\n';
-}
diff --git a/test/LLVMC/C/dg.exp b/test/LLVMC/C/dg.exp
deleted file mode 100644
index a9be28a63c..0000000000
--- a/test/LLVMC/C/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if [ llvm_gcc_supports c ] then {
- RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
-}
diff --git a/test/LLVMC/C/emit-llvm-opt.c b/test/LLVMC/C/emit-llvm-opt.c
deleted file mode 100644
index 50710cf9db..0000000000
--- a/test/LLVMC/C/emit-llvm-opt.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Check that -emit-llvm [-S] works with -opt.
-
-// RUN: llvmc -c -opt -emit-llvm -o - %s | llvm-dis | grep "@f0()" | count 1
-// RUN: llvmc -c -opt -emit-llvm -S -o - %s | grep "@f0()" | count 1
-// RUN: llvmc --dry-run -c -opt -emit-llvm %s |& grep "^opt"
-// XFAIL: vg_leak
-
-int f0(void) {
-}
diff --git a/test/LLVMC/C/emit-llvm.c b/test/LLVMC/C/emit-llvm.c
deleted file mode 100644
index 56a1e30b2e..0000000000
--- a/test/LLVMC/C/emit-llvm.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// Check that -emit-llvm [-S] works correctly.
-
-// RUN: llvmc -c -emit-llvm -o - %s | llvm-dis | grep "@f0()" | count 1
-// RUN: llvmc -c -emit-llvm -S -o - %s | grep "@f0()" | count 1
-// XFAIL: vg_leak
-
-int f0(void) {
-}
diff --git a/test/LLVMC/C/hello.c b/test/LLVMC/C/hello.c
deleted file mode 100644
index 29ad39fd2c..0000000000
--- a/test/LLVMC/C/hello.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Check that we can compile helloworld
- * RUN: llvmc %s -o %t
- * RUN: %abs_tmp | grep hello
- * XFAIL: vg_leak
- */
-
-#include <stdio.h>
-
-int main() {
- printf("hello\n");
- return 0;
-}
diff --git a/test/LLVMC/C/include.c b/test/LLVMC/C/include.c
deleted file mode 100644
index 9c9530bfb4..0000000000
--- a/test/LLVMC/C/include.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Check that the 'include' options work.
- * RUN: echo "int x;\n" > %t1.inc
- * RUN: llvmc -include %t1.inc -fsyntax-only %s
- * XFAIL: vg_leak
- */
-
-int f0(void) {
- return x;
-}
diff --git a/test/LLVMC/C/opt-test.c b/test/LLVMC/C/opt-test.c
deleted file mode 100644
index 7924def203..0000000000
--- a/test/LLVMC/C/opt-test.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Check that the -opt switch works.
- * RUN: llvmc %s -opt -o %t
- * RUN: %abs_tmp | grep hello
- * XFAIL: vg_leak
- */
-
-#include <stdio.h>
-
-int main() {
- printf("hello\n");
- return 0;
-}
diff --git a/test/LLVMC/C/sink.c b/test/LLVMC/C/sink.c
deleted file mode 100644
index c4f9beba8c..0000000000
--- a/test/LLVMC/C/sink.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Check that the 'sink' options work.
- * RUN: llvmc -v -Wall %s -o %t |& grep "Wall"
- * RUN: %abs_tmp | grep hello
- * XFAIL: vg_leak
- */
-
-#include <stdio.h>
-
-int main() {
- printf("hello\n");
- return 0;
-}
diff --git a/test/LLVMC/C/wall.c b/test/LLVMC/C/wall.c
deleted file mode 100644
index 36813ba0f8..0000000000
--- a/test/LLVMC/C/wall.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Check that -Wall works as intended
- * RUN: llvmc -Wall %s -o %t
- * RUN: %abs_tmp | grep hello
- * XFAIL: vg_leak
- */
-
-#include <stdio.h>
-
-int main() {
- printf("hello\n");
- return 0;
-}
diff --git a/test/LLVMC/EmptyCompilationGraph.td b/test/LLVMC/EmptyCompilationGraph.td
deleted file mode 100644
index a52b8a8c19..0000000000
--- a/test/LLVMC/EmptyCompilationGraph.td
+++ /dev/null
@@ -1,8 +0,0 @@
-// Check that the compilation graph can be empty.
-// RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
-// RUN: %compile_cxx %t
-// XFAIL: vg_leak
-
-include "llvm/CompilerDriver/Common.td"
-
-def Graph : CompilationGraph<[]>;
diff --git a/test/LLVMC/EnvParentheses.td b/test/LLVMC/EnvParentheses.td
deleted file mode 100644
index ce0cb82460..0000000000
--- a/test/LLVMC/EnvParentheses.td
+++ /dev/null
@@ -1,18 +0,0 @@
-// Check the fix for PR4157.
-// http://llvm.org/bugs/show_bug.cgi?id=4157
-// RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
-// RUN: not grep {FOO")));} %t
-// RUN: %compile_cxx %t
-// XFAIL: vg_leak
-
-include "llvm/CompilerDriver/Common.td"
-
-def dummy_tool : Tool<[
-(command "gcc $ENV(FOO)/bar"),
-(in_language "dummy"),
-(out_language "dummy")
-]>;
-
-def DummyGraph : CompilationGraph<[(edge "root", "dummy_tool")]>;
-
-def Graph : CompilationGraph<[]>;
diff --git a/test/LLVMC/ForwardAs.td b/test/LLVMC/ForwardAs.td
deleted file mode 100644
index 99b240e30f..0000000000
--- a/test/LLVMC/ForwardAs.td
+++ /dev/null
@@ -1,21 +0,0 @@
-// Check the fix for PR4159.
-// http://llvm.org/bugs/show_bug.cgi?id=4159
-// RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
-// RUN: FileCheck -input-file %t %s
-// RUN: %compile_cxx %t
-// XFAIL: vg_leak
-
-include "llvm/CompilerDriver/Common.td"
-
-def OptList : OptionList<[(parameter_option "dummy", (help "dummmy"))]>;
-
-def dummy_tool : Tool<[
-(command "dummy_cmd"),
-(in_language "dummy"),
-(out_language "dummy"),
-(actions (case
- // CHECK: "unique_name"));
- (not_empty "dummy"), (forward_as "dummy", "unique_name")))
-]>;
-
-def DummyGraph : CompilationGraph<[(edge "root", "dummy_tool")]>;
diff --git a/test/LLVMC/ForwardTransformedValue.td b/test/LLVMC/ForwardTransformedValue.td
deleted file mode 100644
index 9184ede361..0000000000
--- a/test/LLVMC/ForwardTransformedValue.td
+++ /dev/null
@@ -1,27 +0,0 @@
-// Check that forward_transformed_value works.
-// The dummy tool and graph are required to silence warnings.
-// RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
-// RUN: FileCheck -input-file %t %s
-// RUN: %compile_cxx %t
-// XFAIL: vg_leak
-
-include "llvm/CompilerDriver/Common.td"
-
-def OptList : OptionList<[(parameter_option "a", (help "dummy")),
- (prefix_list_option "b", (help "dummy"))]>;
-
-// CHECK: std::string HookA
-// CHECK: std::string HookB
-
-def dummy_tool : Tool<[
-(command "dummy_cmd"),
-(in_language "dummy"),
-(out_language "dummy"),
-(actions (case
- // CHECK: HookA(autogenerated::Parameter_a
- (not_empty "a"), (forward_transformed_value "a", "HookA"),
- // CHECK: HookB(autogenerated::List_b
- (not_empty "b"), (forward_transformed_value "b", "HookB")))
-]>;
-
-def DummyGraph : CompilationGraph<[(edge "root", "dummy_tool")]>;
diff --git a/test/LLVMC/ForwardValue.td b/test/LLVMC/ForwardValue.td
deleted file mode 100644
index a42a3f06ec..0000000000
--- a/test/LLVMC/ForwardValue.td
+++ /dev/null
@@ -1,24 +0,0 @@
-// Check that forward_value works.
-// The dummy tool and graph are required to silence warnings.
-// RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
-// RUN: FileCheck -input-file %t %s
-// RUN: %compile_cxx %t
-// XFAIL: vg_leak
-
-include "llvm/CompilerDriver/Common.td"
-
-def OptList : OptionList<[(parameter_option "a", (help "dummy")),
- (prefix_list_option "b", (help "dummy"))]>;
-
-def dummy_tool : Tool<[
-(command "dummy_cmd"),
-(in_language "dummy"),
-(out_language "dummy"),
-(actions (case
- // CHECK: , autogenerated::Parameter_a));