[lld] c5ccae4 - [ELF][test] Make tests less sensitive of addresses/number of sections

Fangrui Song via llvm-commits llvm-commits at lists.llvm.org
Mon Sep 11 21:01:40 PDT 2023


Author: Fangrui Song
Date: 2023-09-11T21:01:36-07:00
New Revision: c5ccae4f18c8825b30b489cf09d34aee3351c56c

URL: https://github.com/llvm/llvm-project/commit/c5ccae4f18c8825b30b489cf09d34aee3351c56c
DIFF: https://github.com/llvm/llvm-project/commit/c5ccae4f18c8825b30b489cf09d34aee3351c56c.diff

LOG: [ELF][test] Make tests less sensitive of addresses/number of sections

Added: 
    

Modified: 
    lld/test/ELF/aarch64-feature-bti.s
    lld/test/ELF/basic-ppc64.s
    lld/test/ELF/dynamic-reloc.s
    lld/test/ELF/i386-relax-reloc.s
    lld/test/ELF/riscv-gp.s

Removed: 
    


################################################################################
diff  --git a/lld/test/ELF/aarch64-feature-bti.s b/lld/test/ELF/aarch64-feature-bti.s
index 67291ad8670d979..e4768dff0e69d1d 100644
--- a/lld/test/ELF/aarch64-feature-bti.s
+++ b/lld/test/ELF/aarch64-feature-bti.s
@@ -185,7 +185,7 @@
 # RELV-NEXT:           nop
 # RELV-LABEL: <funcRelVtable at plt>:
 # RELV-NEXT:   103c8:  bti     c
-# RELV-NEXT:           adrp    x16, 0x30000 <_DYNAMIC+0xfc20>
+# RELV-NEXT:           adrp    x16, 0x30000
 # RELV-NEXT:           ldr     x17, [x16, #1216]
 # RELV-NEXT:           add     x16, x16, #1216
 # RELV-NEXT:           br      x17

diff  --git a/lld/test/ELF/basic-ppc64.s b/lld/test/ELF/basic-ppc64.s
index 3bf0541f2505c81..f4449bd4bd76500 100644
--- a/lld/test/ELF/basic-ppc64.s
+++ b/lld/test/ELF/basic-ppc64.s
@@ -1,11 +1,23 @@
 # REQUIRES: ppc
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: ld.lld --hash-style=sysv -discard-all -shared %t.o -o %t.so
-# RUN: llvm-readobj --file-headers --sections --section-data -l %t.so | FileCheck --check-prefixes=CHECK,LE %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le %s -o %tle.o
+# RUN: ld.lld --hash-style=sysv -discard-all -shared %tle.o -o %tle.so
+# RUN: llvm-readelf -hSl %tle.so | FileCheck --check-prefixes=CHECK,LE %s
 
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: ld.lld --hash-style=sysv -discard-all -shared %t.o -o %t.so
-# RUN: llvm-readobj --file-headers --sections --section-data -l %t.so | FileCheck --check-prefixes=CHECK,BE %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc64 %s -o %tbe.o
+# RUN: ld.lld --hash-style=sysv -discard-all -shared %tbe.o -o %tbe.so
+# RUN: llvm-readelf -hSl %tbe.so | FileCheck --check-prefixes=CHECK,BE %s
+
+# CHECK:        Class:                             ELF64
+# LE-NEXT:      Data:                              2's complement, little endian
+# BE-NEXT:      Data:                              2's complement, big endian
+# CHECK-NEXT:   Version:                           1 (current)
+# CHECK-NEXT:   OS/ABI:                            UNIX - System V
+# CHECK-NEXT:   ABI Version:                       0
+# CHECK-NEXT:   Type:                              DYN (Shared object file)
+# CHECK-NEXT:   Machine:                           PowerPC64
+
+# CHECK:      Name              Type            Address          Off    Size   ES Flg Lk Inf Al
+# CHECK:      .branch_lt        NOBITS          {{.*}}                  000000 00  WA  0   0  8
 
 .abiversion 2
 # Exits with return code 55 on linux.
@@ -14,347 +26,4 @@
   li 3,55
   sc
 
