From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 0B84E3849AEF for ; Sat, 13 Apr 2024 14:15:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0B84E3849AEF Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0B84E3849AEF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713017753; cv=none; b=YqIigKAvDU3HaPaWVNaGosEimfbfyDINR3GyrVvZH+o8cnGKvCXYX5MknFh8ZwxI3Ha3Yerm4gI7N40sngRGPfBptEtSG08Xm85MyM9tE3yLRGAlsieAyKcq7iZNo5s2mkoP36vgAwCXEl+7ovrgKXL0VOS22+tSIAEWUvhRoTM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713017753; c=relaxed/simple; bh=s4yiU1fMU+VnkifogTMsUfW2ytXA1sUeAoIsgeeW34Y=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=l7QsNE2NaAWXoNd9DfktSduWcLf15VC5gTq71X7pQMur7FS0ZSi5k0WfglnIs0jqNNntKLMbXlxhuIRgFQAlTD4xRuJZ661bQoKlQkpglZw3l5G1ZkqTKOzYhhULY/GPXyqlmowljxxMwYQ4Z6V353QiMtWkOhuDEJzvOxFWBdE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713017751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=rX65sjbiHZvi/DTFUL9fDhfrWhyJvIFAWIPDsET5Dvg=; b=T3Ah7GjENhlCB4pCDYShCODfbbtygQ1vBlEu+TL7jD5+5kX9v+AjAt3OiYrXx0jlWHSo9p piUMqV6KlDMCmRtFPfXNtPjsogziIfpPu7EbPyzfGDSIByZiF/QVcU+Q2rIcYD2QRVMptV YaQUi1xW2sp6MbD2w0l5VASEH2hcdmo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-44-JCNoEAAKPx-w8l08SrLc1w-1; Sat, 13 Apr 2024 10:15:48 -0400 X-MC-Unique: JCNoEAAKPx-w8l08SrLc1w-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EF3C0801FAF; Sat, 13 Apr 2024 14:15:47 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.193.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 21FD8C13FA0; Sat, 13 Apr 2024 14:15:46 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Cc: Peter Bergner Subject: [PATCH] powerpc: Fix ld.so address determination for PCREL mode (bug 31640) Date: Sat, 13 Apr 2024 16:15:41 +0200 Message-ID: <87edb92vsi.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This seems to have stopped working with some GCC 14 versions, which clobber r2. With other compilers, the kernel-provided r2 value is still available at this point. --- sysdeps/powerpc/powerpc64/dl-machine.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h index c6682f3445..2b6f5d2b08 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.h +++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -78,6 +78,7 @@ elf_host_tolerates_class (const Elf64_Ehdr *ehdr) static inline Elf64_Addr elf_machine_load_address (void) __attribute__ ((const)); +#ifndef __PCREL__ static inline Elf64_Addr elf_machine_load_address (void) { @@ -105,6 +106,24 @@ elf_machine_dynamic (void) /* Then subtract off the load address offset. */ return runtime_dynamic - elf_machine_load_address() ; } +#else /* __PCREL__ */ +/* In PCREL mode, r2 may have been clobbered. Rely on relative + relocations instead. */ + +static inline ElfW(Addr) +elf_machine_load_address (void) +{ + extern const ElfW(Ehdr) __ehdr_start attribute_hidden; + return (ElfW(Addr)) &__ehdr_start; +} + +static inline ElfW(Addr) +elf_machine_dynamic (void) +{ + extern ElfW(Dyn) _DYNAMIC[] attribute_hidden; + return (ElfW(Addr)) _DYNAMIC - elf_machine_load_address (); +} +#endif /* __PCREL__ */ /* The PLT uses Elf64_Rela relocs. */ #define elf_machine_relplt elf_machine_rela base-commit: ae7468a7b0bcf22e9cd5fcae42bb9e4f65de83ee