diff options
| author | Charles Davis <cdavis@mines.edu> | 2010-03-05 22:28:45 +0000 |
|---|---|---|
| committer | Charles Davis <cdavis@mines.edu> | 2010-03-05 22:28:45 +0000 |
| commit | 314fef6127a18db9f8c39f0081566f49c70a15f0 (patch) | |
| tree | 6050081af8ebef824334040ae6919f07e8392f91 /lib/CodeGen/TargetLoweringObjectFileImpl.cpp | |
| parent | b6174e3605a184df0e403d6502df1ed57cf34352 (diff) | |
Don't emit global symbols into the (__TEXT,__ustring) section on Darwin. This
is a workaround for <rdar://problem/7672401/> (which I filed).
This let's us build Wine on Darwin, and it gets the Qt build there a little bit
further (so Doug says).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97845 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/TargetLoweringObjectFileImpl.cpp')
| -rw-r--r-- | lib/CodeGen/TargetLoweringObjectFileImpl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/lib/CodeGen/TargetLoweringObjectFileImpl.cpp index 47164f733f..3b3be5d9b1 100644 --- a/lib/CodeGen/TargetLoweringObjectFileImpl.cpp +++ b/lib/CodeGen/TargetLoweringObjectFileImpl.cpp @@ -652,7 +652,7 @@ SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind, // FIXME: Alignment check should be handled by section classifier. if (Kind.isMergeable1ByteCString() || - Kind.isMergeable2ByteCString()) { + (Kind.isMergeable2ByteCString() && !GV->hasExternalLinkage())) { if (TM.getTargetData()->getPreferredAlignment( cast<GlobalVariable>(GV)) < 32) { if (Kind.isMergeable1ByteCString()) |