diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2017-09-06 00:57:53 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2017-09-06 00:57:53 +0000 |
| commit | dc8b7a96bdccc73c5f4ca1baef45afba6d405908 (patch) | |
| tree | 9becdcc93b28ec5e5db6d1e31bc8abd6531eafe0 /llvm/test/Object | |
| parent | bad2c4a000ae189736bbdd80df71aa0776b7c66f (diff) | |
| download | bcm5719-llvm-dc8b7a96bdccc73c5f4ca1baef45afba6d405908.tar.gz bcm5719-llvm-dc8b7a96bdccc73c5f4ca1baef45afba6d405908.zip | |
Use the section name if a STT_SECTION symbol has empty name.
Without this we would have multiple relocations pointing to symbols
with the same name: the empty string. There was no way for yaml2obj to
be able to handle that.
A more general solution would be to unique symbol names in a similar
way to how we unique section names. In practice I think this covers
all common cases and is a bit more user friendly than using names like
sym1, sym2, sym3, etc.
llvm-svn: 312603
Diffstat (limited to 'llvm/test/Object')
| -rw-r--r-- | llvm/test/Object/X86/obj2yaml-dup-symbol-name.s | 9 | ||||
| -rw-r--r-- | llvm/test/Object/obj2yaml.test | 53 |
2 files changed, 44 insertions, 18 deletions
diff --git a/llvm/test/Object/X86/obj2yaml-dup-symbol-name.s b/llvm/test/Object/X86/obj2yaml-dup-symbol-name.s new file mode 100644 index 00000000000..4cc175a19fc --- /dev/null +++ b/llvm/test/Object/X86/obj2yaml-dup-symbol-name.s @@ -0,0 +1,9 @@ +# RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux +# RUN: obj2yaml %t.o | FileCheck %s + +# CHECK: Relocations: +# CHECK: Symbol: .text +# CHECK: Symbols: +# CHECK: - Name: .text + + .quad .text diff --git a/llvm/test/Object/obj2yaml.test b/llvm/test/Object/obj2yaml.test index 73d466cc499..3d89f53bafc 100644 --- a/llvm/test/Object/obj2yaml.test +++ b/llvm/test/Object/obj2yaml.test @@ -268,19 +268,26 @@ ELF-MIPSEL-NEXT: - Name: '$.str' ELF-MIPSEL-NEXT: Type: STT_OBJECT ELF-MIPSEL-NEXT: Section: .rodata.str1.1 ELF-MIPSEL-NEXT: Size: 0x000000000000000D -ELF-MIPSEL-NEXT: - Type: STT_SECTION +ELF-MIPSEL-NEXT: - Name: .text +ELF-MIPSEL-NEXT: Type: STT_SECTION ELF-MIPSEL-NEXT: Section: .text -ELF-MIPSEL-NEXT: - Type: STT_SECTION +ELF-MIPSEL-NEXT: - Name: .data +ELF-MIPSEL-NEXT: Type: STT_SECTION ELF-MIPSEL-NEXT: Section: .data -ELF-MIPSEL-NEXT: - Type: STT_SECTION +ELF-MIPSEL-NEXT: - Name: .bss +ELF-MIPSEL-NEXT: Type: STT_SECTION ELF-MIPSEL-NEXT: Section: .bss -ELF-MIPSEL-NEXT: - Type: STT_SECTION +ELF-MIPSEL-NEXT: - Name: .mdebug.abi32 +ELF-MIPSEL-NEXT: Type: STT_SECTION ELF-MIPSEL-NEXT: Section: .mdebug.abi32 -ELF-MIPSEL-NEXT: - Type: STT_SECTION +ELF-MIPSEL-NEXT: - Name: .rodata.str1.1 +ELF-MIPSEL-NEXT: Type: STT_SECTION ELF-MIPSEL-NEXT: Section: .rodata.str1.1 -ELF-MIPSEL-NEXT: - Type: STT_SECTION +ELF-MIPSEL-NEXT: - Name: .reginfo +ELF-MIPSEL-NEXT: Type: STT_SECTION ELF-MIPSEL-NEXT: Section: .reginfo -ELF-MIPSEL-NEXT: - Type: STT_SECTION +ELF-MIPSEL-NEXT: - Name: .MIPS.abiflags +ELF-MIPSEL-NEXT: Type: STT_SECTION ELF-MIPSEL-NEXT: Section: .MIPS.abiflags ELF-MIPSEL-NEXT: Global: ELF-MIPSEL-NEXT: - Name: main @@ -336,17 +343,22 @@ ELF-MIPS64EL-NEXT: AddressAlign: 0x0000000000000004 ELF-MIPS64EL-NEXT: Content: '' ELF-MIPS64EL-NEXT: Symbols: ELF-MIPS64EL-NEXT: Local: -ELF-MIPS64EL-NEXT: - Type: STT_SECTION +ELF-MIPS64EL-NEXT: - Name: .text +ELF-MIPS64EL-NEXT: Type: STT_SECTION ELF-MIPS64EL-NEXT: Section: .text -ELF-MIPS64EL-NEXT: - Type: STT_SECTION +ELF-MIPS64EL-NEXT: - Name: .data +ELF-MIPS64EL-NEXT: Type: STT_SECTION ELF-MIPS64EL-NEXT: Section: .data -ELF-MIPS64EL-NEXT: - Type: STT_SECTION +ELF-MIPS64EL-NEXT: - Name: .bss +ELF-MIPS64EL-NEXT: Type: STT_SECTION ELF-MIPS64EL-NEXT: Section: .bss ELF-MIPS64EL-NEXT: - Name: bar ELF-MIPS64EL-NEXT: Section: .data -ELF-MIPS64EL-NEXT: - Type: STT_SECTION +ELF-MIPS64EL-NEXT: - Name: .MIPS.options +ELF-MIPS64EL-NEXT: Type: STT_SECTION ELF-MIPS64EL-NEXT: Section: .MIPS.options -ELF-MIPS64EL-NEXT: - Type: STT_SECTION +ELF-MIPS64EL-NEXT: - Name: .pdr +ELF-MIPS64EL-NEXT: Type: STT_SECTION ELF-MIPS64EL-NEXT: Section: .pdr ELF-MIPS64EL-NEXT: Global: ELF-MIPS64EL-NEXT: - Name: zed @@ -382,7 +394,7 @@ ELF-X86-64-NEXT: AddressAlign: 0x0000000000000008 ELF-X86-64-NEXT: Info: .text ELF-X86-64-NEXT: Relocations: ELF-X86-64-NEXT: - Offset: 0x000000000000000D -ELF-X86-64-NEXT: Symbol: '' +ELF-X86-64-NEXT: Symbol: .rodata.str1.1 ELF-X86-64-NEXT: Type: R_X86_64_32S ELF-X86-64-NEXT: - Offset: 0x0000000000000012 ELF-X86-64-NEXT: Symbol: puts @@ -396,11 +408,14 @@ ELF-X86-64-NEXT: Symbols: ELF-X86-64-NEXT: Local: ELF-X86-64-NEXT: - Name: trivial-object-test.s ELF-X86-64-NEXT: Type: STT_FILE -ELF-X86-64-NEXT: - Type: STT_SECTION +ELF-X86-64-NEXT: - Name: .text +ELF-X86-64-NEXT: Type: STT_SECTION ELF-X86-64-NEXT: Section: .text -ELF-X86-64-NEXT: - Type: STT_SECTION +ELF-X86-64-NEXT: - Name: .rodata.str1.1 +ELF-X86-64-NEXT: Type: STT_SECTION ELF-X86-64-NEXT: Section: .rodata.str1.1 -ELF-X86-64-NEXT: - Type: STT_SECTION +ELF-X86-64-NEXT: - Name: .note.GNU-stack +ELF-X86-64-NEXT: Type: STT_SECTION ELF-X86-64-NEXT: Section: .note.GNU-stack ELF-X86-64-NEXT: Global: ELF-X86-64-NEXT: - Name: main @@ -431,9 +446,11 @@ ELF-AVR-NEXT: AddressAlign: 0x0000000000000001 ELF-AVR-NEXT: Content: '' ELF-AVR-NEXT: Symbols: ELF-AVR-NEXT: Local: -ELF-AVR-NEXT: - Type: STT_SECTION +ELF-AVR-NEXT: - Name: .text +ELF-AVR-NEXT: Type: STT_SECTION ELF-AVR-NEXT: Section: .text -ELF-AVR-NEXT: - Type: STT_SECTION +ELF-AVR-NEXT: - Name: .data +ELF-AVR-NEXT: Type: STT_SECTION ELF-AVR-NEXT: Section: .data ELF-AVR-NEXT: Value: 0x0000000000800060 ELF-AVR-NEXT: - Name: a.o |
