From 77756a5f58dfc679ae5fe1cf6361278facf87818 Mon Sep 17 00:00:00 2001
From: someone2639 <someone2639@gmail.com>
Date: Sun, 15 Aug 2021 14:51:48 -0400
Subject: [PATCH] SS2: sm64.ld now has a preliminary mode; no more goddard.ld

---
 goddard.ld     | 46 ---------------------------------------
 goddard.ld.inc | 41 -----------------------------------
 sm64.ld        | 58 ++++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 49 insertions(+), 96 deletions(-)
 delete mode 100644 goddard.ld
 delete mode 100644 goddard.ld.inc

diff --git a/goddard.ld b/goddard.ld
deleted file mode 100644
index 572d1a3c8..000000000
--- a/goddard.ld
+++ /dev/null
@@ -1,46 +0,0 @@
-OUTPUT_ARCH (mips)
-
-#define BEGIN_SEG(name, addr) \
-    _##name##SegmentStart = ADDR(.name); \
-    _##name##SegmentRomStart = __romPos; \
-    .name addr : AT(__romPos)
-
-#define END_SEG(name) \
-    _##name##SegmentEnd = ADDR(.name) + SIZEOF(.name); \
-    _##name##SegmentRomEnd = __romPos + SIZEOF(.name); \
-    __romPos += SIZEOF(.name);
-
-#define BEGIN_NOLOAD(name) \
-    _##name##SegmentBssStart = ADDR(.name.noload); \
-    .name.noload (NOLOAD) :
-
-#define END_NOLOAD(name) \
-    _##name##SegmentBssEnd = ADDR(.name.noload) + SIZEOF(.name.noload); \
-    _##name##SegmentBssSize = SIZEOF(.name.noload);
-
-SECTIONS {
-      __romPos = 0;
-      SEG_GODDARD = 0x80345670;
-      BEGIN_SEG(goddard, SEG_GODDARD)
-      {
-            #define LOAD
-                  #include "goddard.ld.inc"
-            #undef LOAD
-            . = ALIGN(16);
-      }
-      END_SEG(goddard)
-      BEGIN_NOLOAD(goddard) {
-            #define NOLOAD
-                  #include "goddard.ld.inc"
-            #undef NOLOAD
-            . = ALIGN(16);
-      }
-      END_NOLOAD(goddard)
-
-      GODDARD_SIZE = SIZEOF(.goddard) + SIZEOF(.goddard.noload);
-
-      /DISCARD/ :
-      {
-            *(*);
-      }
-}
diff --git a/goddard.ld.inc b/goddard.ld.inc
deleted file mode 100644
index 203b718da..000000000
--- a/goddard.ld.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifdef LOAD
-    KEEP(BUILD_DIR/src/menu*.o(.text));
-    KEEP(BUILD_DIR/src/menu*.o(.data*));
-    KEEP(BUILD_DIR/src/menu*.o(.rodata*));
-#ifdef KEEP_MARIO_HEAD
-    KEEP(BUILD_DIR/libgoddard.a:*.o(.text));
-    KEEP(BUILD_DIR/libgoddard.a:gd_main.o(.data*));
-    KEEP(BUILD_DIR/libgoddard.a:draw_objects.o(.data*));
-    KEEP(BUILD_DIR/libgoddard.a:objects.o(.data*));
-    KEEP(BUILD_DIR/libgoddard.a:particles.o(.data*));
-    KEEP(BUILD_DIR/libgoddard.a:dynlist_proc.o(.data*));
-    KEEP(BUILD_DIR/libgoddard.a:debug_utils.o(.data*));
-    KEEP(BUILD_DIR/libgoddard.a:joints.o(.data*));
-    KEEP(BUILD_DIR/libgoddard.a:shape_helper.o(.data*));
-    KEEP(BUILD_DIR/libgoddard.a:renderer.o(.data*));
-    KEEP(BUILD_DIR/libgoddard.a:gd_main.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:gd_memory.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:draw_objects.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:objects.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:skin_movement.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:particles.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:dynlist_proc.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:old_menu.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:debug_utils.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:joints.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:skin.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:gd_math.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:shape_helper.o(.rodata*));
-    KEEP(BUILD_DIR/libgoddard.a:renderer.o(.rodata*));
-#endif
-#endif
-
-
-
-#ifdef NOLOAD
-    KEEP(BUILD_DIR/src/menu*.o(.bss*));
-#ifdef KEEP_MARIO_HEAD
-    KEEP(BUILD_DIR/libgoddard.a:*.o(.bss*));
-#endif
-#endif
-
diff --git a/sm64.ld b/sm64.ld
index 8c7b86fde..9319551ed 100755
--- a/sm64.ld
+++ b/sm64.ld
@@ -190,7 +190,9 @@ SECTIONS
       lib/PR/hvqm/hvqm2sp1.o(.rodata*);
    }
    END_SEG(main)
