From 6839d23be79f9ff25f314889365eb3fa8c251d60 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Tue, 21 Jan 2014 01:50:12 +0000 Subject: Now that r199688 avoids the real issue, use private linkage for objc strings. llvm-svn: 199705 --- clang/lib/CodeGen/CodeGenModule.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenModule.cpp') diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 12edab7cd67..7f77df00f2c 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/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 ) llvm::GlobalVariable *GV = -- cgit v1.2.3