[Mips] Make tests more tolerant to the program and section headers offsets

No functional changes.

llvm-svn: 234924

diff --git a/lld/test/elf/Mips/dynlib-fileheader-64.test b/lld/test/elf/Mips/dynlib-fileheader-64.test
index 206f4fa..a9c6dd9 100644 (file)
--- a/lld/test/elf/Mips/dynlib-fileheader-64.test
+++ b/lld/test/elf/Mips/dynlib-fileheader-64.test
@@ -23,8 +23,8 @@
 # CHECK:   Machine: EM_MIPS (0x8)
 # CHECK:   Version: 1
 # CHECK:   Entry: 0x170
-# CHECK:   ProgramHeaderOffset: 0x40
-# CHECK:   SectionHeaderOffset: 0x2140
+# CHECK:   ProgramHeaderOffset: 0x{{[0-9A-F]+}}
+# CHECK:   SectionHeaderOffset: 0x{{[0-9A-F]+}}
 # CHECK:   Flags [ (0x80000006)
 # CHECK:     EF_MIPS_ARCH_64R2 (0x80000000)
 # CHECK:     EF_MIPS_CPIC (0x4)

diff --git a/lld/test/elf/Mips/dynlib-fileheader-micro-64.test b/lld/test/elf/Mips/dynlib-fileheader-micro-64.test
index c03a951..9eb7722 100644 (file)
--- a/lld/test/elf/Mips/dynlib-fileheader-micro-64.test
+++ b/lld/test/elf/Mips/dynlib-fileheader-micro-64.test
@@ -23,8 +23,8 @@
 # CHECK-NEXT:  Machine: EM_MIPS (0x8)
 # CHECK-NEXT:  Version: 1
 # CHECK-NEXT:  Entry: 0x170
-# CHECK-NEXT:  ProgramHeaderOffset: 0x40
-# CHECK-NEXT:  SectionHeaderOffset: 0x2140
+# CHECK-NEXT:  ProgramHeaderOffset: 0x{{[0-9A-F]+}}
+# CHECK-NEXT:  SectionHeaderOffset: 0x{{[0-9A-F]+}}
 # CHECK-NEXT:  Flags [ (0x82000007)
 # CHECK-NEXT:    EF_MIPS_ARCH_64R2 (0x80000000)
 # CHECK-NEXT:    EF_MIPS_CPIC (0x4)

diff --git a/lld/test/elf/Mips/dynlib-fileheader-micro.test b/lld/test/elf/Mips/dynlib-fileheader-micro.test
index 5572160..5755e35 100644 (file)
--- a/lld/test/elf/Mips/dynlib-fileheader-micro.test
+++ b/lld/test/elf/Mips/dynlib-fileheader-micro.test
@@ -23,8 +23,8 @@
 # CHECK-NEXT:  Machine: EM_MIPS (0x8)
 # CHECK-NEXT:  Version: 1
 # CHECK-NEXT:  Entry: 0x100
-# CHECK-NEXT:  ProgramHeaderOffset: 0x34
-# CHECK-NEXT:  SectionHeaderOffset: 0x2100
+# CHECK-NEXT:  ProgramHeaderOffset: 0x{{[0-9A-F]+}}
+# CHECK-NEXT:  SectionHeaderOffset: 0x{{[0-9A-F]+}}
 # CHECK-NEXT:  Flags [ (0x72001007)
 # CHECK-NEXT:    EF_MIPS_ABI_O32 (0x1000)
 # CHECK-NEXT:    EF_MIPS_ARCH_32R2 (0x70000000)

diff --git a/lld/test/elf/Mips/dynlib-fileheader.test b/lld/test/elf/Mips/dynlib-fileheader.test
index 426e07d..a71bf28 100644 (file)
--- a/lld/test/elf/Mips/dynlib-fileheader.test
+++ b/lld/test/elf/Mips/dynlib-fileheader.test
@@ -23,8 +23,8 @@
 # CHECK:  Machine: EM_MIPS (0x8)
 # CHECK:  Version: 1
 # CHECK:  Entry: 0x100
-# CHECK:  ProgramHeaderOffset: 0x34
-# CHECK:  SectionHeaderOffset: 0x2100
+# CHECK:  ProgramHeaderOffset: 0x{{[0-9A-F]+}}
+# CHECK:  SectionHeaderOffset: 0x{{[0-9A-F]+}}
 # CHECK:  Flags [ (0x70001007)
 # CHECK:    EF_MIPS_ABI_O32 (0x1000)
 # CHECK:    EF_MIPS_ARCH_32R2 (0x70000000)

