Move <root>/Driver into <root>/tools/clang-cc.

Again, I tried to update cmake but it is untested.

llvm-svn: 67605

26 files changed, 19 insertions, 10 deletions

diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index b9100bfdb58..2eaedf530a7 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -51,7 +51,6 @@ add_definitions( -D_GNU_SOURCE )
 
 add_subdirectory(include)
 add_subdirectory(lib)
-add_subdirectory(Driver)
 add_subdirectory(tools)
 
 # TODO: docs.
diff --git a/clang/Makefile b/clang/Makefile
index b4f60a87168..00e38d26de4 100644
--- a/clang/Makefile
+++ b/clang/Makefile
@@ -1,5 +1,5 @@
 LEVEL = ../..
-DIRS := include lib Driver docs tools
+DIRS := include lib tools docs
 
 include $(LEVEL)/Makefile.common
 
@@ -24,7 +24,7 @@ tags::
 	$(Verb) etags `find . -type f -name \*.h | grep -v /lib/Headers | grep -v /test/` `find . -type f -name \*.cpp | grep -v /lib/Headers | grep -v /test/`
 
 cscope.files:
-	find Driver lib include -name '*.cpp' \
+	find tools lib include -name '*.cpp' \
 	                    -or -name '*.def' \
 	                    -or -name '*.td' \
 	                    -or -name '*.h' > cscope.files
diff --git a/clang/tools/CMakeLists.txt b/clang/tools/CMakeLists.txt
index e5dc2ccb226..6c66deac03e 100644
--- a/clang/tools/CMakeLists.txt
+++ b/clang/tools/CMakeLists.txt
@@ -1 +1,2 @@
+add_subdirectory(clang-cc)
 add_subdirectory(driver)
diff --git a/clang/tools/Makefile b/clang/tools/Makefile
index 25a43cdc67e..e8205d3184d 100644
--- a/clang/tools/Makefile
+++ b/clang/tools/Makefile
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ../../..
-DIRS := ccc driver
+DIRS := clang-cc ccc driver
 
 include $(LEVEL)/Makefile.common
diff --git a/clang/Driver/ASTConsumers.cpp b/clang/tools/clang-cc/ASTConsumers.cpp
index 9eba137918e..9eba137918e 100644
--- a/clang/Driver/ASTConsumers.cpp
+++ b/clang/tools/clang-cc/ASTConsumers.cpp
diff --git a/clang/Driver/ASTConsumers.h b/clang/tools/clang-cc/ASTConsumers.h
index fd8416da0ea..fd8416da0ea 100644
--- a/clang/Driver/ASTConsumers.h
+++ b/clang/tools/clang-cc/ASTConsumers.h
diff --git a/clang/Driver/Analyses.def b/clang/tools/clang-cc/Analyses.def
index 3492d09c10a..3492d09c10a 100644
--- a/clang/Driver/Analyses.def
+++ b/clang/tools/clang-cc/Analyses.def
diff --git a/clang/Driver/AnalysisConsumer.cpp b/clang/tools/clang-cc/AnalysisConsumer.cpp
index f19ff1787eb..f19ff1787eb 100644
--- a/clang/Driver/AnalysisConsumer.cpp
+++ b/clang/tools/clang-cc/AnalysisConsumer.cpp
diff --git a/clang/Driver/Backend.cpp b/clang/tools/clang-cc/Backend.cpp
index 459bd696b05..459bd696b05 100644
--- a/clang/Driver/Backend.cpp
+++ b/clang/tools/clang-cc/Backend.cpp
diff --git a/clang/Driver/CMakeLists.txt b/clang/tools/clang-cc/CMakeLists.txt
index 02e6a4dd496..9dd596c2ce1 100644
--- a/clang/Driver/CMakeLists.txt
+++ b/clang/tools/clang-cc/CMakeLists.txt
@@ -21,7 +21,7 @@ set( LLVM_LINK_COMPONENTS
   selectiondag
   )
 
