about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCarlos Eduardo Seo <carlos.seo@arm.com>2022-06-23 15:27:55 -0300
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2022-10-27 14:46:55 +0100
commita0567ce645bd539b8a362d4dea1ce8e71dba2942 (patch)
tree0792c7b57025e43fe02850770607fc6a8cc6df48
parent0bf202d6d023dc4694e7c59b0bacdedfe14a7ba5 (diff)
downloadglibc-a0567ce645bd539b8a362d4dea1ce8e71dba2942.tar.gz
glibc-a0567ce645bd539b8a362d4dea1ce8e71dba2942.tar.xz
glibc-a0567ce645bd539b8a362d4dea1ce8e71dba2942.zip
cheri: elf: Fix tst-auxv for Morello
-rw-r--r--elf/tst-auxv.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/elf/tst-auxv.c b/elf/tst-auxv.c
index 602875b794..2e3cb6a54f 100644
--- a/elf/tst-auxv.c
+++ b/elf/tst-auxv.c
@@ -27,7 +27,11 @@ static int
 do_test (int argc, char *argv[])
 {
   errno = 0;
+#ifndef __CHERI_PURE_CAPABILITY__
   const char *execfn = (const char *) getauxval (AT_NULL);
+#else
+  const char *execfn = (const char *) getauxptr (AT_NULL);
+#endif
 
   if (errno != ENOENT)
     {
@@ -43,7 +47,11 @@ do_test (int argc, char *argv[])
     }
 
   errno = 0;
+#ifndef __CHERI_PURE_CAPABILITY__
   execfn = (const char *) getauxval (AT_EXECFN);
+#else
+  execfn = (const char *) getauxptr (AT_EXECFN);
+#endif
 
   if (execfn == NULL)
     {