From: Wilco Dijkstra <wilco.dijkstra@arm.com>
Date: Fri, 8 Aug 2025 13:59:31 +0000 (+0000)
Subject: malloc: Remove use of __curbrk
X-Git-Tag: glibc-2.43~665
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94ebcfc4f253129ca772392fe034eea6c0aa6963;p=thirdparty%2Fglibc.git

malloc: Remove use of __curbrk

Remove an odd use of __curbrk and use MORECORE (0) instead.
This fixes Hurd build since it doesn't define this symbol.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
---

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 9d646abae9..5257ee24fd 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -2642,13 +2642,11 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av)
          previous calls. Otherwise, we correct to page-align below.
        */
 
-      /* Defined in brk.c.  */
-      extern void *__curbrk;
       if (__glibc_unlikely (mp_.thp_pagesize != 0))
 	{
-	  uintptr_t top = ALIGN_UP ((uintptr_t) __curbrk + size,
-				    mp_.thp_pagesize);
-	  size = top - (uintptr_t) __curbrk;
+	  uintptr_t lastbrk = (uintptr_t) MORECORE (0);
+	  uintptr_t top = ALIGN_UP (lastbrk + size, mp_.thp_pagesize);
+	  size = top - lastbrk;
 	}
       else
 	size = ALIGN_UP (size, GLRO(dl_pagesize));