diff options
author | Roman Divacky <rdivacky@freebsd.org> | 2010-09-08 18:08:40 +0000 |
---|---|---|
committer | Roman Divacky <rdivacky@freebsd.org> | 2010-09-08 18:08:40 +0000 |
commit | b629dcca72a45ac0ab0095c3dc52cd0a378b1431 (patch) | |
tree | e85fada7b7ef5fd111e9c19c1b2574e0eac85eb7 /lib | |
parent | 30268be89df6444f5ffb585439b3fbfec9055197 (diff) | |
download | external_llvm-b629dcca72a45ac0ab0095c3dc52cd0a378b1431.zip external_llvm-b629dcca72a45ac0ab0095c3dc52cd0a378b1431.tar.gz external_llvm-b629dcca72a45ac0ab0095c3dc52cd0a378b1431.tar.bz2 |
ELF_STB_Local is 0 so setting and checking it must be done specially
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@113375 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-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 ed4f972..5713f47 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 570c391..583052d 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: |