Since the old llvmc was removed, rename llvmc2 to llvmc.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60048 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/LLVMC/emit-llvm.c b/test/LLVMC/emit-llvm.c
index 5a6aa0f..38bbba6 100644
--- a/test/LLVMC/emit-llvm.c
+++ b/test/LLVMC/emit-llvm.c
@@ -1,4 +1,4 @@
-// RUN: llvmc2 -c -emit-llvm -o - %s | llvm-dis | grep "@f0()" | count 1
+// RUN: llvmc -c -emit-llvm -o - %s | llvm-dis | grep "@f0()" | count 1
int f0(void) {
}
diff --git a/test/LLVMC/false.c b/test/LLVMC/false.c
index 4aa365d..eb2883d 100644
--- a/test/LLVMC/false.c
+++ b/test/LLVMC/false.c
@@ -1,5 +1,5 @@
// Test that we can compile .c files as C++ and vice versa
-// RUN: llvmc2 -x c++ %s -x c %p/test_data/false.cpp -x lisp -x whatnot -x none %p/test_data/false2.cpp -o %t
+// RUN: llvmc -x c++ %s -x c %p/test_data/false.cpp -x lisp -x whatnot -x none %p/test_data/false2.cpp -o %t
// RUN: ./%t | grep hello
#include <iostream>
diff --git a/test/LLVMC/hello.c b/test/LLVMC/hello.c
index bf917bc..1cda9c3 100644
--- a/test/LLVMC/hello.c
+++ b/test/LLVMC/hello.c
@@ -1,6 +1,6 @@
/*
* Check that we can compile helloworld
- * RUN: llvmc2 %s -o %t
+ * RUN: llvmc %s -o %t
* RUN: ./%t | grep hello
*/
diff --git a/test/LLVMC/hello.cpp b/test/LLVMC/hello.cpp
index a3148c3..27c89d6 100644
--- a/test/LLVMC/hello.cpp
+++ b/test/LLVMC/hello.cpp
@@ -1,5 +1,5 @@
// Test that we can compile C++ code.
-// RUN: llvmc2 %s -o %t
+// RUN: llvmc %s -o %t
// RUN: ./%t | grep hello
#include <iostream>
diff --git a/test/LLVMC/hello.m b/test/LLVMC/hello.m
index bf917bc..1cda9c3 100644
--- a/test/LLVMC/hello.m
+++ b/test/LLVMC/hello.m
@@ -1,6 +1,6 @@
/*
* Check that we can compile helloworld
- * RUN: llvmc2 %s -o %t
+ * RUN: llvmc %s -o %t
* RUN: ./%t | grep hello
*/
diff --git a/test/LLVMC/hello.mm b/test/LLVMC/hello.mm
index 5f14a94..ff82e4a 100644
--- a/test/LLVMC/hello.mm
+++ b/test/LLVMC/hello.mm
@@ -1,5 +1,5 @@
// Test that we can compile Objective-C++ code.
-// RUN: llvmc2 %s -o %t
+// RUN: llvmc %s -o %t
// RUN: ./%t | grep hello
#include <iostream>
diff --git a/test/LLVMC/include.c b/test/LLVMC/include.c
index eeb6ca6..07ae761 100644
--- a/test/LLVMC/include.c
+++ b/test/LLVMC/include.c
@@ -1,7 +1,7 @@
/*
* Check that the 'include' options work.
* RUN: echo "int x;\n" > %t1.inc
- * RUN: llvmc2 -include %t1.inc -fsyntax-only %s
+ * RUN: llvmc -include %t1.inc -fsyntax-only %s
*/
int f0(void) {
diff --git a/test/LLVMC/opt-test.c b/test/LLVMC/opt-test.c
index 25ca66a..ed2df52 100644
--- a/test/LLVMC/opt-test.c
+++ b/test/LLVMC/opt-test.c
@@ -1,6 +1,6 @@
/*
* Check that the -opt switch works.
- * RUN: llvmc2 %s -opt -o %t
+ * RUN: llvmc %s -opt -o %t
* RUN: ./%t | grep hello
*/
diff --git a/test/LLVMC/sink.c b/test/LLVMC/sink.c
index d1dde41..3edbf78 100644
--- a/test/LLVMC/sink.c
+++ b/test/LLVMC/sink.c
@@ -1,6 +1,6 @@
/*
* Check that the 'sink' options work.
- * RUN: llvmc2 -v -Wall %s -o %t |& grep "Wall"
+ * RUN: llvmc -v -Wall %s -o %t |& grep "Wall"
* RUN: ./%t | grep hello
*/
diff --git a/test/LLVMC/together.cpp b/test/LLVMC/together.cpp
index 09f8d86..b07250e 100644
--- a/test/LLVMC/together.cpp
+++ b/test/LLVMC/together.cpp
@@ -1,5 +1,5 @@
// Check that we can compile files of different types together.
-// RUN: llvmc2 %s %p/test_data/together.c -o %t
+// RUN: llvmc %s %p/test_data/together.c -o %t
// RUN: ./%t | grep hello
extern "C" void test();
diff --git a/test/LLVMC/wall.c b/test/LLVMC/wall.c
index 9af9bfb..2c72ea6 100644
--- a/test/LLVMC/wall.c
+++ b/test/LLVMC/wall.c
@@ -1,6 +1,6 @@
/*
* Check that -Wall works as intended
- * RUN: llvmc2 -Wall %s -o %t
+ * RUN: llvmc -Wall %s -o %t
* RUN: ./%t | grep hello
*/
diff --git a/tools/Makefile b/tools/Makefile
index 30da522..2726c1f 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,22 +1,22 @@
##===- 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 := ..
-# 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
+# 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.
PARALLEL_DIRS := llvm-config \
opt llvm-as llvm-dis \
llc llvm-ranlib llvm-ar llvm-nm \
llvm-ld llvm-prof llvm-link \
lli gccas gccld llvm-extract llvm-db \
- bugpoint llvm-bcanalyzer llvm-stub llvmc2
+ bugpoint llvm-bcanalyzer llvm-stub llvmc
include $(LEVEL)/Makefile.config
diff --git a/tools/llvmc2/CMakeLists.txt b/tools/llvmc/CMakeLists.txt
similarity index 100%
rename from tools/llvmc2/CMakeLists.txt
rename to tools/llvmc/CMakeLists.txt
diff --git a/tools/llvmc2/Makefile b/tools/llvmc/Makefile
similarity index 82%
rename from tools/llvmc2/Makefile
rename to tools/llvmc/Makefile
index 22ca29e..8eb35cb 100644
--- a/tools/llvmc2/Makefile
+++ b/tools/llvmc/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/Makefile -------------------------------*- Makefile -*-===##
+##===- tools/llvmc/Makefile --------------------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
@@ -10,7 +10,7 @@
LEVEL = ../..
BUILTIN_PLUGINS = Base
-DRIVER_NAME = llvmc2
+DRIVER_NAME = llvmc
DIRS = plugins driver
export BUILTIN_PLUGINS
diff --git a/tools/llvmc2/doc/LLVMC-Reference.rst b/tools/llvmc/doc/LLVMC-Reference.rst
similarity index 98%
rename from tools/llvmc2/doc/LLVMC-Reference.rst
rename to tools/llvmc/doc/LLVMC-Reference.rst
index 01a8be0..77d9d2b 100644
--- a/tools/llvmc2/doc/LLVMC-Reference.rst
+++ b/tools/llvmc/doc/LLVMC-Reference.rst
@@ -31,7 +31,7 @@
you shouldn't be able to notice them::
$ # This works as expected:
- $ llvmc2 -O3 -Wall hello.cpp
+ $ llvmc -O3 -Wall hello.cpp
$ ./a.out
hello
@@ -43,7 +43,7 @@
C++, use the ``-x`` option, just like you would do it with ``gcc``::
$ # hello.c is really a C++ file
- $ llvmc2 -x c++ hello.c
+ $ llvmc -x c++ hello.c
$ ./a.out
hello
@@ -51,10 +51,10 @@
object files you should provide the ``--linker`` option since it's
impossible for LLVMC to choose the right linker in that case::
- $ llvmc2 -c hello.cpp
- $ llvmc2 hello.o
+ $ llvmc -c hello.cpp
+ $ llvmc hello.o
[A lot of link-time errors skipped]
- $ llvmc2 --linker=c++ hello.o
+ $ llvmc --linker=c++ hello.o
$ ./a.out
hello
@@ -138,7 +138,7 @@
$ cd $LLVMC_DIR/plugins/Simple
$ make
- $ llvmc2 -load $LLVM_DIR/Release/lib/LLVMCSimple.so
+ $ llvmc -load $LLVM_DIR/Release/lib/LLVMCSimple.so
Sometimes, you will want a 'bare-bones' version of LLVMC that has no
built-in plugins. It can be compiled with the following command::
@@ -229,7 +229,7 @@
default edge *per language*).
To get a visual representation of the compilation graph (useful for
-debugging), run ``llvmc2 --view-graph``. You will need ``dot`` and
+debugging), run ``llvmc --view-graph``. You will need ``dot`` and
``gsview`` installed for this to work properly.
diff --git a/tools/llvmc2/doc/LLVMC-Tutorial.rst b/tools/llvmc/doc/LLVMC-Tutorial.rst
similarity index 97%
rename from tools/llvmc2/doc/LLVMC-Tutorial.rst
rename to tools/llvmc/doc/LLVMC-Tutorial.rst
index 724fd4d..d41f90d 100644
--- a/tools/llvmc2/doc/LLVMC-Tutorial.rst
+++ b/tools/llvmc/doc/LLVMC-Tutorial.rst
@@ -20,7 +20,7 @@
In general, LLVMC tries to be command-line compatible with ``gcc`` as
much as possible, so most of the familiar options work::
- $ llvmc2 -O3 -Wall hello.cpp
+ $ llvmc -O3 -Wall hello.cpp
$ ./a.out
hello
@@ -38,7 +38,7 @@
Start by compiling ``plugins/Simple/Simple.td``, which is a primitive
wrapper for ``gcc``::
- $ cd $LLVM_DIR/tools/llvmc2
+ $ cd $LLVM_DIR/tools/llvmc
$ make DRIVER_NAME=mygcc BUILTIN_PLUGINS=Simple
$ cat > hello.c
[...]
@@ -98,4 +98,3 @@
.. [1] TableGen Fundamentals
http://llvm.cs.uiuc.edu/docs/TableGenFundamentals.html
-
diff --git a/tools/llvmc/doc/Makefile b/tools/llvmc/doc/Makefile
new file mode 100644
index 0000000..864376f
--- /dev/null
+++ b/tools/llvmc/doc/Makefile
@@ -0,0 +1,21 @@
+##===- tools/llvmc/doc/Makefile ----------------------------*- Makefile -*-===##
+#
+# The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+RST2HTML=rst2html --stylesheet=llvm.css --link-stylesheet
+
+all : LLVMC-Reference.html LLVMC-Tutorial.html
+
+LLVMC-Tutorial.html : LLVMC-Tutorial.rst llvm.css
+ $(RST2HTML) $< $@
+
+LLVMC-Reference.html : LLVMC-Reference.rst llvm.css
+ $(RST2HTML) $< $@
+
+clean :
+ rm *.html
diff --git a/tools/llvmc2/doc/img/lines.gif b/tools/llvmc/doc/img/lines.gif
similarity index 100%
rename from tools/llvmc2/doc/img/lines.gif
rename to tools/llvmc/doc/img/lines.gif
Binary files differ
diff --git a/tools/llvmc2/doc/llvm.css b/tools/llvmc/doc/llvm.css
similarity index 100%
rename from tools/llvmc2/doc/llvm.css
rename to tools/llvmc/doc/llvm.css
diff --git a/tools/llvmc2/driver/Action.cpp b/tools/llvmc/driver/Action.cpp
similarity index 100%
rename from tools/llvmc2/driver/Action.cpp
rename to tools/llvmc/driver/Action.cpp
diff --git a/tools/llvmc2/driver/CMakeLists.txt b/tools/llvmc/driver/CMakeLists.txt
similarity index 100%
rename from tools/llvmc2/driver/CMakeLists.txt
rename to tools/llvmc/driver/CMakeLists.txt
diff --git a/tools/llvmc2/driver/CompilationGraph.cpp b/tools/llvmc/driver/CompilationGraph.cpp
similarity index 100%
rename from tools/llvmc2/driver/CompilationGraph.cpp
rename to tools/llvmc/driver/CompilationGraph.cpp
diff --git a/tools/llvmc2/driver/Error.h b/tools/llvmc/driver/Error.h
similarity index 100%
rename from tools/llvmc2/driver/Error.h
rename to tools/llvmc/driver/Error.h
diff --git a/tools/llvmc2/driver/Makefile b/tools/llvmc/driver/Makefile
similarity index 88%
rename from tools/llvmc2/driver/Makefile
rename to tools/llvmc/driver/Makefile
index 7c04fe4..d3aa2cd 100644
--- a/tools/llvmc2/driver/Makefile
+++ b/tools/llvmc/driver/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/src/Makefile ---------------------------*- Makefile -*-===##
+##===- tools/llvmc/driver/Makefile -------------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
diff --git a/tools/llvmc2/driver/Plugin.cpp b/tools/llvmc/driver/Plugin.cpp
similarity index 98%
rename from tools/llvmc2/driver/Plugin.cpp
rename to tools/llvmc/driver/Plugin.cpp
index 17c7086..75abbd0 100644
--- a/tools/llvmc2/driver/Plugin.cpp
+++ b/tools/llvmc/driver/Plugin.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
//
-// Plugin support for llvmc2.
+// Plugin support.
//
//===----------------------------------------------------------------------===//
diff --git a/tools/llvmc2/driver/llvmc.cpp b/tools/llvmc/driver/llvmc.cpp
similarity index 100%
rename from tools/llvmc2/driver/llvmc.cpp
rename to tools/llvmc/driver/llvmc.cpp
diff --git a/tools/llvmc2/plugins/Base/Base.td b/tools/llvmc/plugins/Base/Base.td
similarity index 100%
rename from tools/llvmc2/plugins/Base/Base.td
rename to tools/llvmc/plugins/Base/Base.td
diff --git a/tools/llvmc2/plugins/Base/Makefile b/tools/llvmc/plugins/Base/Makefile
similarity index 84%
rename from tools/llvmc2/plugins/Base/Makefile
rename to tools/llvmc/plugins/Base/Makefile
index c1579d1..5ca6048 100644
--- a/tools/llvmc2/plugins/Base/Makefile
+++ b/tools/llvmc/plugins/Base/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/plugins/Base/Makefile ------------------*- Makefile -*-===##
+##===- tools/llvmc/plugins/Base/Makefile -------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
diff --git a/tools/llvmc2/plugins/Base/PluginMain.cpp b/tools/llvmc/plugins/Base/PluginMain.cpp
similarity index 100%
rename from tools/llvmc2/plugins/Base/PluginMain.cpp
rename to tools/llvmc/plugins/Base/PluginMain.cpp
diff --git a/tools/llvmc2/plugins/Clang/Clang.td b/tools/llvmc/plugins/Clang/Clang.td
similarity index 99%
rename from tools/llvmc2/plugins/Clang/Clang.td
rename to tools/llvmc/plugins/Clang/Clang.td
index ee6987f..0f5d8cd 100644
--- a/tools/llvmc2/plugins/Clang/Clang.td
+++ b/tools/llvmc/plugins/Clang/Clang.td
@@ -83,4 +83,3 @@
Edge<"clang_cpp", "llvm_ld">,
Edge<"clang_objective_c", "llvm_ld">
]>;
-
diff --git a/tools/llvmc2/plugins/Clang/Makefile b/tools/llvmc/plugins/Clang/Makefile
similarity index 84%
rename from tools/llvmc2/plugins/Clang/Makefile
rename to tools/llvmc/plugins/Clang/Makefile
index 237cc73..3206013 100644
--- a/tools/llvmc2/plugins/Clang/Makefile
+++ b/tools/llvmc/plugins/Clang/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/plugins/Clang/Makefile -----------------*- Makefile -*-===##
+##===- tools/llvmc/plugins/Clang/Makefile ------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
@@ -11,4 +11,3 @@
BUILT_SOURCES = AutoGenerated.inc
include ../Makefile
-
diff --git a/tools/llvmc2/plugins/Clang/PluginMain.cpp b/tools/llvmc/plugins/Clang/PluginMain.cpp
similarity index 100%
rename from tools/llvmc2/plugins/Clang/PluginMain.cpp
rename to tools/llvmc/plugins/Clang/PluginMain.cpp
diff --git a/tools/llvmc2/plugins/Hello/Hello.cpp b/tools/llvmc/plugins/Hello/Hello.cpp
similarity index 99%
rename from tools/llvmc2/plugins/Hello/Hello.cpp
rename to tools/llvmc/plugins/Hello/Hello.cpp
index eb52d24..2ecd2f1 100644
--- a/tools/llvmc2/plugins/Hello/Hello.cpp
+++ b/tools/llvmc/plugins/Hello/Hello.cpp
@@ -28,5 +28,3 @@
static llvmc::RegisterPlugin<MyPlugin> RP("Hello", "Hello World plugin");
}
-
-
diff --git a/tools/llvmc2/plugins/Hello/Makefile b/tools/llvmc/plugins/Hello/Makefile
similarity index 82%
rename from tools/llvmc2/plugins/Hello/Makefile
rename to tools/llvmc/plugins/Hello/Makefile
index f0d51dd..181dd0c 100644
--- a/tools/llvmc2/plugins/Hello/Makefile
+++ b/tools/llvmc/plugins/Hello/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/plugins/Hello/Makefile -----------------*- Makefile -*-===##
+##===- tools/llvmc/plugins/Hello/Makefile ------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
diff --git a/tools/llvmc2/plugins/Makefile b/tools/llvmc/plugins/Makefile
similarity index 93%
rename from tools/llvmc2/plugins/Makefile
rename to tools/llvmc/plugins/Makefile
index 041b045..dab58e0 100644
--- a/tools/llvmc2/plugins/Makefile
+++ b/tools/llvmc/plugins/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/plugins/Makefile.plugins ----------------*- Makefile -*-===##
+##===- tools/llvmc/plugins/Makefile.plugins ----------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
diff --git a/tools/llvmc2/plugins/Simple/Makefile b/tools/llvmc/plugins/Simple/Makefile
similarity index 79%
rename from tools/llvmc2/plugins/Simple/Makefile
rename to tools/llvmc/plugins/Simple/Makefile
index 4a16256..1cd5af7 100644
--- a/tools/llvmc2/plugins/Simple/Makefile
+++ b/tools/llvmc/plugins/Simple/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/plugins/Simple/Makefile ------------------*- Makefile -*-===##
+##===- tools/llvmc/plugins/Simple/Makefile -----------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
diff --git a/tools/llvmc2/plugins/Simple/PluginMain.cpp b/tools/llvmc/plugins/Simple/PluginMain.cpp
similarity index 100%
rename from tools/llvmc2/plugins/Simple/PluginMain.cpp
rename to tools/llvmc/plugins/Simple/PluginMain.cpp
diff --git a/tools/llvmc2/plugins/Simple/Simple.td b/tools/llvmc/plugins/Simple/Simple.td
similarity index 100%
rename from tools/llvmc2/plugins/Simple/Simple.td
rename to tools/llvmc/plugins/Simple/Simple.td
diff --git a/tools/llvmc2/doc/Makefile b/tools/llvmc2/doc/Makefile
deleted file mode 100644
index c71f662..0000000
--- a/tools/llvmc2/doc/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-RST2HTML=rst2html --stylesheet=llvm.css --link-stylesheet
-
-all : LLVMC-Reference.html LLVMC-Tutorial.html
-
-LLVMC-Tutorial.html : LLVMC-Tutorial.rst llvm.css
- $(RST2HTML) $< $@
-
-LLVMC-Reference.html : LLVMC-Reference.rst llvm.css
- $(RST2HTML) $< $@
-
-clean :
- rm *.html
