MODERN_CC

decompals · Aug 21, 2024 · bc3c716 · bc3c716
1 parent 1e5343a
commit bc3c716
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/include/PR/os_libc.h b/include/PR/os_libc.h
@@ -80,7 +80,7 @@ extern "C" {
 
 /* byte string operations */
 
-#ifndef MODERN
+#ifndef MODERN_CC
 extern void     bcopy(const void *, void *, int);
 extern int      bcmp(const void *, const void *, int);
 extern void     bzero(void *, int);

diff --git a/makefiles/modern_gcc.mk b/makefiles/modern_gcc.mk
@@ -8,7 +8,7 @@ WARNINGS := -Wall -Wextra -Wno-format-security -Wno-unused-function -Wno-unused-
 WARNINGS += -Wno-int-conversion -Wno-incompatible-pointer-types -Wno-implicit-function-declaration # TODO: Try adjusting code to remove these
 CFLAGS := -G 0 -c -nostdinc -march=vr4300 -mfix4300 -mabi=32 -mno-abicalls -mdivide-breaks -fno-PIC -fno-common -ffreestanding -fbuiltin -fno-builtin-sinf -fno-builtin-cosf -funsigned-char $(WARNINGS)
 ASFLAGS := -w -nostdinc -c -G 0 -march=vr4300 -mgp32 -mfp32 -DMIPSEB -D_LANGUAGE_ASSEMBLY -D_MIPS_SIM=1 -D_ULTRA64
-CPPFLAGS = -DMODERN -D_MIPS_SZLONG=32 -D__USE_ISOC99 $(GBIDEFINE) $(VERSION_DEFINE) $(DEBUGFLAG)
+CPPFLAGS = -DMODERN_CC -D_MIPS_SZLONG=32 -D__USE_ISOC99 $(GBIDEFINE) $(VERSION_DEFINE) $(DEBUGFLAG)
 IINC = -I . -I $(WORKING_DIR)/include -I $(WORKING_DIR)/include/modern_gcc -I $(WORKING_DIR)/include/PR
 MIPS_VERSION := -mips3
 ASOPTFLAGS :=

diff --git a/src/os/exceptasm.s b/src/os/exceptasm.s
@@ -1,4 +1,4 @@
-#ifdef MODERN
+#ifdef MODERN_CC
 .set gp=64
 #endif
 

diff --git a/src/os/getfpccsr.s b/src/os/getfpccsr.s
@@ -6,7 +6,7 @@
 LEAF(__osGetFpcCsr)
     CFC1(   v0, fcr31)
     jr      ra
-#ifndef MODERN
+#ifndef MODERN_CC
 END(__osGetSR) # @bug: Should be __osGetFpcCsr
 #else
 END(__osGetFpcCsr)

diff --git a/src/os/setfpccsr.s b/src/os/setfpccsr.s
@@ -7,7 +7,7 @@ LEAF(__osSetFpcCsr)
     CFC1(   v0, fcr31)
     CTC1(   a0, fcr31)
     jr      ra
-#ifndef MODERN
+#ifndef MODERN_CC
 END(__osSetSR) # @bug: Should be __osSetFpcCsr
 #else
 END(__osSetFpcCsr)