diff options
| author | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-08 19:52:01 -0400 |
|---|---|---|
| committer | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-08 19:54:58 -0400 |
| commit | 6fb1d55c33059c90cfc3e590d1e67f7e50eb1c05 (patch) | |
| tree | 319e5b685057226bc8ddda16764d71114cde4450 | |
| parent | bb5da949f22f0825fa2e75f63dc45a13572686ef (diff) | |
Reverted -nostdlib changes
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | berry_fix/Makefile | 4 | ||||
| -rw-r--r-- | berry_fix/payload/Makefile | 2 | ||||
| -rw-r--r-- | libagbsyscall/Makefile | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -69,7 +69,7 @@ OBJ_DIR := build/emerald LIBPATH := -L ../../tools/agbcc/lib else 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 +override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mcpu=arm7tdmi -fno-toplevel-reorder -Wno-pointer-to-int-cast ROM := pokeemerald_modern.gba 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))" diff --git a/berry_fix/Makefile b/berry_fix/Makefile index f14179176..0ead3804f 100644 --- a/berry_fix/Makefile +++ b/berry_fix/Makefile @@ -42,7 +42,7 @@ CPPFLAGS := -I ../tools/agbcc/include -I ../tools/agbcc -iquote include -nostdin ROM := berry_fix.gba OBJ_DIR := build CC1 := ../tools/agbcc/bin/agbcc$(EXE) -override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm -nostdlib +override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm ELF = $(ROM:.gba=.elf) @@ -56,7 +56,7 @@ C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR) ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR) DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR) -ASFLAGS := -mcpu=arm7tdmi -mthumb-interwork +ASFLAGS := -mcpu=arm7tdmi LDFLAGS = -Map ../$(MAP) diff --git a/berry_fix/payload/Makefile b/berry_fix/payload/Makefile index e7315242f..a121fda93 100644 --- a/berry_fix/payload/Makefile +++ b/berry_fix/payload/Makefile @@ -52,7 +52,7 @@ C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR) ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR) DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR) -ASFLAGS := -mcpu=arm7tdmi -mthumb-interwork +ASFLAGS := -mcpu=arm7tdmi LDFLAGS = -Map ../$(MAP) diff --git a/libagbsyscall/Makefile b/libagbsyscall/Makefile index 2c040fb0f..911cdb237 100644 --- a/libagbsyscall/Makefile +++ b/libagbsyscall/Makefile @@ -31,7 +31,7 @@ else EXE := endif -ASFLAGS := -mcpu=arm7tdmi -mthumb-interwork +ASFLAGS := -mcpu=arm7tdmi ARFLAGS := rc SYSCALLS := IntrWait \ |