diff --git a/lld/test/elf/Mips/exe-fileheader-64.test b/lld/test/elf/Mips/exe-fileheader-64.test
index 63baff5..915d92b 100644 (file)
--- a/lld/test/elf/Mips/exe-fileheader-64.test
+++ b/lld/test/elf/Mips/exe-fileheader-64.test
@@ -23,8 +23,8 @@
 # CHECK:   Machine: EM_MIPS (0x8)
 # CHECK:   Version: 1
 # CHECK:   Entry: 0x1200001A0
-# CHECK:   ProgramHeaderOffset: 0x40
-# CHECK:   SectionHeaderOffset: 0x1300
+# CHECK:   ProgramHeaderOffset: 0x{{[0-9A-F]+}}
+# CHECK:   SectionHeaderOffset: 0x{{[0-9A-F]+}}
 # CHECK:   Flags [ (0x60000007)
 # CHECK:     EF_MIPS_ARCH_64 (0x60000000)
 # CHECK:     EF_MIPS_CPIC (0x4)

diff --git a/lld/test/elf/Mips/exe-fileheader-micro-64.test b/lld/test/elf/Mips/exe-fileheader-micro-64.test
index 044c2f7..97746ce 100644 (file)
--- a/lld/test/elf/Mips/exe-fileheader-micro-64.test
+++ b/lld/test/elf/Mips/exe-fileheader-micro-64.test
@@ -23,8 +23,8 @@
 # CHECK:   Machine: EM_MIPS (0x8)
 # CHECK:   Version: 1
 # CHECK:   Entry: 0x1200001A1
-# CHECK:   ProgramHeaderOffset: 0x40
-# CHECK:   SectionHeaderOffset: 0x1300
+# CHECK:   ProgramHeaderOffset: 0x{{[0-9A-F]+}}
+# CHECK:   SectionHeaderOffset: 0x{{[0-9A-F]+}}
 # CHECK:   Flags [ (0x82000007)
 # CHECK:     EF_MIPS_ARCH_64R2 (0x80000000)
 # CHECK:     EF_MIPS_CPIC (0x4)

diff --git a/lld/test/elf/Mips/exe-fileheader-micro.test b/lld/test/elf/Mips/exe-fileheader-micro.test
index 351f299..3ace021 100644 (file)
--- a/lld/test/elf/Mips/exe-fileheader-micro.test
+++ b/lld/test/elf/Mips/exe-fileheader-micro.test
@@ -24,8 +24,8 @@
 # CHECK-NEXT:   Machine: EM_MIPS (0x8)
 # CHECK-NEXT:   Version: 1
 # CHECK-NEXT:   Entry: 0x400109
-# CHECK-NEXT:   ProgramHeaderOffset: 0x34
-# CHECK-NEXT:   SectionHeaderOffset: 0x1268
+# CHECK-NEXT:   ProgramHeaderOffset: 0x{{[0-9A-F]+}}
+# CHECK-NEXT:   SectionHeaderOffset: 0x{{[0-9A-F]+}}
 # CHECK-NEXT:   Flags [ (0x72001005)
 # CHECK-NEXT:     EF_MIPS_ABI_O32 (0x1000)
 # CHECK-NEXT:     EF_MIPS_ARCH_32R2 (0x70000000)

diff --git a/lld/test/elf/Mips/exe-fileheader.test b/lld/test/elf/Mips/exe-fileheader.test
index ff0d381..68f6f5b 100644 (file)
--- a/lld/test/elf/Mips/exe-fileheader.test
+++ b/lld/test/elf/Mips/exe-fileheader.test
@@ -27,8 +27,8 @@
 # CHECK:   Machine: EM_MIPS (0x8)
 # CHECK:   Version: 1
 # CHECK:   Entry: 0x400190
-# CHECK:   ProgramHeaderOffset: 0x34
-# CHECK:   SectionHeaderOffset: 0x2280
+# CHECK:   ProgramHeaderOffset: 0x{{[0-9A-F]+}}
+# CHECK:   SectionHeaderOffset: 0x{{[0-9A-F]+}}
 # CHECK:   Flags [ (0x70001005)
 # CHECK:     EF_MIPS_ABI_O32 (0x1000)
 # CHECK:     EF_MIPS_ARCH_32R2 (0x70000000)

diff --git a/lld/test/elf/Mips/gp-sym-1-micro.test b/lld/test/elf/Mips/gp-sym-1-micro.test
index 76274ea..fa67e22 100644 (file)
--- a/lld/test/elf/Mips/gp-sym-1-micro.test
+++ b/lld/test/elf/Mips/gp-sym-1-micro.test
@@ -8,7 +8,7 @@
 # RUN: llvm-readobj -symbols %t.exe | FileCheck -check-prefix=SYM %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=SEC %s
 
