Match mem_funcs from cam's work (#1442)

* Match mem_funcs from cam's work * Wrap mem_funcs in an ifdef to ignore Clang's correct errors * Adjustment to ifdefs --------- Co-authored-by: Robin Avery <[email protected]>
doldecomp · Sep 17, 2024 · 711349d · 711349d
1 parent c333d37
commit 711349d
Show file tree

Hide file tree

Showing 4 changed files with 239 additions and 224 deletions.
diff --git a/asm/MSL/mem_funcs.s b/asm/MSL/mem_funcs.s
diff --git a/configure.py b/configure.py
@@ -1193,7 +1193,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> Library:
             Object(Matching, "MSL/ctype.c"),
             Object(NonMatching, "MSL/direct_io.c"),
             Object(Matching, "MSL/cstring.c"),
-            Object(NonMatching, "MSL/mem_funcs.c"),
+            Object(Matching, "MSL/mem_funcs.c"),
             Object(NonMatching, "MSL/printf.c"),
             Object(Matching, "MSL/rand.c"),
             Object(Matching, "MSL/string.c"),

diff --git a/obj_files.mk b/obj_files.mk
@@ -785,7 +785,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/src/MSL/ctype.c.o\
     $(BUILD_DIR)/asm/MSL/direct_io.s.o\
     $(BUILD_DIR)/src/MSL/cstring.c.o\
-    $(BUILD_DIR)/asm/MSL/mem_funcs.s.o\
+    $(BUILD_DIR)/src/MSL/mem_funcs.c.o\
     $(BUILD_DIR)/asm/MSL/printf.s.o\
     $(BUILD_DIR)/src/MSL/rand.c.o\
     $(BUILD_DIR)/src/MSL/string.c.o\