diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2011-01-06 17:36:32 (GMT) |
|---|---|---|
| committer | David Malcolm <dmalcolm@redhat.com> | 2011-01-06 17:36:32 (GMT) |
| commit | 8ad4cd90e97c1ab272c9a047a91539b13d6addf7 (patch) | |
| tree | 034eb85be9894d491cf0ce020702100da436c018 | |
| parent | 59bf738874d2582ca37e49c162a18ef20442177e (diff) | |
| download | cpython-8ad4cd90e97c1ab272c9a047a91539b13d6addf7.zip cpython-8ad4cd90e97c1ab272c9a047a91539b13d6addf7.tar.gz cpython-8ad4cd90e97c1ab272c9a047a91539b13d6addf7.tar.bz2 | |
Merged revisions 87796 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87796 | david.malcolm | 2011-01-06 12:01:36 -0500 (Thu, 06 Jan 2011) | 6 lines
Issue #10655: Fix the build on PowerPC on Linux with GCC when building with
timestamp profiling (--with-tsc): the preprocessor test for the PowerPC
support now looks for "__powerpc__" as well as "__ppc__": the latter seems to
only be present on OS X; the former is the correct one for Linux with GCC.
........
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | Python/ceval.c | 9 |
2 files changed, 10 insertions, 4 deletions
@@ -111,6 +111,11 @@ Build - Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD and DragonFly BSD. Patch by Nicolas Joly. +- Issue #10655: Fix the build on PowerPC on Linux with GCC when building with + timestamp profiling (--with-tsc): the preprocessor test for the PowerPC + support now looks for "__powerpc__" as well as "__ppc__": the latter seems to + only be present on OS X; the former is the correct one for Linux with GCC. + Tests ----- diff --git a/Python/ceval.c b/Python/ceval.c index e848fb0..f3433f1 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -27,10 +27,11 @@ typedef unsigned long long uint64; -#if defined(__ppc__) /* <- Don't know if this is the correct symbol; this - section should work for GCC on any PowerPC - platform, irrespective of OS. - POWER? Who knows :-) */ +/* PowerPC suppport. + "__ppc__" appears to be the preprocessor definition to detect on OS X, whereas + "__powerpc__" appears to be the correct one for Linux with GCC +*/ +#if defined(__ppc__) || defined (__powerpc__) #define READ_TIMESTAMP(var) ppc_getcounter(&var) |