# HG changeset patch # User diego # Date 1162400493 0 # Node ID bd1ecfd747bc9102590b0a4edc8482a13c3a9619 # Parent d3fc48bfea868fdf423fd1f5c636ec3ecdd572a3 Add ARCH_X86_32 as a new define for 32 bit x86 architectures and change the semantics of ARCH_X86 to mean both 32 and 64 bits. diff -r d3fc48bfea86 -r bd1ecfd747bc common.h --- a/common.h Wed Nov 01 16:59:18 2006 +0000 +++ b/common.h Wed Nov 01 17:01:33 2006 +0000 @@ -344,7 +344,7 @@ ); return (d << 32) | (a & 0xffffffff); } -#elif defined(ARCH_X86) +#elif defined(ARCH_X86_32) static inline long long read_time(void) { long long l; diff -r d3fc48bfea86 -r bd1ecfd747bc internal.h --- a/internal.h Wed Nov 01 16:59:18 2006 +0000 +++ b/internal.h Wed Nov 01 17:01:33 2006 +0000 @@ -217,7 +217,7 @@ static always_inline long int lrintf(float x) { #ifdef __MINGW32__ -# ifdef ARCH_X86 +# ifdef ARCH_X86_32 int32_t i; asm volatile( "fistpl %0\n\t" @@ -227,7 +227,7 @@ # else /* XXX: incorrect, but make it compile */ return (int)(x + (x < 0 ? -0.5 : 0.5)); -# endif /* ARCH_X86 */ +# endif /* ARCH_X86_32 */ #else return (int)(rint(x)); #endif /* __MINGW32__ */