From c55e9eeee5f6ed8e2f7cd9912a0b347761ea7126 Mon Sep 17 00:00:00 2001
From: Tharo <17233964+Thar0@users.noreply.github.com>
Date: Wed, 24 Feb 2021 04:15:58 +0000
Subject: pragma variant for GLOBAL_ASM (#49)

* pragma GLOBAL_ASM

* Revert split_asm.py arg description change
---
 src/boot_O2/loadfragment2.c | 4 ++--
 src/boot_O2/stackcheck.c    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/boot_O2')

diff --git a/src/boot_O2/loadfragment2.c b/src/boot_O2/loadfragment2.c
index c7c305a7a..c711e6175 100644
--- a/src/boot_O2/loadfragment2.c
+++ b/src/boot_O2/loadfragment2.c
@@ -56,7 +56,7 @@ void Load2_Relocate(u32 allocatedVRamAddr, OverlayBlockSizes* overlayInfo, u32 v
     }
 }
 #else
-GLOBAL_ASM("./asm/non_matchings/loadfragment2/Load2_Relocate.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/loadfragment2/Load2_Relocate.asm")
 #endif
 
 #ifdef NON_MATCHING
@@ -92,7 +92,7 @@ s32 Load2_LoadOverlay(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd, u3
     return nbytes;
 }
 #else
-GLOBAL_ASM("./asm/non_matchings/loadfragment2/Load2_LoadOverlay.asm")
+#pragma GLOBAL_ASM("./asm/non_matchings/loadfragment2/Load2_LoadOverlay.asm")
 #endif
 
 void* Load2_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd) {
diff --git a/src/boot_O2/stackcheck.c b/src/boot_O2/stackcheck.c
index 50affc8bb..4c6ea9146 100644
--- a/src/boot_O2/stackcheck.c
+++ b/src/boot_O2/stackcheck.c
@@ -97,7 +97,7 @@ s32 StackCheck_GetState(StackEntry* entry) {
     return 0;
 }
 #else
-GLOBAL_ASM("asm/non_matchings/stackcheck/StackCheck_GetState.asm")
+#pragma GLOBAL_ASM("asm/non_matchings/stackcheck/StackCheck_GetState.asm")
 #endif
 
 u32 StackCheck_CheckAll() {
-- 
cgit v1.2.3