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

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

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9100bfdb588824490cb223d0f83533ce1be16d7..2eaedf530a733f21a3f847c35f2115e959ee305d 100644 (file)
--- a/CMakeLists.txt
+++ b/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/Makefile b/Makefile
index b4f60a87168570e20496dca68e2d5d21c9399641..00e38d26de4692880c665e03066fa8101a3669cc 100644 (file)
--- a/Makefile
+++ b/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/tools/CMakeLists.txt b/tools/CMakeLists.txt
index e5dc2ccb22622c038b16f724e597fa12e607e8eb..6c66deac03eb5ce7d0e83948125bb10d21517304 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1 +1,2 @@
+add_subdirectory(clang-cc)
 add_subdirectory(driver)

diff --git a/tools/Makefile b/tools/Makefile
index 25a43cdc67e2b85e6d5b9e34b29e874956bcf11e..e8205d3184d4c36fada0b1a290b7882edd750983 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ../../..
-DIRS := ccc driver
+DIRS := clang-cc ccc driver
 
 include $(LEVEL)/Makefile.common

diff --git a/Driver/ASTConsumers.cpp b/tools/clang-cc/ASTConsumers.cpp
similarity index 100%
rename from Driver/ASTConsumers.cpp
rename to tools/clang-cc/ASTConsumers.cpp

diff --git a/Driver/ASTConsumers.h b/tools/clang-cc/ASTConsumers.h
similarity index 100%
rename from Driver/ASTConsumers.h
rename to tools/clang-cc/ASTConsumers.h

diff --git a/Driver/Analyses.def b/tools/clang-cc/Analyses.def
similarity index 100%
rename from Driver/Analyses.def
rename to tools/clang-cc/Analyses.def

diff --git a/Driver/AnalysisConsumer.cpp b/tools/clang-cc/AnalysisConsumer.cpp
similarity index 100%
rename from Driver/AnalysisConsumer.cpp
rename to tools/clang-cc/AnalysisConsumer.cpp

diff --git a/Driver/Backend.cpp b/tools/clang-cc/Backend.cpp
similarity index 100%
rename from Driver/Backend.cpp
rename to tools/clang-cc/Backend.cpp

diff --git a/Driver/CMakeLists.txt b/tools/clang-cc/CMakeLists.txt
similarity index 95%
rename from Driver/CMakeLists.txt
rename to tools/clang-cc/CMakeLists.txt
index 02e6a4dd496648d8548468362849009a69ac2307..9dd596c2ce1ad65e04d44d9efc43c7458352061f 100644 (file)
--- a/Driver/CMakeLists.txt
+++ b/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/Driver/CacheTokens.cpp b/tools/clang-cc/CacheTokens.cpp
similarity index 100%
rename from Driver/CacheTokens.cpp
rename to tools/clang-cc/CacheTokens.cpp

diff --git a/Driver/DependencyFile.cpp b/tools/clang-cc/DependencyFile.cpp
similarity index 100%
rename from Driver/DependencyFile.cpp
rename to tools/clang-cc/DependencyFile.cpp

diff --git a/Driver/DiagChecker.cpp b/tools/clang-cc/DiagChecker.cpp
similarity index 100%
rename from Driver/DiagChecker.cpp
rename to tools/clang-cc/DiagChecker.cpp

diff --git a/Driver/HTMLPrint.cpp b/tools/clang-cc/HTMLPrint.cpp
similarity index 100%
rename from Driver/HTMLPrint.cpp
rename to tools/clang-cc/HTMLPrint.cpp

diff --git a/Driver/Makefile b/tools/clang-cc/Makefile
similarity index 59%
rename from Driver/Makefile
rename to tools/clang-cc/Makefile
index 188df25eef0b296cf8a96659393ee29990d6c870..4539665d2e8652858dfcffac34a75b7e3ffc8f69 100644 (file)
--- a/Driver/Makefile
+++ b/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/Driver/PrintParserCallbacks.cpp b/tools/clang-cc/PrintParserCallbacks.cpp
similarity index 100%
rename from Driver/PrintParserCallbacks.cpp
rename to tools/clang-cc/PrintParserCallbacks.cpp

diff --git a/Driver/PrintPreprocessedOutput.cpp b/tools/clang-cc/PrintPreprocessedOutput.cpp
similarity index 100%
rename from Driver/PrintPreprocessedOutput.cpp
rename to tools/clang-cc/PrintPreprocessedOutput.cpp

diff --git a/Driver/RewriteBlocks.cpp b/tools/clang-cc/RewriteBlocks.cpp
similarity index 100%
rename from Driver/RewriteBlocks.cpp
rename to tools/clang-cc/RewriteBlocks.cpp

diff --git a/Driver/RewriteMacros.cpp b/tools/clang-cc/RewriteMacros.cpp
similarity index 100%
rename from Driver/RewriteMacros.cpp
rename to tools/clang-cc/RewriteMacros.cpp

diff --git a/Driver/RewriteObjC.cpp b/tools/clang-cc/RewriteObjC.cpp
similarity index 100%
rename from Driver/RewriteObjC.cpp
rename to tools/clang-cc/RewriteObjC.cpp

diff --git a/Driver/RewriteTest.cpp b/tools/clang-cc/RewriteTest.cpp
similarity index 100%
rename from Driver/RewriteTest.cpp
rename to tools/clang-cc/RewriteTest.cpp

diff --git a/Driver/SerializationTest.cpp b/tools/clang-cc/SerializationTest.cpp
similarity index 100%
rename from Driver/SerializationTest.cpp
rename to tools/clang-cc/SerializationTest.cpp

diff --git a/Driver/Warnings.cpp b/tools/clang-cc/Warnings.cpp
similarity index 100%
rename from Driver/Warnings.cpp
rename to tools/clang-cc/Warnings.cpp

diff --git a/Driver/clang.cpp b/tools/clang-cc/clang.cpp
similarity index 100%
rename from Driver/clang.cpp
rename to tools/clang-cc/clang.cpp

diff --git a/Driver/clang.h b/tools/clang-cc/clang.h
similarity index 100%
rename from Driver/clang.h
rename to tools/clang-cc/clang.h

diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index 9ad719fa07fdb919b5445ca5315699ad608e4f0c..89100019ee37b377595fd83714b97bdaca871049 100644 (file)
--- a/tools/driver/Makefile
+++ b/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