Drop mergeable flag, if size is no suitable

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53313 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/X86TargetAsmInfo.cpp b/lib/Target/X86/X86TargetAsmInfo.cpp
index 7a56ed5..304e5a5 100644
--- a/lib/Target/X86/X86TargetAsmInfo.cpp
+++ b/lib/Target/X86/X86TargetAsmInfo.cpp
@@ -323,8 +323,11 @@
       Type = C->getType();
 
     unsigned Size = TD->getABITypeSize(Type);
-    if (Size > 16)
+    if (Size > 16) {
+      // Too big for mergeable
       Size = 0;
+      Flags &= ~SectionFlags::Mergeable;
+    }
     Flags = SectionFlags::setEntitySize(Flags, Size);
   }
 
@@ -513,8 +516,11 @@
       Type = C->getType();
 
     unsigned Size = TD->getABITypeSize(Type);
-    if (Size > 16)
+    if (Size > 16) {
+      // Too big for mergeable
       Size = 0;
+      Flags &= ~SectionFlags::Mergeable;
+    }
     Flags = SectionFlags::setEntitySize(Flags, Size);
   }