[lld] r292160 - [ELF][MIPS] Remove redundant checkings from test cases. NFC

Simon Atanasyan via llvm-commits llvm-commits at lists.llvm.org
Mon Jan 16 13:17:09 PST 2017


Author: atanasyan
Date: Mon Jan 16 15:17:09 2017
New Revision: 292160

URL: http://llvm.org/viewvc/llvm-project?rev=292160&view=rev
Log:
[ELF][MIPS] Remove redundant checkings from test cases. NFC

Modified:
    lld/trunk/test/ELF/mips-64-disp.s
    lld/trunk/test/ELF/mips-64-got.s
    lld/trunk/test/ELF/mips-got-and-copy.s
    lld/trunk/test/ELF/mips-got-extsym.s
    lld/trunk/test/ELF/mips-got-hilo.s
    lld/trunk/test/ELF/mips-got-redundant.s
    lld/trunk/test/ELF/mips-got-weak.s
    lld/trunk/test/ELF/mips-got16.s
    lld/trunk/test/ELF/mips-options.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=292160&r1=292159&r2=292160&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-64-disp.s (original)
+++ lld/trunk/test/ELF/mips-64-disp.s Mon Jan 16 15:17:09 2017
@@ -18,23 +18,22 @@
 # CHECK-NEXT:    20010:   24 42 80 38   addiu   $2, $2, -32712
 
 # CHECK: 0000000000020014     .text   00000000 foo
-# CHECK: 0000000000047ff0     *ABS*   00000000 .hidden _gp
 # 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: 0x47FF0
+# GOT-NEXT:   Canonical gp value:
 # GOT-NEXT:   Reserved entries [
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x40000
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32752
 # GOT-NEXT:       Initial: 0x0
 # GOT-NEXT:       Purpose: Lazy resolver
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x40008
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32744
 # GOT-NEXT:       Initial: 0x8000000000000000
 # GOT-NEXT:       Purpose: Module pointer (GNU extension)
@@ -42,29 +41,29 @@
 # GOT-NEXT:   ]
 # GOT-NEXT:   Local entries [
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x40010
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32736
 # GOT-NEXT:       Initial: 0x20014
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x40018
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32728
 # GOT-NEXT:       Initial: 0x20004
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x40020
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32720
 # GOT-NEXT:       Initial: 0x20008
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x40028
+# 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: 0x40030
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32704
 # GOT-NEXT:       Initial: 0x0
 # GOT-NEXT:       Value: 0x0

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=292160&r1=292159&r2=292160&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-64-got.s (original)
+++ lld/trunk/test/ELF/mips-64-got.s Mon Jan 16 15:17:09 2017
@@ -19,23 +19,22 @@
 # CHECK-NEXT:    20010:   24 42 80 38   addiu   $2,  $2, -32712
 
 # CHECK: 0000000000020018   .text   00000000 foo
-# CHECK: 0000000000047ff0   *ABS*   00000000 .hidden _gp
 # CHECK: 0000000000020000   .text   00000000 __start
 # CHECK: 0000000000020014   .text   00000000 bar
 
 # GOT:      Relocations [
 # GOT-NEXT: ]
 # GOT-NEXT: Primary GOT {
-# GOT-NEXT:   Canonical gp value: 0x47FF0
+# GOT-NEXT:   Canonical gp value:
 # GOT-NEXT:   Reserved entries [
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x40000
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32752
 # GOT-NEXT:       Initial: 0x0
 # GOT-NEXT:       Purpose: Lazy resolver
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x40008
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32744
 # GOT-NEXT:       Initial: 0x8000000000000000
 # GOT-NEXT:       Purpose: Module pointer (GNU extension)
@@ -43,29 +42,29 @@
 # GOT-NEXT:   ]
 # GOT-NEXT:   Local entries [
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x40010
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32736
 # GOT-NEXT:       Initial: 0x20000
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x40018
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32728
 # GOT-NEXT:       Initial: 0x30000
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x40020
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32720
 # GOT-NEXT:       Initial: 0x20014
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x40028
+# 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: 0x40030
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32704
 # GOT-NEXT:       Initial: 0x0
 # GOT-NEXT:       Value: 0x0

