git: cf12f7ba97dc - stable/13 - crt_malloc: use uintptr_t instead of long for arithmetic on addresses

The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=cf12f7ba97dcb8d415414e491b5e4d68f1605190

commit cf12f7ba97dcb8d415414e491b5e4d68f1605190
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-10-12 21:39:07 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-10-22 23:32:27 +0000

    crt_malloc: use uintptr_t instead of long for arithmetic on addresses
    
    (cherry picked from commit 0b72d2965d68113bce16f6cccea77257283ef0a7)
---
 libexec/rtld-elf/rtld_malloc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c
index 6604aa7201f8..f22c3c727c73 100644
--- a/libexec/rtld-elf/rtld_malloc.c
+++ b/libexec/rtld-elf/rtld_malloc.c
@@ -259,7 +259,7 @@ morepages(int n)
 	int offset;
 
 	if (pagepool_end - pagepool_start > pagesz) {
-		addr = (caddr_t)roundup2((long)pagepool_start, pagesz);
+		addr = roundup2(pagepool_start, pagesz);
 		if (munmap(addr, pagepool_end - addr) != 0) {
 #ifdef IN_RTLD
 			rtld_fdprintf(STDERR_FILENO, _BASENAME_RTLD ": "
@@ -269,8 +269,8 @@ morepages(int n)
 		}
 	}
 
-	offset = (long)pagepool_start - rounddown2((long)pagepool_start,
-	    pagesz);
+	offset = (uintptr_t)pagepool_start - rounddown2(
+	    (uintptr_t)pagepool_start, pagesz);
 
 	pagepool_start = mmap(0, n * pagesz, PROT_READ | PROT_WRITE,
 	    MAP_ANON | MAP_PRIVATE, -1, 0);