diff options
author | Daniel Dunbar <daniel@zuster.org> | 2009-03-24 03:00:12 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2009-03-24 03:00:12 +0000 |
commit | 073777f3ab6f829d6f16105e0d9513b7691b4a4d (patch) | |
tree | b609d540bdaacaf817b0a0eb24bc6171d36d8440 | |
parent | cbcd98bdb9e8eb09203ff212bf496734c3249e33 (diff) | |
download | clang-073777f3ab6f829d6f16105e0d9513b7691b4a4d.tar.gz |
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
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | tools/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tools/Makefile | 2 | ||||
-rw-r--r-- | tools/clang-cc/ASTConsumers.cpp (renamed from Driver/ASTConsumers.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/ASTConsumers.h (renamed from Driver/ASTConsumers.h) | 0 | ||||
-rw-r--r-- | tools/clang-cc/Analyses.def (renamed from Driver/Analyses.def) | 0 | ||||
-rw-r--r-- | tools/clang-cc/AnalysisConsumer.cpp (renamed from Driver/AnalysisConsumer.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/Backend.cpp (renamed from Driver/Backend.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/CMakeLists.txt (renamed from Driver/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | tools/clang-cc/CacheTokens.cpp (renamed from Driver/CacheTokens.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/DependencyFile.cpp (renamed from Driver/DependencyFile.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/DiagChecker.cpp (renamed from Driver/DiagChecker.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/HTMLPrint.cpp (renamed from Driver/HTMLPrint.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/Makefile (renamed from Driver/Makefile) | 13 | ||||
-rw-r--r-- | tools/clang-cc/PrintParserCallbacks.cpp (renamed from Driver/PrintParserCallbacks.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/PrintPreprocessedOutput.cpp (renamed from Driver/PrintPreprocessedOutput.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/RewriteBlocks.cpp (renamed from Driver/RewriteBlocks.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/RewriteMacros.cpp (renamed from Driver/RewriteMacros.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/RewriteObjC.cpp (renamed from Driver/RewriteObjC.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/RewriteTest.cpp (renamed from Driver/RewriteTest.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/SerializationTest.cpp (renamed from Driver/SerializationTest.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/Warnings.cpp (renamed from Driver/Warnings.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/clang.cpp (renamed from Driver/clang.cpp) | 0 | ||||
-rw-r--r-- | tools/clang-cc/clang.h (renamed from Driver/clang.h) | 0 | ||||
-rw-r--r-- | tools/driver/Makefile | 6 |
26 files changed, 19 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b9100bfdb5..2eaedf530a 100644 --- 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. @@ -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 e5dc2ccb22..6c66deac03 100644 --- 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 25a43cdc67..e8205d3184 100644 --- 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 index 9eba137918..9eba137918 100644 --- a/Driver/ASTConsumers.cpp +++ b/tools/clang-cc/ASTConsumers.cpp diff --git a/Driver/ASTConsumers.h b/tools/clang-cc/ASTConsumers.h index fd8416da0e..fd8416da0e 100644 --- a/Driver/ASTConsumers.h +++ b/tools/clang-cc/ASTConsumers.h diff --git a/Driver/Analyses.def b/tools/clang-cc/Analyses.def index 3492d09c10..3492d09c10 100644 --- a/Driver/Analyses.def +++ b/tools/clang-cc/Analyses.def diff --git a/Driver/AnalysisConsumer.cpp b/tools/clang-cc/AnalysisConsumer.cpp index f19ff1787e..f19ff1787e 100644 --- a/Driver/AnalysisConsumer.cpp +++ b/tools/clang-cc/AnalysisConsumer.cpp diff --git a/Driver/Backend.cpp b/tools/clang-cc/Backend.cpp index 459bd696b0..459bd696b0 100644 --- a/Driver/Backend.cpp +++ b/tools/clang-cc/Backend.cpp diff --git a/Driver/CMakeLists.txt b/tools/clang-cc/CMakeLists.txt index 02e6a4dd49..9dd596c2ce 100644 --- 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 index 4ca350e6fb..4ca350e6fb 100644 --- a/Driver/CacheTokens.cpp +++ b/tools/clang-cc/CacheTokens.cpp diff --git a/Driver/DependencyFile.cpp b/tools/clang-cc/DependencyFile.cpp index 2140afcfef..2140afcfef 100644 --- a/Driver/DependencyFile.cpp +++ b/tools/clang-cc/DependencyFile.cpp diff --git a/Driver/DiagChecker.cpp b/tools/clang-cc/DiagChecker.cpp index e5be10abd5..e5be10abd5 100644 --- a/Driver/DiagChecker.cpp +++ b/tools/clang-cc/DiagChecker.cpp diff --git a/Driver/HTMLPrint.cpp b/tools/clang-cc/HTMLPrint.cpp index b2bb29c9eb..b2bb29c9eb 100644 --- a/Driver/HTMLPrint.cpp +++ b/tools/clang-cc/HTMLPrint.cpp diff --git a/Driver/Makefile b/tools/clang-cc/Makefile index 188df25eef..4539665d2e 100644 --- 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 index 6230591ffc..6230591ffc 100644 --- a/Driver/PrintParserCallbacks.cpp +++ b/tools/clang-cc/PrintParserCallbacks.cpp diff --git a/Driver/PrintPreprocessedOutput.cpp b/tools/clang-cc/PrintPreprocessedOutput.cpp index 0e95c914c4..0e95c914c4 100644 --- a/Driver/PrintPreprocessedOutput.cpp +++ b/tools/clang-cc/PrintPreprocessedOutput.cpp diff --git a/Driver/RewriteBlocks.cpp b/tools/clang-cc/RewriteBlocks.cpp index 2672d32ef0..2672d32ef0 100644 --- a/Driver/RewriteBlocks.cpp +++ b/tools/clang-cc/RewriteBlocks.cpp diff --git a/Driver/RewriteMacros.cpp b/tools/clang-cc/RewriteMacros.cpp index 809a3b510b..809a3b510b 100644 --- a/Driver/RewriteMacros.cpp +++ b/tools/clang-cc/RewriteMacros.cpp diff --git a/Driver/RewriteObjC.cpp b/tools/clang-cc/RewriteObjC.cpp index c3cc2c3852..c3cc2c3852 100644 --- a/Driver/RewriteObjC.cpp +++ b/tools/clang-cc/RewriteObjC.cpp diff --git a/Driver/RewriteTest.cpp b/tools/clang-cc/RewriteTest.cpp index 1d0c6f9e9c..1d0c6f9e9c 100644 --- a/Driver/RewriteTest.cpp +++ b/tools/clang-cc/RewriteTest.cpp diff --git a/Driver/SerializationTest.cpp b/tools/clang-cc/SerializationTest.cpp index e489a19ff8..e489a19ff8 100644 --- a/Driver/SerializationTest.cpp +++ b/tools/clang-cc/SerializationTest.cpp diff --git a/Driver/Warnings.cpp b/tools/clang-cc/Warnings.cpp index 18e44d72e3..18e44d72e3 100644 --- a/Driver/Warnings.cpp +++ b/tools/clang-cc/Warnings.cpp diff --git a/Driver/clang.cpp b/tools/clang-cc/clang.cpp index 2ae1b6ec73..2ae1b6ec73 100644 --- a/Driver/clang.cpp +++ b/tools/clang-cc/clang.cpp diff --git a/Driver/clang.h b/tools/clang-cc/clang.h index 33bc7fe583..33bc7fe583 100644 --- a/Driver/clang.h +++ b/tools/clang-cc/clang.h diff --git a/tools/driver/Makefile b/tools/driver/Makefile index 9ad719fa07..89100019ee 100644 --- 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 |