From: David Malcolm Date: Thu, 6 Jan 2011 17:36:32 +0000 (+0000) Subject: Merged revisions 87796 via svnmerge from X-Git-Tag: v3.2.1b1~347^2~92 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ad4cd90e97c1ab272c9a047a91539b13d6addf7;p=thirdparty%2FPython%2Fcpython.git 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 a7b49de66d14..c3268558143e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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 e848fb07cf96..f3433f1d7dc3 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)