git: d48dfb33181f - stable/12 - Fix 64-bit build of libofw.

The branch stable/12 has been updated by kevans:

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

commit d48dfb33181f6ec9f48805dee4bec55290318641
Author:     Brandon Bergren <bdragon@FreeBSD.org>
AuthorDate: 2020-09-08 23:22:11 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2021-10-08 05:24:29 +0000

    Fix 64-bit build of libofw.
    
    Adjust a couple of printf() lines that deal with dumping out addresses
    to cast to uintmax_t.
    
    This allows building a 64-bit libofw for use in things like a future
    Petitboot loader for PowerPC64, and other FDT platforms that require
    a 64-bit loader binary and want to use forth.
    
    Sponsored by:   Tag1 Consulting, Inc.
    
    (cherry picked from commit 3e91d8268ff7ad4ca543d720f66525e6f114fb12)
---
 stand/libofw/ofw_memory.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/stand/libofw/ofw_memory.c b/stand/libofw/ofw_memory.c
index f05881ee8a19..2b7cd87ac765 100644
--- a/stand/libofw/ofw_memory.c
+++ b/stand/libofw/ofw_memory.c
@@ -80,11 +80,11 @@ ofw_memmap(int acells)
 		    "Physical Range", "#Pages", "Mode");
 
 		for (i = 0; i < nmapping; i++) {
-			sprintf(lbuf, "%08x-%08x\t%08x-%08x\t%8d\t%6x\n",
-				mapptr[i].va,
-				mapptr[i].va + mapptr[i].len,
-				mapptr[i].pa,
-				mapptr[i].pa + mapptr[i].len,
+			sprintf(lbuf, "%08jx-%08jx\t%08jx-%08jx\t%8d\t%6x\n",
+				(uintmax_t)mapptr[i].va,
+				(uintmax_t)mapptr[i].va + mapptr[i].len,
+				(uintmax_t)mapptr[i].pa,
+				(uintmax_t)mapptr[i].pa + mapptr[i].len,
 				mapptr[i].len / 0x1000,
 				mapptr[i].mode);
 			if (pager_output(lbuf))
@@ -98,11 +98,11 @@ ofw_memmap(int acells)
 		       "Physical Range", "#Pages", "Mode");
 
 		for (i = 0; i < nmapping; i++) {
-			sprintf(lbuf, "%08x-%08x\t%08x-%08x\t%8d\t%6x\n",
-				mapptr2[i].va,
-				mapptr2[i].va + mapptr2[i].len,
-				mapptr2[i].pa_lo,
-				mapptr2[i].pa_lo + mapptr2[i].len,
+			sprintf(lbuf, "%08jx-%08jx\t%08jx-%08jx\t%8d\t%6x\n",
+				(uintmax_t)mapptr2[i].va,
+				(uintmax_t)mapptr2[i].va + mapptr2[i].len,
+				(uintmax_t)mapptr2[i].pa_lo,
+				(uintmax_t)mapptr2[i].pa_lo + mapptr2[i].len,
 				mapptr2[i].len / 0x1000,
 				mapptr2[i].mode);
 			if (pager_output(lbuf))