Index: llvm/include/llvm/Object/ELFObjectFile.h =================================================================== --- llvm/include/llvm/Object/ELFObjectFile.h +++ llvm/include/llvm/Object/ELFObjectFile.h @@ -56,6 +56,7 @@ virtual uint16_t getEMachine() const = 0; virtual uint64_t getSymbolSize(DataRefImpl Symb) const = 0; + virtual uint8_t getSymbolBinding(DataRefImpl Symb) const = 0; virtual uint8_t getSymbolOther(DataRefImpl Symb) const = 0; virtual uint8_t getSymbolELFType(DataRefImpl Symb) const = 0; @@ -144,6 +145,10 @@ return getObject()->getSymbolSize(getRawDataRefImpl()); } + uint8_t getBinding() const { + return getObject()->getSymbolBinding(getRawDataRefImpl()); + } + uint8_t getOther() const { return getObject()->getSymbolOther(getRawDataRefImpl()); } @@ -251,6 +256,7 @@ uint32_t getSymbolAlignment(DataRefImpl Symb) const override; uint64_t getCommonSymbolSizeImpl(DataRefImpl Symb) const override; uint32_t getSymbolFlags(DataRefImpl Symb) const override; + uint8_t getSymbolBinding(DataRefImpl Symb) const override; uint8_t getSymbolOther(DataRefImpl Symb) const override; uint8_t getSymbolELFType(DataRefImpl Symb) const override; Expected getSymbolType(DataRefImpl Symb) const override; @@ -554,6 +560,11 @@ } template +uint8_t ELFObjectFile::getSymbolBinding(DataRefImpl Symb) const { + return getSymbol(Symb)->getBinding(); +} + +template uint8_t ELFObjectFile::getSymbolOther(DataRefImpl Symb) const { return getSymbol(Symb)->st_other; } Index: llvm/test/tools/llvm-nm/X86/unique.test =================================================================== --- /dev/null +++ llvm/test/tools/llvm-nm/X86/unique.test @@ -0,0 +1,39 @@ +# Check that we print 'u' for unique symbols +# +# The yaml in this test was generated by running +# ./bin/llvm-mc %s -filetype=obj -triple=x86_64-pc-linux | ./bin/obj2yaml +# on the assembly code reproducer below +# .data +# .type foo,%gnu_unique_object +#foo: +# .byte 0 +# which was copied from the bug report +# https://bugs.llvm.org/show_bug.cgi?id=41353 +# +# RUN: yaml2obj < %s | llvm-nm - | FileCheck %s + +--- !ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + Machine: EM_X86_64 +Sections: + - Name: .text + Type: SHT_PROGBITS + Flags: [ SHF_ALLOC, SHF_EXECINSTR ] + AddressAlign: 0x0000000000000004 + Content: '' + - Name: .data + Type: SHT_PROGBITS + Flags: [ SHF_WRITE, SHF_ALLOC ] + AddressAlign: 0x0000000000000001 + Content: '00' +Symbols: + - Name: foo + Type: STT_OBJECT + Section: .data + Binding: STB_GNU_UNIQUE +... + +# CHECK: 0000000000000000 u foo Index: llvm/tools/llvm-nm/llvm-nm.cpp =================================================================== --- llvm/tools/llvm-nm/llvm-nm.cpp +++ llvm/tools/llvm-nm/llvm-nm.cpp @@ -944,7 +944,7 @@ return 't'; case (ELF::SHF_TLS | ELF::SHF_ALLOC | ELF::SHF_WRITE): case (ELF::SHF_ALLOC | ELF::SHF_WRITE): - return 'd'; + return SymI->getBinding() == ELF::STB_GNU_UNIQUE ? 'u' : 'd'; case ELF::SHF_ALLOC: case (ELF::SHF_ALLOC | ELF::SHF_MERGE): case (ELF::SHF_ALLOC | ELF::SHF_MERGE | ELF::SHF_STRINGS): @@ -1172,7 +1172,9 @@ else Ret = getSymbolNMTypeChar(cast(Obj), I); - if (Symflags & object::SymbolRef::SF_Global) + if ((Symflags & object::SymbolRef::SF_Global) && + (!(Obj.isELF() && + (ELFSymbolRef(*I).getBinding() == ELF::STB_GNU_UNIQUE)))) Ret = toupper(Ret); return Ret;