From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id E9614385152A; Thu, 27 Oct 2022 14:00:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E9614385152A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666879219; bh=ayAwci+xux0Grg5pyMHQ4t7Acxi4UxZQb4WE7eu+dHI=; h=From:To:Subject:Date:From; b=jAnHz1J3qpUZjQ1HraE3ZEW/iYV/d1Ntovk3RHDeFddegjDHPQ/YBn37QJMilz767 orCAHaKjQun8G/vutoerANJbVkd2mvogQXoH9smHC/LScQ+vd/qGRXmQKDRJUrD4/e XIlCSil39qcRRoGogrgLWc03S0AjUDzp+W2k7324= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: elf: Fix tst-auxv for Morello X-Act-Checkin: glibc X-Git-Author: Carlos Eduardo Seo X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 0bf202d6d023dc4694e7c59b0bacdedfe14a7ba5 X-Git-Newrev: a0567ce645bd539b8a362d4dea1ce8e71dba2942 Message-Id: <20221027140019.E9614385152A@sourceware.org> Date: Thu, 27 Oct 2022 14:00:19 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a0567ce645bd539b8a362d4dea1ce8e71dba2942 commit a0567ce645bd539b8a362d4dea1ce8e71dba2942 Author: Carlos Eduardo Seo 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) {