From 113ec35f7f69bd66c0fbab7b42e2b9d59eddb946 Mon Sep 17 00:00:00 2001
From: Mikhail Glushenkov <foldr@codedgers.com>
Date: Tue, 25 Nov 2008 21:38:12 +0000
Subject: [PATCH] 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
---
 test/LLVMC/emit-llvm.c                        |   2 +-
 test/LLVMC/false.c                            |   2 +-
 test/LLVMC/hello.c                            |   2 +-
 test/LLVMC/hello.cpp                          |   2 +-
 test/LLVMC/hello.m                            |   2 +-
 test/LLVMC/hello.mm                           |   2 +-
 test/LLVMC/include.c                          |   2 +-
 test/LLVMC/opt-test.c                         |   2 +-
 test/LLVMC/sink.c                             |   2 +-
 test/LLVMC/together.cpp                       |   2 +-
 test/LLVMC/wall.c                             |   2 +-
 tools/Makefile                                |  10 ++++-----
 tools/{llvmc2 => llvmc}/CMakeLists.txt        |   0
 tools/{llvmc2 => llvmc}/Makefile              |   4 ++--
 .../{llvmc2 => llvmc}/doc/LLVMC-Reference.rst |  14 ++++++------
 .../{llvmc2 => llvmc}/doc/LLVMC-Tutorial.rst  |   5 ++---
 tools/llvmc/doc/Makefile                      |  21 ++++++++++++++++++
 tools/{llvmc2 => llvmc}/doc/img/lines.gif     | Bin
 tools/{llvmc2 => llvmc}/doc/llvm.css          |   0
 tools/{llvmc2 => llvmc}/driver/Action.cpp     |   0
 tools/{llvmc2 => llvmc}/driver/CMakeLists.txt |   0
 .../driver/CompilationGraph.cpp               |   0
 tools/{llvmc2 => llvmc}/driver/Error.h        |   0
 tools/{llvmc2 => llvmc}/driver/Makefile       |   2 +-
 tools/{llvmc2 => llvmc}/driver/Plugin.cpp     |   2 +-
 tools/{llvmc2 => llvmc}/driver/llvmc.cpp      |   0
 tools/{llvmc2 => llvmc}/plugins/Base/Base.td  |   0
 tools/{llvmc2 => llvmc}/plugins/Base/Makefile |   2 +-
 .../plugins/Base/PluginMain.cpp               |   0
 .../{llvmc2 => llvmc}/plugins/Clang/Clang.td  |   1 -
 .../{llvmc2 => llvmc}/plugins/Clang/Makefile  |   3 +--
 .../plugins/Clang/PluginMain.cpp              |   0
 .../{llvmc2 => llvmc}/plugins/Hello/Hello.cpp |   2 --
 .../{llvmc2 => llvmc}/plugins/Hello/Makefile  |   2 +-
 tools/{llvmc2 => llvmc}/plugins/Makefile      |   2 +-
 .../{llvmc2 => llvmc}/plugins/Simple/Makefile |   2 +-
 .../plugins/Simple/PluginMain.cpp             |   0
 .../plugins/Simple/Simple.td                  |   0
 tools/llvmc2/doc/Makefile                     |  13 -----------
 39 files changed, 55 insertions(+), 52 deletions(-)
 rename tools/{llvmc2 => llvmc}/CMakeLists.txt (100%)
 rename tools/{llvmc2 => llvmc}/Makefile (82%)
 rename tools/{llvmc2 => llvmc}/doc/LLVMC-Reference.rst (98%)
 rename tools/{llvmc2 => llvmc}/doc/LLVMC-Tutorial.rst (97%)
 create mode 100644 tools/llvmc/doc/Makefile
 rename tools/{llvmc2 => llvmc}/doc/img/lines.gif (100%)
 rename tools/{llvmc2 => llvmc}/doc/llvm.css (100%)
 rename tools/{llvmc2 => llvmc}/driver/Action.cpp (100%)
 rename tools/{llvmc2 => llvmc}/driver/CMakeLists.txt (100%)
 rename tools/{llvmc2 => llvmc}/driver/CompilationGraph.cpp (100%)
 rename tools/{llvmc2 => llvmc}/driver/Error.h (100%)
 rename tools/{llvmc2 => llvmc}/driver/Makefile (88%)
 rename tools/{llvmc2 => llvmc}/driver/Plugin.cpp (98%)
 rename tools/{llvmc2 => llvmc}/driver/llvmc.cpp (100%)
 rename tools/{llvmc2 => llvmc}/plugins/Base/Base.td (100%)
 rename tools/{llvmc2 => llvmc}/plugins/Base/Makefile (84%)
 rename tools/{llvmc2 => llvmc}/plugins/Base/PluginMain.cpp (100%)
 rename tools/{llvmc2 => llvmc}/plugins/Clang/Clang.td (99%)
 rename tools/{llvmc2 => llvmc}/plugins/Clang/Makefile (84%)
 rename tools/{llvmc2 => llvmc}/plugins/Clang/PluginMain.cpp (100%)
 rename tools/{llvmc2 => llvmc}/plugins/Hello/Hello.cpp (99%)
 rename tools/{llvmc2 => llvmc}/plugins/Hello/Makefile (83%)
 rename tools/{llvmc2 => llvmc}/plugins/Makefile (94%)
 rename tools/{llvmc2 => llvmc}/plugins/Simple/Makefile (80%)
 rename tools/{llvmc2 => llvmc}/plugins/Simple/PluginMain.cpp (100%)
 rename tools/{llvmc2 => llvmc}/plugins/Simple/Simple.td (100%)
 delete mode 100644 tools/llvmc2/doc/Makefile

