diff --git a/Makefile b/Makefile index ef82f139e9..c536645799 100644 --- a/Makefile +++ b/Makefile @@ -324,7 +324,7 @@ $(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt) $(RAMSCRGEN) COMMON $< ENGLISH -c $(C_BUILDDIR),common_syms > $@ $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt - $(RAMSCRGEN) .sbss $< ENGLISH > $@ + $(RAMSCRGEN) ewram_data $< ENGLISH > $@ ifeq ($(MODERN),0) LD_SCRIPT := ld_script.ld diff --git a/include/gba/defines.h b/include/gba/defines.h index 590494d088..46c722a1ae 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -11,7 +11,7 @@ #define EWRAM_DATA __attribute__((section("__DATA,ewram_data"))) #else #define IWRAM_DATA __attribute__((section("iwram_data"))) -#define EWRAM_DATA __attribute__((section(".sbss"))) +#define EWRAM_DATA __attribute__((section("ewram_data"))) #endif #if MODERN diff --git a/ld_script.ld b/ld_script.ld index 381ed1ca9e..1d2bbf29d9 100644 --- a/ld_script.ld +++ b/ld_script.ld @@ -10,7 +10,7 @@ MEMORY SECTIONS { - .ewram.sbss 0x2000000 (NOLOAD) : + ewram 0x2000000 (NOLOAD) : ALIGN(4) { gHeap = .; @@ -18,7 +18,7 @@ SECTIONS { . = 0x1C000; INCLUDE "sym_ewram.ld" - src/*.o(.sbss); + src/*.o(ewram_data); *libc.a:impure.o(.data); *libc.a:locale.o(.data); diff --git a/ld_script_modern.ld b/ld_script_modern.ld index c33a8bfb59..76f4536fb9 100644 --- a/ld_script_modern.ld +++ b/ld_script_modern.ld @@ -10,14 +10,14 @@ MEMORY SECTIONS { - .ewram.sbss 0x2000000 (NOLOAD) : + ewram 0x2000000 (NOLOAD) : ALIGN(4) { gHeap = .; . = 0x1C000; - *(.sbss); + *(ewram_data); } > EWRAM iwram 0x3000000 (NOLOAD) :