From 9949bb06389dd6e6a23366572a3c760e2c7fcc82 Mon Sep 17 00:00:00 2001 From: John David Anglin Date: Fri, 26 Nov 2021 21:42:16 +0000 Subject: [PATCH] Fix ifunc test fails on hppa*-*-* 2021-11-26 John David Anglin PR ld/27442 ld/ChangeLog: * ld/testsuite/ld-ifunc/ifunc.exp (contains_irelative_reloc): Adjust regexp. Skip static ifunc-using executable test on hppa*-*-*. --- ld/testsuite/ld-ifunc/ifunc.exp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp index e559884fd0e..7e20dc2cac8 100644 --- a/ld/testsuite/ld-ifunc/ifunc.exp +++ b/ld/testsuite/ld-ifunc/ifunc.exp @@ -147,7 +147,7 @@ proc contains_irelative_reloc { binary_file } { # 080496f4 0000002a R_386_IRELATIVE - if { ![regexp "\[0-9a-f\]+\[ \]+\[0-9a-f\]+\[ \]+R_(\[_0-9A-Z\]+_IREL(|ATIVE)|PARISC_IPLT)\[ \]*\[0-9a-f\]*\n" [file_contents readelf.out]] } { + if { ![regexp "\[0-9a-f\]+\[ \]+\[0-9a-f\]+\[ \]+R_(\[_0-9A-Z\]+_IREL(|ATIVE)|PARISC_IPLT).*\n" [file_contents readelf.out]] } { return 0 } @@ -361,6 +361,7 @@ if {[contains_irelative_reloc tmpdir/local_prog] != 1} { set fails [expr $fails + 1] } if { ![string match "" $STATIC_LDFLAGS] \ + && ![istarget hppa*-*-*] \ && [contains_irelative_reloc tmpdir/static_prog] != 1} { fail "Static ifunc-using executable does not contain R_*_IRELATIVE relocation" set fails [expr $fails + 1] -- 2.30.2