5 files changed, 41 insertions, 38 deletions
diff --git a/libc/misc/auxvt/getauxval.c b/libc/misc/auxvt/getauxval.c
index 2bdffaf2c..7610b7e5c 100755
--- a/libc/misc/auxvt/getauxval.c
+++ b/libc/misc/auxvt/getauxval.c
@@ -17,32 +17,28 @@
  *  <http://www.gnu.org/licenses/>.
  */
 
-#include "errno.h"
-#include "ldso.h"
-#include "sys/auxv.h"
+#include <errno.h>
+#include <ldso.h>
+#include <sys/auxv.h>
 
-
-/*
- *
- * aarch64 gcc 11 uses __getauxval() in init_have_lse_atomics()
- *
- */
 unsigned long int __getauxval (unsigned long int __type)
 {
-	if ( __type >= AUX_MAX_AT_ID ){
+	// Requested value part of cached subset of auxiliary vector?
+	if (__type < AUX_MAX_AT_ID) {
+		if (_dl_auxvt[__type].a_type == __type)
+			return _dl_auxvt[__type].a_un.a_val;
+
 		__set_errno (ENOENT);
 		return 0;
 	}
 
-	if ( _dl_auxvt[__type].a_type == __type){
-		return _dl_auxvt[__type].a_un.a_val;
-	}
+	// Otherwise we have to iterate the auxiliary vector.
+	for (ElfW(auxv_t) *entry = _dl_auxv_start; entry->a_type != AT_NULL; entry++)
+		if (entry->a_type == __type)
+			return entry->a_un.a_val;
 
 	__set_errno (ENOENT);
 	return 0;
 }
 
-unsigned long int getauxval (unsigned long int __type){
-	return __getauxval( __type );
-}
-
+weak_alias(__getauxval, getauxval)
diff --git a/libc/misc/elf/dl-support.c b/libc/misc/elf/dl-support.c
index 87cd1bb72..09cbefc18 100644
--- a/libc/misc/elf/dl-support.c
+++ b/libc/misc/elf/dl-support.c
@@ -12,6 +12,7 @@
  */
 
 #include <link.h>
+#include <ldso.h>
 #include <elf.h>
 #if defined(USE_TLS) && USE_TLS
 #include <assert.h>
@@ -31,17 +32,29 @@ ElfW(Phdr) *_dl_phdr;
 size_t _dl_phnum;
 size_t _dl_pagesize;
 
+ElfW(auxv_t) _dl_auxvt[AUX_MAX_AT_ID];
+ElfW(auxv_t) *_dl_auxv_start;
+
 void internal_function _dl_aux_init (ElfW(auxv_t) *av);
 void internal_function _dl_aux_init (ElfW(auxv_t) *av)
 {
+   _dl_auxv_start = av;
+
+   memset(_dl_auxvt, 0x00, sizeof(_dl_auxvt));
+   for (; av->a_type != AT_NULL; av++)
+     {
+       if (av->a_type < AUX_MAX_AT_ID)
+         _dl_auxvt[av->a_type] = *av;
+     }
+
    /* Get the program headers base address from the aux vect */
-   _dl_phdr = (ElfW(Phdr) *) av[AT_PHDR].a_un.a_val;
+   _dl_phdr = (ElfW(Phdr) *) _dl_auxvt[AT_PHDR].a_un.a_val;
 
    /* Get the number of program headers from the aux vect */
-   _dl_phnum = (size_t) av[AT_PHNUM].a_un.a_val;
+   _dl_phnum = (size_t) _dl_auxvt[AT_PHNUM].a_un.a_val;
 
    /* Get the pagesize from the aux vect */
-   _dl_pagesize = (av[AT_PAGESZ].a_un.a_val) ? (size_t) av[AT_PAGESZ].a_un.a_val : PAGE_SIZE;
+   _dl_pagesize = (_dl_auxvt[AT_PAGESZ].a_un.a_val) ? (size_t) _dl_auxvt[AT_PAGESZ].a_un.a_val : PAGE_SIZE;
 }
 
 #if defined(USE_TLS) && USE_TLS
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 64a9c8214..60695b6ed 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -43,7 +43,7 @@
 /* Are we in a secure process environment or are we dealing
  * with setuid stuff?  If we are dynamically linked, then we
  * already have _dl_secure, otherwise we need to re-examine
- * auxvt[] below.
+ * _dl_auxvt[] below.
  */
 int _pe_secure = 0;
 libc_hidden_data_def(_pe_secure)
@@ -84,6 +84,8 @@ static void fdpic_init_array_jump(void *addr)
 #ifndef SHARED
 void *__libc_stack_end = NULL;
 
+#include "dl-auxvt.h"
+
 # ifdef __UCLIBC_HAS_SSP__
 #  include <dl-osinfo.h>
 static uintptr_t stack_chk_guard;
@@ -373,7 +375,6 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc,
 {
 #ifndef SHARED
     unsigned long *aux_dat;
-    ElfW(auxv_t) auxvt[AT_EGID + 1];
 #endif
 
 #ifdef __UCLIBC_HAS_THREADS_NATIVE__
@@ -399,23 +400,14 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc,
 
 #ifndef SHARED
     /* Pull stuff from the ELF header when possible */
-    memset(auxvt, 0x00, sizeof(auxvt));
     aux_dat = (unsigned long*)__environ;
     while (*aux_dat) {
 	aux_dat++;
     }
     aux_dat++;
-    while (*aux_dat) {
-	ElfW(auxv_t) *auxv_entry = (ElfW(auxv_t) *) aux_dat;
-	if (auxv_entry->a_type <= AT_EGID) {
-	    memcpy(&(auxvt[auxv_entry->a_type]), auxv_entry, sizeof(ElfW(auxv_t)));
-	}
-	aux_dat += 2;
-    }
     /* Get the program headers (_dl_phdr) from the aux vector
        It will be used into __libc_setup_tls. */
-
-    _dl_aux_init (auxvt);
+    _dl_aux_init ((ElfW(auxv_t) *)aux_dat);
 #endif
 
     /* We need to initialize uClibc.  If we are dynamically linked this
@@ -431,10 +423,10 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc,
 #ifndef SHARED
     /* Prevent starting SUID binaries where the stdin. stdout, and
      * stderr file descriptors are not already opened. */
-    if ((auxvt[AT_UID].a_un.a_val == (size_t)-1 && __check_suid()) ||
-	    (auxvt[AT_UID].a_un.a_val != (size_t)-1 &&
-	    (auxvt[AT_UID].a_un.a_val != auxvt[AT_EUID].a_un.a_val ||
-	     auxvt[AT_GID].a_un.a_val != auxvt[AT_EGID].a_un.a_val)))
+    if ((_dl_auxvt[AT_UID].a_un.a_val == (size_t)-1 && __check_suid()) ||
+	    (_dl_auxvt[AT_UID].a_un.a_val != (size_t)-1 &&
+	    (_dl_auxvt[AT_UID].a_un.a_val != _dl_auxvt[AT_EUID].a_un.a_val ||
+	     _dl_auxvt[AT_GID].a_un.a_val != _dl_auxvt[AT_EGID].a_un.a_val)))
 #else
     if (_dl_secure)
 #endif
diff --git a/libc/misc/internals/reloc_static_pie.c b/libc/misc/internals/reloc_static_pie.c
index 81af7d666..3bbdef18e 100644
--- a/libc/misc/internals/reloc_static_pie.c
+++ b/libc/misc/internals/reloc_static_pie.c
@@ -21,7 +21,7 @@
 #include <dl-elf.h>
 
 #include <ldso.h>
-#if defined(__mips__) || defined(__xtensa__)
+#if defined(__m68k__) || defined(__mips__) || defined(__xtensa__)
 #include <dl-startup.h>
 #endif
 
@@ -107,6 +107,8 @@ reloc_static_pie(ElfW(Addr) load_addr)
 					PERFORM_BOOTSTRAP_RELOC(rpnt, reloc_addr, symbol_addr, load_addr, sym);
 				}
 			}
+#else
+			(void)rel_size;
 #endif
     }
     _dl_load_base = load_addr;
diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
index 2714d47d7..782b67f93 100644
--- a/libc/misc/wchar/wchar.c
+++ b/libc/misc/wchar/wchar.c
@@ -1298,7 +1298,7 @@ iconv_t weak_function iconv_open(const char *tocode, const char *fromcode)
 
 int weak_function iconv_close(iconv_t cd)
 {
-	free(cd);
+	free((void *) cd);
 
 	return 0;
 }