-add_clang_executable(clang
+add_clang_executable(clang-cc
   AnalysisConsumer.cpp
   ASTConsumers.cpp
   Backend.cpp
diff --git a/clang/Driver/CacheTokens.cpp b/clang/tools/clang-cc/CacheTokens.cpp
index 4ca350e6fb0..4ca350e6fb0 100644
--- a/clang/Driver/CacheTokens.cpp
+++ b/clang/tools/clang-cc/CacheTokens.cpp
diff --git a/clang/Driver/DependencyFile.cpp b/clang/tools/clang-cc/DependencyFile.cpp
index 2140afcfefb..2140afcfefb 100644
--- a/clang/Driver/DependencyFile.cpp
+++ b/clang/tools/clang-cc/DependencyFile.cpp
diff --git a/clang/Driver/DiagChecker.cpp b/clang/tools/clang-cc/DiagChecker.cpp
index e5be10abd52..e5be10abd52 100644
--- a/clang/Driver/DiagChecker.cpp
+++ b/clang/tools/clang-cc/DiagChecker.cpp
diff --git a/clang/Driver/HTMLPrint.cpp b/clang/tools/clang-cc/HTMLPrint.cpp
index b2bb29c9eb3..b2bb29c9eb3 100644
--- a/clang/Driver/HTMLPrint.cpp
+++ b/clang/tools/clang-cc/HTMLPrint.cpp
diff --git a/clang/Driver/Makefile b/clang/tools/clang-cc/Makefile
index 188df25eef0..4539665d2e8 100644
--- a/clang/Driver/Makefile
+++ b/clang/tools/clang-cc/Makefile
@@ -1,6 +1,15 @@
-LEVEL = ../../..
+##===- tools/clang-cc/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 = clang-cc
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../include -I$(PROJ_OBJ_DIR)/../include
+CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 CXXFLAGS = -fno-rtti
 
 # Clang has no plugins, optimize startup time.
diff --git a/clang/Driver/PrintParserCallbacks.cpp b/clang/tools/clang-cc/PrintParserCallbacks.cpp
index 6230591ffcc..6230591ffcc 100644
--- a/clang/Driver/PrintParserCallbacks.cpp
+++ b/clang/tools/clang-cc/PrintParserCallbacks.cpp
diff --git a/clang/Driver/PrintPreprocessedOutput.cpp b/clang/tools/clang-cc/PrintPreprocessedOutput.cpp
index 0e95c914c4a..0e95c914c4a 100644
--- a/clang/Driver/PrintPreprocessedOutput.cpp
+++ b/clang/tools/clang-cc/PrintPreprocessedOutput.cpp
diff --git a/clang/Driver/RewriteBlocks.cpp b/clang/tools/clang-cc/RewriteBlocks.cpp
index 2672d32ef05..2672d32ef05 100644
--- a/clang/Driver/RewriteBlocks.cpp
+++ b/clang/tools/clang-cc/RewriteBlocks.cpp
diff --git a/clang/Driver/RewriteMacros.cpp b/clang/tools/clang-cc/RewriteMacros.cpp
index 809a3b510b2..809a3b510b2 100644
--- a/clang/Driver/RewriteMacros.cpp
+++ b/clang/tools/clang-cc/RewriteMacros.cpp
diff --git a/clang/Driver/RewriteObjC.cpp b/clang/tools/clang-cc/RewriteObjC.cpp
index c3cc2c3852a..c3cc2c3852a 100644
--- a/clang/Driver/RewriteObjC.cpp
+++ b/clang/tools/clang-cc/RewriteObjC.cpp
diff --git a/clang/Driver/RewriteTest.cpp b/clang/tools/clang-cc/RewriteTest.cpp
index 1d0c6f9e9c0..1d0c6f9e9c0 100644
--- a/clang/Driver/RewriteTest.cpp
+++ b/clang/tools/clang-cc/RewriteTest.cpp
diff --git a/clang/Driver/SerializationTest.cpp b/clang/tools/clang-cc/SerializationTest.cpp
index e489a19ff83..e489a19ff83 100644
--- a/clang/Driver/SerializationTest.cpp
+++ b/clang/tools/clang-cc/SerializationTest.cpp
diff --git a/clang/Driver/Warnings.cpp b/clang/tools/clang-cc/Warnings.cpp
index 18e44d72e3c..18e44d72e3c 100644
--- a/clang/Driver/Warnings.cpp
+++ b/clang/tools/clang-cc/Warnings.cpp
diff --git a/clang/Driver/clang.cpp b/clang/tools/clang-cc/clang.cpp
index 2ae1b6ec737..2ae1b6ec737 100644
--- a/clang/Driver/clang.cpp
+++ b/clang/tools/clang-cc/clang.cpp
diff --git a/clang/Driver/clang.h b/clang/tools/clang-cc/clang.h
index 33bc7fe5832..33bc7fe5832 100644
--- a/clang/Driver/clang.h
+++ b/clang/tools/clang-cc/clang.h
diff --git a/clang/tools/driver/Makefile b/clang/tools/driver/Makefile
index 9ad719fa07f..89100019ee3 100644
--- a/clang/tools/driver/Makefile
+++ b/clang/tools/driver/Makefile
@@ -12,12 +12,12 @@ TOOLNAME = clang-driver
 CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 CXXFLAGS = -fno-rtti
 
+# This tool has no plugins, optimize startup time.
+TOOL_NO_EXPORTS = 1
+
 # FIXME: It is unfortunate we need to pull in the bitcode reader and
 # writer just to get the serializer stuff used by clangBasic.
 LINK_COMPONENTS := system support bitreader bitwriter
 USEDLIBS = clangDriver.a clangBasic.a
 
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
 include $(LEVEL)/Makefile.common