From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 66EE6383FBB5; Wed, 26 Oct 2022 15:21:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 66EE6383FBB5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666797706; bh=Db/qIZjDlnqvFnmyQAyhEGs7Wdy8jbHPgOeNiZ4Bi8k=; h=From:To:Subject:Date:From; b=ZhPOTvzNp5urUhmeXqSdIT7svaVwZ5E9JPrrP1CyYUKjvlpp5WtkdmuuBUj2VbwpY RgjrxtK2hCUCncd3m2REx8t6QEVi4iiXsBudAZUi5BKIjECZjuGB5ObsTLuqy/C7dD wXwWvLrTkag7Vt87ufJRkSsyZjibDTonYDr8fs5k= 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: daafde98940b02f6ad01c4789a234a2c06df883c X-Git-Newrev: 25309006c00fbac6a589a47b399cdb07fba6852c Message-Id: <20221026152146.66EE6383FBB5@sourceware.org> Date: Wed, 26 Oct 2022 15:21:46 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=25309006c00fbac6a589a47b399cdb07fba6852c commit 25309006c00fbac6a589a47b399cdb07fba6852c 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) {