From e95edbf5a966ed5e5c6f1683ef5e37c10fd10192 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Wed, 25 Feb 2015 01:32:04 +0000 Subject: [PATCH] Adapt clang-tools-extra to clang module format changes. - add clangCodeGen.a to the tools that need it - tweak pp-trace command line handling to not conflict with clang's. llvm-svn: 230424 --- .../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, 71 insertions(+), 50 deletions(-) diff --git a/clang-tools-extra/clang-apply-replacements/tool/Makefile b/clang-tools-extra/clang-apply-replacements/tool/Makefile index 8c911720ebde..916a54da261d 100644 --- a/clang-tools-extra/clang-apply-replacements/tool/Makefile +++ b/clang-tools-extra/clang-apply-replacements/tool/Makefile @@ -17,9 +17,10 @@ TOOL_NO_EXPORTS = 1 SOURCES = ClangApplyReplacementsMain.cpp -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \ + instrumentation bitwriter support mc option USEDLIBS = clangApplyReplacements.a clangFormat.a \ - clangTooling.a clangToolingCore.a clangFrontend.a \ + clangTooling.a clangToolingCore.a clangFrontend.a clangCodeGen.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 efc361343ff6..36c871ce149a 100644 --- a/clang-tools-extra/clang-modernize/tool/Makefile +++ b/clang-tools-extra/clang-modernize/tool/Makefile @@ -35,9 +35,10 @@ 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 support mc mcparser option +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \ + instrumentation bitwriter support mc option USEDLIBS = modernizeCore.a clangFormat.a \ - clangTooling.a clangToolingCore.a clangFrontend.a \ + clangTooling.a clangToolingCore.a clangFrontend.a clangCodeGen.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 f62b0b541313..110f366e202a 100644 --- a/clang-tools-extra/clang-query/tool/Makefile +++ b/clang-tools-extra/clang-query/tool/Makefile @@ -17,9 +17,10 @@ TOOL_NO_EXPORTS = 1 SOURCES = ClangQuery.cpp -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \ + instrumentation bitwriter support mc option USEDLIBS = clangQuery.a clangDynamicASTMatchers.a clangFormat.a clangTooling.a \ - clangFrontend.a clangSerialization.a clangDriver.a clangRewriteFrontend.a \ + clangFrontend.a clangCodeGen.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 b3d9555f37b7..2b348cee35d5 100644 --- a/clang-tools-extra/clang-rename/tool/Makefile +++ b/clang-tools-extra/clang-rename/tool/Makefile @@ -1,8 +1,9 @@ CLANG_LEVEL := ../../../.. TOOLNAME = clang-rename include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option -USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \ +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 \ 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 f2d83ebf2292..e9e0bf57826e 100644 --- a/clang-tools-extra/clang-tidy/tool/Makefile +++ b/clang-tools-extra/clang-tidy/tool/Makefile @@ -15,13 +15,14 @@ TOOLNAME = clang-tidy TOOL_NO_EXPORTS = 1 include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \ + instrumentation bitwriter 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 clangSerialization.a clangDriver.a clangParse.a \ + clangFrontend.a clangCodeGen.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 f96540b751dc..11aaf730e94a 100644 --- a/clang-tools-extra/modularize/Makefile +++ b/clang-tools-extra/modularize/Makefile @@ -15,8 +15,10 @@ NO_INSTALL = 0 # No plugins, optimize startup time. TOOL_NO_EXPORTS = 1 -LINK_COMPONENTS := mcparser bitreader support mc option TransformUtils -USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \ +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 \ 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 3467ecb31f47..81bcb302ef59 100644 --- a/clang-tools-extra/pp-trace/Makefile +++ b/clang-tools-extra/pp-trace/Makefile @@ -14,8 +14,10 @@ TOOLNAME = pp-trace # No plugins, optimize startup time. TOOL_NO_EXPORTS = 1 -LINK_COMPONENTS := mcparser bitreader support mc option TransformUtils -USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \ +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 \ 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 aae6215151f1..fa9863986a87 100644 --- a/clang-tools-extra/pp-trace/PPTrace.cpp +++ b/clang-tools-extra/pp-trace/PPTrace.cpp @@ -79,28 +79,6 @@ using namespace clang::tooling; using namespace llvm; using namespace llvm::opt; -// Options: - -// Collect the source files. -cl::list SourcePaths(cl::Positional, - cl::desc(" [... ]"), - cl::OneOrMore); - -// Option to specify a list or one or more callback names to ignore. -cl::opt IgnoreCallbacks( - "ignore", cl::init(""), - cl::desc("Ignore callbacks, i.e. \"Callback1, Callback2...\".")); - -// Option to specify the trace output file name. -cl::opt 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 -CC1Arguments(cl::ConsumeAfter, - cl::desc("...")); - // Frontend action stuff: // Consumer is responsible for setting up the callbacks. @@ -175,10 +153,35 @@ int outputPPTrace(std::vector &CallbackCalls, // Program entry point. int main(int Argc, const char **Argv) { + // Collect the source files. + cl::list SourcePaths(cl::Positional, + cl::desc(" [... ]"), + cl::OneOrMore); + + // Option to specify a list or one or more callback names to ignore. + cl::opt IgnoreCallbacks( + "ignore", cl::init(""), + cl::desc("Ignore callbacks, i.e. \"Callback1, Callback2...\".")); + + // Option to specify the trace output file name. + cl::opt 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 + CC1Arguments(cl::ConsumeAfter, + cl::desc("...")); // 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 IgnoreCallbacksStrings; StringRef(IgnoreCallbacks).split(IgnoreCallbacksStrings, ",", diff --git a/clang-tools-extra/remove-cstr-calls/Makefile b/clang-tools-extra/remove-cstr-calls/Makefile index b4110c184b8b..432c14c70bdb 100644 --- a/clang-tools-extra/remove-cstr-calls/Makefile +++ b/clang-tools-extra/remove-cstr-calls/Makefile @@ -16,8 +16,10 @@ NO_INSTALL = 1 TOOL_NO_EXPORTS = 1 include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option -USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ +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 \ 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 8a461e4dc7cb..2d5c0c5be658 100644 --- a/clang-tools-extra/tool-template/Makefile +++ b/clang-tools-extra/tool-template/Makefile @@ -16,8 +16,10 @@ NO_INSTALL = 1 TOOL_NO_EXPORTS = 1 include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option -USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ +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 \ 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 61bbf8bd571d..d0a90c2a8d71 100644 --- a/clang-tools-extra/unittests/clang-apply-replacements/Makefile +++ b/clang-tools-extra/unittests/clang-apply-replacements/Makefile @@ -11,10 +11,11 @@ CLANG_LEVEL = ../../../.. include $(CLANG_LEVEL)/../../Makefile.config TESTNAME = ClangApplyReplacementsTests -LINK_COMPONENTS := asmparser bitreader support mc mcparser option \ +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \ + instrumentation bitwriter support mc option \ TransformUtils USEDLIBS = clangApplyReplacements.a clangFormat.a clangTooling.a \ - clangToolingCore.a clangFrontend.a \ + clangToolingCore.a clangFrontend.a clangCodeGen.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 6f7bb16d32c9..a7b1dbb11f97 100644 --- a/clang-tools-extra/unittests/clang-modernize/Makefile +++ b/clang-tools-extra/unittests/clang-modernize/Makefile @@ -11,10 +11,11 @@ CLANG_LEVEL = ../../../.. include $(CLANG_LEVEL)/../../Makefile.config TESTNAME = ClangModernizeTests -LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \ + instrumentation bitwriter support mc option \ TransformUtils USEDLIBS = modernizeCore.a clangFormat.a clangApplyReplacements.a \ - clangTooling.a clangToolingCore.a clangFrontend.a \ + clangTooling.a clangToolingCore.a clangFrontend.a clangCodeGen.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 2ef1353c0a46..7008f108ab60 100644 --- a/clang-tools-extra/unittests/clang-query/Makefile +++ b/clang-tools-extra/unittests/clang-query/Makefile @@ -11,9 +11,10 @@ CLANG_LEVEL = ../../../.. include $(CLANG_LEVEL)/../../Makefile.config TESTNAME = ClangQuery -LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \ + instrumentation bitwriter support mc option \ TransformUtils -USEDLIBS = clangQuery.a clangTooling.a clangFrontend.a clangSerialization.a \ +USEDLIBS = clangQuery.a clangTooling.a clangFrontend.a clangCodeGen.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 d597e47583fc..c4578ebe2cd4 100644 --- a/clang-tools-extra/unittests/clang-rename/Makefile +++ b/clang-tools-extra/unittests/clang-rename/Makefile @@ -11,9 +11,10 @@ CLANG_LEVEL = ../../../.. include $(CLANG_LEVEL)/../../Makefile.config TESTNAME = ClangRenameTests -LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \ + instrumentation bitwriter support mc option \ TransformUtils -USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \ +USEDLIBS = clangRename.a clangFrontend.a clangCodeGen.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 82a3a27cb655..f0f78f725705 100644 --- a/clang-tools-extra/unittests/clang-tidy/Makefile +++ b/clang-tools-extra/unittests/clang-tidy/Makefile @@ -11,7 +11,8 @@ CLANG_LEVEL = ../../../.. include $(CLANG_LEVEL)/../../Makefile.config TESTNAME = ClangTidy -LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \ + instrumentation bitwriter support mc option \ TransformUtils USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \ clangTidyMiscModule.a clangTidyReadability.a clangTidy.a \ @@ -19,7 +20,7 @@ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \ clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \ clangStaticAnalyzerCore.a \ clangFormat.a clangTooling.a clangToolingCore.a \ - clangFrontend.a clangSerialization.a \ + clangFrontend.a clangCodeGen.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