summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-12-08 16:35:28 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-12-08 16:35:28 (GMT)
commit309608b43499bffdd7c65c05fd91b659945d2388 (patch)
tree6bd150a405efaaa7aa04db1c51ccee868bd295c0 /Include
parent781eba79722e1dae402d6ca8cf2f7e13cc784ebe (diff)
downloadcpython-309608b43499bffdd7c65c05fd91b659945d2388.zip
cpython-309608b43499bffdd7c65c05fd91b659945d2388.tar.gz
cpython-309608b43499bffdd7c65c05fd91b659945d2388.tar.bz2
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. ........
Diffstat (limited to 'Include')
-rw-r--r--Include/pymacconfig.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h
index c4da722..813a617 100644
--- a/Include/pymacconfig.h
+++ b/Include/pymacconfig.h
@@ -22,8 +22,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
@@ -82,6 +80,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