From nobody Mon Nov 24 13:53:57 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 4dFS3V0cM9z6HFBs for ; Mon, 24 Nov 2025 13:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dFS3T6qDjz3YfG for ; Mon, 24 Nov 2025 13:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763992438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J3FGzT2WCb0O0r0TjXX3RK0jbDAT9oXsrAFKiIfXTPY=; b=bcEGkBd1j/Syg70wB+heInMp4yYjuENHfhbNGxP8EY9i2EgkMU0VeC23jnGDf+U35Vds5f sa/S9bbkst1gf9Au+pIJdLLq1Lv0DYKRp5tIqzn47exQbvoRLc62ZbkC8qUlDARRSY+6uP WqEYJmjU6wAI6tM89dAO9OCbcOr4UN2R4nnef1EE/6+vqF+Sh0IsHIvjXmm7Sdj/5FDteT lwJOvfIIWJ7eu2Uiy8Ir9daHW3IteQ39ltpTBg51MAwvMg45q5zYgpH7QMDh3kwGie4iVE OnAb6vT+65HcC7wp1AdDK9dKCkhGHtcaZp56pvbTWzJN8GBx5f7JvMP+jbv3UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763992438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J3FGzT2WCb0O0r0TjXX3RK0jbDAT9oXsrAFKiIfXTPY=; b=XueAYuZrPDnztuR78y3GlQ57jdr1SAK0dbmImrD+fSld9gP6OLuHbEZ1kkDepflW2axzkt DBnVtmJJf4gM8YyRmagjwWjk4+r2WVKy6DNx1O+4dNBOL0TbaOSSJVsvlkvzX2c0TCuFRk ilfIYkl7jnvFlZr+PZJ+u4j2C8WhlGqo2RAWbejqvl0zjQbCXcvK1vuceXkRMtA57qzVqV EQgT7WWwivEdj9Zze5tcbHUWYjYTWNzq0ZqKS/BxYKYAwn4/RwVUtcJGcart6qaQEG0ikX Rb6aj1ZVWrM/jjT2Ypb/7coj6VAvOQ0Z9UtX8vYXyvW+lu/5it9Uj+Wsj+iBdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763992438; a=rsa-sha256; cv=none; b=uYYrAFNVaCNFfL+GPGV9J7XvVYBoLQ2WlQgRSf8yrwYypiqsyGuHFfUxx/fYFiIZhLvYWK ILdf6C+EZBYZFunbAowFzUMsTjv2BVeZzFtQVbQfKONMp8mY9HAoploAtPgdTZ2RPP0Pcg OLssunrQi603UpoS4F5udLknXlFR5X4O+YBnQ8S8+xVMZKoWpuwARo5Nimqtn1SxdR1neW +mpFb3IwKWAERDcdtaHZYm3CtB5Egy7Ezhzd031MoilaiImuzjxzuYzBEUZtJpHWtmbwCD 251RicrEt9pES13oS0zNsKknh5v/muRlcdkw+j1pUpLmn1l8M032uNOaUrnLeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dFS3T5zhkz2HL for ; Mon, 24 Nov 2025 13:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 28d4d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Nov 2025 13:53:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0628c252bd16 - main - rtld: fix powerpc build 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0628c252bd161ccdd1228a3b8aefeb471044ca04 Auto-Submitted: auto-generated Date: Mon, 24 Nov 2025 13:53:57 +0000 Message-Id: <69246375.28d4d.42d735f2@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0628c252bd161ccdd1228a3b8aefeb471044ca04 commit 0628c252bd161ccdd1228a3b8aefeb471044ca04 Author: Konstantin Belousov AuthorDate: 2025-11-24 08:44:52 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-24 13:53:49 +0000 rtld: fix powerpc build In arch_fix_auxv(), remove local variable shadowing the argument, remove write-only variable, and declare the loop variable. The wrong patch was committed after series of local reverts and re-apply. Fixes: b2b3d2a962eb00005641546fbe672b95e5d0672a Sponsored by: The FreeBSD Foundation MFC after: 1 week --- libexec/rtld-elf/powerpc/reloc.c | 4 +--- libexec/rtld-elf/powerpc64/reloc.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c index a38cadfe76ba..c160028cea6d 100644 --- a/libexec/rtld-elf/powerpc/reloc.c +++ b/libexec/rtld-elf/powerpc/reloc.c @@ -844,10 +844,8 @@ __tls_get_addr(tls_index* ti) void arch_fix_auxv(Elf_Auxinfo *aux, Elf_Auxinfo *aux_info[]) { - Elf_Auxinfo *aux; - bool old_auxv_format; + Elf_Auxinfo *auxp; - old_auxv_format = true; for (auxp = aux; auxp->a_type != AT_NULL; auxp++) { if (auxp->a_type == 23) /* AT_STACKPROT */ return; diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c index 29c52d8fc19f..4a4107aef861 100644 --- a/libexec/rtld-elf/powerpc64/reloc.c +++ b/libexec/rtld-elf/powerpc64/reloc.c @@ -741,10 +741,8 @@ __tls_get_addr(tls_index* ti) void arch_fix_auxv(Elf_Auxinfo *aux, Elf_Auxinfo *aux_info[]) { - Elf_Auxinfo *aux; - bool old_auxv_format; + Elf_Auxinfo *auxp; - old_auxv_format = true; for (auxp = aux; auxp->a_type != AT_NULL; auxp++) { if (auxp->a_type == 23) /* AT_STACKPROT */ return;