-// CHECK:      Format: elf64-powerpc
-// LE-NEXT:    Arch: powerpc64le
-// BE-NEXT:    Arch: powerpc64{{$}}
-// CHECK-NEXT: AddressSize: 64bit
-// CHECK-NEXT: LoadName:
-// CHECK-NEXT: ElfHeader {
-// CHECK-NEXT:  Ident {
-// CHECK-NEXT:    Magic: (7F 45 4C 46)
-// CHECK-NEXT:    Class: 64-bit (0x2)
-// LE-NEXT:       DataEncoding: LittleEndian (0x1)
-// BE-NEXT:       DataEncoding: BigEndian (0x2)
-// CHECK-NEXT:    FileVersion: 1
-// CHECK-NEXT:    OS/ABI: SystemV (0x0)
-// CHECK-NEXT:    ABIVersion: 0
-// CHECK-NEXT:    Unused: (00 00 00 00 00 00 00)
-// CHECK-NEXT:  }
-// CHECK-NEXT:  Type: SharedObject (0x3)
-// CHECK-NEXT:  Machine: EM_PPC64 (0x15)
-// CHECK-NEXT:  Version: 1
-// CHECK-NEXT:  Entry: 0x0
-// CHECK-NEXT:  ProgramHeaderOffset: 0x40
-// CHECK-NEXT:  SectionHeaderOffset: 0x340
-// CHECK-NEXT:  Flags [ (0x2)
-// CHECK-NEXT:    0x2
-// CHECK-NEXT:  ]
-// CHECK-NEXT:  HeaderSize: 64
-// CHECK-NEXT:  ProgramHeaderEntrySize: 56
-// CHECK-NEXT:  ProgramHeaderCount: 7
-// CHECK-NEXT:  SectionHeaderEntrySize: 64
-// CHECK-NEXT:  SectionHeaderCount: 11
-// CHECK-NEXT:  StringTableSectionIndex: 9
-// CHECK-NEXT:}
-// CHECK-NEXT:Sections [
-// CHECK-NEXT:  Section {
-// CHECK-NEXT:    Index: 0
-// CHECK-NEXT:    Name:  (0)
-// CHECK-NEXT:    Type: SHT_NULL (0x0)
-// CHECK-NEXT:    Flags [ (0x0)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x0
-// CHECK-NEXT:    Offset: 0x0
-// CHECK-NEXT:    Size: 0
-// CHECK-NEXT:    Link: 0
-// CHECK-NEXT:    Info: 0
-// CHECK-NEXT:    AddressAlignment: 0
-// CHECK-NEXT:    EntrySize: 0
-// CHECK-NEXT:    SectionData (
-// CHECK-NEXT:    )
-// CHECK-NEXT:  }
-// CHECK-NEXT:  Section {
-// CHECK-NEXT:    Index: 1
-// CHECK-NEXT:    Name: .dynsym (1)
-// CHECK-NEXT:    Type: SHT_DYNSYM (0xB)
-// CHECK-NEXT:    Flags [ (0x2)
-// CHECK-NEXT:      SHF_ALLOC (0x2)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x200
-// CHECK-NEXT:    Offset: 0x200
-// CHECK-NEXT:    Size: 24
-// CHECK-NEXT:    Link: 3
-// CHECK-NEXT:    Info: 1
-// CHECK-NEXT:    AddressAlignment: 8
-// CHECK-NEXT:    EntrySize: 24
-// CHECK-NEXT:    SectionData (
-// CHECK-NEXT:      0000: 00000000 00000000 00000000 00000000  |................|
-// CHECK-NEXT:      0010: 00000000 00000000                    |........|
-// CHECK-NEXT:    )
-// CHECK-NEXT:  }
-// CHECK-NEXT:  Section {
-// CHECK-NEXT:    Index: 2
-// CHECK-NEXT:    Name: .hash (9)
-// CHECK-NEXT:    Type: SHT_HASH (0x5)
-// CHECK-NEXT:    Flags [ (0x2)
-// CHECK-NEXT:      SHF_ALLOC (0x2)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x218
-// CHECK-NEXT:    Offset: 0x218
-// CHECK-NEXT:    Size: 16
-// CHECK-NEXT:    Link: 1
-// CHECK-NEXT:    Info: 0
-// CHECK-NEXT:    AddressAlignment: 4
-// CHECK-NEXT:    EntrySize: 4
-// CHECK-NEXT:    SectionData (
-// LE-NEXT:         0000: 01000000 01000000 00000000 00000000
-// BE-NEXT:         0000: 00000001 00000001 00000000 00000000
-// CHECK-NEXT:    )
-// CHECK-NEXT:  }
-// CHECK-NEXT:  Section {
-// CHECK-NEXT:    Index: 3
-// CHECK-NEXT:    Name: .dynstr (15)
-// CHECK-NEXT:    Type: SHT_STRTAB (0x3)
-// CHECK-NEXT:    Flags [ (0x2)
-// CHECK-NEXT:      SHF_ALLOC (0x2)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x228
-// CHECK-NEXT:    Offset: 0x228
-// CHECK-NEXT:    Size: 1
-// CHECK-NEXT:    Link: 0
-// CHECK-NEXT:    Info: 0
-// CHECK-NEXT:    AddressAlignment: 1
-// CHECK-NEXT:    EntrySize: 0
-// CHECK-NEXT:    SectionData (
-// CHECK-NEXT:      0000: 00                                   |.|
-// CHECK-NEXT:    )
-// CHECK-NEXT:  }
-// CHECK-NEXT:  Section {
-// CHECK-NEXT:    Index: 4
-// CHECK-NEXT:    Name: .text (23)
-// CHECK-NEXT:    Type: SHT_PROGBITS (0x1)
-// CHECK-NEXT:    Flags [ (0x6)
-// CHECK-NEXT:      SHF_ALLOC (0x2)
-// CHECK-NEXT:      SHF_EXECINSTR (0x4)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x1022C
-// CHECK-NEXT:    Offset: 0x22C
-// CHECK-NEXT:    Size: 12
-// CHECK-NEXT:    Link: 0
-// CHECK-NEXT:    Info: 0
-// CHECK-NEXT:    AddressAlignment: 4
-// CHECK-NEXT:    EntrySize: 0
-// CHECK-NEXT:    SectionData (
-// LE-NEXT:         0000: 01000038 37006038 02000044
-// BE-NEXT:         0000: 38000001 38600037 44000002
-// CHECK-NEXT:    )
-// CHECK-NEXT:  }
-// CHECK-NEXT:  Section {
-// CHECK-NEXT:    Index: 5
-// CHECK-NEXT:    Name: .dynamic (29)
-// CHECK-NEXT:    Type: SHT_DYNAMIC (0x6)
-// CHECK-NEXT:    Flags [ (0x3)
-// CHECK-NEXT:      SHF_ALLOC (0x2)
-// CHECK-NEXT:      SHF_WRITE (0x1)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x20238
-// CHECK-NEXT:    Offset: 0x238
-// CHECK-NEXT:    Size: 112
-// CHECK-NEXT:    Link: 3
-// CHECK-NEXT:    Info: 0
-// CHECK-NEXT:    AddressAlignment: 8
-// CHECK-NEXT:    EntrySize: 16
-// CHECK-NEXT:    SectionData (
-// LE-NEXT:         0000: 06000000 00000000 00020000 00000000  |
-// LE-NEXT:         0010: 0B000000 00000000 18000000 00000000  |
-// LE-NEXT:         0020: 05000000 00000000 28020000 00000000  |
-// LE-NEXT:         0030: 0A000000 00000000 01000000 00000000  |
-// LE-NEXT:         0040: 04000000 00000000 18020000 00000000  |
-// LE-NEXT:         0050: 03000070 00000000 00000000 00000000  |
-// LE-NEXT:         0060: 00000000 00000000 00000000 00000000  |
-// BE-NEXT:         0000: 00000000 00000006 00000000 00000200  |
-// BE-NEXT:         0010: 00000000 0000000B 00000000 00000018  |
-// BE-NEXT:         0020: 00000000 00000005 00000000 00000228  |
-// BE-NEXT:         0030: 00000000 0000000A 00000000 00000001  |
-// BE-NEXT:         0040: 00000000 00000004 00000000 00000218  |
-// BE-NEXT:         0050: 00000000 70000003 00000000 00000000  |
-// BE-NEXT:         0060: 00000000 00000000 00000000 00000000  |
-// CHECK-NEXT:    )
-// CHECK-NEXT:  }
-// CHECK-NEXT:  Section {
-// CHECK-NEXT:    Index: 6
-// CHECK-NEXT:    Name: .branch_lt (38)
-// CHECK-NEXT:    Type: SHT_NOBITS (0x8)
-// CHECK-NEXT:    Flags [ (0x3)
-// CHECK-NEXT:      SHF_ALLOC (0x2)
-// CHECK-NEXT:      SHF_WRITE (0x1)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x302A8
-// CHECK-NEXT:    Offset: 0x2A8
-// CHECK-NEXT:    Size: 0
-// CHECK-NEXT:    Link: 0
-// CHECK-NEXT:    Info: 0
-// CHECK-NEXT:    AddressAlignment: 8
-// CHECK-NEXT:    EntrySize: 0
-// CHECK-NEXT:  }
-// CHECK-NEXT:  Section {
-// CHECK-NEXT:    Index: 7
-// CHECK-NEXT:    Name: .comment (49)
-// CHECK-NEXT:    Type: SHT_PROGBITS (0x1)
-// CHECK-NEXT:    Flags [ (0x30)
-// CHECK-NEXT:      SHF_MERGE (0x10)
-// CHECK-NEXT:      SHF_STRINGS (0x20)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x0
-// CHECK-NEXT:    Offset: 0x2A8
-// CHECK-NEXT:    Size: 8
-// CHECK-NEXT:    Link: 0
-// CHECK-NEXT:    Info: 0
-// CHECK-NEXT:    AddressAlignment: 1
-// CHECK-NEXT:    EntrySize: 1
-// CHECK-NEXT:    SectionData (
-// CHECK-NEXT:      0000: 4C4C4420 312E3000                    |LLD 1.0.|
-// CHECK-NEXT:    )
-// CHECK-NEXT:  }
-// CHECK-NEXT:  Section {
-// CHECK-NEXT:    Index: 8
-// CHECK-NEXT:    Name: .symtab (58)
-// CHECK-NEXT:    Type: SHT_SYMTAB (0x2)
-// CHECK-NEXT:    Flags [ (0x0)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x0
-// CHECK-NEXT:    Offset: 0x2B0
-// CHECK-NEXT:    Size: 48
-// CHECK-NEXT:    Link: 10
-// CHECK-NEXT:    Info: 2
-// CHECK-NEXT:    AddressAlignment: 8
-// CHECK-NEXT:    EntrySize: 24
-// CHECK-NEXT:    SectionData (
-// LE-NEXT:         0000: 00000000 00000000 00000000 00000000
-// LE-NEXT:         0010: 00000000 00000000 01000000 00020500
-// LE-NEXT:         0020: 38020200 00000000 00000000 00000000
-// BE-NEXT:         0000: 00000000 00000000 00000000 00000000
-// BE-NEXT:         0010: 00000000 00000000 00000001 00020005
-// BE-NEXT:         0020: 00000000 00020238 00000000 00000000
-// CHECK-NEXT:    )
-// CHECK-NEXT:  }
-// CHECK-NEXT:  Section {
-// CHECK-NEXT:    Index: 9
-// CHECK-NEXT:    Name: .shstrtab (66)
-// CHECK-NEXT:    Type: SHT_STRTAB (0x3)
-// CHECK-NEXT:    Flags [ (0x0)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x0
-// CHECK-NEXT:    Offset: 0x2E0
-// CHECK-NEXT:    Size: 84
-// CHECK-NEXT:    Link: 0
-// CHECK-NEXT:    Info: 0
-// CHECK-NEXT:    AddressAlignment: 1
-// CHECK-NEXT:    EntrySize: 0
-// CHECK-NEXT:    SectionData (
-// CHECK-NEXT:      0000: 002E6479 6E73796D 002E6861 7368002E  |..dynsym..hash..|
-// CHECK-NEXT:      0010: 64796E73 7472002E 74657874 002E6479  |dynstr..text..dy|
-// CHECK-NEXT:      0020: 6E616D69 63002E62 72616E63 685F6C74  |namic..branch_lt|
-// CHECK-NEXT:      0030: 002E636F 6D6D656E 74002E73 796D7461  |..comment..symta|
-// CHECK-NEXT:      0040: 62002E73 68737472 74616200 2E737472  |b..shstrtab..str|
-// CHECK-NEXT:      0050: 74616200                             |tab.|
-// CHECK-NEXT:    )
-// CHECK-NEXT:  }
-// CHECK-NEXT:  Section {
-// CHECK-NEXT:    Index: 10
-// CHECK-NEXT:    Name: .strtab (76)
-// CHECK-NEXT:    Type: SHT_STRTAB (0x3)
-// CHECK-NEXT:    Flags [ (0x0)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x0
-// CHECK-NEXT:    Offset: 0x334
-// CHECK-NEXT:    Size: 10
-// CHECK-NEXT:    Link: 0
-// CHECK-NEXT:    Info: 0
-// CHECK-NEXT:    AddressAlignment: 1
-// CHECK-NEXT:    EntrySize: 0
-// CHECK-NEXT:    SectionData (
-// CHECK-NEXT:      0000: 005F4459 4E414D49 4300               |._DYNAMIC.|
-// CHECK-NEXT:    )
-// CHECK-NEXT:  }
-// CHECK-NEXT:]
-// CHECK-NEXT:ProgramHeaders [
-// CHECK-NEXT:  ProgramHeader {
-// CHECK-NEXT:    Type: PT_PHDR (0x6)
-// CHECK-NEXT:    Offset: 0x40
-// CHECK-NEXT:    VirtualAddress: 0x40
-// CHECK-NEXT:    PhysicalAddress: 0x40
-// CHECK-NEXT:    FileSize: 448
-// CHECK-NEXT:    MemSize: 448
-// CHECK-NEXT:    Flags [ (0x4)
-// CHECK-NEXT:      PF_R (0x4)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Alignment: 8
-// CHECK-NEXT:  }
-// CHECK-NEXT:  ProgramHeader {
-// CHECK-NEXT:    Type: PT_LOAD (0x1)
-// CHECK-NEXT:    Offset: 0x0
-// CHECK-NEXT:    VirtualAddress: 0x0
-// CHECK-NEXT:    PhysicalAddress: 0x0
-// CHECK-NEXT:    FileSize: 553
-// CHECK-NEXT:    MemSize: 553
-// CHECK-NEXT:    Flags [ (0x4)
-// CHECK-NEXT:      PF_R (0x4)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Alignment: 65536
-// CHECK-NEXT:  }
-// CHECK-NEXT:  ProgramHeader {
-// CHECK-NEXT:    Type: PT_LOAD (0x1)
-// CHECK-NEXT:    Offset: 0x22C
-// CHECK-NEXT:    VirtualAddress: 0x1022C
-// CHECK-NEXT:    PhysicalAddress: 0x1022C
-// CHECK-NEXT:    FileSize: 12
-// CHECK-NEXT:    MemSize: 12
-// CHECK-NEXT:    Flags [ (0x5)
-// CHECK-NEXT:      PF_R (0x4)
-// CHECK-NEXT:      PF_X (0x1)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Alignment: 65536
-// CHECK-NEXT:  }
-// CHECK-NEXT:  ProgramHeader {
-// CHECK-NEXT:    Type: PT_LOAD (0x1)
-// CHECK-NEXT:    Offset: 0x238
-// CHECK-NEXT:    VirtualAddress: 0x20238
-// CHECK-NEXT:    PhysicalAddress: 0x20238
-// CHECK-NEXT:    FileSize: 112
-// CHECK-NEXT:    MemSize: 112
-// CHECK-NEXT:    Flags [ (0x6)
-// CHECK-NEXT:      PF_R (0x4)
-// CHECK-NEXT:      PF_W (0x2)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Alignment: 65536
-// CHECK-NEXT:  }
-// CHECK-NEXT:  ProgramHeader {
-// CHECK-NEXT:    Type: PT_DYNAMIC (0x2)
-// CHECK-NEXT:    Offset: 0x238
-// CHECK-NEXT:    VirtualAddress: 0x20238
-// CHECK-NEXT:    PhysicalAddress: 0x20238
-// CHECK-NEXT:    FileSize: 112
-// CHECK-NEXT:    MemSize: 112
-// CHECK-NEXT:    Flags [ (0x6)
-// CHECK-NEXT:      PF_R (0x4)
-// CHECK-NEXT:      PF_W (0x2)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Alignment: 8
-// CHECK-NEXT:  }
-// CHECK-NEXT:  ProgramHeader {
-// CHECK-NEXT:    Type: PT_GNU_RELRO (0x6474E552)
-// CHECK-NEXT:    Offset: 0x238
-// CHECK-NEXT:    VirtualAddress: 0x20238
-// CHECK-NEXT:    PhysicalAddress: 0x20238
-// CHECK-NEXT:    FileSize: 112
-// CHECK-NEXT:    MemSize: 3528
-// CHECK-NEXT:    Flags [ (0x4)
-// CHECK-NEXT:      PF_R (0x4)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Alignment: 1
-// CHECK-NEXT:  }
-// CHECK-NEXT:  ProgramHeader {
-// CHECK-NEXT:    Type: PT_GNU_STACK (0x6474E551)
-// CHECK-NEXT:    Offset: 0x0
-// CHECK-NEXT:    VirtualAddress: 0x0
-// CHECK-NEXT:    PhysicalAddress: 0x0
-// CHECK-NEXT:    FileSize: 0
-// CHECK-NEXT:    MemSize: 0
-// CHECK-NEXT:    Flags [ (0x6)
-// CHECK-NEXT:      PF_R (0x4)
-// CHECK-NEXT:      PF_W (0x2)
-// CHECK-NEXT:    ]
-// CHECK-NEXT:    Alignment: 0
-// CHECK-NEXT:  }
-// CHECK-NEXT:]
+

