From 6e861af4046451e48d0d2cb9789508c1760ea146 Mon Sep 17 00:00:00 2001
From: Derek Hensley <hensley.derek58@gmail.com>
Date: Thu, 28 Nov 2024 08:40:49 -0800
Subject: [PATCH] Move compiler includes to include/compiler (#91)

---
 include/{ => compiler}/gcc/math.h           | 0
 include/{ => compiler}/gcc/memory.h         | 0
 include/{ => compiler}/gcc/sgidefs.h        | 0
 include/{ => compiler}/gcc/stdarg.h         | 0
 include/{ => compiler}/gcc/stdio.h          | 0
 include/{ => compiler}/gcc/stdlib.h         | 0
 include/{ => compiler}/gcc/string.h         | 0
 include/{ => compiler}/ido/math.h           | 0
 include/{ => compiler}/ido/memory.h         | 0
 include/{ => compiler}/ido/stdarg.h         | 0
 include/{ => compiler}/ido/stdio.h          | 0
 include/{ => compiler}/ido/stdlib.h         | 0
 include/{ => compiler}/ido/string.h         | 0
 include/{ => compiler}/modern_gcc/math.h    | 0
 include/{ => compiler}/modern_gcc/memory.h  | 0
 include/{ => compiler}/modern_gcc/sgidefs.h | 0
 include/{ => compiler}/modern_gcc/stdarg.h  | 0
 include/{ => compiler}/modern_gcc/stdio.h   | 0
 include/{ => compiler}/modern_gcc/stdlib.h  | 0
 include/{ => compiler}/modern_gcc/string.h  | 0
 makefiles/gcc.mk                            | 2 +-
 makefiles/ido.mk                            | 2 +-
 makefiles/modern_gcc.mk                     | 2 +-
 23 files changed, 3 insertions(+), 3 deletions(-)
 rename include/{ => compiler}/gcc/math.h (100%)
 rename include/{ => compiler}/gcc/memory.h (100%)
 rename include/{ => compiler}/gcc/sgidefs.h (100%)
 rename include/{ => compiler}/gcc/stdarg.h (100%)
 rename include/{ => compiler}/gcc/stdio.h (100%)
 rename include/{ => compiler}/gcc/stdlib.h (100%)
 rename include/{ => compiler}/gcc/string.h (100%)
 rename include/{ => compiler}/ido/math.h (100%)
 rename include/{ => compiler}/ido/memory.h (100%)
 rename include/{ => compiler}/ido/stdarg.h (100%)
 rename include/{ => compiler}/ido/stdio.h (100%)
 rename include/{ => compiler}/ido/stdlib.h (100%)
 rename include/{ => compiler}/ido/string.h (100%)
 rename include/{ => compiler}/modern_gcc/math.h (100%)
 rename include/{ => compiler}/modern_gcc/memory.h (100%)
 rename include/{ => compiler}/modern_gcc/sgidefs.h (100%)
 rename include/{ => compiler}/modern_gcc/stdarg.h (100%)
 rename include/{ => compiler}/modern_gcc/stdio.h (100%)
 rename include/{ => compiler}/modern_gcc/stdlib.h (100%)
 rename include/{ => compiler}/modern_gcc/string.h (100%)

diff --git a/include/gcc/math.h b/include/compiler/gcc/math.h
similarity index 100%
rename from include/gcc/math.h
rename to include/compiler/gcc/math.h
diff --git a/include/gcc/memory.h b/include/compiler/gcc/memory.h
similarity index 100%
rename from include/gcc/memory.h
rename to include/compiler/gcc/memory.h
diff --git a/include/gcc/sgidefs.h b/include/compiler/gcc/sgidefs.h
similarity index 100%
rename from include/gcc/sgidefs.h
rename to include/compiler/gcc/sgidefs.h
diff --git a/include/gcc/stdarg.h b/include/compiler/gcc/stdarg.h
similarity index 100%
rename from include/gcc/stdarg.h
rename to include/compiler/gcc/stdarg.h
diff --git a/include/gcc/stdio.h b/include/compiler/gcc/stdio.h
similarity index 100%
rename from include/gcc/stdio.h
rename to include/compiler/gcc/stdio.h
diff --git a/include/gcc/stdlib.h b/include/compiler/gcc/stdlib.h
similarity index 100%
rename from include/gcc/stdlib.h
rename to include/compiler/gcc/stdlib.h
diff --git a/include/gcc/string.h b/include/compiler/gcc/string.h
similarity index 100%
rename from include/gcc/string.h
rename to include/compiler/gcc/string.h
diff --git a/include/ido/math.h b/include/compiler/ido/math.h
similarity index 100%
rename from include/ido/math.h
rename to include/compiler/ido/math.h
diff --git a/include/ido/memory.h b/include/compiler/ido/memory.h
similarity index 100%
rename from include/ido/memory.h
rename to include/compiler/ido/memory.h
diff --git a/include/ido/stdarg.h b/include/compiler/ido/stdarg.h
similarity index 100%
rename from include/ido/stdarg.h
rename to include/compiler/ido/stdarg.h
diff --git a/include/ido/stdio.h b/include/compiler/ido/stdio.h
similarity index 100%
rename from include/ido/stdio.h
rename to include/compiler/ido/stdio.h
diff --git a/include/ido/stdlib.h b/include/compiler/ido/stdlib.h
similarity index 100%
rename from include/ido/stdlib.h
rename to include/compiler/ido/stdlib.h
diff --git a/include/ido/string.h b/include/compiler/ido/string.h
similarity index 100%
rename from include/ido/string.h
rename to include/compiler/ido/string.h
diff --git a/include/modern_gcc/math.h b/include/compiler/modern_gcc/math.h
similarity index 100%
rename from include/modern_gcc/math.h
rename to include/compiler/modern_gcc/math.h
diff --git a/include/modern_gcc/memory.h b/include/compiler/modern_gcc/memory.h
similarity index 100%
rename from include/modern_gcc/memory.h
rename to include/compiler/modern_gcc/memory.h
diff --git a/include/modern_gcc/sgidefs.h b/include/compiler/modern_gcc/sgidefs.h
similarity index 100%
rename from include/modern_gcc/sgidefs.h
rename to include/compiler/modern_gcc/sgidefs.h
diff --git a/include/modern_gcc/stdarg.h b/include/compiler/modern_gcc/stdarg.h
similarity index 100%
rename from include/modern_gcc/stdarg.h
rename to include/compiler/modern_gcc/stdarg.h
diff --git a/include/modern_gcc/stdio.h b/include/compiler/modern_gcc/stdio.h
similarity index 100%
rename from include/modern_gcc/stdio.h
rename to include/compiler/modern_gcc/stdio.h
diff --git a/include/modern_gcc/stdlib.h b/include/compiler/modern_gcc/stdlib.h
similarity index 100%
rename from include/modern_gcc/stdlib.h
rename to include/compiler/modern_gcc/stdlib.h
diff --git a/include/modern_gcc/string.h b/include/compiler/modern_gcc/string.h
similarity index 100%
rename from include/modern_gcc/string.h
rename to include/compiler/modern_gcc/string.h
diff --git a/makefiles/gcc.mk b/makefiles/gcc.mk
index 9e71ccb9..85b25a24 100644
--- a/makefiles/gcc.mk
+++ b/makefiles/gcc.mk
@@ -8,7 +8,7 @@ STRIP =
 CFLAGS := -w -nostdinc -c -G 0 -mgp32 -mfp32 -D_LANGUAGE_C
 ASFLAGS := -w -nostdinc -c -G 0 -mgp32 -mfp32 -DMIPSEB -D_LANGUAGE_ASSEMBLY -D_MIPS_SIM=1 -D_ULTRA64
 CPPFLAGS = -D_MIPS_SZLONG=32 -D__USE_ISOC99 $(GBIDEFINE) $(VERSION_DEFINE) $(DEBUGFLAG)
-IINC = -I . -I $(WORKING_DIR)/include -I $(WORKING_DIR)/include/gcc -I $(WORKING_DIR)/include/PR
+IINC = -I . -I $(WORKING_DIR)/include -I $(WORKING_DIR)/include/compiler/gcc -I $(WORKING_DIR)/include/PR
 MIPS_VERSION := -mips3
 ASOPTFLAGS :=
 
diff --git a/makefiles/ido.mk b/makefiles/ido.mk
index 6df2cc31..c5deb1de 100644
--- a/makefiles/ido.mk
+++ b/makefiles/ido.mk
@@ -8,7 +8,7 @@ STRIP =
 CFLAGS := -c -Wab,-r4300_mul -G 0 -nostdinc -Xcpluscomm -fullwarn -woff 516,649,838,712
 ASFLAGS := -c -Wab,-r4300_mul -G 0 -nostdinc -woff 516,649,838,712
 CPPFLAGS = -D_MIPS_SZLONG=32 $(GBIDEFINE) $(VERSION_DEFINE) $(PICFLAGS) $(DEBUGFLAG)
-IINC = -I $(WORKING_DIR)/include -I $(WORKING_DIR)/include/ido -I $(WORKING_DIR)/include/PR
+IINC = -I $(WORKING_DIR)/include -I $(WORKING_DIR)/include/compiler/ido -I $(WORKING_DIR)/include/PR
 MIPS_VERSION := -mips2 -o32
 PICFLAGS := -non_shared
 
diff --git a/makefiles/modern_gcc.mk b/makefiles/modern_gcc.mk
index afcf5e28..a914d78e 100644
--- a/makefiles/modern_gcc.mk
+++ b/makefiles/modern_gcc.mk
@@ -10,7 +10,7 @@ CFLAGS := -G 0 -c -nostdinc -march=vr4300 -mfix4300 -mabi=32 -mno-abicalls -mdiv
 CFLAGS += -fno-strict-aliasing # TODO: Try adjusting code to remove this
 ASFLAGS := -w -nostdinc -c -G 0 -march=vr4300 -mgp32 -mfp32 -DMIPSEB -D_LANGUAGE_ASSEMBLY -D_MIPS_SIM=1 -D_ULTRA64
 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
+IINC = -I . -I $(WORKING_DIR)/include -I $(WORKING_DIR)/include/compiler/modern_gcc -I $(WORKING_DIR)/include/PR
 MIPS_VERSION := -mips3
 ASOPTFLAGS :=