From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id A3F8C3853D70; Wed, 23 Nov 2022 14:44:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A3F8C3853D70 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214661; bh=W4dEs+zCMDEGJmNaczxL2AER8ltNTWhzLJgbPBrolnc=; h=From:To:Subject:Date:From; b=Sye1ik05OAiXNhwgIRSemkLRlOdn9y1GVFlLCh+Kzj52YcapMrvKGAk+SQi/4l1Eb w1KrGsWxzGklmHblSj1LlOd218KKabCJqmoluYgwtz/cScdurpgU76l1asUUmmBDMB JDWMacl8p6fy35t62eAS5SrWn23mPvRRmUo2zdpE= 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: use elfptr_t for auxv parsing X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 4b0cb26b3b2faa0247c8d5dc3348808ffae1e94a X-Git-Newrev: 93efaa5bdc2218db547addcc5e96ac59c8c8bea0 Message-Id: <20221123144421.A3F8C3853D70@sourceware.org> Date: Wed, 23 Nov 2022 14:44:21 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=93efaa5bdc2218db547addcc5e96ac59c8c8bea0 commit 93efaa5bdc2218db547addcc5e96ac59c8c8bea0 Author: Szabolcs Nagy Date: Mon Mar 14 08:44:32 2022 +0000 cheri: elf: use elfptr_t for auxv parsing Diff: --- sysdeps/unix/sysv/linux/dl-parse_auxv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/dl-parse_auxv.h b/sysdeps/unix/sysv/linux/dl-parse_auxv.h index bf9374371e..48ca7736a0 100644 --- a/sysdeps/unix/sysv/linux/dl-parse_auxv.h +++ b/sysdeps/unix/sysv/linux/dl-parse_auxv.h @@ -22,14 +22,14 @@ #include #include -typedef ElfW(Addr) dl_parse_auxv_t[AT_MINSIGSTKSZ + 1]; +typedef elfptr_t dl_parse_auxv_t[AT_MINSIGSTKSZ + 1]; /* Copy the auxiliary vector into AUXV_VALUES and set up GLRO variables. */ static inline void _dl_parse_auxv (ElfW(auxv_t) *av, dl_parse_auxv_t auxv_values) { - auxv_values[AT_ENTRY] = (ElfW(Addr)) ENTRY_POINT; + auxv_values[AT_ENTRY] = (elfptr_t) ENTRY_POINT; auxv_values[AT_PAGESZ] = EXEC_PAGESIZE; auxv_values[AT_FPUCW] = _FPU_DEFAULT;