From 958f32b1778492d07a5859fbb0b0192c5098d4e8 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Tue, 2 May 2023 21:31:19 +0100 Subject: [PATCH] Include macros.inc properly --- agb/src/agbabi/memcpy.s | 2 -- agb/src/agbabi/mod.rs | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/agb/src/agbabi/memcpy.s b/agb/src/agbabi/memcpy.s index 931d1a06..6eede8dc 100644 --- a/agb/src/agbabi/memcpy.s +++ b/agb/src/agbabi/memcpy.s @@ -11,8 +11,6 @@ =============================================================================== */ -.include "src/agbabi/macros.inc" - .arm .section .iwram.__aeabi_memcpy, "ax", %progbits diff --git a/agb/src/agbabi/mod.rs b/agb/src/agbabi/mod.rs index c6dede71..bfd4a385 100644 --- a/agb/src/agbabi/mod.rs +++ b/agb/src/agbabi/mod.rs @@ -1,5 +1,6 @@ use core::arch::global_asm; +global_asm!(include_str!("macros.inc")); global_asm!(include_str!("memcpy.s")); global_asm!(include_str!("memset.s"));