Only common symbol on MachO and COFF have a size.
For COFF we already had a custom format.
For MachO, there is no native objdump and we were printing it as ELF. Now
we only print the sizes for symbols that actually have them.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240422
91177308-0d34-0410-b5e6-
96231b3b80d8
macho-i386: trivial-object-test.macho-i386: file format Mach-O 32-bit i386
macho-i386: SYMBOL TABLE:
-macho-i386: 00000000 g F __TEXT,__text 00000000 _main
-macho-i386: 00000000 *UND* 00000000 _SomeOtherFunction
-macho-i386: 00000000 *UND* 00000000 _puts
+macho-i386: 00000000 g F __TEXT,__text _main
+macho-i386: 00000000 *UND* _SomeOtherFunction
+macho-i386: 00000000 *UND* _puts
ELF-shared: shared-object-test.elf-i386: file format
ELF-shared: SYMBOL TABLE:
RUN: llvm-objdump -macho -t %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
CHECK: SYMBOL TABLE:
-CHECK: 000000000000003b l F __TEXT,__cstring 00000000 L_.str
-CHECK: 0000000000000068 l F __TEXT,__eh_frame 00000000 EH_frame0
-CHECK: 0000000000000000 g F __TEXT,__text 00000000 _main
-CHECK: 0000000000000080 g F __TEXT,__eh_frame 00000000 _main.eh
-CHECK: 0000000000000000 *UND* 00000000 _printf
+CHECK: 000000000000003b l F __TEXT,__cstring L_.str
+CHECK: 0000000000000068 l F __TEXT,__eh_frame EH_frame0
+CHECK: 0000000000000000 g F __TEXT,__text _main
+CHECK: 0000000000000080 g F __TEXT,__eh_frame _main.eh
+CHECK: 0000000000000000 *UND* _printf
continue;
if (error(Symbol.getType(Type)))
continue;
- uint64_t Size = Symbol.getSize();
if (error(Symbol.getSection(Section)))
continue;
StringRef Name;
bool Common = Flags & SymbolRef::SF_Common;
bool Hidden = Flags & SymbolRef::SF_Hidden;
- if (Common) {
- uint32_t Alignment = Symbol.getAlignment();
- Address = Size;
- Size = Alignment;
- }
+ if (Common)
+ Address = Symbol.getSize();
+
if (Address == UnknownAddressOrSize)
Address = 0;
- if (Size == UnknownAddressOrSize)
- Size = 0;
char GlobLoc = ' ';
if (Type != SymbolRef::ST_Unknown)
GlobLoc = Global ? 'g' : 'l';
SectionName = "";
outs() << SectionName;
}
- outs() << '\t'
- << format("%08" PRIx64 " ", Size);
+
+ outs() << '\t';
+ if (Common)
+ outs() << format("%08" PRIx64 " ", Symbol.getAlignment());
+ else if (isa<ELFObjectFileBase>(o))
+ outs() << format("%08" PRIx64 " ", Symbol.getSize());
+
if (Hidden) {
outs() << ".hidden ";
}