diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-01-29 14:23:28 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-01-29 14:23:28 +0000 |
| commit | 093dcc43f75ba47cd3f223910fb214134200e111 (patch) | |
| tree | 814f4c6aa93aff281e61cdb531ba81c6523db6b0 /llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp | |
| parent | 33804cac96a6d0bc2d60ae24494f684de97add79 (diff) | |
| download | bcm5719-llvm-093dcc43f75ba47cd3f223910fb214134200e111.tar.gz bcm5719-llvm-093dcc43f75ba47cd3f223910fb214134200e111.zip | |
Use isMergeableConst now that it is sane.
llvm-svn: 227441
Diffstat (limited to 'llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp index 41fb0645c81..5e5f8e4d964 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()) |