diff --git a/test/LLVMC/emit-llvm.c b/test/LLVMC/emit-llvm.c
index 5a6aa0f538a..38bbba6f0af 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 4aa365d89a3..eb2883d699e 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 bf917bcdea7..1cda9c3a340 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 a3148c3c164..27c89d66fa7 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 bf917bcdea7..1cda9c3a340 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 5f14a94ccca..ff82e4af518 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 eeb6ca6926b..07ae761d2c8 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 25ca66a5c6b..ed2df52fed7 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 d1dde41bb33..3edbf78112e 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 09f8d86379c..b07250e9d0b 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 9af9bfba318..2c72ea69929 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 30da5224a91..2726c1f3e43 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 22ca29e2ed7..8eb35cbe9cc 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 01a8be0d20e..77d9d2bd3a4 100644
--- a/tools/llvmc2/doc/LLVMC-Reference.rst
+++ b/tools/llvmc/doc/LLVMC-Reference.rst
@@ -31,7 +31,7 @@ although there are some small differences. Most of the time, however,
 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 @@ extensions). If you want to force files ending with ".c" to compile as
 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 @@ On the other hand, when using LLVMC as a linker to combine several C++
 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 @@ directory and run ``make``. The resulting file will be called
 
     $ 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 @@ which gets a special treatment - there you are allowed to specify one
 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 724fd4dfacb..d41f90d6349 100644
--- a/tools/llvmc2/doc/LLVMC-Tutorial.rst
+++ b/tools/llvmc/doc/LLVMC-Tutorial.rst
@@ -20,7 +20,7 @@ Compiling with LLVMC
 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 @@ be familiar with it to get anything done.
 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 @@ References
 
 .. [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 00000000000..864376f9d90
--- /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
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 7c04fe4aca4..d3aa2cd52ad 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 17c70869ea6..75abbd041d3 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 c1579d146d1..5ca6048508a 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 ee6987fa352..0f5d8cd9180 100644
--- a/tools/llvmc2/plugins/Clang/Clang.td
+++ b/tools/llvmc/plugins/Clang/Clang.td
@@ -83,4 +83,3 @@ def CompilationGraph : CompilationGraph<[
     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 237cc736f0f..32060138c23 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 @@ LLVMC_PLUGIN = Clang
 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 eb52d249f0b..2ecd2f1c5b9 100644
--- a/tools/llvmc2/plugins/Hello/Hello.cpp
+++ b/tools/llvmc/plugins/Hello/Hello.cpp
@@ -28,5 +28,3 @@ struct MyPlugin : public llvmc::BasePlugin {
 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 83%
rename from tools/llvmc2/plugins/Hello/Makefile
rename to tools/llvmc/plugins/Hello/Makefile
index f0d51ddbfcb..181dd0c6050 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 94%
rename from tools/llvmc2/plugins/Makefile
rename to tools/llvmc/plugins/Makefile
index 041b045652c..dab58e07581 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 80%
rename from tools/llvmc2/plugins/Simple/Makefile
rename to tools/llvmc/plugins/Simple/Makefile
index 4a162566653..1cd5af7a15e 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 c71f6625ad6..00000000000
--- 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
-- 
2.34.1