diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2011-03-14 17:55:00 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2011-03-14 17:55:00 +0000 |
commit | 7a6cf01895a250cf3cdb54551937d12bb4289397 (patch) | |
tree | c784d177dbf0c4ba491bd1bb3f8176360d4e5277 /clang/lib/CodeGen | |
parent | e92dcceab733b8518e9489d74f4e3741f2f77257 (diff) | |
download | bcm5719-llvm-7a6cf01895a250cf3cdb54551937d12bb4289397.tar.gz bcm5719-llvm-7a6cf01895a250cf3cdb54551937d12bb4289397.zip |
Fix link of libxul with LTO and the linker in xcode4. It is not clear if this
is working around a bug in ld or if the new linker has a reasonable reason
for wanting the string constant to be linker visible.
llvm-svn: 127594
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index a758d610f8d..4753bc38d3e 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -1669,7 +1669,10 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) { // does make plain ascii ones writable. isConstant = true; } else { - Linkage = llvm::GlobalValue::PrivateLinkage; + // 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::InternalLinkage; isConstant = !Features.WritableStrings; } |