From 1e1613647fc5da78f7924f8264b09eeed6362987 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 21 Jan 2020 16:20:38 -0800 Subject: [PATCH] pr23900-1.d: Adjusted Linux program headers may look like Section to Segment mapping: Segment Sections... 00 .note.gnu.property .text 01 .note.gnu.property 02 .note.gnu.property or Section to Segment mapping: Segment Sections... 00 .note.gnu.property 01 .text 02 .note.gnu.property 03 .note.gnu.property Update pr23900-1.d to accept both. * testsuite/ld-elf/pr23900-1.d: Adjusted. --- ld/ChangeLog | 4 ++++ ld/testsuite/ld-elf/pr23900-1.d | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index a686c187cbf..369ffee04ad 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2020-01-21 H.J. Lu + + * testsuite/ld-elf/pr23900-1.d: Adjusted. + 2020-01-21 H.J. Lu * testsuite/ld-elf/pr23900-1.d: Also pass -l to readelf. diff --git a/ld/testsuite/ld-elf/pr23900-1.d b/ld/testsuite/ld-elf/pr23900-1.d index 8f8c7ccf037..da0fcbb4e34 100644 --- a/ld/testsuite/ld-elf/pr23900-1.d +++ b/ld/testsuite/ld-elf/pr23900-1.d @@ -5,7 +5,7 @@ #... GNU_PROPERTY .* #... - +[0-9]+ +\.note\.gnu\.property + +[0-9]+ +.*\.note\.gnu\.property.* #... +[0-9]+ +\.note\.gnu\.property #... -- 2.30.2