From bdd036abeb4e61221ce60e47a96b74b2a0648554 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sun, 11 Nov 2018 18:49:05 +0000 Subject: [PATCH] [ELF] Fix objdump tests after rL346610 llvm-svn: 346613 --- lld/test/ELF/mips-32.s | 4 ++-- lld/test/ELF/mips-64.s | 4 ++-- lld/test/ELF/mips-got-relocs.s | 4 ++-- lld/test/ELF/mips-hilo.s | 6 +++--- lld/test/ELF/mips-mgot.s | 14 +++++++------- lld/test/ELF/mips-tls-64.s | 6 +++--- lld/test/ELF/mips-tls-hilo.s | 2 +- lld/test/ELF/mips-tls-static-64.s | 4 ++-- lld/test/ELF/mips-tls-static.s | 4 ++-- lld/test/ELF/mips-tls.s | 6 +++--- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lld/test/ELF/mips-32.s b/lld/test/ELF/mips-32.s index 7efcfcd65167..85bc95592edb 100644 --- a/lld/test/ELF/mips-32.s +++ b/lld/test/ELF/mips-32.s @@ -41,8 +41,8 @@ v2: # ^-- v2+4 ^-- v1 # SYM: SYMBOL TABLE: -# SYM: 00020000 l .data 00000004 v1 -# SYM: 00020004 g .data 00000008 v2 +# SYM: 00020000 l O .data 00000004 v1 +# SYM: 00020004 g O .data 00000008 v2 # REL: Relocations [ # REL-NEXT: Section (7) .rel.dyn { diff --git a/lld/test/ELF/mips-64.s b/lld/test/ELF/mips-64.s index e37b75c070ec..70e445f5327a 100644 --- a/lld/test/ELF/mips-64.s +++ b/lld/test/ELF/mips-64.s @@ -25,8 +25,8 @@ v2: # SYM: SYMBOL TABLE: -# SYM: 00020000 l .data 00000004 v1 -# SYM: 00020008 g .data 00000008 v2 +# SYM: 00020000 l O .data 00000004 v1 +# SYM: 00020008 g O .data 00000008 v2 # CHECK: Relocations [ # CHECK-NEXT: Section (7) .rel.dyn { diff --git a/lld/test/ELF/mips-got-relocs.s b/lld/test/ELF/mips-got-relocs.s index d085df06524a..0465b08b9ed4 100644 --- a/lld/test/ELF/mips-got-relocs.s +++ b/lld/test/ELF/mips-got-relocs.s @@ -48,7 +48,7 @@ v1: # EXE_SYM: SYMBOL TABLE: # EXE_SYM: 00038000 .got 00000000 .hidden _gp # ^-- .got + GP offset (0x7ff0) -# EXE_SYM: 00030000 g .data 00000004 v1 +# EXE_SYM: 00030000 g O .data 00000004 v1 # EXE_GOT_BE: Contents of section .got: @@ -72,7 +72,7 @@ v1: # DSO_SYM: SYMBOL TABLE: # DSO_SYM: 00028000 .got 00000000 .hidden _gp # ^-- .got + GP offset (0x7ff0) -# DSO_SYM: 00020000 g .data 00000004 v1 +# DSO_SYM: 00020000 g O .data 00000004 v1 # DSO_GOT_BE: Contents of section .got: # DSO_GOT_BE: 20010 00000000 80000000 00020000 diff --git a/lld/test/ELF/mips-hilo.s b/lld/test/ELF/mips-hilo.s index a00ffaa9fb1c..64f41140350b 100644 --- a/lld/test/ELF/mips-hilo.s +++ b/lld/test/ELF/mips-hilo.s @@ -47,6 +47,6 @@ g1: # ^-- %lo(l1-4) # CHECK: SYMBOL TABLE: -# CHECK: 0030000 l .data 00000004 l1 -# CHECK: 0020000 .text 00000000 __start -# CHECK: 0030004 g .data 00000004 g1 +# CHECK: 0030000 l O .data 00000004 l1 +# CHECK: 0020000 .text 00000000 __start +# CHECK: 0030004 g O .data 00000004 g1 diff --git a/lld/test/ELF/mips-mgot.s b/lld/test/ELF/mips-mgot.s index 0bb1a76ea8f5..4e364916c814 100644 --- a/lld/test/ELF/mips-mgot.s +++ b/lld/test/ELF/mips-mgot.s @@ -18,13 +18,13 @@ # CHECK-NEXT: 60040 00000000 00000000 00000000 # CHECK: SYMBOL TABLE: -# CHECK: 00000000 l .tdata 00000000 loc0 -# CHECK: 00010000 .text 00000000 foo0 -# CHECK: 00000000 g .tdata 00000000 tls0 -# CHECK: 00010020 .text 00000000 foo1 -# CHECK: 00000004 g .tdata 00000000 tls1 -# CHECK: 00010030 .text 00000000 foo2 -# CHECK: 00000008 g .tdata 00000000 tls2 +# CHECK: 00000000 l O .tdata 00000000 loc0 +# CHECK: 00010000 .text 00000000 foo0 +# CHECK: 00000000 g O .tdata 00000000 tls0 +# CHECK: 00010020 .text 00000000 foo1 +# CHECK: 00000004 g O .tdata 00000000 tls1 +# CHECK: 00010030 .text 00000000 foo2 +# CHECK: 00000008 g O .tdata 00000000 tls2 # GOT: Relocations [ # GOT-NEXT: Section (7) .rel.dyn { diff --git a/lld/test/ELF/mips-tls-64.s b/lld/test/ELF/mips-tls-64.s index f000755b4e82..2d0749edc585 100644 --- a/lld/test/ELF/mips-tls-64.s +++ b/lld/test/ELF/mips-tls-64.s @@ -28,9 +28,9 @@ # DIS-NEXT: 30040 00000000 00000001 00000000 00000000 # DIS-NEXT: 30050 00000000 00000001 ffffffff ffff8004 -# DIS: 0000000000000000 l .tdata 00000000 loc -# DIS: 0000000000000004 g .tdata 00000000 bar -# DIS: 0000000000000000 g *UND* 00000000 foo +# DIS: 0000000000000000 l O .tdata 00000000 loc +# DIS: 0000000000000004 g O .tdata 00000000 bar +# DIS: 0000000000000000 g O *UND* 00000000 foo # CHECK: Relocations [ # CHECK-NEXT: Section (7) .rel.dyn { diff --git a/lld/test/ELF/mips-tls-hilo.s b/lld/test/ELF/mips-tls-hilo.s index ae54602327a9..6b6df17eb97d 100644 --- a/lld/test/ELF/mips-tls-hilo.s +++ b/lld/test/ELF/mips-tls-hilo.s @@ -20,7 +20,7 @@ # DIS-NEXT: 2000c: 24 62 90 00 addiu $2, $3, -28672 # %lo(loc0 - .tdata - 0x7000) --^ -# DIS: 00000000 l .tdata 00000000 loc0 +# DIS: 00000000 l O .tdata 00000000 loc0 # CHECK: Relocations [ # CHECK-NEXT: ] diff --git a/lld/test/ELF/mips-tls-static-64.s b/lld/test/ELF/mips-tls-static-64.s index 04f18fa57585..23c775fb32f5 100644 --- a/lld/test/ELF/mips-tls-static-64.s +++ b/lld/test/ELF/mips-tls-static-64.s @@ -11,8 +11,8 @@ # CHECK-NEXT: 30010 ffff9004 # # CHECK: SYMBOL TABLE: -# CHECK: 0000000000020004 .text 00000000 __tls_get_addr -# CHECK: 0000000000000000 g .tdata 00000000 tls1 +# CHECK: 0000000000020004 .text 00000000 __tls_get_addr +# CHECK: 0000000000000000 g O .tdata 00000000 tls1 .text .global __start diff --git a/lld/test/ELF/mips-tls-static.s b/lld/test/ELF/mips-tls-static.s index b09f5516bc89..9a1294003f48 100644 --- a/lld/test/ELF/mips-tls-static.s +++ b/lld/test/ELF/mips-tls-static.s @@ -13,8 +13,8 @@ # CHECK-NEXT: 30020 ffff8000 00000001 00000000 # # CHECK: SYMBOL TABLE: -# CHECK: 0002000c .text 00000000 __tls_get_addr -# CHECK: 00000000 g .tdata 00000000 tls1 +# CHECK: 0002000c .text 00000000 __tls_get_addr +# CHECK: 00000000 g O .tdata 00000000 tls1 .text .global __start diff --git a/lld/test/ELF/mips-tls.s b/lld/test/ELF/mips-tls.s index ece55c69b303..5e1f8a957d20 100644 --- a/lld/test/ELF/mips-tls.s +++ b/lld/test/ELF/mips-tls.s @@ -26,9 +26,9 @@ # DIS-NEXT: 30020 00000000 00000000 00000001 00000000 # DIS-NEXT: 30030 00000001 ffff8004 -# DIS: 00000000 l .tdata 00000000 loc -# DIS: 00000004 g .tdata 00000000 bar -# DIS: 00000000 g *UND* 00000000 foo +# DIS: 00000000 l O .tdata 00000000 loc +# DIS: 00000004 g O .tdata 00000000 bar +# DIS: 00000000 g O *UND* 00000000 foo # CHECK: Relocations [ # CHECK-NEXT: Section (7) .rel.dyn {