diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-31 11:50:28 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 11:50:28 -0600 |
| commit | 4099f871e691c75b1beea0930fba2e1c54f4fe6e (patch) | |
| tree | c55610701fcb7d95552c862c7b5d9021feb6696a | |
| parent | 935a098843b1176db8e4b4f8f82f70086a0ed92f (diff) | |
| parent | 7c57699fa5205aa7bb3d639a6b8d4680bc03d8dc (diff) | |
Merge pull request #502 from nullableVoidPtr/master
Remove sed from ld_script, replace with INCLUDEs
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ld_script.sed | 14 | ||||
| -rw-r--r-- | ld_script.txt | 6 |
3 files changed, 4 insertions, 18 deletions
@@ -178,7 +178,7 @@ $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt $(RAMSCRGEN) ewram_data $< ENGLISH > $@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld - cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld + cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../ld_script.txt > ld_script.ld $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB) diff --git a/ld_script.sed b/ld_script.sed deleted file mode 100644 index b91542b6f..000000000 --- a/ld_script.sed +++ /dev/null @@ -1,14 +0,0 @@ -/<EWRAM>/ { - r sym_ewram.ld - d -} - -/<BSS>/ { - r sym_bss.ld - d -} - -/<COMMON>/ { - r sym_common.ld - d -} diff --git a/ld_script.txt b/ld_script.txt index c0810850e..660c1d60d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -13,7 +13,7 @@ SECTIONS { . = 0x1C000; -<EWRAM> + INCLUDE "sym_ewram.ld" . = 0x40000; } @@ -24,13 +24,13 @@ SECTIONS { ALIGN(4) { /* .bss starts at 0x3000000 */ -<BSS> + INCLUDE "sym_bss.ld" /* .bss.code starts at 0x3001AA8 */ src/m4a_2.o(.bss.code); /* COMMON starts at 0x30022A8 */ -<COMMON> + INCLUDE "sym_common.ld" *libc.a:sbrkr.o(COMMON); end = .; . = 0x8000; |