From 457273c666e64424ee6de9aa146cc975473e7b4d Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 17 Jan 2024 08:03:29 -0800 Subject: [PATCH] Update x86-64: Add -z mark-plt and -z nomark-plt Pass --hash-style=both to ld for -z mark-plt tests to support linker configured with --enable-default-hash-style=gnu. * testsuite/ld-x86-64/mark-plt-1b-x32.d: Pass --hash-style=both to ld. * testsuite/ld-x86-64/mark-plt-1b.d: Likewise. * testsuite/ld-x86-64/mark-plt-1d-x32.d: Likewise. * testsuite/ld-x86-64/mark-plt-1d.d: Likewise. (cherry picked from commit 16666ccc91295d1568c5c2cb0e7600694840dfd9) --- ld/testsuite/ld-x86-64/mark-plt-1b-x32.d | 2 +- ld/testsuite/ld-x86-64/mark-plt-1b.d | 2 +- ld/testsuite/ld-x86-64/mark-plt-1d-x32.d | 2 +- ld/testsuite/ld-x86-64/mark-plt-1d.d | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ld/testsuite/ld-x86-64/mark-plt-1b-x32.d b/ld/testsuite/ld-x86-64/mark-plt-1b-x32.d index 74306a0d8d7..848d45e1e43 100644 --- a/ld/testsuite/ld-x86-64/mark-plt-1b-x32.d +++ b/ld/testsuite/ld-x86-64/mark-plt-1b-x32.d @@ -1,6 +1,6 @@ #source: mark-plt-1.s #as: --x32 -#ld: -melf32_x86_64 -shared -z mark-plt +#ld: -melf32_x86_64 -shared -z mark-plt --hash-style=both #objdump: -dw #... diff --git a/ld/testsuite/ld-x86-64/mark-plt-1b.d b/ld/testsuite/ld-x86-64/mark-plt-1b.d index dc046c031eb..a5c6931fd2a 100644 --- a/ld/testsuite/ld-x86-64/mark-plt-1b.d +++ b/ld/testsuite/ld-x86-64/mark-plt-1b.d @@ -1,6 +1,6 @@ #source: mark-plt-1.s #as: --64 -#ld: -melf_x86_64 -shared -z mark-plt +#ld: -melf_x86_64 -shared -z mark-plt --hash-style=both #objdump: -dw #... diff --git a/ld/testsuite/ld-x86-64/mark-plt-1d-x32.d b/ld/testsuite/ld-x86-64/mark-plt-1d-x32.d index 318ca1f0931..f08c99ea9cd 100644 --- a/ld/testsuite/ld-x86-64/mark-plt-1d-x32.d +++ b/ld/testsuite/ld-x86-64/mark-plt-1d-x32.d @@ -1,6 +1,6 @@ #source: mark-plt-1.s #as: --x32 -#ld: -melf32_x86_64 -shared -z mark-plt -z ibtplt +#ld: -melf32_x86_64 -shared -z mark-plt -z ibtplt --hash-style=both #objdump: -dw #... diff --git a/ld/testsuite/ld-x86-64/mark-plt-1d.d b/ld/testsuite/ld-x86-64/mark-plt-1d.d index 2dd63bc10b7..9ca8d654324 100644 --- a/ld/testsuite/ld-x86-64/mark-plt-1d.d +++ b/ld/testsuite/ld-x86-64/mark-plt-1d.d @@ -1,6 +1,6 @@ #source: mark-plt-1.s #as: --64 -#ld: -melf_x86_64 -shared -z mark-plt -z ibtplt +#ld: -melf_x86_64 -shared -z mark-plt -z ibtplt --hash-style=both #objdump: -dw #... -- 2.47.2