From 2e1ad73a25102ffd457fecd37d0237f388659fdc Mon Sep 17 00:00:00 2001
From: Toad King <toadking@toadking.com>
Date: Wed, 22 Aug 2012 06:40:16 -0400
Subject: [PATCH 1/2] (GX) fix loading huge cores

---
 console/exec/dol.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/console/exec/dol.c b/console/exec/dol.c
index 343cf218fa..18b7976d43 100644
--- a/console/exec/dol.c
+++ b/console/exec/dol.c
@@ -62,10 +62,13 @@ uint32_t *load_dol_image (void *dolstart)
          DCFlushRangeNoSync ((void *) dolfile->data_start[i], dolfile->data_size[i]);
       }
 
-      RARCH_LOG("clearing bss\n");
+      // clearing bss will mess up loading the huge fba core, so we let libogc's startup routine do it
+      // we also cross our fingers and pray to god launching the loader from the fba core doens't overwrite
+      // anything too important in this section
+      /* RARCH_LOG("clearing bss\n");
 
       memset ((void *) dolfile->bss_start, 0, dolfile->bss_size);
-      DCFlushRange((void *) dolfile->bss_start, dolfile->bss_size);
+      DCFlushRange((void *) dolfile->bss_start, dolfile->bss_size); */
 
       return (uint32_t *) dolfile->entry_point;
    }

From 68ff958252af028dc3bb9a94939d3f92bf923f63 Mon Sep 17 00:00:00 2001
From: Toad King <toadking@toadking.com>
Date: Wed, 22 Aug 2012 06:42:40 -0400
Subject: [PATCH 2/2] (GX) generate memory map (for help with potential bug
 reports)

---
 Makefile.wii | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.wii b/Makefile.wii
index e38c192f7d..cde9297a8c 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -34,7 +34,7 @@ LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
 
 MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
-LDFLAGS := $(MACHDEP) -T gx/ld/rvl.ld
+LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map -T gx/ld/rvl.ld
 LIBS := -lfat -lretro_wii -lwiiuse -logc -lbte
 
 OBJ = console/griffin/griffin.o console/font.bmpobj console/rzlib/rzlib.o