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

Merge pull request #1407 from ipatix/fix/modern

Browse source 
Fix modern target when libc functions are used.
This commit is contained in:
GriffinR 2021-05-05 20:06:15 -04:00 committed by GitHub
commit de3b32f76b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -67,12 +67,14 @@ override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-
ROM := pokeemerald.gba ROM := pokeemerald.gba
OBJ_DIR := build/emerald OBJ_DIR := build/emerald
LIBPATH := -L ../../tools/agbcc/lib LIBPATH := -L ../../tools/agbcc/lib
LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
else else
CC1 = $(shell $(CC) --print-prog-name=cc1) -quiet CC1 = $(shell $(CC) --print-prog-name=cc1) -quiet
override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast -g override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast -g
ROM := pokeemerald_modern.gba ROM := pokeemerald_modern.gba
OBJ_DIR := build/modern OBJ_DIR := build/modern
LIBPATH := -L "$(dir $(shell $(CC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(CC) -mthumb -print-file-name=libc.a))" LIBPATH := -L "$(dir $(shell $(CC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(CC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(CC) -mthumb -print-file-name=libc.a))"
LIB := $(LIBPATH) -lc -lnosys -lgcc -L../../libagbsyscall -lagbsyscall
endif endif
CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN) CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN)
@ -82,8 +84,6 @@ endif
LDFLAGS = -Map ../../$(MAP) LDFLAGS = -Map ../../$(MAP)
LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
GFX := tools/gbagfx/gbagfx$(EXE) GFX := tools/gbagfx/gbagfx$(EXE)
AIF := tools/aif2pcm/aif2pcm$(EXE) AIF := tools/aif2pcm/aif2pcm$(EXE)

23
ld_script_modern.txt
View file

@ -27,6 +27,8 @@ SECTIONS {
/* .bss starts at 0x3000000 */ /* .bss starts at 0x3000000 */
src/*.o(.bss); src/*.o(.bss);
gflib/*.o(.bss); gflib/*.o(.bss);
*libc.a:*.o(.bss*);
*libnosys.a:*.o(.bss*);
/* .bss.code starts at 0x3001AA8 */ /* .bss.code starts at 0x3001AA8 */
src/m4a.o(.bss.code); src/m4a.o(.bss.code);
@ -34,7 +36,8 @@ SECTIONS {
/* COMMON starts at 0x30022A8 */ /* COMMON starts at 0x30022A8 */
src/*.o(COMMON); src/*.o(COMMON);
gflib/*.o(COMMON); gflib/*.o(COMMON);
*libc.a:sbrkr.o(COMMON); *libc.a:*.o(COMMON);
*libnosys.a:*.o(COMMON);
end = .; end = .;
. = 0x8000; . = 0x8000;
} }
@ -44,19 +47,10 @@ SECTIONS {
.text : .text :
ALIGN(4) ALIGN(4)
{ {
src/crt0.o(.text); src/crt0.o(.text*);
src/*.o(.text); src/*.o(.text*);
gflib/*.o(.text); gflib/*.o(.text*);
asm/*.o(.text); asm/*.o(.text*);
} =0
.text.unlikely :
ALIGN(4)
{
src/crt0.o(.text.unlikely);
src/*.o(.text.unlikely);
gflib/*.o(.text.unlikely);
asm/*.o(.text.unlikely);
} =0 } =0
script_data : script_data :
@ -82,6 +76,7 @@ SECTIONS {
*libagbsyscall.a:*.o(.text*); *libagbsyscall.a:*.o(.text*);
*libgcc.a:*.o(.text*); *libgcc.a:*.o(.text*);
*libc.a:*.o(.text*); *libc.a:*.o(.text*);
*libnosys.a:*.o(.text*);
src/libisagbprn.o(.text); src/libisagbprn.o(.text);
} =0 } =0