[lld] r361394 - [mips] Use GNU-style output to make tests smaller. NFC
Simon Atanasyan via llvm-commits
llvm-commits at lists.llvm.org
Wed May 22 08:03:53 PDT 2019
Author: atanasyan
Date: Wed May 22 08:03:52 2019
New Revision: 361394
URL: http://llvm.org/viewvc/llvm-project?rev=361394&view=rev
Log:
[mips] Use GNU-style output to make tests smaller. NFC
Modified:
lld/trunk/test/ELF/mips-64-disp.s
lld/trunk/test/ELF/mips-64-got-overflow.s
lld/trunk/test/ELF/mips-64-got.s
lld/trunk/test/ELF/mips-call-hilo.s
lld/trunk/test/ELF/mips-got16.s
Modified: lld/trunk/test/ELF/mips-64-disp.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-64-disp.s?rev=361394&r1=361393&r2=361394&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-64-disp.s (original)
+++ lld/trunk/test/ELF/mips-64-disp.s Wed May 22 08:03:52 2019
@@ -7,7 +7,7 @@
# RUN: ld.lld %t.so.o -shared -o %t.so
# RUN: ld.lld %t.exe.o %t.so -o %t.exe
# RUN: llvm-objdump -d -t %t.exe | FileCheck %s
-# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r --mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
# CHECK: __start:
# CHECK-NEXT: 20000: 24 42 80 40 addiu $2, $2, -32704
@@ -20,59 +20,24 @@
# CHECK: 0000000000020000 .text 00000000 __start
# CHECK: 0000000000000000 g F *UND* 00000000 foo1a
-# GOT: Relocations [
-# GOT-NEXT: ]
-# GOT-NEXT: Primary GOT {
-# GOT-NEXT: Canonical gp value:
-# GOT-NEXT: Reserved entries [
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32752
-# GOT-NEXT: Initial: 0x0
-# GOT-NEXT: Purpose: Lazy resolver
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32744
-# GOT-NEXT: Initial: 0x8000000000000000
-# GOT-NEXT: Purpose: Module pointer (GNU extension)
-# GOT-NEXT: }
-# GOT-NEXT: ]
-# GOT-NEXT: Local entries [
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32736
-# GOT-NEXT: Initial: 0x20014
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32728
-# GOT-NEXT: Initial: 0x20004
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32720
-# GOT-NEXT: Initial: 0x20008
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32712
-# GOT-NEXT: Initial: 0x2000C
-# GOT-NEXT: }
-# GOT-NEXT: ]
-# GOT-NEXT: Global entries [
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32704
-# GOT-NEXT: Initial: 0x0
-# GOT-NEXT: Value: 0x0
-# GOT-NEXT: Type: Function
-# GOT-NEXT: Section: Undefined
-# GOT-NEXT: Name: foo1a
-# GOT-NEXT: }
-# GOT-NEXT: ]
-# GOT-NEXT: Number of TLS and multi-GOT entries: 0
-# GOT-NEXT: }
+# GOT: Primary GOT:
+# GOT-NEXT: Canonical gp value: 0000000000038000
+# GOT-EMPTY:
+# GOT-NEXT: Reserved entries:
+# GOT-NEXT: Address Access Initial Purpose
+# GOT-NEXT: 0000000000030010 -32752(gp) 0000000000000000 Lazy resolver
+# GOT-NEXT: 0000000000030018 -32744(gp) 8000000000000000 Module pointer (GNU extension)
+# GOT-EMPTY:
+# GOT-NEXT: Local entries:
+# GOT-NEXT: Address Access Initial
+# GOT-NEXT: 0000000000030020 -32736(gp) 0000000000020014
+# GOT-NEXT: 0000000000030028 -32728(gp) 0000000000020004
+# GOT-NEXT: 0000000000030030 -32720(gp) 0000000000020008
+# GOT-NEXT: 0000000000030038 -32712(gp) 000000000002000c
+# GOT-EMPTY:
+# GOT-NEXT: Global entries:
+# GOT-NEXT: Address Access Initial Sym.Val. Type Ndx Name
+# GOT-NEXT: 0000000000030040 -32704(gp) 0000000000000000 0000000000000000 FUNC UND foo1a
.text
.global __start
Modified: lld/trunk/test/ELF/mips-64-got-overflow.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-64-got-overflow.s?rev=361394&r1=361393&r2=361394&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-64-got-overflow.s (original)
+++ lld/trunk/test/ELF/mips-64-got-overflow.s Wed May 22 08:03:52 2019
@@ -6,69 +6,35 @@
# RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t2.so.o
# RUN: ld.lld -shared -mips-got-size 32 %t1.so.o %t2.so.o -o %t-sgot.so
# RUN: ld.lld -shared -mips-got-size 24 %t1.so.o %t2.so.o -o %t-mgot.so
-# RUN: llvm-readobj -r --dyn-syms --mips-plt-got %t-sgot.so | FileCheck -check-prefix=SGOT %s
-# RUN: llvm-readobj -r --dyn-syms --mips-plt-got %t-mgot.so | FileCheck -check-prefix=MGOT %s
+# RUN: llvm-readelf --mips-plt-got %t-sgot.so | FileCheck -check-prefix=SGOT %s
+# RUN: llvm-readelf --mips-plt-got %t-mgot.so | FileCheck -check-prefix=MGOT %s
-# SGOT: Primary GOT {
-# SGOT-NEXT: Canonical gp value: 0x27FF0
-# SGOT-NEXT: Reserved entries [
-# SGOT-NEXT: Entry {
-# SGOT-NEXT: Address:
-# SGOT-NEXT: Access: -32752
-# SGOT-NEXT: Initial: 0x0
-# SGOT-NEXT: Purpose: Lazy resolver
-# SGOT-NEXT: }
-# SGOT-NEXT: Entry {
-# SGOT-NEXT: Address:
-# SGOT-NEXT: Access: -32744
-# SGOT-NEXT: Initial: 0x80000000
-# SGOT-NEXT: Purpose: Module pointer (GNU extension)
-# SGOT-NEXT: }
-# SGOT-NEXT: ]
-# SGOT-NEXT: Local entries [
-# SGOT-NEXT: Entry {
-# SGOT-NEXT: Address:
-# SGOT-NEXT: Access: -32736
-# SGOT-NEXT: Initial: 0x20020
-# SGOT-NEXT: }
-# SGOT-NEXT: Entry {
-# SGOT-NEXT: Address:
-# SGOT-NEXT: Access: -32728
-# SGOT-NEXT: Initial: 0x20030
-# SGOT-NEXT: }
-# SGOT-NEXT: ]
-# SGOT-NEXT: Global entries [
-# SGOT-NEXT: ]
-# SGOT-NEXT: Number of TLS and multi-GOT entries: 0
-# SGOT-NEXT: }
+# SGOT: Primary GOT:
+# SGOT-NEXT: Canonical gp value: 0000000000027ff0
+# SGOT-EMPTY:
+# SGOT-NEXT: Reserved entries:
+# SGOT-NEXT: Address Access Initial Purpose
+# SGOT-NEXT: 0000000000020000 -32752(gp) 0000000000000000 Lazy resolver
+# SGOT-NEXT: 0000000000020008 -32744(gp) 8000000000000000 Module pointer (GNU extension)
+# SGOT-EMPTY:
+# SGOT-NEXT: Local entries:
+# SGOT-NEXT: Address Access Initial
+# SGOT-NEXT: 0000000000020010 -32736(gp) 0000000000020020
+# SGOT-NEXT: 0000000000020018 -32728(gp) 0000000000020030
-# MGOT: Primary GOT {
-# MGOT-NEXT: Canonical gp value: 0x27FF0
-# MGOT-NEXT: Reserved entries [
-# MGOT-NEXT: Entry {
-# MGOT-NEXT: Address:
-# MGOT-NEXT: Access: -32752
-# MGOT-NEXT: Initial: 0x0
-# MGOT-NEXT: Purpose: Lazy resolver
-# MGOT-NEXT: }
-# MGOT-NEXT: Entry {
-# MGOT-NEXT: Address:
-# MGOT-NEXT: Access: -32744
-# MGOT-NEXT: Initial: 0x80000000
-# MGOT-NEXT: Purpose: Module pointer (GNU extension)
-# MGOT-NEXT: }
-# MGOT-NEXT: ]
-# MGOT-NEXT: Local entries [
-# MGOT-NEXT: Entry {
-# MGOT-NEXT: Address:
-# MGOT-NEXT: Access: -32736
-# MGOT-NEXT: Initial: 0x20020
-# MGOT-NEXT: }
-# MGOT-NEXT: ]
-# MGOT-NEXT: Global entries [
-# MGOT-NEXT: ]
-# MGOT-NEXT: Number of TLS and multi-GOT entries: 1
-# MGOT-NEXT: }
+# MGOT: Primary GOT:
+# MGOT-NEXT: Canonical gp value: 0000000000027ff0
+# MGOT-EMPTY:
+# MGOT-NEXT: Reserved entries:
+# MGOT-NEXT: Address Access Initial Purpose
+# MGOT-NEXT: 0000000000020000 -32752(gp) 0000000000000000 Lazy resolver
+# MGOT-NEXT: 0000000000020008 -32744(gp) 8000000000000000 Module pointer (GNU extension)
+# MGOT-EMPTY:
+# MGOT-NEXT: Local entries:
+# MGOT-NEXT: Address Access Initial
+# MGOT-NEXT: 0000000000020010 -32736(gp) 0000000000020020
+# MGOT-EMPTY:
+# MGOT-NEXT: Number of TLS and multi-GOT entries 1
.text
.global foo2
Modified: lld/trunk/test/ELF/mips-64-got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-64-got.s?rev=361394&r1=361393&r2=361394&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-64-got.s (original)
+++ lld/trunk/test/ELF/mips-64-got.s Wed May 22 08:03:52 2019
@@ -7,7 +7,7 @@
# RUN: ld.lld %t.so.o -shared -o %t.so
# RUN: ld.lld %t.exe.o %t.so -o %t.exe
# RUN: llvm-objdump -d -t %t.exe | FileCheck %s
-# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r --mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
# CHECK: __start:
@@ -21,59 +21,25 @@
# CHECK: 0000000000020000 .text 00000000 __start
# CHECK: 0000000000020014 .text 00000000 bar
-# GOT: Relocations [
-# GOT-NEXT: ]
-# GOT-NEXT: Primary GOT {
-# GOT-NEXT: Canonical gp value:
-# GOT-NEXT: Reserved entries [
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32752
-# GOT-NEXT: Initial: 0x0
-# GOT-NEXT: Purpose: Lazy resolver
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32744
-# GOT-NEXT: Initial: 0x8000000000000000
-# GOT-NEXT: Purpose: Module pointer (GNU extension)
-# GOT-NEXT: }
-# GOT-NEXT: ]
-# GOT-NEXT: Local entries [
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32736
-# GOT-NEXT: Initial: 0x20000
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32728
-# GOT-NEXT: Initial: 0x30000
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32720
-# GOT-NEXT: Initial: 0x20014
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32712
-# GOT-NEXT: Initial: 0x20018
-# GOT-NEXT: }
-# GOT-NEXT: ]
-# GOT-NEXT: Global entries [
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32704
-# GOT-NEXT: Initial: 0x0
-# GOT-NEXT: Value: 0x0
-# GOT-NEXT: Type: Function
-# GOT-NEXT: Section: Undefined
-# GOT-NEXT: Name: foo1a
-# GOT-NEXT: }
-# GOT-NEXT: ]
-# GOT-NEXT: Number of TLS and multi-GOT entries: 0
-# GOT-NEXT: }
+# GOT: There are no relocations in this file.
+# GOT-NEXT: Primary GOT:
+# GOT-NEXT: Canonical gp value: 0000000000038000
+# GOT-EMPTY:
+# GOT-NEXT: Reserved entries:
+# GOT-NEXT: Address Access Initial Purpose
+# GOT-NEXT: 0000000000030010 -32752(gp) 0000000000000000 Lazy resolver
+# GOT-NEXT: 0000000000030018 -32744(gp) 8000000000000000 Module pointer (GNU extension)
+# GOT-EMPTY:
+# GOT-NEXT: Local entries:
+# GOT-NEXT: Address Access Initial
+# GOT-NEXT: 0000000000030020 -32736(gp) 0000000000020000
+# GOT-NEXT: 0000000000030028 -32728(gp) 0000000000030000
+# GOT-NEXT: 0000000000030030 -32720(gp) 0000000000020014
+# GOT-NEXT: 0000000000030038 -32712(gp) 0000000000020018
+# GOT-EMPTY:
+# GOT-NEXT: Global entries:
+# GOT-NEXT: Address Access Initial Sym.Val. Type Ndx Name
+# GOT-NEXT: 0000000000030040 -32704(gp) 0000000000000000 0000000000000000 FUNC UND foo1a
.text
.global __start, bar
Modified: lld/trunk/test/ELF/mips-call-hilo.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-call-hilo.s?rev=361394&r1=361393&r2=361394&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-call-hilo.s (original)
+++ lld/trunk/test/ELF/mips-call-hilo.s Wed May 22 08:03:52 2019
@@ -4,7 +4,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o -shared -o %t.so
# RUN: llvm-objdump -d %t.so | FileCheck %s
-# RUN: llvm-readobj -r --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
# CHECK: Disassembly of section .text:
# CHECK-EMPTY:
@@ -16,36 +16,23 @@
# CHECK-NEXT: 10010: 3c 02 00 00 lui $2, 0
# CHECK-NEXT: 10014: 8c 42 80 1c lw $2, -32740($2)
-# GOT: Relocations [
-# GOT-NEXT: ]
-
-# GOT: Primary GOT {
-# GOT-NEXT: Canonical gp value: 0x27FF0
-# GOT: Local entries [
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address: 0x20008
-# GOT-NEXT: Access: -32744
-# GOT-NEXT: Initial: 0x10018
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address: 0x2000C
-# GOT-NEXT: Access: -32740
-# GOT-NEXT: Initial: 0x1001C
-# GOT-NEXT: }
-# GOT-NEXT: ]
-# GOT-NEXT: Global entries [
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address: 0x20010
-# GOT-NEXT: Access: -32736
-# GOT-NEXT: Initial: 0x0
-# GOT-NEXT: Value: 0x0
-# GOT-NEXT: Type: None
-# GOT-NEXT: Section: Undefined
-# GOT-NEXT: Name: bar
-# GOT-NEXT: }
-# GOT-NEXT: ]
-# GOT-NEXT: Number of TLS and multi-GOT entries: 0
-# GOT-NEXT: }
+# GOT: There are no relocations in this file.
+# GOT: Primary GOT:
+# GOT-NEXT: Canonical gp value: 00027ff0
+# GOT-EMPTY:
+# GOT-NEXT: Reserved entries:
+# GOT-NEXT: Address Access Initial Purpose
+# GOT-NEXT: 00020000 -32752(gp) 00000000 Lazy resolver
+# GOT-NEXT: 00020004 -32748(gp) 80000000 Module pointer (GNU extension)
+# GOT-EMPTY:
+# GOT-NEXT: Local entries:
+# GOT-NEXT: Address Access Initial
+# GOT-NEXT: 00020008 -32744(gp) 00010018
+# GOT-NEXT: 0002000c -32740(gp) 0001001c
+# GOT-EMPTY:
+# GOT-NEXT: Global entries:
+# GOT-NEXT: Address Access Initial Sym.Val. Type Ndx Name
+# GOT-NEXT: 00020010 -32736(gp) 00000000 00000000 NOTYPE UND bar
.text
.global foo
Modified: lld/trunk/test/ELF/mips-got16.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got16.s?rev=361394&r1=361393&r2=361394&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got16.s (original)
+++ lld/trunk/test/ELF/mips-got16.s Wed May 22 08:03:52 2019
@@ -4,7 +4,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o -shared -o %t.so
# RUN: llvm-objdump -d -t %t.so | FileCheck %s
-# RUN: llvm-readobj -r --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
# CHECK: Disassembly of section .text:
# CHECK-EMPTY:
@@ -25,83 +25,29 @@
# CHECK: 00041008 .data 00000000 .hidden bar
# CHECK: 00000000 *UND* 00000000 foo
-# GOT: Relocations [
-# GOT-NEXT: ]
+# GOT: There are no relocations in this file.
-# GOT: Primary GOT {
-# GOT-NEXT: Canonical gp value:
-# GOT-NEXT: Reserved entries [
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32752
-# GOT-NEXT: Initial: 0x0
-# GOT-NEXT: Purpose: Lazy resolver
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32748
-# GOT-NEXT: Initial: 0x80000000
-# GOT-NEXT: Purpose: Module pointer (GNU extension)
-# GOT-NEXT: }
-# GOT-NEXT: ]
-# GOT-NEXT: Local entries [
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32744
-# GOT-NEXT: Initial: 0x10000
-# ^-- (0x1002c + 0x8000) & ~0xffff
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32740
-# GOT-NEXT: Initial: 0x20000
-# ^-- redundant unused entry
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32736
-# GOT-NEXT: Initial: 0x20000
-# ^-- redundant unused entry
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32732
-# GOT-NEXT: Initial: 0x30000
-# ^-- (0x29000 + 0x8000) & ~0xffff
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32728
-# GOT-NEXT: Initial: 0x40000
-# ^-- (0x29000 + 0x10004 + 0x8000) & ~0xffff
-# ^-- (0x29000 + 0x18004 + 0x8000) & ~0xffff
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32724
-# GOT-NEXT: Initial: 0x50000
-# ^-- redundant unused entry
-# GOT-NEXT: }
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32720
-# GOT-NEXT: Initial: 0x41008
-# ^-- 'bar' address
-# GOT-NEXT: }
-# GOT-NEXT: ]
-# GOT-NEXT: Global entries [
-# GOT-NEXT: Entry {
-# GOT-NEXT: Address:
-# GOT-NEXT: Access: -32716
-# GOT-NEXT: Initial: 0x0
-# GOT-NEXT: Value: 0x0
-# GOT-NEXT: Type: None
-# GOT-NEXT: Section: Undefined
-# GOT-NEXT: Name: foo
-# GOT-NEXT: }
-# GOT-NEXT: ]
-# GOT-NEXT: Number of TLS and multi-GOT entries: 0
-# GOT-NEXT: }
+# GOT: Local entries:
+# GOT-NEXT: Address Access Initial
+# GOT-NEXT: 00041018 -32744(gp) 00010000
+# ^-- (0x1002c + 0x8000) & ~0xffff
+# GOT-NEXT: 0004101c -32740(gp) 00020000
+# ^-- redundant unused entry
+# GOT-NEXT: 00041020 -32736(gp) 00020000
+# ^-- redundant unused entry
+# GOT-NEXT: 00041024 -32732(gp) 00030000
+# ^-- (0x29000 + 0x8000) & ~0xffff
+# GOT-NEXT: 00041028 -32728(gp) 00040000
+# ^-- (0x29000 + 0x10004 + 0x8000) & ~0xffff
+# ^-- (0x29000 + 0x18004 + 0x8000) & ~0xffff
+# GOT-NEXT: 0004102c -32724(gp) 00050000
+# ^-- redundant unused entry
+# GOT-NEXT: 00041030 -32720(gp) 00041008
+# ^-- 'bar' address
+# GOT-EMPTY:
+# GOT-NEXT: Global entries:
+# GOT-NEXT: Address Access Initial Sym.Val. Type Ndx Name
+# GOT-NEXT: 00041034 -32716(gp) 00000000 00000000 NOTYPE UND foo
.text
.globl __start
More information about the llvm-commits
mailing list