Update toolchain to use GCC 8.1.

[n64chain.git] / libn64 / Makefile

diff --git a/libn64/Makefile b/libn64/Makefile
index 672a06c..2b2a530 100644 (file)
--- a/libn64/Makefile
+++ b/libn64/Makefile
@@ -19,33 +19,49 @@ endif
 AS = $(call FIXPATH,$(CURDIR)/../tools/bin/mips64-elf-as)
 AR = $(call FIXPATH,$(CURDIR)/../tools/bin/mips64-elf-gcc-ar)
 CC = $(call FIXPATH,$(CURDIR)/../tools/bin/mips64-elf-gcc)
+CPP = $(call FIXPATH,$(CURDIR)/../tools/bin/mips64-elf-cpp)
+
+RSPASM = $(call FIXPATH,$(CURDIR)/../tools/bin/rspasm)
 
 CFLAGS = -Wall -Wextra -pedantic -std=c99 -I. -Iinclude -Ipriv_include
-OPTFLAGS = -Os -march=vr4300 -mabi=eabi -mgp32 -mlong32 \
+OPTFLAGS = -Os -march=vr4300 -mtune=vr4300 -mabi=eabi -mgp32 -mlong32 \
        -flto -ffat-lto-objects -ffunction-sections -fdata-sections \
-       -G4 -mno-extern-sdata -mgpopt
+       -G4 -mno-extern-sdata -mgpopt -mfix4300 -mbranch-likely \
+       -mno-check-zero-division
 
 ASMFILES = $(call FIXPATH,\
        os/asm/boot.s \
        os/asm/context.s \
        os/asm/exception.s \
+       os/asm/idle_thread.s \
        os/asm/message.s \
        os/asm/syscall.s \
 )
 
 CFILES = $(call FIXPATH,\
+       io/init.c \
+       io/filesystem.c \
+       io/pi_thread.c \
+       io/si_thread.c \
        os/fbtext.c \
-       os/kthread.c \
        os/main.c \
        os/mm.c \
        os/panic.c \
        os/thread.c \
+       os/time.c \
        rcp/vi.c \
+       sp/init.c \
+       sp/sp_thread.c \
+)
+
+UCODES = $(call FIXPATH,\
+       ucodes/init.rsp \
 )
 
 OBJFILES = \
        $(CFILES:.c=.o) \
-       $(ASMFILES:.s=.o)
+       $(ASMFILES:.s=.o) \
+       $(UCODES:.rsp=.o)
 
 DEPFILES = $(OBJFILES:.o=.d)
 
@@ -63,10 +79,16 @@ libn64.a: $(OBJFILES)
        @echo $(call FIXPATH,"Assembling: libn64/$<")
        @$(CC) -x assembler-with-cpp $(CFLAGS) $(OPTFLAGS) -MMD -c $< -o $@
 
-%.o: %.c
+%.o: %.c include/syscall.h
        @echo $(call FIXPATH,"Compiling: libn64/$<")
        @$(CC) $(CFLAGS) $(OPTFLAGS) -MMD -c $< -o $@
 
+%.o: %.rsp %.rsps
+       @echo $(call FIXPATH,"Assembling: $(ROM_NAME)/$@")
+       @$(CPP) -E -Iucodes $< > $(<:.rsp=.rsppch)
+       @$(RSPASM) $(<:.rsp=.rsppch) -o $(<:.rsp=.bin)
+       @$(CC) -x assembler-with-cpp $(CFLAGS) $(OPTFLAGS) -MMD -c $(<:.rsp=.rsps) -o $@
+
 #
 # Clean project target.
 #