diff --git a/configure.py b/configure.py index 1611a41b8..9ee6cd358 100644 --- a/configure.py +++ b/configure.py @@ -1065,16 +1065,16 @@ config.libs = [ "cflags": cflags_runtime, "host": False, "objects": [ - Object(NonMatching, "Runtime.PPCEABI.H/__mem.c"), + Object(Matching, "Runtime.PPCEABI.H/__mem.c"), Object(Matching, "Runtime.PPCEABI.H/__va_arg.c"), Object(Matching, "Runtime.PPCEABI.H/global_destructor_chain.c"), Object(Matching, "Runtime.PPCEABI.H/CPlusLibPPC.cp"), - Object(NonMatching, "Runtime.PPCEABI.H/NMWException.cp"), - Object(NonMatching, "Runtime.PPCEABI.H/ptmf.c"), - Object(NonMatching, "Runtime.PPCEABI.H/runtime.c"), + Object(Matching, "Runtime.PPCEABI.H/NMWException.cp"), + Object(Matching, "Runtime.PPCEABI.H/ptmf.c"), + Object(Matching, "Runtime.PPCEABI.H/runtime.c"), Object(Matching, "Runtime.PPCEABI.H/__init_cpp_exceptions.cpp"), Object(Matching, "Runtime.PPCEABI.H/Gecko_ExceptionPPC.cp"), - Object(NonMatching, "Runtime.PPCEABI.H/GCN_mem_alloc.c"), + Object(Matching, "Runtime.PPCEABI.H/GCN_mem_alloc.c"), ], }, { diff --git a/src/Runtime.PPCEABI.H/GCN_mem_alloc.c b/src/Runtime.PPCEABI.H/GCN_mem_alloc.c index 3e2628a0a..b5f2e147c 100644 --- a/src/Runtime.PPCEABI.H/GCN_mem_alloc.c +++ b/src/Runtime.PPCEABI.H/GCN_mem_alloc.c @@ -6,9 +6,11 @@ inline static void InitDefaultHeap() { void* arenaLo; void* arenaHi; - /* NONMATCH: OSReport strings should be two separate rodata entries with padding */ - OSReport("GCN_Mem_Alloc.c : InitDefaultHeap. No Heap Available\n"); - OSReport("Metrowerks CW runtime library initializing default heap\n"); + // This is to force the two strings be two separate rodata entries with padding instead of a single stringbase. + static const char dummy1[] = "GCN_Mem_Alloc.c : InitDefaultHeap. No Heap Available\n"; + static const char dummy2[] = "Metrowerks CW runtime library initializing default heap\n"; + OSReport(dummy1); + OSReport(dummy2); arenaLo = OSGetArenaLo(); arenaHi = OSGetArenaHi();