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-08-05 19:45:19 +0100
commit6cca02f73288961d2ecb325efbc6d91ad3ae9045 (patch)
treedb92824f695b477023f6d53ab870b1892e08bc9d
parent2b9e393156be659736cec34d1b12b92cc47ebe3a (diff)
downloadglibc-6cca02f73288961d2ecb325efbc6d91ad3ae9045.tar.gz
glibc-6cca02f73288961d2ecb325efbc6d91ad3ae9045.tar.xz
glibc-6cca02f73288961d2ecb325efbc6d91ad3ae9045.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)
     {