aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2025-11-24 08:44:52 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2025-11-24 13:53:49 +0000
commit0628c252bd161ccdd1228a3b8aefeb471044ca04 (patch)
tree81b645e57050696630101bb9a675bcb31a2f5386
parent8f8b8e4af91d4e158caf6ba4b728482311bfc7c3 (diff)
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
-rw-r--r--libexec/rtld-elf/powerpc/reloc.c4
-rw-r--r--libexec/rtld-elf/powerpc64/reloc.c4
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;