From nobody Mon Nov 24 08:47:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dFKGb3bvzz6JKk3; Mon, 24 Nov 2025 08:48:07 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dFKGZ3GK3z49d9; Mon, 24 Nov 2025 08:48:06 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 5AO8lq5J026309; Mon, 24 Nov 2025 10:47:55 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 5AO8lq5J026309 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 5AO8lq32026308; Mon, 24 Nov 2025 10:47:52 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 24 Nov 2025 10:47:52 +0200 From: Konstantin Belousov To: Colin Percival Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b2b3d2a962eb - main - rtld-elf: move powerpc-specific auxv compat code into arch hook Message-ID: References: <69206a47.27746.245d9408@gitrepo.freebsd.org> <0100019ab4713726-027a4a44-11b8-48f3-8321-3e34256c858a-000000@email.amazonses.com> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0100019ab4713726-027a4a44-11b8-48f3-8321-3e34256c858a-000000@email.amazonses.com> X-Spamd-Bar: - X-Spamd-Result: default: False [-1.20 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; NEURAL_SPAM_SHORT(0.80)[0.798]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; MISSING_XM_UA(0.00)[]; R_DKIM_NA(0.00)[]; HAS_XAW(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; R_SPF_SOFTFAIL(0.00)[~all:c]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4dFKGZ3GK3z49d9 On Mon, Nov 24, 2025 at 05:58:29AM +0000, Colin Percival wrote: > On 11/21/25 05:33, Konstantin Belousov wrote: > > commit b2b3d2a962eb00005641546fbe672b95e5d0672a > > Author: Konstantin Belousov > > AuthorDate: 2025-11-18 11:06:04 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2025-11-21 13:33:17 +0000 > > > > rtld-elf: move powerpc-specific auxv compat code into arch hook > > Tested by: Timothy Pearson (tpearson_raptorengineering.com) > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > Differential revision: https://reviews.freebsd.org/D53801 > > --- a/libexec/rtld-elf/powerpc64/reloc.c > > +++ b/libexec/rtld-elf/powerpc64/reloc.c > > @@ -737,3 +737,29 @@ __tls_get_addr(tls_index* ti) > > return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset + > > TLS_DTV_OFFSET)); > > } > > + > > +void > > +arch_fix_auxv(Elf_Auxinfo *aux, Elf_Auxinfo *aux_info[]) > > +{ > > + Elf_Auxinfo *aux; > > This does not compile: > > /usr/src/libexec/rtld-elf/powerpc64/reloc.c:744:15: error: redefinition of 'aux' > > 744 | Elf_Auxinfo *aux; > > | ^ > > /usr/src/libexec/rtld-elf/powerpc64/reloc.c:742:28: note: previous definition is here > > Which makes me wonder just how much testing this precise patch has > received. ;-) I ran tinderbox, and it was tested on power by Timothy Pearson. Hm, I think I see what happen: patch was updated, then reverted, and then I blindly took the change from the previous variant of the differential, loosing the additional change. I will commit the fix after my tb finishes.