From: David Malcolm Date: Thu, 6 Jan 2011 17:39:24 +0000 (+0000) Subject: Merged revisions 87796 via svnmerge from X-Git-Tag: v2.7.2rc1~396 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c29e1cd01f2bd4142a45ef359e045d79d444fcb;p=python 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. ........ --- diff --git a/Misc/NEWS b/Misc/NEWS index 1ac5985059..eea77ce0b4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -116,6 +116,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 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)