diff --git a/ChangeLog b/ChangeLog index 5af9c04ce..32c3b0d7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-07-07 Yunqiang Su (tiny change) + + * config/config.trampoline.c: + * Source/NSObject.m (GSAtomicIncrement, GSAtomicDecrement): + Use __mips64 to distinguish MIPS64. + 2014-06-30 Yavor Doganov * Tools/GNUmakefile (CONFIG_SYSTEM_LIBS): diff --git a/Source/NSObject.m b/Source/NSObject.m index 0a3c09699..cdfc7352b 100644 --- a/Source/NSObject.m +++ b/Source/NSObject.m @@ -337,7 +337,7 @@ GSAtomicIncrement(gsatomic_t X) int tmp; __asm__ __volatile__ ( -#if !defined(__mips64__) +#if !defined(__mips64) " .set mips2 \n" #endif "0: ll %0, %1 \n" @@ -354,7 +354,7 @@ GSAtomicDecrement(gsatomic_t X) int tmp; __asm__ __volatile__ ( -#if !defined(__mips64__) +#if !defined(__mips64) " .set mips2 \n" #endif "0: ll %0, %1 \n" diff --git a/config/config.trampoline.c b/config/config.trampoline.c index 47d151fa7..593dde0dc 100644 --- a/config/config.trampoline.c +++ b/config/config.trampoline.c @@ -42,7 +42,7 @@ register void* env __asm__("a0"); #ifdef __mips__ register void* env __asm__("$2"); #endif -#ifdef __mips64__ +#ifdef __mips64 register void* env __asm__("$2"); #endif #if defined(__sparc__) && !defined(__sparc64__)