From c3faefc061b7bc57eae460deffd7d2d0ad7d3c0c Mon Sep 17 00:00:00 2001
From: cadmic <cadmic24@gmail.com>
Date: Mon, 26 Feb 2024 22:53:10 -0800
Subject: [PATCH] Fix some retail `boot` data (#1668)

* Fix is_debug.c bss

* Fix stackcheck.c rodata

* Poke jenkins

* Don't introduce new variable
---
 src/boot/is_debug.c   | 4 ++--
 src/boot/stackcheck.c | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/boot/is_debug.c b/src/boot/is_debug.c
index b5d077212a..9507fde857 100644
--- a/src/boot/is_debug.c
+++ b/src/boot/is_debug.c
@@ -1,11 +1,11 @@
 #include "global.h"
 
-OSPiHandle* sISVHandle; // official name : is_Handle
-
 #define gISVDbgPrnAdrs ((ISVDbg*)0xB3FF0000)
 #define ASCII_TO_U32(a, b, c, d) ((u32)((a << 24) | (b << 16) | (c << 8) | (d << 0)))
 
 #if OOT_DEBUG
+OSPiHandle* sISVHandle; // official name : is_Handle
+
 void isPrintfInit(void) {
     sISVHandle = osCartRomInit();
     osEPiWriteIo(sISVHandle, (u32)&gISVDbgPrnAdrs->put, 0);
diff --git a/src/boot/stackcheck.c b/src/boot/stackcheck.c
index f7eefad718..aa0972d2f8 100644
--- a/src/boot/stackcheck.c
+++ b/src/boot/stackcheck.c
@@ -98,6 +98,11 @@ u32 StackCheck_GetState(StackEntry* entry) {
         ret = STACK_STATUS_OK;
     }
 
+#if !OOT_DEBUG
+    // This string is still in .rodata for retail builds
+    (void)"(null)";
+#endif
+
     PRINTF("head=%08x tail=%08x last=%08x used=%08x free=%08x [%s]\n", entry->head, entry->tail, last, used, free,
            entry->name != NULL ? entry->name : "(null)");
     PRINTF(VT_RST);