6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-08 19:25:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix printing of common symbols.

Browse Source 
Printing the symbol size matches the behavior or both gnu nm and freebsd nm.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241480 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2015-07-06 18:18:44 +00:00
parent edfa571cbd
commit e473de21aa
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/Object/X86/nm-print-size.s
View File

@@ -3,6 +3,7 @@
// CHECK: 0000000000000000 ffffffffffffffff n a // CHECK: 0000000000000000 ffffffffffffffff n a
// CHECK: 0000000000000000 0000000000000000 N b // CHECK: 0000000000000000 0000000000000000 N b
// CHECK: 0000000000000004 0000000000000004 C c
.section foo .section foo
a: a:
@@ -10,3 +11,5 @@ a:
.global b .global b
b: b:
.comm c,4,8

13
tools/llvm-nm/llvm-nm.cpp
View File

@@ -901,10 +901,15 @@ static void dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName,
S.Size = ELFSymbolRef(Sym).getSize(); S.Size = ELFSymbolRef(Sym).getSize();
} }
if (PrintAddress && isa<ObjectFile>(Obj)) { if (PrintAddress && isa<ObjectFile>(Obj)) {
ErrorOr<uint64_t> AddressOrErr = SymbolRef(Sym).getAddress(); SymbolRef SymRef(Sym);
if (error(AddressOrErr.getError())) if (SymFlags & SymbolRef::SF_Common) {
break; S.Address = SymRef.getCommonSize();
S.Address = *AddressOrErr; } else {
ErrorOr<uint64_t> AddressOrErr = SymRef.getAddress();
if (error(AddressOrErr.getError()))
break;
S.Address = *AddressOrErr;
}
} }
S.TypeChar = getNMTypeChar(Obj, Sym); S.TypeChar = getNMTypeChar(Obj, Sym);
if (error(Sym.printName(OS))) if (error(Sym.printName(OS)))