From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 36A61385780A; Fri, 5 Aug 2022 19:37:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 36A61385780A 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: 2b9e393156be659736cec34d1b12b92cc47ebe3a X-Git-Newrev: 6cca02f73288961d2ecb325efbc6d91ad3ae9045 Message-Id: <20220805193752.36A61385780A@sourceware.org> Date: Fri, 5 Aug 2022 19:37:52 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 19:37:52 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6cca02f73288961d2ecb325efbc6d91ad3ae9045 commit 6cca02f73288961d2ecb325efbc6d91ad3ae9045 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) {