From bdc6b5015374cdedcc7b599d3774537bc2802ae1 Mon Sep 17 00:00:00 2001 From: cadmic Date: Mon, 13 Jan 2025 05:32:25 -0800 Subject: [iQue] Define EGCS macro instead of relying on `__GNUC__` (#2423) * [iQue] Define EGCS macro instead of relying on __GNUC__ * Revert longlong.h --- src/audio/general.c | 2 -- src/code/sched.c | 2 -- src/code/z_actor.c | 2 -- src/libgcc/longlong.h | 1 + 4 files changed, 1 insertion(+), 6 deletions(-) (limited to 'src') diff --git a/src/audio/general.c b/src/audio/general.c index cb87548fa..2a639275b 100644 --- a/src/audio/general.c +++ b/src/audio/general.c @@ -8,8 +8,6 @@ #define AUDIO_PRINTF osSyncPrintf #elif IDO_PRINTF_WORKAROUND #define AUDIO_PRINTF(args) (void)0 -#elif defined(__GNUC__) && __GNUC__ < 3 -#define AUDIO_PRINTF(format, args...) (void)0 #else #define AUDIO_PRINTF(format, ...) (void)0 #endif diff --git a/src/code/sched.c b/src/code/sched.c index 58aa627a7..b22f38b40 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -62,8 +62,6 @@ vs32 sSchedDebugPrintfEnabled = false; PRINTF #elif IDO_PRINTF_WORKAROUND #define SCHED_DEBUG_PRINTF(args) (void)0 -#elif defined(__GNUC__) && __GNUC__ < 3 -#define SCHED_DEBUG_PRINTF(format, args...) (void)0 #else #define SCHED_DEBUG_PRINTF(format, ...) (void)0 #endif diff --git a/src/code/z_actor.c b/src/code/z_actor.c index c0633747f..309be3077 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -24,8 +24,6 @@ static s32 sCurCeilingBgId; PRINTF #elif IDO_PRINTF_WORKAROUND #define ACTOR_DEBUG_PRINTF(args) (void)0 -#elif defined(__GNUC__) && __GNUC__ < 3 -#define ACTOR_DEBUG_PRINTF(format, args...) (void)0 #else #define ACTOR_DEBUG_PRINTF(format, ...) (void)0 #endif diff --git a/src/libgcc/longlong.h b/src/libgcc/longlong.h index 403a7f6fa..fb6ebb15e 100644 --- a/src/libgcc/longlong.h +++ b/src/libgcc/longlong.h @@ -87,6 +87,7 @@ #define umul_ppmm(w1, w0, u, v) \ __asm__("multu %2,%3" : "=l"((USItype)(w0)), "=h"((USItype)(w1)) : "d"((USItype)(u)), "d"((USItype)(v))) #else +/* Non-matching version for modern GCC */ #define umul_ppmm(w1, w0, u, v) \ __asm__("multu %2,%3\n\t" \ "mflo %0\n\t" \ -- cgit v1.2.3