From b97f5c1eb2c21302307c624f9c6371bf86dc3fd5 Mon Sep 17 00:00:00 2001
From: Adrian Prantl <aprantl@apple.com>
Date: Wed, 25 Feb 2015 02:46:37 +0000
Subject: [PATCH] Revert "Adapt clang-tools-extra to clang module format
changes."
This reverts commit 230424.
llvm-svn: 230456
---
.../clang-apply-replacements/tool/Makefile | 5 +-
.../clang-modernize/tool/Makefile | 5 +-
clang-tools-extra/clang-query/tool/Makefile | 5 +-
clang-tools-extra/clang-rename/tool/Makefile | 5 +-
clang-tools-extra/clang-tidy/tool/Makefile | 5 +-
clang-tools-extra/modularize/Makefile | 6 +--
clang-tools-extra/pp-trace/Makefile | 6 +--
clang-tools-extra/pp-trace/PPTrace.cpp | 47 +++++++++----------
clang-tools-extra/remove-cstr-calls/Makefile | 6 +--
clang-tools-extra/tool-template/Makefile | 6 +--
.../clang-apply-replacements/Makefile | 5 +-
.../unittests/clang-modernize/Makefile | 5 +-
.../unittests/clang-query/Makefile | 5 +-
.../unittests/clang-rename/Makefile | 5 +-
.../unittests/clang-tidy/Makefile | 5 +-
15 files changed, 50 insertions(+), 71 deletions(-)
diff --git a/clang-tools-extra/clang-apply-replacements/tool/Makefile b/clang-tools-extra/clang-apply-replacements/tool/Makefile
index 916a54da261d..8c911720ebde 100644
--- a/clang-tools-extra/clang-apply-replacements/tool/Makefile
+++ b/clang-tools-extra/clang-apply-replacements/tool/Makefile
@@ -17,10 +17,9 @@ TOOL_NO_EXPORTS = 1
SOURCES = ClangApplyReplacementsMain.cpp
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
USEDLIBS = clangApplyReplacements.a clangFormat.a \
- clangTooling.a clangToolingCore.a clangFrontend.a clangCodeGen.a \
+ clangTooling.a clangToolingCore.a clangFrontend.a \
clangSerialization.a clangDriver.a clangRewriteFrontend.a \
clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
diff --git a/clang-tools-extra/clang-modernize/tool/Makefile b/clang-tools-extra/clang-modernize/tool/Makefile
index 36c871ce149a..efc361343ff6 100644
--- a/clang-tools-extra/clang-modernize/tool/Makefile
+++ b/clang-tools-extra/clang-modernize/tool/Makefile
@@ -35,10 +35,9 @@ BUILT_SOURCES += $(ObjDir)/../PassByValue/.objdir
SOURCES += $(addprefix ../ReplaceAutoPtr/,$(notdir $(wildcard $(PROJ_SRC_DIR)/../ReplaceAutoPtr/*.cpp)))
BUILT_SOURCES += $(ObjDir)/../ReplaceAutoPtr/.objdir
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
USEDLIBS = modernizeCore.a clangFormat.a \
- clangTooling.a clangToolingCore.a clangFrontend.a clangCodeGen.a \
+ clangTooling.a clangToolingCore.a clangFrontend.a \
clangSerialization.a clangDriver.a clangRewriteFrontend.a \
clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
diff --git a/clang-tools-extra/clang-query/tool/Makefile b/clang-tools-extra/clang-query/tool/Makefile
index 110f366e202a..f62b0b541313 100644
--- a/clang-tools-extra/clang-query/tool/Makefile
+++ b/clang-tools-extra/clang-query/tool/Makefile
@@ -17,10 +17,9 @@ TOOL_NO_EXPORTS = 1
SOURCES = ClangQuery.cpp
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
USEDLIBS = clangQuery.a clangDynamicASTMatchers.a clangFormat.a clangTooling.a \
- clangFrontend.a clangCodeGen.a clangSerialization.a clangDriver.a clangRewriteFrontend.a \
+ clangFrontend.a clangSerialization.a clangDriver.a clangRewriteFrontend.a \
LLVMLineEditor.a clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
diff --git a/clang-tools-extra/clang-rename/tool/Makefile b/clang-tools-extra/clang-rename/tool/Makefile
index 2b348cee35d5..b3d9555f37b7 100644
--- a/clang-tools-extra/clang-rename/tool/Makefile
+++ b/clang-tools-extra/clang-rename/tool/Makefile
@@ -1,9 +1,8 @@
CLANG_LEVEL := ../../../..
TOOLNAME = clang-rename
include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option
-USEDLIBS = clangRename.a clangFrontend.a clangCodeGen.a clangSerialization.a clangDriver.a \
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
+USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \
clangTooling.a clangToolingCore.a \
clangParse.a clangSema.a clangIndex.a \
clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
diff --git a/clang-tools-extra/clang-tidy/tool/Makefile b/clang-tools-extra/clang-tidy/tool/Makefile
index e9e0bf57826e..f2d83ebf2292 100644
--- a/clang-tools-extra/clang-tidy/tool/Makefile
+++ b/clang-tools-extra/clang-tidy/tool/Makefile
@@ -15,14 +15,13 @@ TOOLNAME = clang-tidy
TOOL_NO_EXPORTS = 1
include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
clangTidyMiscModule.a clangTidyReadability.a clangTidyUtils.a \
clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
clangStaticAnalyzerCore.a \
clangFormat.a clangASTMatchers.a clangTooling.a clangToolingCore.a \
- clangFrontend.a clangCodeGen.a clangSerialization.a clangDriver.a clangParse.a \
+ clangFrontend.a clangSerialization.a clangDriver.a clangParse.a \
clangSema.a clangAnalysis.a clangRewriteFrontend.a clangRewrite.a \
clangEdit.a clangAST.a clangLex.a clangBasic.a
diff --git a/clang-tools-extra/modularize/Makefile b/clang-tools-extra/modularize/Makefile
index 11aaf730e94a..f96540b751dc 100644
--- a/clang-tools-extra/modularize/Makefile
+++ b/clang-tools-extra/modularize/Makefile
@@ -15,10 +15,8 @@ NO_INSTALL = 0
# No plugins, optimize startup time.
TOOL_NO_EXPORTS = 1
-include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option
-USEDLIBS = clangFrontend.a clangCodeGen.a clangSerialization.a clangDriver.a \
+LINK_COMPONENTS := mcparser bitreader support mc option TransformUtils
+USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \
clangTooling.a clangParse.a clangSema.a clangAnalysis.a \
clangEdit.a clangAST.a clangLex.a clangBasic.a
diff --git a/clang-tools-extra/pp-trace/Makefile b/clang-tools-extra/pp-trace/Makefile
index 81bcb302ef59..3467ecb31f47 100644
--- a/clang-tools-extra/pp-trace/Makefile
+++ b/clang-tools-extra/pp-trace/Makefile
@@ -14,10 +14,8 @@ TOOLNAME = pp-trace
# No plugins, optimize startup time.
TOOL_NO_EXPORTS = 1
-include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option
-USEDLIBS = clangFrontend.a clangCodeGen.a clangSerialization.a clangDriver.a \
+LINK_COMPONENTS := mcparser bitreader support mc option TransformUtils
+USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \
clangTooling.a clangParse.a clangSema.a clangAnalysis.a \
clangEdit.a clangAST.a clangLex.a clangBasic.a
diff --git a/clang-tools-extra/pp-trace/PPTrace.cpp b/clang-tools-extra/pp-trace/PPTrace.cpp
index fa9863986a87..aae6215151f1 100644
--- a/clang-tools-extra/pp-trace/PPTrace.cpp
+++ b/clang-tools-extra/pp-trace/PPTrace.cpp
@@ -79,6 +79,28 @@ using namespace clang::tooling;
using namespace llvm;
using namespace llvm::opt;
+// Options:
+
+// Collect the source files.
+cl::list<std::string> SourcePaths(cl::Positional,
+ cl::desc("<source0> [... <sourceN>]"),
+ cl::OneOrMore);
+
+// Option to specify a list or one or more callback names to ignore.
+cl::opt<std::string> IgnoreCallbacks(
+ "ignore", cl::init(""),
+ cl::desc("Ignore callbacks, i.e. \"Callback1, Callback2...\"."));
+
+// Option to specify the trace output file name.
+cl::opt<std::string> OutputFileName(
+ "output", cl::init(""),
+ cl::desc("Output trace to the given file name or '-' for stdout."));
+
+// Collect all other arguments, which will be passed to the front end.
+cl::list<std::string>
+CC1Arguments(cl::ConsumeAfter,
+ cl::desc("<arguments to be passed to front end>..."));
+
// Frontend action stuff:
// Consumer is responsible for setting up the callbacks.
@@ -153,35 +175,10 @@ int outputPPTrace(std::vector<CallbackCall> &CallbackCalls,
// Program entry point.
int main(int Argc, const char **Argv) {
- // Collect the source files.
- cl::list<std::string> SourcePaths(cl::Positional,
- cl::desc("<source0> [... <sourceN>]"),
- cl::OneOrMore);
-
- // Option to specify a list or one or more callback names to ignore.
- cl::opt<std::string> IgnoreCallbacks(
- "ignore", cl::init(""),
- cl::desc("Ignore callbacks, i.e. \"Callback1, Callback2...\"."));
-
- // Option to specify the trace output file name.
- cl::opt<std::string> OutputFileName(
- "output", cl::init(""),
- cl::desc("Output trace to the given file name or '-' for stdout."));
- // Collect all other arguments, which will be passed to the front end.
- cl::list<std::string>
- CC1Arguments(cl::ConsumeAfter,
- cl::desc("<arguments to be passed to front end>..."));
// Parse command line.
cl::ParseCommandLineOptions(Argc, Argv, "pp-trace.\n");
- // Unregister our options so they don't interfere with the command line
- // parsing in CodeGen/BackendUtil.cpp.
- CC1Arguments.removeArgument();
- OutputFileName.removeArgument();
- IgnoreCallbacks.removeArgument();
- SourcePaths.removeArgument();
-
// Parse the IgnoreCallbacks list into strings.
SmallVector<StringRef, 32> IgnoreCallbacksStrings;
StringRef(IgnoreCallbacks).split(IgnoreCallbacksStrings, ",",
diff --git a/clang-tools-extra/remove-cstr-calls/Makefile b/clang-tools-extra/remove-cstr-calls/Makefile
index 432c14c70bdb..b4110c184b8b 100644
--- a/clang-tools-extra/remove-cstr-calls/Makefile
+++ b/clang-tools-extra/remove-cstr-calls/Makefile
@@ -16,10 +16,8 @@ NO_INSTALL = 1
TOOL_NO_EXPORTS = 1
include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option
-USEDLIBS = clangTooling.a clangFrontend.a clangCodeGen.a \
- clangSerialization.a clangDriver.a \
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
+USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
clangToolingCore.a clangRewriteFrontend.a clangRewrite.a \
clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
diff --git a/clang-tools-extra/tool-template/Makefile b/clang-tools-extra/tool-template/Makefile
index 2d5c0c5be658..8a461e4dc7cb 100644
--- a/clang-tools-extra/tool-template/Makefile
+++ b/clang-tools-extra/tool-template/Makefile
@@ -16,10 +16,8 @@ NO_INSTALL = 1
TOOL_NO_EXPORTS = 1
include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option
-USEDLIBS = clangTooling.a clangFrontend.a clangCodeGen.a \
- clangSerialization.a clangDriver.a \
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
+USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
clangRewriteFrontend.a clangToolingCore.a clangRewrite.a \
clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
diff --git a/clang-tools-extra/unittests/clang-apply-replacements/Makefile b/clang-tools-extra/unittests/clang-apply-replacements/Makefile
index d0a90c2a8d71..61bbf8bd571d 100644
--- a/clang-tools-extra/unittests/clang-apply-replacements/Makefile
+++ b/clang-tools-extra/unittests/clang-apply-replacements/Makefile
@@ -11,11 +11,10 @@ CLANG_LEVEL = ../../../..
include $(CLANG_LEVEL)/../../Makefile.config
TESTNAME = ClangApplyReplacementsTests
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option \
+LINK_COMPONENTS := asmparser bitreader support mc mcparser option \
TransformUtils
USEDLIBS = clangApplyReplacements.a clangFormat.a clangTooling.a \
- clangToolingCore.a clangFrontend.a clangCodeGen.a \
+ clangToolingCore.a clangFrontend.a \
clangSerialization.a clangDriver.a clangRewriteFrontend.a \
clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
diff --git a/clang-tools-extra/unittests/clang-modernize/Makefile b/clang-tools-extra/unittests/clang-modernize/Makefile
index a7b1dbb11f97..6f7bb16d32c9 100644
--- a/clang-tools-extra/unittests/clang-modernize/Makefile
+++ b/clang-tools-extra/unittests/clang-modernize/Makefile
@@ -11,11 +11,10 @@ CLANG_LEVEL = ../../../..
include $(CLANG_LEVEL)/../../Makefile.config
TESTNAME = ClangModernizeTests
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option \
+LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
TransformUtils
USEDLIBS = modernizeCore.a clangFormat.a clangApplyReplacements.a \
- clangTooling.a clangToolingCore.a clangFrontend.a clangCodeGen.a \
+ clangTooling.a clangToolingCore.a clangFrontend.a \
clangSerialization.a clangDriver.a clangRewriteFrontend.a \
clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a \
diff --git a/clang-tools-extra/unittests/clang-query/Makefile b/clang-tools-extra/unittests/clang-query/Makefile
index 7008f108ab60..2ef1353c0a46 100644
--- a/clang-tools-extra/unittests/clang-query/Makefile
+++ b/clang-tools-extra/unittests/clang-query/Makefile
@@ -11,10 +11,9 @@ CLANG_LEVEL = ../../../..
include $(CLANG_LEVEL)/../../Makefile.config
TESTNAME = ClangQuery
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option \
+LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
TransformUtils
-USEDLIBS = clangQuery.a clangTooling.a clangFrontend.a clangCodeGen.a clangSerialization.a \
+USEDLIBS = clangQuery.a clangTooling.a clangFrontend.a clangSerialization.a \
clangDriver.a clangParse.a clangSema.a clangEdit.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangDynamicASTMatchers.a clangLex.a \
clangBasic.a
diff --git a/clang-tools-extra/unittests/clang-rename/Makefile b/clang-tools-extra/unittests/clang-rename/Makefile
index c4578ebe2cd4..d597e47583fc 100644
--- a/clang-tools-extra/unittests/clang-rename/Makefile
+++ b/clang-tools-extra/unittests/clang-rename/Makefile
@@ -11,10 +11,9 @@ CLANG_LEVEL = ../../../..
include $(CLANG_LEVEL)/../../Makefile.config
TESTNAME = ClangRenameTests
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option \
+LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
TransformUtils
-USEDLIBS = clangRename.a clangFrontend.a clangCodeGen.a clangSerialization.a clangDriver.a \
+USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \
clangTooling.a clangParse.a clangSema.a clangIndex.a \
clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \
diff --git a/clang-tools-extra/unittests/clang-tidy/Makefile b/clang-tools-extra/unittests/clang-tidy/Makefile
index f0f78f725705..82a3a27cb655 100644
--- a/clang-tools-extra/unittests/clang-tidy/Makefile
+++ b/clang-tools-extra/unittests/clang-tidy/Makefile
@@ -11,8 +11,7 @@ CLANG_LEVEL = ../../../..
include $(CLANG_LEVEL)/../../Makefile.config
TESTNAME = ClangTidy
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \
- instrumentation bitwriter support mc option \
+LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
TransformUtils
USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
clangTidyMiscModule.a clangTidyReadability.a clangTidy.a \
@@ -20,7 +19,7 @@ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
clangStaticAnalyzerCore.a \
clangFormat.a clangTooling.a clangToolingCore.a \
- clangFrontend.a clangCodeGen.a clangSerialization.a \
+ clangFrontend.a clangSerialization.a \
clangDriver.a clangRewriteFrontend.a clangRewrite.a \
clangParse.a clangSema.a clangAnalysis.a clangAST.a \
clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a