From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Tue, 11 Oct 2022 15:24:05 +0000 (+0100)
Subject: cheri: use getauxptr in iconv/tst-gconv-init-failure test
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb2ecefc21b525866dc0c22360d958a535992011;p=thirdparty%2Fglibc.git

cheri: use getauxptr in iconv/tst-gconv-init-failure test

On CHERI targets getauxval cannot return a valid pointer.
---

diff --git a/iconv/tst-gconv-init-failure.c b/iconv/tst-gconv-init-failure.c
index b29c5db6b81..b86958ab906 100644
--- a/iconv/tst-gconv-init-failure.c
+++ b/iconv/tst-gconv-init-failure.c
@@ -31,13 +31,13 @@
 static void
 activate_test_gconv_modules (void)
 {
-  unsigned long ptr = getauxval (AT_EXECFN);
-  if (ptr == 0)
+  const char *ptr = getauxptr (AT_EXECFN);
+  if (ptr == NULL)
     {
       printf ("warning: AT_EXECFN not support, cannot run test\n");
       exit (EXIT_UNSUPPORTED);
     }
-  char *test_program_directory = dirname (xstrdup ((const char *) ptr));
+  char *test_program_directory = dirname (xstrdup (ptr));
   TEST_VERIFY (setenv ("GCONV_PATH", test_program_directory, 1) == 0);
   free (test_program_directory);
 }