public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/arm/morello/main] cheri: elf: Fix tst-auxv for Morello
Date: Thu, 27 Oct 2022 14:00:19 +0000 (GMT)	[thread overview]
Message-ID: <20221027140019.E9614385152A@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a0567ce645bd539b8a362d4dea1ce8e71dba2942

commit a0567ce645bd539b8a362d4dea1ce8e71dba2942
Author: Carlos Eduardo Seo <carlos.seo@arm.com>
Date:   Thu Jun 23 15:27:55 2022 -0300

    cheri: elf: Fix tst-auxv for Morello

Diff:
---
 elf/tst-auxv.c | 8 ++++++++
 1 file changed, 8 insertions(+)

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)
     {

             reply	other threads:[~2022-10-27 14:00 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-27 14:00 Szabolcs Nagy [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-11-23 14:50 Szabolcs Nagy
2022-10-26 15:21 Szabolcs Nagy
2022-08-05 19:37 Szabolcs Nagy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221027140019.E9614385152A@sourceware.org \
    --to=nsz@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).