From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 598D83852C5C; Wed, 23 Nov 2022 14:50:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 598D83852C5C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669215007; bh=+M/F+S6/eq41ti4zkmWwgXQvYuSpZe24HtBBMjVcpx0=; h=From:To:Subject:Date:From; b=ZG3cDvxPibOznGDb/V7xAnEdIjPe8SkoNXs+XZIgC0BOhr/YoAS77uhjKSKIt8cet BJ5kJOgk9d3vXzF9ZG8IJQIwIFotEyta2lNNM+rTuk0rEvoQ3C6px5rDFT/jCxGIr7 mFYfT68e9NFdsCYi0wKmmwCCshaBl5UstfIeLNZA= 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: 1eb01283ddc5da94bde495f326411eb0fcfba556 X-Git-Newrev: a05a3def727285eb498f329b16baa3f52d26df79 Message-Id: <20221123145007.598D83852C5C@sourceware.org> Date: Wed, 23 Nov 2022 14:50:07 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a05a3def727285eb498f329b16baa3f52d26df79 commit a05a3def727285eb498f329b16baa3f52d26df79 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) {