public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: John David Anglin <danglin@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] Fix elf/tst-audit2 on hppa Date: Sun, 6 Mar 2022 15:58:07 +0000 (GMT) [thread overview] Message-ID: <20220306155807.AB0F7385842B@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3be79b72d556e3ac37075ad6b99eb5eac18e1402 commit 3be79b72d556e3ac37075ad6b99eb5eac18e1402 Author: John David Anglin <danglin@gcc.gnu.org> Date: Sun Mar 6 15:56:57 2022 +0000 Fix elf/tst-audit2 on hppa The test elf/tst-audit2 fails on hppa with a segmentation fault in the long branch stub used to call malloc from calloc. This occurs because the test is not a PIC executable and calloc is called from the dynamic linker before the dp register is initialized in _dl_start_user. The fix is to move the dp register initialization into elf_machine_runtime_setup. Since the address of $global$ can't be loaded directly, we continue to use the DT_PLTGOT value from the the main_map to initialize dp. Since l_main_map is not available in v2.34 and earlier, we use a new function, elf_machine_main_map, to find the main map. Diff: --- sysdeps/hppa/dl-machine.h | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/sysdeps/hppa/dl-machine.h b/sysdeps/hppa/dl-machine.h index f048fd2072..24f0f47d8f 100644 --- a/sysdeps/hppa/dl-machine.h +++ b/sysdeps/hppa/dl-machine.h @@ -27,6 +27,7 @@ #include <string.h> #include <link.h> #include <errno.h> +#include <ldsodefs.h> #include <dl-fptr.h> #include <abort-instr.h> #include <tls.h> @@ -159,6 +160,24 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rela *reloc, return (struct fdesc) { value.ip + reloc->r_addend, value.gp }; } +static inline struct link_map * +elf_machine_main_map (void) +{ + struct link_map *main_map; + +#if defined SHARED && IS_IN (rtld) + asm ( +" bl 1f,%0\n" +" addil L'_rtld_local - ($PIC_pcrel$0 - 1),%0\n" +"1: ldw R'_rtld_local - ($PIC_pcrel$0 - 5)(%%r1),%0\n" + : "=r" (main_map) : : "r1"); +#else + main_map = NULL; +#endif + + return main_map; +} + /* Set up the loaded object described by L so its unrelocated PLT entries will jump to the on-demand fixup code in dl-runtime.c. */ @@ -174,6 +193,15 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) Elf32_Addr i[2]; } sig = {{0x00,0xc0,0xff,0xee, 0xde,0xad,0xbe,0xef}}; + /* Initialize dp register for main executable. */ + if (l == elf_machine_main_map ()) + { + register Elf32_Addr dp asm ("%r27"); + + dp = D_PTR (l, l_info[DT_PLTGOT]); + asm volatile ("" : : "r" (dp)); + } + /* If we don't have a PLT we can just skip all this... */ if (__builtin_expect (l->l_info[DT_JMPREL] == NULL,0)) return lazy; @@ -336,16 +364,6 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) its return value is the user program's entry point. */ #define RTLD_START \ -/* Set up dp for any non-PIC lib constructors that may be called. */ \ -static struct link_map * __attribute__((used)) \ -set_dp (struct link_map *map) \ -{ \ - register Elf32_Addr dp asm ("%r27"); \ - dp = D_PTR (map, l_info[DT_PLTGOT]); \ - asm volatile ("" : : "r" (dp)); \ - return map; \ -} \ - \ asm ( \ " .text\n" \ " .globl _start\n" \ @@ -445,14 +463,11 @@ asm ( \ " stw %r24,-44(%sp)\n" \ \ ".Lnofix:\n" \ + /* Call _dl_init(main_map, argc, argv, envp). */ \ " addil LT'_rtld_local,%r19\n" \ " ldw RT'_rtld_local(%r1),%r26\n" \ -" bl set_dp, %r2\n" \ " ldw 0(%r26),%r26\n" \ \ - /* Call _dl_init(_dl_loaded, argc, argv, envp). */ \ -" copy %r28,%r26\n" \ - \ /* envp = argv + argc + 1 */ \ " sh2add %r25,%r24,%r23\n" \ " bl _dl_init,%r2\n" \
reply other threads:[~2022-03-06 15:58 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220306155807.AB0F7385842B@sourceware.org \ --to=danglin@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).