diff options
| -rw-r--r-- | lib/MC/ELFObjectWriter.cpp | 4 | ||||
| -rw-r--r-- | lib/MC/MCELFStreamer.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp index ed4f972be5..5713f47026 100644 --- a/lib/MC/ELFObjectWriter.cpp +++ b/lib/MC/ELFObjectWriter.cpp @@ -439,7 +439,7 @@ void ELFObjectWriterImpl::WriteSymbolTable(MCDataFragment *F, assert((Data.getFlags() & ELF_STB_Global) && "External symbol requires STB_GLOBAL flag"); WriteSymbol(F, MSD, Layout); - if (Data.getFlags() & ELF_STB_Local) + if ((Data.getFlags() & (0xf << ELF_STB_Shift)) == ELF_STB_Local) LastLocalSymbolIndex++; } @@ -448,7 +448,7 @@ void ELFObjectWriterImpl::WriteSymbolTable(MCDataFragment *F, MCSymbolData &Data = *MSD.SymbolData; Data.setFlags(Data.getFlags() | ELF_STB_Global); WriteSymbol(F, MSD, Layout); - if (Data.getFlags() & ELF_STB_Local) + if ((Data.getFlags() & (0xf << ELF_STB_Shift)) == ELF_STB_Local) LastLocalSymbolIndex++; } } diff --git a/lib/MC/MCELFStreamer.cpp b/lib/MC/MCELFStreamer.cpp index 570c3917ab..583052d063 100644 --- a/lib/MC/MCELFStreamer.cpp +++ b/lib/MC/MCELFStreamer.cpp @@ -196,7 +196,9 @@ void MCELFStreamer::EmitSymbolAttribute(MCSymbol *Symbol, break; case MCSA_Local: - SD.setFlags(SD.getFlags() | ELF_STB_Local); + // ELF_STB_Local is 0, so zero the ELF_STB area + // SD.getFlags() | ELF_STB_Local is a NOP + SD.setFlags(SD.getFlags() & ~(0xf << ELF_STB_Shift)); break; case MCSA_ELF_TypeFunction: |