-# SYM:      Name: _gp (203)
+# SYM:      Name: _gp
 # SYM-NEXT: Value: 0x408FF0
 
 # SEC:      Contents of section .text:

diff --git a/lld/test/elf/Mips/gp-sym-1.test b/lld/test/elf/Mips/gp-sym-1.test
index 6c2ffb6..ef059a5 100644 (file)
--- a/lld/test/elf/Mips/gp-sym-1.test
+++ b/lld/test/elf/Mips/gp-sym-1.test
@@ -7,7 +7,7 @@
 # RUN: llvm-readobj -symbols %t.exe | FileCheck -check-prefix=SYM %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=SEC %s
 
-# SYM:      Name: _gp (203)
+# SYM:      Name: _gp
 # SYM-NEXT: Value: 0x408FF0
 
 # SEC:      Contents of section .text:

diff --git a/lld/test/elf/Mips/mips-options-gp0.test b/lld/test/elf/Mips/mips-options-gp0.test
index f0c140b..572c8e2 100644 (file)
--- a/lld/test/elf/Mips/mips-options-gp0.test
+++ b/lld/test/elf/Mips/mips-options-gp0.test
@@ -5,7 +5,7 @@
 # RUN: llvm-readobj -symbols %t.so | FileCheck -check-prefix=SYM %s
 # RUN: llvm-objdump -s %t.so | FileCheck -check-prefix=SEC %s
 
-# SYM:      Name: L1 (1)
+# SYM:      Name: L1
 # SYM-NEXT: Value: 0x1A4
 # SYM-NEXT: Size: 4
 # SYM-NEXT: Binding: Local (0x0)
@@ -13,7 +13,7 @@
 # SYM-NEXT: Other: 0
 # SYM-NEXT: Section: .text (0x5)
 
-# SYM:      Name: _gp (34)
+# SYM:      Name: _gp
 # SYM-NEXT: Value: 0x9FF0
 # SYM-NEXT: Size: 0
 # SYM-NEXT: Binding: Global (0x1)

diff --git a/lld/test/elf/Mips/rel-gprel16.test b/lld/test/elf/Mips/rel-gprel16.test
index 84fc3ec..b5d1c6c 100644 (file)
--- a/lld/test/elf/Mips/rel-gprel16.test
+++ b/lld/test/elf/Mips/rel-gprel16.test
@@ -5,7 +5,7 @@
 # RUN: llvm-readobj -symbols %t.so | FileCheck -check-prefix=SYM %s
 # RUN: llvm-objdump -s %t.so | FileCheck -check-prefix=SEC %s
 
-# SYM:      Name: L1 (1)
+# SYM:      Name: L1
 # SYM-NEXT: Value: 0x104
 # SYM-NEXT: Size: 4
 # SYM-NEXT: Binding: Local (0x0)
@@ -13,7 +13,7 @@
 # SYM-NEXT: Other: 0
 # SYM-NEXT: Section: .text (0x5)
 
-# SYM:      Name: G1 (4)
+# SYM:      Name: G1
 # SYM-NEXT: Value: 0x108
 # SYM-NEXT: Size: 4
 # SYM-NEXT: Binding: Global (0x1)
@@ -21,7 +21,7 @@
 # SYM-NEXT: Other: 0
 # SYM-NEXT: Section: .text (0x5)
 
-# SYM:      Name: _gp (34)
+# SYM:      Name: _gp
 # SYM-NEXT: Value: 0x8FF0
 # SYM-NEXT: Size: 0
 # SYM-NEXT: Binding: Global (0x1)

diff --git a/lld/test/elf/Mips/rel-gprel32.test b/lld/test/elf/Mips/rel-gprel32.test
index ced53f5..567ce66 100644 (file)
--- a/lld/test/elf/Mips/rel-gprel32.test
+++ b/lld/test/elf/Mips/rel-gprel32.test
@@ -5,7 +5,7 @@
 # RUN: llvm-readobj -symbols %t-exe | FileCheck -check-prefix=SYM %s
 # RUN: llvm-objdump -s %t-exe | FileCheck -check-prefix=SEC %s
 
-# SYM:      Name: $L1 (1)
+# SYM:      Name: $L1
 # SYM-NEXT: Value: 0x400140
 # SYM-NEXT: Size: 4
 # SYM-NEXT: Binding: Local (0x0)
@@ -13,7 +13,7 @@
 # SYM-NEXT: Other: 0
 # SYM-NEXT: Section: .text (0x6)
 #
-# SYM:      Name: _gp (212)
+# SYM:      Name: _gp
 # SYM-NEXT: Value: 0x408FF0
 # SYM-NEXT: Size: 0
 # SYM-NEXT: Binding: Global (0x1)