From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 5A5583846423; Wed, 26 Oct 2022 15:16:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5A5583846423 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666797378; bh=lmXlkLE8CosrQQSPSEh+vJuIdRHLUjEkiQ0udSmc8tw=; h=From:To:Subject:Date:From; b=X00aHN8KFfV2GTp6OHTy6fo7Egc/3Hv86OG6mZXGfu9tPDS33umbqquOfJSwl9gkt Fp2voMWxxuR06tnikOetd6BGyKHVDCF89Wn/sFOY1zPGuMhTh/OxNNlQAJLuol4P1J PEl+Eiei78lWPg11+kTpFQPgIKepvqwsKp1agCSM= 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: 72aca7d8eb54c2a44b2d1b13e5b84dc874241c1e X-Git-Newrev: ef4103377aae39b21f41817976ce5c9383b0511a Message-Id: <20221026151618.5A5583846423@sourceware.org> Date: Wed, 26 Oct 2022 15:16:18 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ef4103377aae39b21f41817976ce5c9383b0511a commit ef4103377aae39b21f41817976ce5c9383b0511a 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