From 14b9cde7679e8102ad7f1b223c3401bbc5bb5383 Mon Sep 17 00:00:00 2001
From: someone2639 <someone2639@gmail.com>
Date: Fri, 13 Aug 2021 15:27:56 -0400
Subject: [PATCH] SS2: move align directives into the linkerscripts themselves

---
 goddard.ld     | 2 ++
 goddard.ld.inc | 2 --
 sm64.ld        | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/goddard.ld b/goddard.ld
index 46b4e8bd..572d1a3c 100644
--- a/goddard.ld
+++ b/goddard.ld
@@ -26,12 +26,14 @@ SECTIONS {
             #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)
 
diff --git a/goddard.ld.inc b/goddard.ld.inc
index acb4316f..203b718d 100644
--- a/goddard.ld.inc
+++ b/goddard.ld.inc
@@ -28,7 +28,6 @@
     KEEP(BUILD_DIR/libgoddard.a:shape_helper.o(.rodata*));
     KEEP(BUILD_DIR/libgoddard.a:renderer.o(.rodata*));
 #endif
-    . = ALIGN(16);
 #endif
 
 
@@ -38,6 +37,5 @@
 #ifdef KEEP_MARIO_HEAD
     KEEP(BUILD_DIR/libgoddard.a:*.o(.bss*));
 #endif
-    . = ALIGN(16);
 #endif
 
diff --git a/sm64.ld b/sm64.ld
index 5b6ed8a6..8c7b86fd 100755
--- a/sm64.ld
+++ b/sm64.ld
@@ -303,6 +303,7 @@ SECTIONS
       #define LOAD
          #include "goddard.ld.inc"
       #undef LOAD
+      . = ALIGN(16);
    }
    END_SEG(goddard)
    BEGIN_NOLOAD(goddard)
@@ -310,6 +311,7 @@ SECTIONS
       #define NOLOAD
          #include "goddard.ld.inc"
       #undef NOLOAD
+      . = ALIGN(16);
    }
    END_NOLOAD(goddard)