From 1a2d2b492a3d16cd9d743c4eb2cafaf11b50092a Mon Sep 17 00:00:00 2001 From: Georgii Rymar Date: Thu, 19 Dec 2019 14:01:23 +0300 Subject: [PATCH] [llvm-readobj] - Merge `gnu-symbols.test` to `symbols.test` and cleanup. This cleans up and merges `gnu-symbols.test` to `symbols.test`. Initially `gnu-symbols.test` tested the following things: 1) How symbols are printed in GNU style. It does not make sense to have a separate file for such tests. 2) It tried to test proc-specific symbol indexes. The test was incomplete and also we already have `symbol-shndx.test` for that, so this part was removed. 3) It tested `--dyn-symbols` and `--symbols` correlation. All following cases were moved to `symbols.test`: a) That `--dyn-symbols` does not trigger showing regular symbols.. b) That `--symbols` triggers `--dyn-symbols` implicitly. c) That `--dyn-symbols` and `--symbols` works fine together. Differential revision: https://reviews.llvm.org/D71697 --- .../ELF/Inputs/relocs.obj.elf-x86_64 | Bin 1984 -> 0 bytes .../Inputs/symbols-proc-specific.elf-hexagon | Bin 600 -> 0 bytes .../tools/llvm-readobj/ELF/gnu-symbols.test | 57 ------- llvm/test/tools/llvm-readobj/ELF/symbols.test | 143 +++++++++++++----- 4 files changed, 109 insertions(+), 91 deletions(-) delete mode 100644 llvm/test/tools/llvm-readobj/ELF/Inputs/relocs.obj.elf-x86_64 delete mode 100644 llvm/test/tools/llvm-readobj/ELF/Inputs/symbols-proc-specific.elf-hexagon delete mode 100644 llvm/test/tools/llvm-readobj/ELF/gnu-symbols.test diff --git a/llvm/test/tools/llvm-readobj/ELF/Inputs/relocs.obj.elf-x86_64 b/llvm/test/tools/llvm-readobj/ELF/Inputs/relocs.obj.elf-x86_64 deleted file mode 100644 index 3ca9d8c6939f22dbc3bde6a5dde0a9d796b0abf5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1984 zcmeIxIYf93H^rL6%YP-#EOOeT+AyRdM1{4T@!QnT(9Wm^7hTIj}9vB-JF-hl)sjc4S=ITElZq@ zh&VS;J>9R+tqpw(#4>M&pC`z$eLa|rbM}a=$A$3mwoy@So2RrzFHaKKTi^WXH*Ba zZLFiWh8y?jz+_jQOfunQGwJkZYAd^yNII!(b+F8g*dL$O5@9UFm5%d4!5&NZ?+@Zh zAH!f<@Fmh`D_S+_^K{%#=}UB+oAhNm&QW@j-lTk;j_;G>H|WjEx9Paoa{LaxRe6El zrhK2?uH2>LOlACII`&)oDZNwq8NEyS1-)DOCA~-a6&-g;=Dnu(DZioP{N?yt`hfB~ z`k?ZAI{q&i=Yc+~{EQ9w!&NPrk|(x_CB1T_Yw6aRt@!~lYy zk>A2UU}GzHjx9bWo^*b9@15;)a<}969LIr$gJ*nKK!=KRGS_uO19QJzz$qS{Dh2ZC z`{OH$;JRMa?rQGOFT@E`D~hi9_*q@-sHVmsfA$!Cq% zA+~R0X@M8QHU;mYGqrR~Ils-q=JO %t.symbols -# RUN: llvm-readobj --syms %p/Inputs/trivial.obj.elf-i386 > %t.syms +# SYMBOLS-LLVM:Symbols [ +# SYMBOLS-LLVM-NEXT: Symbol { +# SYMBOLS-LLVM-NEXT: Name: (0) +# SYMBOLS-LLVM-NEXT: Value: 0x0 +# SYMBOLS-LLVM-NEXT: Size: 0 +# SYMBOLS-LLVM-NEXT: Binding: Local (0x0) +# SYMBOLS-LLVM-NEXT: Type: None (0x0) +# SYMBOLS-LLVM-NEXT: Other: 0 +# SYMBOLS-LLVM-NEXT: Section: Undefined (0x0) +# SYMBOLS-LLVM-NEXT: } +# SYMBOLS-LLVM-NEXT: Symbol { +# SYMBOLS-LLVM-NEXT: Name: foo (5) +# SYMBOLS-LLVM-NEXT: Value: 0x1 +# SYMBOLS-LLVM-NEXT: Size: 0 +# SYMBOLS-LLVM-NEXT: Binding: Local (0x0) +# SYMBOLS-LLVM-NEXT: Type: None (0x0) +# SYMBOLS-LLVM-NEXT: Other: 0 +# SYMBOLS-LLVM-NEXT: Section: Undefined (0x0) +# SYMBOLS-LLVM-NEXT: } +# SYMBOLS-LLVM-NEXT: Symbol { +# SYMBOLS-LLVM-NEXT: Name: bar (1) +# SYMBOLS-LLVM-NEXT: Value: 0x2 +# SYMBOLS-LLVM-NEXT: Size: 0 +# SYMBOLS-LLVM-NEXT: Binding: Local (0x0) +# SYMBOLS-LLVM-NEXT: Type: None (0x0) +# SYMBOLS-LLVM-NEXT: Other: 0 +# SYMBOLS-LLVM-NEXT: Section: Undefined (0x0) +# SYMBOLS-LLVM-NEXT: } +# SYMBOLS-LLVM-NEXT:] + +# SYMBOLS-GNU64:Symbol table '.symtab' contains 3 entries: +# SYMBOLS-GNU64-NEXT: Num: Value Size Type Bind Vis Ndx Name +# SYMBOLS-GNU64-NEXT: 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND +# SYMBOLS-GNU64-NEXT: 1: 0000000000000001 0 NOTYPE LOCAL DEFAULT UND foo +# SYMBOLS-GNU64-NEXT: 2: 0000000000000002 0 NOTYPE LOCAL DEFAULT UND bar + +# SYMBOLS-GNU32:Symbol table '.symtab' contains 3 entries: +# SYMBOLS-GNU32-NEXT: Num: Value Size Type Bind Vis Ndx Name +# SYMBOLS-GNU32-NEXT: 0: 00000000 0 NOTYPE LOCAL DEFAULT UND +# SYMBOLS-GNU32-NEXT: 1: 00000001 0 NOTYPE LOCAL DEFAULT UND foo +# SYMBOLS-GNU32-NEXT: 2: 00000002 0 NOTYPE LOCAL DEFAULT UND bar + +## Case 2: Check flag aliases produce identical output +# RUN: llvm-readobj --symbols %t64 > %t.symbols +# RUN: llvm-readobj --syms %t64 > %t.syms # RUN: cmp %t.symbols %t.syms -# RUN: llvm-readobj -t %p/Inputs/trivial.obj.elf-i386 > %t.t +# RUN: llvm-readobj -t %t64 > %t.t # RUN: cmp %t.symbols %t.t -# RUN: llvm-readelf -s --elf-output-style LLVM %p/Inputs/trivial.obj.elf-i386 > %t.lowers +# RUN: llvm-readelf -s --elf-output-style=LLVM %t64 > %t.lowers # RUN: cmp %t.symbols %t.lowers -# CHECK: Symbols [ -# CHECK-NEXT: Symbol { -# CHECK-NEXT: Name: (0) -# CHECK-NEXT: Value: 0x0 -# CHECK-NEXT: Size: 0 -# CHECK-NEXT: Binding: Local (0x0) -# CHECK-NEXT: Type: None (0x0) -# CHECK-NEXT: Other: 0 -# CHECK-NEXT: Section: Undefined (0x0) -# CHECK-NEXT: } -# CHECK-NEXT: Symbol { -# CHECK-NEXT: Name: trivial.ll (1) -# CHECK-NEXT: Value: 0x0 -# CHECK-NEXT: Size: 0 -# CHECK-NEXT: Binding: Local (0x0) -# CHECK-NEXT: Type: File (0x4) -# CHECK-NEXT: Other: 0 -# CHECK-NEXT: Section: Absolute (0xFFF1) -# CHECK-NEXT: } -# CHECK-NEXT: Symbol { -# CHECK-NEXT: Name: .L.str (39) -# CHECK-NEXT: Value: 0x0 -# CHECK-NEXT: Size: 13 -# CHECK-NEXT: Binding: Local (0x0) -# CHECK-NEXT: Type: Object (0x1) -# CHECK-NEXT: Other: 0 -# CHECK-NEXT: Section: .rodata.str1.1 (0x5) -# CHECK-NEXT: } +# RUN: llvm-readelf --symbols %t64 > %t.symbols.gnu +# RUN: llvm-readelf --syms %t64 > %t.syms.gnu +# RUN: cmp %t.symbols.gnu %t.syms.gnu +## There is no -t option in llvm-readelf. +# RUN: not llvm-readelf -t %t64 2>&1 | FileCheck %s --check-prefix=NO-T-ERR +# NO-T-ERR: Unknown command line argument '-t' +## -s is an llvm-readobj option to dump sections. +# RUN: llvm-readobj -s --elf-output-style=GNU %t64 | FileCheck %s --implicit-check-not="Symbol table" + +## Case 3: Test that both regular and dynamic symbols are dumped when `--symbols` and `--dyn-symbols` +## are specified together. Note that the order is different for different styles. +# RUN: llvm-readobj --symbols --dyn-symbols %t64 | FileCheck %s --check-prefix=BOTH-LLVM +# RUN: llvm-readelf --symbols --dyn-symbols %t64 | FileCheck %s --check-prefix=BOTH-GNU + +# BOTH-LLVM: Symbols [ +# BOTH-LLVM: DynamicSymbols [ + +# BOTH-GNU: Symbol table '.dynsym' +# BOTH-GNU: Symbol table '.symtab' + +## Case 4: --symbols implies --dyn-symbols for llvm-readelf. +# RUN: llvm-readobj --symbols %t64 | FileCheck %s --implicit-check-not="DynamicSymbols [" +# RUN: llvm-readelf --symbols %t64 | FileCheck %s --check-prefix=BOTH-GNU + +## Case 5: Test that `--dyn-symbols` does not trigger `--symbols` implicitly. +# RUN: llvm-readobj --dyn-symbols %t64 | FileCheck %s --implicit-check-not="{{^}}Symbols [" +# RUN: llvm-readelf --dyn-symbols %t64 | FileCheck %s --implicit-check-not="Symbol table '.symtab'" + +--- !ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + Machine: EM_X86_64 +Symbols: + - Name: foo + Value: 0x1 + - Name: bar + Value: 0x2 +DynamicSymbols: + - Name: zed + +--- !ELF +FileHeader: + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL + Machine: EM_386 +Symbols: + - Name: foo + Value: 0x1 + - Name: bar + Value: 0x2 +DynamicSymbols: + - Name: zed