diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-12-08 16:36:47 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-12-08 16:36:47 (GMT) |
| commit | 2cfd61a12a2b9753062a4ad9b9aeb76c8b93c19e (patch) | |
| tree | 21141c26b68fd72c6d81f7b76dc4124f9889e936 | |
| parent | 4fad6bdde98e182d95eb2033eb8dd78344556727 (diff) | |
| download | cpython-2cfd61a12a2b9753062a4ad9b9aeb76c8b93c19e.zip cpython-2cfd61a12a2b9753062a4ad9b9aeb76c8b93c19e.tar.gz cpython-2cfd61a12a2b9753062a4ad9b9aeb76c8b93c19e.tar.bz2 | |
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.
........
................
| -rw-r--r-- | Include/pymacconfig.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h index a452836..50b429c 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 |