summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorDavid Malcolm <dmalcolm@redhat.com>2011-01-06 17:39:24 +0000
committerDavid Malcolm <dmalcolm@redhat.com>2011-01-06 17:39:24 +0000
commite987fa758af3ed449c395deeda537d34ec2ac8ab (patch)
treed74668e54c0fde2c199b29bb0ca323df2615e113 /Python
parent80249cae2b692dd11030478e985da8ce8e917995 (diff)
downloadcpython-e987fa758af3ed449c395deeda537d34ec2ac8ab.tar.gz
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. ........
Diffstat (limited to 'Python')
-rw-r--r--Python/ceval.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index 673eac2ed4..4c6c0eaf69 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)