From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 43ACF3857364; Fri, 5 Aug 2022 19:34:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 43ACF3857364 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: 8022e6934eaf4faa20bfd8acdd99bea2e687247b X-Git-Newrev: 8536404f41d411e2e6deaafdd51c9c6dfb3ba22a Message-Id: <20220805193419.43ACF3857364@sourceware.org> Date: Fri, 5 Aug 2022 19:34:19 +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:34:19 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8536404f41d411e2e6deaafdd51c9c6dfb3ba22a commit 8536404f41d411e2e6deaafdd51c9c6dfb3ba22a 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;