From 95fbde6791dd4b7821a40cbbc985a257e4819fdb Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 1 Aug 2018 18:59:03 +0930 Subject: [PATCH] Re: PowerPC64 __tls_get_addr_opt stub .eh_frame fix The modified test failed on some powerpc targets due to differences in default hash style. If the default hash style is both, then more sections are created, bumping section ids. Section id is used in stub symbols and although the test is careful to not depend on id in labels, the stub hash traversal order changes when stub names change. That lead to the stubs being emitted in a different order and thus not matching expected output. * testsuite/ld-powerpc/powerpc.exp: Run tlsopt5 with hash-style specified. (cherry picked from commit a67ae9b01af7eb2b1f8e5c517338a4b12167ce40) --- ld/ChangeLog | 5 +++++ ld/testsuite/ld-powerpc/powerpc.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index c719502b781..97fe5699c84 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2018-08-01 Alan Modra + + * testsuite/ld-powerpc/powerpc.exp: Run tlsopt5 with hash-style + specified. + 2018-08-01 Alan Modra * testsuite/ld-powerpc/powerpc.exp: Run tlsopt5 with plt alignment. diff --git a/ld/testsuite/ld-powerpc/powerpc.exp b/ld/testsuite/ld-powerpc/powerpc.exp index 3c7b707cd0d..de762966e5d 100644 --- a/ld/testsuite/ld-powerpc/powerpc.exp +++ b/ld/testsuite/ld-powerpc/powerpc.exp @@ -221,7 +221,7 @@ set ppc64elftests { "tlsopt4"} {"TLS DLL" "-shared -melf64ppc --version-script tlsdll.ver" "" "-a64" {tlsdll.s} {} "tlsdll.so"} - {"TLS opt 5" "-melf64ppc -shared --gc-sections --no-plt-localentry tmpdir/tlsdll.so" "" "-a64" {tlsopt5.s} + {"TLS opt 5" "-melf64ppc -shared --hash-style=both --gc-sections --no-plt-localentry tmpdir/tlsdll.so" "" "-a64" {tlsopt5.s} {{objdump -dr tlsopt5.d} {readelf -wf tlsopt5.wf}} "tlsopt5"} {"sym@tocbase" "-shared -melf64ppc" "" "-a64" {symtocbase-1.s symtocbase-2.s} -- 2.47.2