aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzabolcs Nagy <szabolcs.nagy@arm.com>2022-10-11 16:24:05 +0100
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2022-10-12 14:22:03 +0100
commitcb2ecefc21b525866dc0c22360d958a535992011 (patch)
tree0a84d061afd009fd0b6ffd8fc9636f32bd9fea94
parent85c6eba32a3c1f227ff89bbd23d6c97cdf76892b (diff)
downloadglibc-cb2ecefc21b525866dc0c22360d958a535992011.zip
glibc-cb2ecefc21b525866dc0c22360d958a535992011.tar.gz
glibc-cb2ecefc21b525866dc0c22360d958a535992011.tar.bz2
cheri: use getauxptr in iconv/tst-gconv-init-failure test
On CHERI targets getauxval cannot return a valid pointer.
-rw-r--r--iconv/tst-gconv-init-failure.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/iconv/tst-gconv-init-failure.c b/iconv/tst-gconv-init-failure.c
index b29c5db..b86958a 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);
}