From fc0264a38e3d2e24d5cd44a6f028e2283f8b71ca Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Fri, 31 Jul 2009 16:17:13 +0000
Subject: fix PR4650: we only track sizes for certain objects, so only put
 something into the mergable section if it is one of our special cases.  This
 could obviously be improved, but this is the minimal fix and restores us to
 the previous behavior.

llvm-svn: 77679
---
 llvm/lib/Target/TargetLoweringObjectFile.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'llvm/lib/Target/TargetLoweringObjectFile.cpp')

diff --git a/llvm/lib/Target/TargetLoweringObjectFile.cpp b/llvm/lib/Target/TargetLoweringObjectFile.cpp
index 166f120..a42911d 100644
--- a/llvm/lib/Target/TargetLoweringObjectFile.cpp
+++ b/llvm/lib/Target/TargetLoweringObjectFile.cpp
@@ -340,7 +340,10 @@ getSectionFlagsAsString(SectionKind Kind, SmallVectorImpl<char> &Str) const {
     Str.push_back('x');
   if (Kind.isWriteable())
     Str.push_back('w');
-  if (Kind.isMergeableConst() || Kind.isMergeableCString())
+  if (Kind.isMergeableCString() ||
+      Kind.isMergeableConst4() ||
+      Kind.isMergeableConst8() ||
+      Kind.isMergeableConst16())
     Str.push_back('M');
   if (Kind.isMergeableCString())
     Str.push_back('S');
-- 
cgit v1.1