From 3e73a6c09440d0ac332f3cf19d3bc437f576ec83 Mon Sep 17 00:00:00 2001 From: CrashOveride95 Date: Tue, 22 Jun 2021 23:39:24 -0400 Subject: [PATCH] fix overalignment --- sm64.ld | 2 +- src/goddard/gd_main.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sm64.ld b/sm64.ld index 12580b97..f2e0fded 100755 --- a/sm64.ld +++ b/sm64.ld @@ -219,7 +219,7 @@ SECTIONS BEGIN_NOLOAD(engine) { BUILD_DIR/src/engine*.o(.bss*); - . = ALIGN(0x100); + . = ALIGN(0x40); } END_NOLOAD(engine) diff --git a/src/goddard/gd_main.h b/src/goddard/gd_main.h index 2fa0c3ec..dbbb19e5 100644 --- a/src/goddard/gd_main.h +++ b/src/goddard/gd_main.h @@ -10,14 +10,15 @@ // "#define printf(...) /* nothing */" wasn't an option.) // This macro is separate from the gd_printf function; one probably // forwarded to the other, but it is hard to tell in which direction. -#ifdef __GNUC__ + +#if defined(ISVPRINT) || defined(UNF) +#define printf osSyncPrintf +#else #define printf(...) \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wunused-value\"") \ (__VA_ARGS__); \ _Pragma ("GCC diagnostic pop") -#else -#define printf #endif // structs