-   ASSERT((_mainSegmentRomEnd <= 0x101000), "Error: Please shrink your main segment to under 1MB.")
+   #ifndef PRELIMINARY
+      ASSERT((_mainSegmentRomEnd <= 0x101000), "Error: Please shrink your main segment to under 1MB.")
+   #endif
    BEGIN_NOLOAD(main)
    {
       BUILD_DIR/src/game*.o(.*bss*);
@@ -247,7 +249,9 @@ SECTIONS
 
    __expansionRamStart = 0x80400000;
    #ifndef USE_EXT_RAM
-      ASSERT((. <= __expansionRamStart), "Error: RDRAM expanded into Expansion RAM, despite Expansion RAM not being defined.")
+      #ifndef PRELIMINARY
+         ASSERT((. <= __expansionRamStart), "Error: RDRAM expanded into Expansion RAM, despite Expansion RAM not being defined.")
+      #endif
    #endif
 
    BEGIN_SEG(entry, 0x10000000)
@@ -298,24 +302,60 @@ SECTIONS
    END_SEG(behavior)
 
    /* 0x8016F000 21D7D0-255EC0 [386F0] */
+#ifdef PRELIMINARY
    BEGIN_SEG(goddard, RAM_END - GODDARD_SIZE)
+#else
+   BEGIN_SEG(goddard, 0x80345678)
+#endif
    {
-      #define LOAD
-         #include "goddard.ld.inc"
-      #undef LOAD
+      KEEP(BUILD_DIR/src/menu*.o(.text));
+      KEEP(BUILD_DIR/src/menu*.o(.data*));
+      KEEP(BUILD_DIR/src/menu*.o(.rodata*));
+   #ifdef KEEP_MARIO_HEAD
+      KEEP(BUILD_DIR/libgoddard.a:*.o(.text));
+      KEEP(BUILD_DIR/libgoddard.a:gd_main.o(.data*));
+      KEEP(BUILD_DIR/libgoddard.a:draw_objects.o(.data*));
+      KEEP(BUILD_DIR/libgoddard.a:objects.o(.data*));
+      KEEP(BUILD_DIR/libgoddard.a:particles.o(.data*));
+      KEEP(BUILD_DIR/libgoddard.a:dynlist_proc.o(.data*));
+      KEEP(BUILD_DIR/libgoddard.a:debug_utils.o(.data*));
+      KEEP(BUILD_DIR/libgoddard.a:joints.o(.data*));
+      KEEP(BUILD_DIR/libgoddard.a:shape_helper.o(.data*));
+      KEEP(BUILD_DIR/libgoddard.a:renderer.o(.data*));
+      KEEP(BUILD_DIR/libgoddard.a:gd_main.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:gd_memory.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:draw_objects.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:objects.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:skin_movement.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:particles.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:dynlist_proc.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:old_menu.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:debug_utils.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:joints.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:skin.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:gd_math.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:shape_helper.o(.rodata*));
+      KEEP(BUILD_DIR/libgoddard.a:renderer.o(.rodata*));
+   #endif
       . = ALIGN(16);
    }
    END_SEG(goddard)
    BEGIN_NOLOAD(goddard)
    {
-      #define NOLOAD
-         #include "goddard.ld.inc"
-      #undef NOLOAD
+      KEEP(BUILD_DIR/src/menu*.o(.bss*));
+   #ifdef KEEP_MARIO_HEAD
+      KEEP(BUILD_DIR/libgoddard.a:*.o(.bss*));
+   #endif
       . = ALIGN(16);
    }
    END_NOLOAD(goddard)
 
-   ASSERT((. <= (SEG_POOL_START + POOL_SIZE)), "Error: extended past pool end.")
+   #ifndef PRELIMINARY
+      ASSERT((. <= (SEG_POOL_START + POOL_SIZE)), "Error: extended past pool end.")
+   #endif
+   #ifdef PRELIMINARY
+      GODDARD_SIZE = SIZEOF(.goddard) + SIZEOF(.goddard.noload);
+   #endif
 
    /* 0x268020 0x268020-0 [0] */
    BEGIN_SEG(intro, 0x14000000)