diff options
| author | Wilco Dijkstra <wilco.dijkstra@arm.com> | 2025-08-04 17:31:56 +0000 |
|---|---|---|
| committer | Wilco Dijkstra <wilco.dijkstra@arm.com> | 2025-08-04 17:31:56 +0000 |
| commit | 7ab623afb9b2a4709c68f10debd300bfb4622d0c (patch) | |
| tree | 616730d2656bc2f11b644d943a55466442268b76 | |
| parent | 91a7726374deaf085bb545cb1f463b7adaebe631 (diff) | |
| download | glibc-7ab623afb9b2a4709c68f10debd300bfb4622d0c.zip glibc-7ab623afb9b2a4709c68f10debd300bfb4622d0c.tar.gz glibc-7ab623afb9b2a4709c68f10debd300bfb4622d0c.tar.bz2 | |
Revert "Remove use of __curbrk."
This reverts commit 1ee0b771a9c0cd2b882fe7acd38deddb7d4fbef2.
| -rw-r--r-- | malloc/malloc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 5257ee2..9d646ab 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -2642,11 +2642,13 @@ 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 lastbrk = (uintptr_t) MORECORE (0); - uintptr_t top = ALIGN_UP (lastbrk + size, mp_.thp_pagesize); - size = top - lastbrk; + uintptr_t top = ALIGN_UP ((uintptr_t) __curbrk + size, + mp_.thp_pagesize); + size = top - (uintptr_t) __curbrk; } else size = ALIGN_UP (size, GLRO(dl_pagesize)); |