atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove sed from ld_script, replace with INCLUDEs

Browse source
This commit is contained in:
nullableVoidPtr 2019-01-01 00:38:49 +08:00
parent 935a098843
commit 7c57699fa5
3 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -178,7 +178,7 @@ $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
$(RAMSCRGEN) ewram_data $< ENGLISH > $@ $(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 $(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) $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB) cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)

14
ld_script.sed
View file

@ -1,14 +0,0 @@
/<EWRAM>/ {
r sym_ewram.ld
d
}
/<BSS>/ {
r sym_bss.ld
d
}
/<COMMON>/ {
r sym_common.ld
d
}

6
ld_script.txt
View file

@ -13,7 +13,7 @@ SECTIONS {
. = 0x1C000; . = 0x1C000;
<EWRAM> INCLUDE "sym_ewram.ld"
. = 0x40000; . = 0x40000;
} }
@ -24,13 +24,13 @@ SECTIONS {
ALIGN(4) ALIGN(4)
{ {
/* .bss starts at 0x3000000 */ /* .bss starts at 0x3000000 */
<BSS> INCLUDE "sym_bss.ld"
/* .bss.code starts at 0x3001AA8 */ /* .bss.code starts at 0x3001AA8 */
src/m4a_2.o(.bss.code); src/m4a_2.o(.bss.code);
/* COMMON starts at 0x30022A8 */ /* COMMON starts at 0x30022A8 */
<COMMON> INCLUDE "sym_common.ld"
*libc.a:sbrkr.o(COMMON); *libc.a:sbrkr.o(COMMON);
end = .; end = .;
. = 0x8000; . = 0x8000;