Skip to content

Commit

Permalink
Revert section rename
Browse files Browse the repository at this point in the history
  • Loading branch information
GriffinRichards committed Jun 22, 2024
1 parent bc76541 commit 21e8a14
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/gba/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ld_script.ld
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ MEMORY

SECTIONS {

.ewram.sbss 0x2000000 (NOLOAD) :
ewram 0x2000000 (NOLOAD) :
ALIGN(4)
{
gHeap = .;

. = 0x1C000;

INCLUDE "sym_ewram.ld"
src/*.o(.sbss);
src/*.o(ewram_data);

*libc.a:impure.o(.data);
*libc.a:locale.o(.data);
Expand Down
4 changes: 2 additions & 2 deletions ld_script_modern.ld
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ MEMORY

SECTIONS {

.ewram.sbss 0x2000000 (NOLOAD) :
ewram 0x2000000 (NOLOAD) :
ALIGN(4)
{
gHeap = .;

. = 0x1C000;

*(.sbss);
*(ewram_data);
} > EWRAM

iwram 0x3000000 (NOLOAD) :
Expand Down

0 comments on commit 21e8a14

Please sign in to comment.