AnnotateFunctions: Tweak for mingw.

  - Externalize the registry.
  - Update libdeps.

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

diff --git a/examples/AnnotateFunctions/CMakeLists.txt b/examples/AnnotateFunctions/CMakeLists.txt
index 5aa6a9064ca03b486adeaad4a1b4865048e1f498..10e16f254df22f19380aab7d2d1092d26e03ecbf 100644 (file)
--- a/examples/AnnotateFunctions/CMakeLists.txt
+++ b/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/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h
index f7a9ea95182563945f7623242cff0f51e7144286..817c09fcdbca8caa757234f738c34326d348a19e 100644 (file)
--- a/include/clang/Lex/Preprocessor.h
+++ b/include/clang/Lex/Preprocessor.h
@@ -1943,4 +1943,6 @@ typedef llvm::Registry<PragmaHandler> PragmaHandlerRegistry;
 
 }  // end namespace clang
 
+extern template class llvm::Registry<clang::PragmaHandler>;
+
 #endif

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 70b992170c9ad8428d96df9b6ed59f86c555fc68..297b556015f42448ac0d8305b22c4741cd613d86 100644 (file)
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -53,6 +53,8 @@
 #include "llvm/Support/raw_ostream.h"
 using namespace clang;
 
+template class llvm::Registry<clang::PragmaHandler>;
+
 //===----------------------------------------------------------------------===//
 ExternalPreprocessorSource::~ExternalPreprocessorSource() { }