From 3b3e2090118966e3b885ae578440e380dc90e648 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 24 Apr 2024 12:45:04 +0100 Subject: Update readelf's display of RELR sections to include the number of locations relocated --- ld/testsuite/ld-elf/dt-relr-2b.d | 2 +- ld/testsuite/ld-elf/dt-relr-2c.d | 2 +- ld/testsuite/ld-elf/dt-relr-2d.d | 2 +- ld/testsuite/ld-elf/dt-relr-2e.d | 2 +- ld/testsuite/ld-elf/dt-relr-2i.d | 2 +- ld/testsuite/ld-i386/dt-relr-1a.d | 2 +- ld/testsuite/ld-i386/dt-relr-1b.d | 2 +- ld/testsuite/ld-powerpc/abs-pie-relr.r | 2 +- ld/testsuite/ld-powerpc/abs-shared-relr.r | 2 +- ld/testsuite/ld-x86-64/dt-relr-1a-x32.d | 2 +- ld/testsuite/ld-x86-64/dt-relr-1a.d | 2 +- ld/testsuite/ld-x86-64/dt-relr-1b-x32.d | 2 +- ld/testsuite/ld-x86-64/dt-relr-1b.d | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'ld/testsuite') diff --git a/ld/testsuite/ld-elf/dt-relr-2b.d b/ld/testsuite/ld-elf/dt-relr-2b.d index f9c6880..6c66d56 100644 --- a/ld/testsuite/ld-elf/dt-relr-2b.d +++ b/ld/testsuite/ld-elf/dt-relr-2b.d @@ -12,7 +12,7 @@ Relocation section '\.rel(a|)\.dyn' at offset 0x[0-9a-f]+ contains 1 entry: #... [0-9a-f]+ +[0-9a-f]+ +R_.*_(RELATIVE|UADDR.*) .* #... -Relocation section '\.relr\.dyn' at offset 0x[0-9a-f]+ contains 2 entries: +Relocation section '\.relr\.dyn' at offset 0x[0-9a-f]+ contains 2 entries which relocate [0-9]+ locations: #... 0000: +[0-9a-f]+ [0-9a-f]+ +data 0001: +[0-9a-f]+ [0-9a-f]+ +data \+ 0x[0-9a-f]+ diff --git a/ld/testsuite/ld-elf/dt-relr-2c.d b/ld/testsuite/ld-elf/dt-relr-2c.d index d9e3698..cc37375 100644 --- a/ld/testsuite/ld-elf/dt-relr-2c.d +++ b/ld/testsuite/ld-elf/dt-relr-2c.d @@ -12,7 +12,7 @@ Relocation section '\.rel(a|)\.dyn' at offset 0x[0-9a-f]+ contains 2 entries: #... [0-9a-f]+ +[0-9a-f]+ +R_.*_(RELATIVE|UADDR.*) .* #... -Relocation section '\.relr\.dyn' at offset 0x[0-9a-f]+ contains 2 entries: +Relocation section '\.relr\.dyn' at offset 0x[0-9a-f]+ contains 2 entries which relocate [0-9]+ locations: #... 0000: +[0-9a-f]+ [0-9a-f]+ +.* 0001: +[0-9a-f]+ [0-9a-f]+ +.* diff --git a/ld/testsuite/ld-elf/dt-relr-2d.d b/ld/testsuite/ld-elf/dt-relr-2d.d index 69863bd..d149e77 100644 --- a/ld/testsuite/ld-elf/dt-relr-2d.d +++ b/ld/testsuite/ld-elf/dt-relr-2d.d @@ -12,7 +12,7 @@ Relocation section '\.rel(a|)\.dyn' at offset 0x[0-9a-f]+ contains 1 entry: #... [0-9a-f]+ +[0-9a-f]+ +R_.*_(RELATIVE|UADDR.*) .* #... -Relocation section '\.relr\.dyn' at offset 0x[0-9a-f]+ contains 2 entries: +Relocation section '\.relr\.dyn' at offset 0x[0-9a-f]+ contains 2 entries which relocate [0-9]+ locations: #... 0000: +[0-9a-f]+ [0-9a-f]+ +data 0001: +[0-9a-f]+ [0-9a-f]+ +data \+ 0x[0-9a-f]+ diff --git a/ld/testsuite/ld-elf/dt-relr-2e.d b/ld/testsuite/ld-elf/dt-relr-2e.d index e047c0d..e6b478c 100644 --- a/ld/testsuite/ld-elf/dt-relr-2e.d +++ b/ld/testsuite/ld-elf/dt-relr-2e.d @@ -12,7 +12,7 @@ Relocation section '\.rel(a|)\.data' at offset 0x[0-9a-f]+ contains 1 entry: #... [0-9a-f]+ +[0-9a-f]+ +R_.*_(RELATIVE|UADDR.*) .* #... -Relocation section '\.relr\.dyn' at offset 0x[0-9a-f]+ contains 2 entries: +Relocation section '\.relr\.dyn' at offset 0x[0-9a-f]+ contains 2 entries which relocate [0-9]+ locations: #... 0000: +[0-9a-f]+ [0-9a-f]+ +data 0001: +[0-9a-f]+ [0-9a-f]+ +data \+ 0x[0-9a-f]+ diff --git a/ld/testsuite/ld-elf/dt-relr-2i.d b/ld/testsuite/ld-elf/dt-relr-2i.d index a328ccb..2a07fcb 100644 --- a/ld/testsuite/ld-elf/dt-relr-2i.d +++ b/ld/testsuite/ld-elf/dt-relr-2i.d @@ -12,7 +12,7 @@ Relocation section '\.rel(a|)\.dyn' at offset 0x[0-9a-f]+ contains 1 entry: #... [0-9a-f]+ +[0-9a-f]+ +R_.*_(RELATIVE|UADDR.*) .* #... -Relocation section '\.relr\.dyn' at offset 0x[0-9a-f]+ contains 2 entries: +Relocation section '\.relr\.dyn' at offset 0x[0-9a-f]+ contains 2 entries which relocate [0-9]+ locations: #... 0000: +[0-9a-f]+ [0-9a-f]+ +data 0001: +[0-9a-f]+ [0-9a-f]+ +data \+ 0x[0-9a-f]+ diff --git a/ld/testsuite/ld-i386/dt-relr-1a.d b/ld/testsuite/ld-i386/dt-relr-1a.d index 89cc636..282540b 100644 --- a/ld/testsuite/ld-i386/dt-relr-1a.d +++ b/ld/testsuite/ld-i386/dt-relr-1a.d @@ -13,7 +13,7 @@ Relocation section '\.rel\.plt' at offset 0x[0-9a-f]+ contains 1 entry: +Offset +Info +Type +Sym. Value +Symbol's Name [0-9a-f]+ +[0-9a-f]+ +R_386_JUMP_SLOT +0+ +func1 -Relocation section '.relr.dyn' at offset 0x[a-f0-9]+ contains 2 entries: +Relocation section '.relr.dyn' at offset 0x[a-f0-9]+ contains 2 entries which relocate [0-9]+ locations: #... 0000: +[0-9a-f]+ [0-9a-f]+ +.* 0001: +[0-9a-f]+ [0-9a-f]+ +.* diff --git a/ld/testsuite/ld-i386/dt-relr-1b.d b/ld/testsuite/ld-i386/dt-relr-1b.d index 6e7f3ca..ff02725 100644 --- a/ld/testsuite/ld-i386/dt-relr-1b.d +++ b/ld/testsuite/ld-i386/dt-relr-1b.d @@ -16,7 +16,7 @@ Relocation section '\.rel\.plt' at offset 0x[0-9a-f]+ contains 1 entry: +Offset +Info +Type +Sym. Value +Symbol's Name [0-9a-f]+ +[0-9a-f]+ +R_386_JUMP_SLOT +0+ +func1 -Relocation section '.relr.dyn' at offset 0x[a-f0-9]+ contains 2 entries: +Relocation section '.relr.dyn' at offset 0x[a-f0-9]+ contains 2 entries which relocate [0-9]+ locations: #... 0000: +[0-9a-f]+ [0-9a-f]+ +.* 0001: +[0-9a-f]+ [0-9a-f]+ +.* diff --git a/ld/testsuite/ld-powerpc/abs-pie-relr.r b/ld/testsuite/ld-powerpc/abs-pie-relr.r index e84b0af..37c64f3 100644 --- a/ld/testsuite/ld-powerpc/abs-pie-relr.r +++ b/ld/testsuite/ld-powerpc/abs-pie-relr.r @@ -3,6 +3,6 @@ #ld: -melf64ppc -pie --hash-style=sysv -z pack-relative-relocs --defsym a=1 --defsym 'HIDDEN(b=2)' --defsym c=0x123456789abcdef0 #readelf: -rW -Relocation section '\.relr\.dyn' at offset .* contains 1 entry: +Relocation section '\.relr\.dyn' at offset .* contains 1 entry which relocates 1 location: Index: Entry Address Symbolic Address 0000: +[0-9a-f]+ [0-9a-f]+ +x diff --git a/ld/testsuite/ld-powerpc/abs-shared-relr.r b/ld/testsuite/ld-powerpc/abs-shared-relr.r index ce1a7ee..3f36c5d 100644 --- a/ld/testsuite/ld-powerpc/abs-shared-relr.r +++ b/ld/testsuite/ld-powerpc/abs-shared-relr.r @@ -12,7 +12,7 @@ Relocation section '\.rela\.dyn' at offset .* contains 6 entries: 0+10428 0+400000014 R_PPC64_GLOB_DAT 123456789abcdef0 c \+ 0 0+10450 0+400000026 R_PPC64_ADDR64 123456789abcdef0 c \+ 0 -Relocation section '\.relr\.dyn' at offset .* contains 1 entry: +Relocation section '\.relr\.dyn' at offset .* contains 1 entry which relocates 1 location: Index: Entry Address Symbolic Address 0000: +[0-9a-f]+ [0-9a-f]+ +x diff --git a/ld/testsuite/ld-x86-64/dt-relr-1a-x32.d b/ld/testsuite/ld-x86-64/dt-relr-1a-x32.d index 863e97a..dd2b73e 100644 --- a/ld/testsuite/ld-x86-64/dt-relr-1a-x32.d +++ b/ld/testsuite/ld-x86-64/dt-relr-1a-x32.d @@ -13,7 +13,7 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entry: +Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend [0-9a-f]+ +[0-9a-f]+ +R_X86_64_JUMP_SLOT +0+ +func1 \+ 0 -Relocation section '.relr.dyn' at offset 0x[a-f0-9]+ contains 2 entries: +Relocation section '.relr.dyn' at offset 0x[a-f0-9]+ contains 2 entries which relocate [0-9]+ locations: #... 0000: +[0-9a-f]+ [0-9a-f]+ +.* 0001: +[0-9a-f]+ [0-9a-f]+ +.* diff --git a/ld/testsuite/ld-x86-64/dt-relr-1a.d b/ld/testsuite/ld-x86-64/dt-relr-1a.d index 30af875..c7a74e3 100644 --- a/ld/testsuite/ld-x86-64/dt-relr-1a.d +++ b/ld/testsuite/ld-x86-64/dt-relr-1a.d @@ -13,7 +13,7 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entry: +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend [0-9a-f]+ +[0-9a-f]+ +R_X86_64_JUMP_SLOT +0+ +func1 \+ 0 -Relocation section '.relr.dyn' at offset 0x[a-f0-9]+ contains 2 entries: +Relocation section '.relr.dyn' at offset 0x[a-f0-9]+ contains 2 entries which relocate [0-9]+ locations: #... 0000: +[0-9a-f]+ [0-9a-f]+ +.* 0001: +[0-9a-f]+ [0-9a-f]+ +.* diff --git a/ld/testsuite/ld-x86-64/dt-relr-1b-x32.d b/ld/testsuite/ld-x86-64/dt-relr-1b-x32.d index 3c37bcd..bc582ae 100644 --- a/ld/testsuite/ld-x86-64/dt-relr-1b-x32.d +++ b/ld/testsuite/ld-x86-64/dt-relr-1b-x32.d @@ -16,7 +16,7 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entry: +Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend [0-9a-f]+ +[0-9a-f]+ +R_X86_64_JUMP_SLOT +0+ +func1 \+ 0 -Relocation section '.relr.dyn' at offset 0x[a-f0-9]+ contains 2 entries: +Relocation section '.relr.dyn' at offset 0x[a-f0-9]+ contains 2 entries which relocate [0-9]+ locations: #... 0000: +[0-9a-f]+ [0-9a-f]+ +.* 0001: +[0-9a-f]+ [0-9a-f]+ +.* diff --git a/ld/testsuite/ld-x86-64/dt-relr-1b.d b/ld/testsuite/ld-x86-64/dt-relr-1b.d index bc07cf8..c3fddb0 100644 --- a/ld/testsuite/ld-x86-64/dt-relr-1b.d +++ b/ld/testsuite/ld-x86-64/dt-relr-1b.d @@ -16,7 +16,7 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entry: +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend [0-9a-f]+ +[0-9a-f]+ +R_X86_64_JUMP_SLOT +0+ +func1 \+ 0 -Relocation section '.relr.dyn' at offset 0x[a-f0-9]+ contains 2 entries: +Relocation section '.relr.dyn' at offset 0x[a-f0-9]+ contains 2 entries which relocate [0-9]+ locations: #... 0000: +[0-9a-f]+ [0-9a-f]+ +.* 0001: +[0-9a-f]+ [0-9a-f]+ +.* -- cgit v1.1