summaryrefslogtreecommitdiff
path: root/lib/CodeGen/CodeGenModule.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-01-21 01:50:12 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-01-21 01:50:12 +0000
commitf68203224c237e3ca84553fc5dad52305cc3e048 (patch)
treef04acb568bc156305bd11505ac266081a266d1eb /lib/CodeGen/CodeGenModule.cpp
parent61c5a77816956c54c864a3f1cca3cfc9941e15fc (diff)
downloadclang-f68203224c237e3ca84553fc5dad52305cc3e048.tar.gz
clang-f68203224c237e3ca84553fc5dad52305cc3e048.tar.bz2
clang-f68203224c237e3ca84553fc5dad52305cc3e048.tar.xz
Now that r199688 avoids the real issue, use private linkage for objc strings.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@199705 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CodeGenModule.cpp')
-rw-r--r--lib/CodeGen/CodeGenModule.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 12edab7cd6..7f77df00f2 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -2383,11 +2383,8 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) {
// FIXME: why do utf strings get "_" labels instead of "L" labels?
Linkage = llvm::GlobalValue::InternalLinkage;
else
- // FIXME: With OS X ld 123.2 (xcode 4) and LTO we would get a linker error
- // when using private linkage. It is not clear if this is a bug in ld
- // or a reasonable new restriction.
- Linkage = llvm::GlobalValue::LinkerPrivateLinkage;
-
+ Linkage = llvm::GlobalValue::PrivateLinkage;
+
// Note: -fwritable-strings doesn't make the backing store strings of
// CFStrings writable. (See <rdar://problem/10657500>)
llvm::GlobalVariable *GV =