Modified: lld/trunk/test/ELF/mips-got-and-copy.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-and-copy.s?rev=292160&r1=292159&r2=292160&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-and-copy.s (original)
+++ lld/trunk/test/ELF/mips-got-and-copy.s Mon Jan 16 15:17:09 2017
@@ -14,29 +14,29 @@
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section (7) .rel.dyn {
-# CHECK-NEXT:     0x{{[0-9A-F]+}} R_MIPS_COPY data0
-# CHECK-NEXT:     0x{{[0-9A-F]+}} R_MIPS_COPY data1
+# CHECK-NEXT:     0x[[DATA0:[0-9A-F]+]] R_MIPS_COPY data0
+# CHECK-NEXT:     0x[[DATA1:[0-9A-F]+]] R_MIPS_COPY data1
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 # CHECK-NEXT: Primary GOT {
-# CHECK-NEXT:   Canonical gp value: 0x47FF0
+# CHECK-NEXT:   Canonical gp value:
 # CHECK-NEXT:   Reserved entries [
 # CHECK:        ]
 # CHECK-NEXT:   Local entries [
 # CHECK-NEXT:     Entry {
-# CHECK-NEXT:       Address: 0x40008
+# CHECK-NEXT:       Address:
 # CHECK-NEXT:       Access: -32744
-# CHECK-NEXT:       Initial: 0x50000
+# CHECK-NEXT:       Initial: 0x[[DATA0]]
 # CHECK-NEXT:     }
 # CHECK-NEXT:   ]
 # CHECK-NEXT:   Global entries [
 # CHECK-NEXT:     Entry {
-# CHECK-NEXT:       Address: 0x4000C
+# CHECK-NEXT:       Address:
 # CHECK-NEXT:       Access: -32740
-# CHECK-NEXT:       Initial: 0x50004
-# CHECK-NEXT:       Value: 0x50004
-# CHECK-NEXT:       Type: Object (0x1)
-# CHECK-NEXT:       Section: .bss (0xD)
+# CHECK-NEXT:       Initial: 0x[[DATA1]]
+# CHECK-NEXT:       Value: 0x[[DATA1]]
+# CHECK-NEXT:       Type: Object
+# CHECK-NEXT:       Section: .bss
 # CHECK-NEXT:       Name: data1@
 # CHECK-NEXT:     }
 # CHECK-NEXT:   ]

Modified: lld/trunk/test/ELF/mips-got-extsym.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-extsym.s?rev=292160&r1=292159&r2=292160&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-extsym.s (original)
+++ lld/trunk/test/ELF/mips-got-extsym.s Mon Jan 16 15:17:09 2017
@@ -30,7 +30,7 @@
 
 # CHECK:      Local entries [
 # CHECK-NEXT:   Entry {
-# CHECK-NEXT:     Address: 0x40008
+# CHECK-NEXT:     Address:
 # CHECK-NEXT:     Access: -32744
 # CHECK-NEXT:     Initial: 0x20008
 #                          ^-- bar
@@ -38,7 +38,7 @@
 # CHECK-NEXT: ]
 # CHECK-NEXT: Global entries [
 # CHECK-NEXT:   Entry {
-# CHECK-NEXT:     Address: 0x4000C
+# CHECK-NEXT:     Address:
 # CHECK-NEXT:     Access: -32740
 # CHECK-NEXT:     Initial: 0x0
 # CHECK-NEXT:     Value: 0x0

Modified: lld/trunk/test/ELF/mips-got-hilo.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-hilo.s?rev=292160&r1=292159&r2=292160&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-hilo.s (original)
+++ lld/trunk/test/ELF/mips-got-hilo.s Mon Jan 16 15:17:09 2017
@@ -20,22 +20,22 @@
 # GOT-NEXT: ]
 
 # GOT:      Primary GOT {
-# GOT-NEXT:   Canonical gp value: 0x37FF0
+# GOT-NEXT:   Canonical gp value:
 # GOT:        Local entries [
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x30008
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32744
 # GOT-NEXT:       Initial: 0x20000
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x3000C
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32740
 # GOT-NEXT:       Initial: 0x20004
 # GOT-NEXT:     }
 # GOT-NEXT:   ]
 # GOT-NEXT:   Global entries [
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x30010
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32736
 # GOT-NEXT:       Initial: 0x0
 # GOT-NEXT:       Value: 0x0

Modified: lld/trunk/test/ELF/mips-got-redundant.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-redundant.s?rev=292160&r1=292159&r2=292160&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-redundant.s (original)
+++ lld/trunk/test/ELF/mips-got-redundant.s Mon Jan 16 15:17:09 2017
@@ -8,25 +8,25 @@
 
 # CHECK:      Local entries [
 # CHECK-NEXT:   Entry {
-# CHECK-NEXT:     Address: 0x40008
+# CHECK-NEXT:     Address:
 # CHECK-NEXT:     Access: -32744
 # CHECK-NEXT:     Initial: 0x20000
 #                          ^-- loc1
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Entry {
-# CHECK-NEXT:     Address: 0x4000C
+# CHECK-NEXT:     Address:
 # CHECK-NEXT:     Access: -32740
 # CHECK-NEXT:     Initial: 0x30000
 #                          ^-- loc2, loc3, loc4
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Entry {
-# CHECK-NEXT:     Address: 0x40010
+# CHECK-NEXT:     Address:
 # CHECK-NEXT:     Access: -32736
 # CHECK-NEXT:     Initial: 0x40000
 #                          ^-- redundant
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Entry {
-# CHECK-NEXT:     Address: 0x40014
+# CHECK-NEXT:     Address:
 # CHECK-NEXT:     Access: -32732
 # CHECK-NEXT:     Initial: 0x30008
 #                          ^-- glb1

Modified: lld/trunk/test/ELF/mips-got-weak.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-weak.s?rev=292160&r1=292159&r2=292160&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-weak.s (original)
+++ lld/trunk/test/ELF/mips-got-weak.s Mon Jan 16 15:17:09 2017
@@ -47,16 +47,16 @@
 # NOSYM-NEXT: 0x70000013 MIPS_GOTSYM          0x1
 
 # NOSYM:      Primary GOT {
-# NOSYM-NEXT:   Canonical gp value: 0x37FF0
+# NOSYM-NEXT:   Canonical gp value:
 # NOSYM-NEXT:   Reserved entries [
 # NOSYM-NEXT:     Entry {
-# NOSYM-NEXT:       Address: 0x30000
+# NOSYM-NEXT:       Address:
 # NOSYM-NEXT:       Access: -32752
 # NOSYM-NEXT:       Initial: 0x0
 # NOSYM-NEXT:       Purpose: Lazy resolver
 # NOSYM-NEXT:     }
 # NOSYM-NEXT:     Entry {
-# NOSYM-NEXT:       Address: 0x30004
+# NOSYM-NEXT:       Address:
 # NOSYM-NEXT:       Access: -32748
 # NOSYM-NEXT:       Initial: 0x80000000
 # NOSYM-NEXT:       Purpose: Module pointer (GNU extension)
@@ -66,7 +66,7 @@
 # NOSYM-NEXT:   ]
 # NOSYM-NEXT:   Global entries [
 # NOSYM-NEXT:     Entry {
-# NOSYM-NEXT:       Address: 0x30008
+# NOSYM-NEXT:       Address:
 # NOSYM-NEXT:       Access: -32744
 # NOSYM-NEXT:       Initial: 0x20000
 # NOSYM-NEXT:       Value: 0x20000
@@ -75,7 +75,7 @@
 # NOSYM-NEXT:       Name: foo
 # NOSYM-NEXT:     }
 # NOSYM-NEXT:     Entry {
-# NOSYM-NEXT:       Address: 0x3000C
+# NOSYM-NEXT:       Address:
 # NOSYM-NEXT:       Access: -32740
 # NOSYM-NEXT:       Initial: 0x0
 # NOSYM-NEXT:       Value: 0x0
@@ -84,7 +84,7 @@
 # NOSYM-NEXT:       Name: bar
 # NOSYM-NEXT:     }
 # NOSYM-NEXT:     Entry {
-# NOSYM-NEXT:       Address: 0x30010
+# NOSYM-NEXT:       Address:
 # NOSYM-NEXT:       Access: -32736
 # NOSYM-NEXT:       Initial: 0x20004
 # NOSYM-NEXT:       Value: 0x20004
@@ -115,16 +115,16 @@
 # SYM-NEXT: 0x70000013 MIPS_GOTSYM          0x3
 
 # SYM:      Primary GOT {
-# SYM-NEXT:   Canonical gp value: 0x37FF0
+# SYM-NEXT:   Canonical gp value:
 # SYM-NEXT:   Reserved entries [
 # SYM-NEXT:     Entry {
-# SYM-NEXT:       Address: 0x30000
+# SYM-NEXT:       Address:
 # SYM-NEXT:       Access: -32752
 # SYM-NEXT:       Initial: 0x0
 # SYM-NEXT:       Purpose: Lazy resolver
 # SYM-NEXT:     }
 # SYM-NEXT:     Entry {
-# SYM-NEXT:       Address: 0x30004
+# SYM-NEXT:       Address:
 # SYM-NEXT:       Access: -32748
 # SYM-NEXT:       Initial: 0x80000000
 # SYM-NEXT:       Purpose: Module pointer (GNU extension)
@@ -132,19 +132,19 @@
 # SYM-NEXT:   ]
 # SYM-NEXT:   Local entries [
 # SYM-NEXT:     Entry {
-# SYM-NEXT:       Address: 0x30008
+# SYM-NEXT:       Address:
 # SYM-NEXT:       Access: -32744
 # SYM-NEXT:       Initial: 0x20000
 # SYM-NEXT:     }
 # SYM-NEXT:     Entry {
-# SYM-NEXT:       Address: 0x3000C
+# SYM-NEXT:       Address:
 # SYM-NEXT:       Access: -32740
 # SYM-NEXT:       Initial: 0x20004
 # SYM-NEXT:     }
 # SYM-NEXT:   ]
 # SYM-NEXT:   Global entries [
 # SYM-NEXT:     Entry {
-# SYM-NEXT:       Address: 0x30010
+# SYM-NEXT:       Address:
 # SYM-NEXT:       Access: -32736
 # SYM-NEXT:       Initial: 0x0
 # SYM-NEXT:       Value: 0x0

Modified: lld/trunk/test/ELF/mips-got16.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got16.s?rev=292160&r1=292159&r2=292160&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got16.s (original)
+++ lld/trunk/test/ELF/mips-got16.s Mon Jan 16 15:17:09 2017
@@ -29,16 +29,16 @@
 # GOT-NEXT: ]
 
 # GOT:      Primary GOT {
-# GOT-NEXT:   Canonical gp value: 0x57FF0
+# GOT-NEXT:   Canonical gp value:
 # GOT-NEXT:   Reserved entries [
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x50000
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32752
 # GOT-NEXT:       Initial: 0x0
 # GOT-NEXT:       Purpose: Lazy resolver
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x50004
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32748
 # GOT-NEXT:       Initial: 0x80000000
 # GOT-NEXT:       Purpose: Module pointer (GNU extension)
@@ -46,44 +46,44 @@
 # GOT-NEXT:   ]
 # GOT-NEXT:   Local entries [
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x50008
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32744
 # GOT-NEXT:       Initial: 0x10000
 #                          ^-- (0x1002c + 0x8000) & ~0xffff
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x5000C
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32740
 # GOT-NEXT:       Initial: 0x20000
 #                          ^-- redundant unused entry
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x50010
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32736
 # GOT-NEXT:       Initial: 0x20000
 #                          ^-- redundant unused entry
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x50014
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32732
 # GOT-NEXT:       Initial: 0x30000
 #                          ^-- (0x29000 + 0x8000) & ~0xffff
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x50018
+# 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: 0x5001C
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32724
 # GOT-NEXT:       Initial: 0x50000
 #                          ^-- redundant unused entry
 # GOT-NEXT:     }
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x50020
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32720
 # GOT-NEXT:       Initial: 0x41008
 #                          ^-- 'bar' address
@@ -91,7 +91,7 @@
 # GOT-NEXT:   ]
 # GOT-NEXT:   Global entries [
 # GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x50024
+# GOT-NEXT:       Address:
 # GOT-NEXT:       Access: -32716
 # GOT-NEXT:       Initial: 0x0
 # GOT-NEXT:       Value: 0x0

Modified: lld/trunk/test/ELF/mips-options.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-options.s?rev=292160&r1=292159&r2=292160&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-options.s (original)
+++ lld/trunk/test/ELF/mips-options.s Mon Jan 16 15:17:09 2017
@@ -17,11 +17,11 @@ __start:
     lui  $gp, %hi(%neg(%gp_rel(g1)))
 
 # CHECK:      Name: _gp
-# CHECK-NEXT: Value: 0x100008258
+# CHECK-NEXT: Value: 0x[[GP:[0-9A-F]+]]
 
 # CHECK:      MIPS Options {
 # CHECK-NEXT:   ODK_REGINFO {
-# CHECK-NEXT:     GP: 0x100008258
+# CHECK-NEXT:     GP: 0x[[GP]]
 # CHECK-NEXT:     General Mask: 0x10000001
 # CHECK-NEXT:     Co-Proc Mask0: 0x0
 # CHECK-NEXT:     Co-Proc Mask1: 0x0




More information about the llvm-commits mailing list