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: b2b3d2a962
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
This commit is contained in:
@@ -844,10 +844,8 @@ __tls_get_addr(tls_index* ti)
|
|||||||
void
|
void
|
||||||
arch_fix_auxv(Elf_Auxinfo *aux, Elf_Auxinfo *aux_info[])
|
arch_fix_auxv(Elf_Auxinfo *aux, Elf_Auxinfo *aux_info[])
|
||||||
{
|
{
|
||||||
Elf_Auxinfo *aux;
|
Elf_Auxinfo *auxp;
|
||||||
bool old_auxv_format;
|
|
||||||
|
|
||||||
old_auxv_format = true;
|
|
||||||
for (auxp = aux; auxp->a_type != AT_NULL; auxp++) {
|
for (auxp = aux; auxp->a_type != AT_NULL; auxp++) {
|
||||||
if (auxp->a_type == 23) /* AT_STACKPROT */
|
if (auxp->a_type == 23) /* AT_STACKPROT */
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -741,10 +741,8 @@ __tls_get_addr(tls_index* ti)
|
|||||||
void
|
void
|
||||||
arch_fix_auxv(Elf_Auxinfo *aux, Elf_Auxinfo *aux_info[])
|
arch_fix_auxv(Elf_Auxinfo *aux, Elf_Auxinfo *aux_info[])
|
||||||
{
|
{
|
||||||
Elf_Auxinfo *aux;
|
Elf_Auxinfo *auxp;
|
||||||
bool old_auxv_format;
|
|
||||||
|
|
||||||
old_auxv_format = true;
|
|
||||||
for (auxp = aux; auxp->a_type != AT_NULL; auxp++) {
|
for (auxp = aux; auxp->a_type != AT_NULL; auxp++) {
|
||||||
if (auxp->a_type == 23) /* AT_STACKPROT */
|
if (auxp->a_type == 23) /* AT_STACKPROT */
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user