From cacd94e24224eed079955f457a22715a5511263e Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Mon, 4 Apr 2016 15:30:44 +0000 Subject: [PATCH] AnnotateFunctions: Tweak for mingw. - Externalize the registry. - Update libdeps. llvm-svn: 265301 --- clang/examples/AnnotateFunctions/CMakeLists.txt | 2 ++ clang/include/clang/Lex/Preprocessor.h | 2 ++ clang/lib/Lex/Preprocessor.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/clang/examples/AnnotateFunctions/CMakeLists.txt b/clang/examples/AnnotateFunctions/CMakeLists.txt index 5aa6a90..10e16f2 100644 --- a/clang/examples/AnnotateFunctions/CMakeLists.txt +++ b/clang/examples/AnnotateFunctions/CMakeLists.txt @@ -3,7 +3,9 @@ add_llvm_loadable_module(AnnotateFunctions AnnotateFunctions.cpp) if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) target_link_libraries(AnnotateFunctions ${cmake_2_8_12_PRIVATE} clangAST + clangBasic clangFrontend + clangLex LLVMSupport ) endif() diff --git a/clang/include/clang/Lex/Preprocessor.h b/clang/include/clang/Lex/Preprocessor.h index f7a9ea9..817c09f 100644 --- a/clang/include/clang/Lex/Preprocessor.h +++ b/clang/include/clang/Lex/Preprocessor.h @@ -1943,4 +1943,6 @@ typedef llvm::Registry PragmaHandlerRegistry; } // end namespace clang +extern template class llvm::Registry; + #endif diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp index 70b9921..297b556 100644 --- a/clang/lib/Lex/Preprocessor.cpp +++ b/clang/lib/Lex/Preprocessor.cpp @@ -53,6 +53,8 @@ #include "llvm/Support/raw_ostream.h" using namespace clang; +template class llvm::Registry; + //===----------------------------------------------------------------------===// ExternalPreprocessorSource::~ExternalPreprocessorSource() { } -- 2.7.4