From 28e6a46bcb00e9972540e4d12a98cc3f6fbb9d87 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 24 Aug 2017 07:53:41 -0700 Subject: [PATCH] x86-64: Run pr22001-1b on x32 Run pr22001-1b on x32 since R_X86_64_32S relocation can be turned into dynamic R_X86_64_32 relocation which won't overflow on x32. * testsuite/ld-x86-64/x86-64.exp: Run pr22001-1b on x32. --- ld/ChangeLog | 20 +++++++++++-------- ld/testsuite/ld-x86-64/x86-64.exp | 33 +++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 0c445920232..6a3a35f2fc9 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,16 +1,20 @@ +2017-08-24 H.J. Lu + + * testsuite/ld-x86-64/x86-64.exp: Run pr22001-1b on x32. + 2017-08-24 H.J. Lu PR ld/22001 * testsuite/ld-i386/i386.exp: Run -z nocopyreloc tests. * testsuite/ld-x86-64/x86-64.exp: Likewise. - * ld/testsuite/ld-i386/pr22001-1a.c: New file. - * ld/testsuite/ld-i386/pr22001-1b.c: Likewise. - * ld/testsuite/ld-i386/pr22001-1c.S: Likewise. - * ld/testsuite/ld-x86-64/pr22001-1a.c: Likewise. - * ld/testsuite/ld-x86-64/pr22001-1a.err: Likewise. - * ld/testsuite/ld-x86-64/pr22001-1b.c: Likewise. - * ld/testsuite/ld-x86-64/pr22001-1b.err: Likewise. - * ld/testsuite/ld-x86-64/pr22001-1c.c: Likewise. + * testsuite/ld-i386/pr22001-1a.c: New file. + * testsuite/ld-i386/pr22001-1b.c: Likewise. + * testsuite/ld-i386/pr22001-1c.S: Likewise. + * testsuite/ld-x86-64/pr22001-1a.c: Likewise. + * testsuite/ld-x86-64/pr22001-1a.err: Likewise. + * testsuite/ld-x86-64/pr22001-1b.c: Likewise. + * testsuite/ld-x86-64/pr22001-1b.err: Likewise. + * testsuite/ld-x86-64/pr22001-1c.c: Likewise. 2017-08-17 Andrew Burgess diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 6dc36657121..7382a1bbfe6 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -1056,16 +1056,33 @@ if { [isnative] && [which $CC] != 0 } { {{error_output "pr22001-1a.err"}} \ "pr22001-1a" \ ] \ - [list \ - "Build pr22001-1b" \ - "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \ - "$NOPIE_CFLAGS" \ - { pr22001-1c.c } \ - {{error_output "pr22001-1b.err"}} \ - "pr22001-1b" \ - ] \ ] + if {[istarget "x86_64-*-linux*-gnux32"]} { + run_ld_link_exec_tests [list \ + [list \ + "Run pr22001-1b" \ + "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \ + "" \ + { pr22001-1c.c } \ + "pr22001-1b" \ + "pass.out" \ + "$NOPIE_CFLAGS" \ + ] \ + ] + } else { + run_cc_link_tests [list \ + [list \ + "Build pr22001-1b" \ + "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \ + "$NOPIE_CFLAGS" \ + { pr22001-1c.c } \ + {{error_output "pr22001-1b.err"}} \ + "pr22001-1b" \ + ] \ + ] + } + run_ld_link_exec_tests [list \ [list \ "Run plt-main" \ -- 2.30.2