From 85f2093ddc13e96585e9a44ee03b52f848ffbf75 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 13 Feb 2018 20:32:19 -0800 Subject: [PATCH] x86-64: Use pr22393-3a.so and pr22393-3a-now.so They should be pr22393-3a.so and pr22393-3a-now.so, not pr22393-2a.so and pr22393-2a-now.so. Since ld-elf/shared.exp creates pr22393-2a.so and pr22393-2a-now.so, we won't notice the problem if x86-64.exp runs after ld-elf/shared.exp. * testsuite/ld-x86-64/x86-64.exp: Replace pr22393-2a.so and pr22393-2a-now.so with pr22393-3a.so and pr22393-3a-now.so. --- ld/ChangeLog | 5 +++++ ld/testsuite/ld-x86-64/x86-64.exp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index fae7ca5c662..01c90efa6c0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2018-02-13 H.J. Lu + + * testsuite/ld-x86-64/x86-64.exp: Replace pr22393-2a.so and + pr22393-2a-now.so with pr22393-3a.so and pr22393-3a-now.so. + 2018-02-14 H.J. Lu PR 22836 diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index a649de87cd1..8442663af17 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -1127,7 +1127,7 @@ if { [isnative] && [which $CC] != 0 } { ] \ [list \ "Build pr22393-3" \ - "$NOPIE_LDFLAGS -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-2a.so" \ + "$NOPIE_LDFLAGS -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a.so" \ "$NOPIE_CFLAGS" \ {pr22393-3b.c} \ {{readelf -lW pr22393-3a.rd} \ @@ -1136,7 +1136,7 @@ if { [isnative] && [which $CC] != 0 } { ] \ [list \ "Build pr22393-3 (PIE)" \ - "-pie -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-2a-now.so" \ + "-pie -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a-now.so" \ "-fPIE" \ {pr22393-3b.c} \ {{readelf -lW pr22393-3a.rd} \ -- 2.30.2