diff  --git a/lld/test/ELF/dynamic-reloc.s b/lld/test/ELF/dynamic-reloc.s
index 0df38b565ddf11f..6d98db0c2468e6d 100644
--- a/lld/test/ELF/dynamic-reloc.s
+++ b/lld/test/ELF/dynamic-reloc.s
@@ -19,7 +19,7 @@
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: [[RELASIZE:.*]]
 // CHECK-NEXT: Link: 1
-// CHECK-NEXT: Info: 9
+// CHECK-NEXT: Info:
 // CHECK-NEXT: AddressAlignment: 8
 // CHECK-NEXT: EntrySize: 24
 

diff  --git a/lld/test/ELF/i386-relax-reloc.s b/lld/test/ELF/i386-relax-reloc.s
index 93a9d681b910c0c..7376af7c8caa492 100644
--- a/lld/test/ELF/i386-relax-reloc.s
+++ b/lld/test/ELF/i386-relax-reloc.s
@@ -5,7 +5,7 @@
 // RUN: llvm-objdump --no-print-imm-hex -d --no-show-raw-insn %t.so | FileCheck %s
 
 // SEC:      .got PROGBITS 000021f0
-// SEC-NEXT: .got.plt PROGBITS 000031f4
+// SEC:      .got.plt PROGBITS 000031f4
 
 // CHECK: <foo>:
 // CHECK-NEXT: 1194: movl    -4100(%ebx), %eax

