From 093dcc43f75ba47cd3f223910fb214134200e111 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 29 Jan 2015 14:23:28 +0000 Subject: [PATCH] Use isMergeableConst now that it is sane. llvm-svn: 227441 --- llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp index 41fb0645c813..5e5f8e4d964d 100644 --- a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp +++ b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp @@ -182,9 +182,7 @@ getELFSectionFlags(SectionKind K) { if (K.isThreadLocal()) Flags |= ELF::SHF_TLS; - // K.isMergeableConst() is left out to honour PR4650 - if (K.isMergeableCString() || K.isMergeableConst4() || - K.isMergeableConst8() || K.isMergeableConst16()) + if (K.isMergeableCString() || K.isMergeableConst()) Flags |= ELF::SHF_MERGE; if (K.isMergeableCString())