From: Carlos Eduardo Seo <carlos.seo@arm.com>
Date: Thu, 23 Jun 2022 18:27:55 +0000 (-0300)
Subject: cheri: elf: Fix tst-auxv for Morello
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0567ce645bd539b8a362d4dea1ce8e71dba2942;p=thirdparty%2Fglibc.git

cheri: elf: Fix tst-auxv for Morello
---

diff --git a/elf/tst-auxv.c b/elf/tst-auxv.c
index 602875b7946..2e3cb6a54f6 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)
     {