From 45f518dfbcd421e76bfd043b905cd6d7436906e5 Mon Sep 17 00:00:00 2001
From: Hunter Kvalevog <hunter@kvog.sh>
Date: Mon, 28 Sep 2026 20:22:30 -0500
Subject: aarch64: move common.S to _common/aarch64

---
 _common/aarch64/common.S    | 25 +++++++++++++++++++++++++
 aarch64/common.S            | 25 -------------------------
 aarch64/kusswurm_ch11.S     |  2 +-
 aarch64/mariokartwii_ch07.S |  2 +-
 aarch64/mariokartwii_ch08.S |  2 +-
 5 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 _common/aarch64/common.S
 delete mode 100644 aarch64/common.S

diff --git a/_common/aarch64/common.S b/_common/aarch64/common.S
new file mode 100644
index 0000000..34bb529
--- /dev/null
+++ b/_common/aarch64/common.S
@@ -0,0 +1,25 @@
+// ================================================================================================
+// Shared macros
+//
+// License:
+//     SPDX-License-Identifier: 0BSD
+//     Copyright (c) 2026 Hunter Kvalevog
+//
+//     Permission to use, copy, modify, and/or distribute this software for any
+//     purpose with or without fee is hereby granted.
+//
+//     THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+//     WITH REGARD TO THIS SOFTWARE.
+// ================================================================================================
+
+#define CONCAT_(A, B) A ## B
+#define CONCAT(A, B) CONCAT_(A, B)
+
+#ifdef __APPLE__
+#   define SYM(LABEL) CONCAT(_, LABEL)
+#   define TEXT_SEGMENT .section __TEXT,__text
+#else
+#   define SYM(LABEL) LABEL
+#   define TEXT_SEGMENT .section .text
+#endif
+
diff --git a/aarch64/common.S b/aarch64/common.S
deleted file mode 100644
index 34bb529..0000000
--- a/aarch64/common.S
+++ /dev/null
@@ -1,25 +0,0 @@
-// ================================================================================================
-// Shared macros
-//
-// License:
-//     SPDX-License-Identifier: 0BSD
-//     Copyright (c) 2026 Hunter Kvalevog
-//
-//     Permission to use, copy, modify, and/or distribute this software for any
-//     purpose with or without fee is hereby granted.
-//
-//     THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-//     WITH REGARD TO THIS SOFTWARE.
-// ================================================================================================
-
-#define CONCAT_(A, B) A ## B
-#define CONCAT(A, B) CONCAT_(A, B)
-
-#ifdef __APPLE__
-#   define SYM(LABEL) CONCAT(_, LABEL)
-#   define TEXT_SEGMENT .section __TEXT,__text
-#else
-#   define SYM(LABEL) LABEL
-#   define TEXT_SEGMENT .section .text
-#endif
-
diff --git a/aarch64/kusswurm_ch11.S b/aarch64/kusswurm_ch11.S
index fab99db..29158af 100644
--- a/aarch64/kusswurm_ch11.S
+++ b/aarch64/kusswurm_ch11.S
@@ -12,7 +12,7 @@
 //     WITH REGARD TO THIS SOFTWARE.
 // ================================================================================================
 
-#include "common.S"
+#include "../_common/aarch64/common.S"
 
 TEXT_SEGMENT
 
diff --git a/aarch64/mariokartwii_ch07.S b/aarch64/mariokartwii_ch07.S
index 69794eb..fe1848d 100644
--- a/aarch64/mariokartwii_ch07.S
+++ b/aarch64/mariokartwii_ch07.S
@@ -13,7 +13,7 @@
 //     WITH REGARD TO THIS SOFTWARE.
 // ================================================================================================
 
-#include "common.S"
+#include "../_common/aarch64/common.S"
 
 TEXT_SEGMENT
 
diff --git a/aarch64/mariokartwii_ch08.S b/aarch64/mariokartwii_ch08.S
index 7713fe8..f2a62af 100644
--- a/aarch64/mariokartwii_ch08.S
+++ b/aarch64/mariokartwii_ch08.S
@@ -13,7 +13,7 @@
 //     WITH REGARD TO THIS SOFTWARE.
 // ================================================================================================
 
-#include "common.S"
+#include "../_common/aarch64/common.S"
 
 TEXT_SEGMENT
 
-- 
cgit v1.2.3