Finish fixing <rdar://problem/5929344> clang ObjC rewriter: "extern int __CFConstantS...

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

diff --git a/Driver/RewriteObjC.cpp b/Driver/RewriteObjC.cpp
index a6e53649740e7b8d67f34d3284045ee482f0a72c..b83200e16ec15f2be4d37258d785524e10b7fb75 100644 (file)
--- a/Driver/RewriteObjC.cpp
+++ b/Driver/RewriteObjC.cpp
@@ -358,7 +358,11 @@ void RewriteObjC::Initialize(ASTContext &context) {
   Preamble += "  char *str;\n";
   Preamble += "  long length;\n";
   Preamble += "};\n";
+  Preamble += "#ifdef CF_EXPORT_CONSTANT_STRING\n";
+  Preamble += "extern \"C\" __declspec(dllexport) int __CFConstantStringClassReference[];\n";
+  Preamble += "#else\n";
   Preamble += "__OBJC_RW_EXTERN int __CFConstantStringClassReference[];\n";
+  Preamble += "#endif\n";
   Preamble += "#define __NSCONSTANTSTRINGIMPL\n";
   Preamble += "#endif\n";
   if (LangOpts.Microsoft) {