From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 2B56B3852C4B; Wed, 23 Nov 2022 14:44:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2B56B3852C4B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214692; bh=6jercqWisiDMbg7yBiwfNFCtIJLtwX1CTtWsvDnPE4o=; h=From:To:Subject:Date:From; b=YPbFLo/zRrxh2hwlL+tPlL3/KfI6DJgzBjHFhWYlE2vkDyfpy1MJXswS1hDqnO2eK R3MoP1o37o8QwUth4XxaQjblkTvdoJoEsMNaTzUCzUT1hLSAXQfvQRCUkQtNjHcF6m rfFCeW7lCttw0AJ7LZ3YJXkA5moKJWm1M3+s5p8o= 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: 871fb8be0164201890e337b90159e8208abe2913 X-Git-Newrev: 7f6564cd800df24154650d363ff048c5869affa0 Message-Id: <20221123144452.2B56B3852C4B@sourceware.org> Date: Wed, 23 Nov 2022 14:44:52 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7f6564cd800df24154650d363ff048c5869affa0 commit 7f6564cd800df24154650d363ff048c5869affa0 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