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 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; }