diff  --git a/lld/test/ELF/riscv-gp.s b/lld/test/ELF/riscv-gp.s
index fcc59ffa94813cf..29411d19b019291 100644
--- a/lld/test/ELF/riscv-gp.s
+++ b/lld/test/ELF/riscv-gp.s
@@ -1,22 +1,20 @@
 # REQUIRES: riscv
 # RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
 # RUN: ld.lld -pie %t.32.o -o %t.32
-# RUN: llvm-readelf -s %t.32 | FileCheck --check-prefix=SYM32 %s
-# RUN: llvm-readelf -S %t.32 | FileCheck --check-prefix=SEC32 %s
+# RUN: llvm-readelf -S -s %t.32 | FileCheck --check-prefix=SEC32 %s
 # RUN: not ld.lld -shared %t.32.o -o /dev/null 2>&1 | FileCheck --check-prefix=ERR %s
 
 # RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
 # RUN: ld.lld -pie %t.64.o -o %t.64
-# RUN: llvm-readelf -s %t.64 | FileCheck --check-prefix=SYM64 %s
-# RUN: llvm-readelf -S %t.64 | FileCheck --check-prefix=SEC64 %s
+# RUN: llvm-readelf -S -s %t.64 | FileCheck --check-prefix=SEC64 %s
 # RUN: not ld.lld -shared %t.64.o -o /dev/null 2>&1 | FileCheck --check-prefix=ERR %s
 
 ## __global_pointer$ = .sdata+0x800 = 0x39c0
-# SEC32: [ 7] .sdata PROGBITS {{0*}}000031c0
-# SYM32: {{0*}}000039c0 0 NOTYPE GLOBAL DEFAULT 7 __global_pointer$
+# SEC32: [ [[#SDATA:]]] .sdata PROGBITS {{0*}}000031c0
+# SEC32: {{0*}}000039c0 0 NOTYPE GLOBAL DEFAULT [[#SDATA]] __global_pointer$
 
-# SEC64: [ 7] .sdata PROGBITS {{0*}}000032e0
-# SYM64: {{0*}}00003ae0 0 NOTYPE GLOBAL DEFAULT 7 __global_pointer$
+# SEC64: [ [[#SDATA:]]] .sdata PROGBITS {{0*}}000032e0
+# SEC64: {{0*}}00003ae0 0 NOTYPE GLOBAL DEFAULT [[#SDATA]] __global_pointer$
 
 ## __global_pointer$ - 0x1000 = 4096*3-2048
 # DIS:      1000: auipc gp, 3


        


More information about the llvm-commits mailing list