diff --git a/include/SDL_endian.h b/include/SDL_endian.h index 436dec476..e2e7007db 100644 --- a/include/SDL_endian.h +++ b/include/SDL_endian.h @@ -92,7 +92,7 @@ SDL_Swap16(Uint16 x) __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x)); return result; } -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) +#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) static __inline__ Uint16 SDL_Swap16(Uint16 x) { @@ -132,7 +132,7 @@ SDL_Swap32(Uint32 x) __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x)); return result; } -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) +#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) static __inline__ Uint32 SDL_Swap32(Uint32 x) { diff --git a/src/audio/SDL_mixer.c b/src/audio/SDL_mixer.c index b0d812761..3c4b7ab5a 100644 --- a/src/audio/SDL_mixer.c +++ b/src/audio/SDL_mixer.c @@ -102,7 +102,7 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format, case AUDIO_U8: { -#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) +#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES) SDL_MixAudio_m68k_U8((char *) dst, (char *) src, (unsigned long) len, (long) volume, (char *) mix8); @@ -135,7 +135,7 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format, } else #endif #endif -#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) +#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES) SDL_MixAudio_m68k_S8((char *) dst, (char *) src, (unsigned long) len, (long) volume); #else @@ -182,7 +182,7 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format, } else #endif #endif -#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) +#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES) SDL_MixAudio_m68k_S16LSB((short *) dst, (short *) src, (unsigned long) len, (long) volume); #else @@ -216,7 +216,7 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format, case AUDIO_S16MSB: { -#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) +#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES) SDL_MixAudio_m68k_S16MSB((short *) dst, (short *) src, (unsigned long) len, (long) volume); #else diff --git a/src/audio/SDL_mixer_m68k.c b/src/audio/SDL_mixer_m68k.c index 9ecde2e07..631c42e49 100644 --- a/src/audio/SDL_mixer_m68k.c +++ b/src/audio/SDL_mixer_m68k.c @@ -27,7 +27,7 @@ Patrice Mandin */ -#if defined(__M68000__) && defined(__GNUC__) +#if defined(__M68000__) && !defined(__mcoldfire__) && defined(__GNUC__) void SDL_MixAudio_m68k_U8(char *dst, char *src, long len, long volume, char *mix8) {