falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert memcpy linker change because new ld does not like it 

adjust dependency scan to still skip libs
This commit is contained in:
Henny022p 2023-05-11 19:02:49 +02:00
parent c2ad020de6
commit d40664bb74
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GBA.mk
View File

@ -136,7 +136,7 @@ LIB := -L ../../tools/agbcc/lib -lc
$(ROM): $(ELF) $(ROM): $(ELF)
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
$(ELF): objs = $(shell grep -o -E "(\w|/)+\.o" linker.ld) $(ELF): objs = $(shell grep -vE "\*\w+\.a" linker.ld | grep -oE "(\w|/)+\.o")
$(ELF): $(BUILD_DIR)/linker.ld $$(addprefix $(BUILD_DIR)/, $$(objs)) $(ELF): $(BUILD_DIR)/linker.ld $$(addprefix $(BUILD_DIR)/, $$(objs))
cd $(BUILD_DIR) && $(LD) $(LDFLAGS) -n -T linker.ld -o ../../$@ $(LIB) cd $(BUILD_DIR) && $(LD) $(LDFLAGS) -n -T linker.ld -o ../../$@ $(LIB)
$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent $(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent

2
linker.ld
View File

@ -867,7 +867,7 @@ SECTIONS {
src/gba/m4a.o(.text); src/gba/m4a.o(.text);
asm/lib/libagbsyscall.o(.text); asm/lib/libagbsyscall.o(.text);
src/eeprom.o(.text); src/eeprom.o(.text);
libc.a(.text); *libc.a:memcpy.o(.text);
/* handwritten assembly in arm mode */ /* handwritten assembly in arm mode */
asm/src/intr.o(.text); asm/src/intr.o(.text);