[llvm-commits] [llvm] r53340 - /llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp

[Anton Korobeynikov]

Author: asl
Date: Wed Jul  9 14:06:02 2008
New Revision: 53340

URL: http://llvm.org/viewvc/llvm-project?rev=53340&view=rev
Log:
Weak stuff always goes to coalesced sections on Darwin

Modified:
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=53340&r1=53339&r2=53340&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Wed Jul  9 14:06:02 2008
@@ -263,9 +263,13 @@
    case SectionKind::ROData:
     return (isWeak ? ConstDataCoalSection : getReadOnlySection_());
    case SectionKind::RODataMergeStr:
-    return MergeableStringSection(cast<GlobalVariable>(GV));
+    return (isWeak ?
+            ConstDataCoalSection :
+            MergeableStringSection(cast<GlobalVariable>(GV)));
    case SectionKind::RODataMergeConst:
-    return MergeableConstSection(cast<GlobalVariable>(GV));
+    return (isWeak ?
+            ConstDataCoalSection:
+            MergeableConstSection(cast<GlobalVariable>(GV)));
    default:
     assert(0 && "Unsuported section kind for global");
   }