From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id B1B3E3858C2F; Fri, 5 Aug 2022 19:33:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B1B3E3858C2F 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: fix static linking early allocation X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 887a33c6bbeb52fc71cf486759ec22ecbd47a946 X-Git-Newrev: cb79f5073a957fb4804538fad25d6656343f2ef3 Message-Id: <20220805193338.B1B3E3858C2F@sourceware.org> Date: Fri, 5 Aug 2022 19:33:38 +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:33:38 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cb79f5073a957fb4804538fad25d6656343f2ef3 commit cb79f5073a957fb4804538fad25d6656343f2ef3 Author: Szabolcs Nagy Date: Mon Jul 18 07:12:56 2022 +0100 cheri: fix static linking early allocation Store mmap result to intptr_t instead of long. Diff: --- sysdeps/unix/sysv/linux/dl-early_allocate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/dl-early_allocate.c b/sysdeps/unix/sysv/linux/dl-early_allocate.c index 52c538e85a..d3e4961dba 100644 --- a/sysdeps/unix/sysv/linux/dl-early_allocate.c +++ b/sysdeps/unix/sysv/linux/dl-early_allocate.c @@ -64,7 +64,7 @@ _dl_early_allocate (size_t size) for static PIE. */ if (result == NULL) { - long int ret; + intptr_t ret; int prot = PROT_READ | PROT_WRITE; int flags = MAP_PRIVATE | MAP_ANONYMOUS; #ifdef __NR_mmap2