diff options
| author | cadmic <cadmic24@gmail.com> | 2024-08-19 22:15:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-20 01:15:24 -0400 |
| commit | ec70295357c198c48660e2ab5670c15ef6a661cf (patch) | |
| tree | 0c46c5493c7538ced1e2d1ab6344251bd2673d31 /spec | |
| parent | aba1bb88a3ed369ab450345a65f0176ceb0e482c (diff) | |
Move non-libultra libc functions to src/libc/ (#2055)
* Move non-libultra libc functions to src/libc/
* Add explicit nops in delay slots
* Don't rely on CPP expanding undefined macros to 0
* Delete old Makefile rules
* Fix type of memset()
Diffstat (limited to 'spec')
| -rw-r--r-- | spec | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -69,7 +69,7 @@ beginseg #endif include "$(BUILD_DIR)/src/libultra/os/unmaptlball.o" include "$(BUILD_DIR)/src/libultra/io/epidma.o" -#if OOT_DEBUG || COMPILER_GCC +#if OOT_DEBUG || defined(COMPILER_GCC) include "$(BUILD_DIR)/src/libultra/libc/string.o" #endif include "$(BUILD_DIR)/src/libultra/os/invalicache.o" @@ -128,6 +128,8 @@ beginseg include "$(BUILD_DIR)/src/libultra/os/setwatchlo.o" include "$(BUILD_DIR)/data/rsp_boot.text.o" #ifdef COMPILER_GCC + include "$(BUILD_DIR)/src/libc/memset.o" + include "$(BUILD_DIR)/src/libc/memmove.o" include "$(BUILD_DIR)/src/gcc_fix/missing_gcc_functions.o" #endif endseg @@ -577,7 +579,7 @@ beginseg #if !OOT_DEBUG include "$(BUILD_DIR)/src/libultra/libc/xprintf.o" #endif -#if !OOT_DEBUG && !COMPILER_GCC +#if !OOT_DEBUG && !defined(COMPILER_GCC) include "$(BUILD_DIR)/src/libultra/libc/string.o" #endif include "$(BUILD_DIR)/src/libultra/io/sp.o" @@ -636,11 +638,13 @@ beginseg include "$(BUILD_DIR)/src/libultra/libc/llcvt.o" include "$(BUILD_DIR)/src/libultra/io/vigetcurrframebuf.o" include "$(BUILD_DIR)/src/libultra/io/spsetpc.o" - include "$(BUILD_DIR)/src/libultra/libc/sqrt.o" - include "$(BUILD_DIR)/src/libultra/libc/absf.o" - include "$(BUILD_DIR)/src/code/fmodf.o" - include "$(BUILD_DIR)/src/code/__osMemset.o" - include "$(BUILD_DIR)/src/code/__osMemmove.o" + include "$(BUILD_DIR)/src/libc/sqrt.o" + include "$(BUILD_DIR)/src/libc/absf.o" + include "$(BUILD_DIR)/src/libc/fmodf.o" +#ifndef COMPILER_GCC + include "$(BUILD_DIR)/src/libc/memset.o" + include "$(BUILD_DIR)/src/libc/memmove.o" +#endif // For some reason, the data sections of z_message and z_game_over are // placed near the rodata sections of other files, so we first build this // combined object before the final link. |