diff options
Diffstat (limited to 'llvm/lib/MC')
| -rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index 40b84ae4585..92aad94f17f 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/lib/MC/ELFObjectWriter.cpp @@ -1851,7 +1851,8 @@ const MCSymbol *MipsELFObjectWriter::ExplicitRelSym(const MCAssembler &Asm,    assert(Target.getSymA() && "SymA cannot be 0.");    const MCSymbol &Sym = Target.getSymA()->getSymbol(); -  if (Sym.getSection().getKind().isMergeable1ByteCString()) +  if (Sym.getSection().getKind().isMergeableCString() || +      Sym.getSection().getKind().isMergeableConst())      return &Sym;    return NULL; @@ -1914,4 +1915,3 @@ unsigned MipsELFObjectWriter::GetRelocType(const MCValue &Target,    return Type;  } -  | 

