From 2cfd61a12a2b9753062a4ad9b9aeb76c8b93c19e Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Tue, 8 Dec 2009 16:36:47 +0000 Subject: Merged revisions 76713 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76713 | ronald.oussoren | 2009-12-08 17:35:28 +0100 (Tue, 08 Dec 2009) | 11 lines Merged revisions 76712 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76712 | ronald.oussoren | 2009-12-08 17:32:52 +0100 (Tue, 08 Dec 2009) | 4 lines Fix for issue 7452: HAVE_GCC_ASM_FOR_X87 gets set when doing a universal build on an i386 based machine, but should only be active when compiling the x86 part of the universal binary. ........ ................ --- Include/pymacconfig.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Include/pymacconfig.h') diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h index a452836e32..50b429c400 100644 --- a/Include/pymacconfig.h +++ b/Include/pymacconfig.h @@ -20,8 +20,6 @@ # undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 # undef DOUBLE_IS_BIG_ENDIAN_IEEE754 # undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 -/* we don't ever need to play with the x87 control word on OS X/Intel, so just - pretend that we can't, to avoid problems on Intel+PPC builds */ # undef HAVE_GCC_ASM_FOR_X87 # undef VA_LIST_IS_ARRAY @@ -76,6 +74,10 @@ #define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 #endif /* __BIG_ENDIAN */ +#ifdef __i386__ +# define HAVE_GCC_ASM_FOR_X87 +#endif + /* * The definition in pyconfig.h is only valid on the OS release * where configure ran on and not necessarily for all systems where -- cgit v1.2.3