Commit 8ad4cd90 authored by David Malcolm's avatar David Malcolm

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.
........
parent 59bf7388
...@@ -111,6 +111,11 @@ Build ...@@ -111,6 +111,11 @@ Build
- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD - Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD
and DragonFly BSD. Patch by Nicolas Joly. 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 Tests
----- -----
......
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
typedef unsigned long long uint64; typedef unsigned long long uint64;
#if defined(__ppc__) /* <- Don't know if this is the correct symbol; this /* PowerPC suppport.
section should work for GCC on any PowerPC "__ppc__" appears to be the preprocessor definition to detect on OS X, whereas
platform, irrespective of OS. "__powerpc__" appears to be the correct one for Linux with GCC
POWER? Who knows :-) */ */
#if defined(__ppc__) || defined (__powerpc__)
#define READ_TIMESTAMP(var) ppc_getcounter(&var) #define READ_TIMESTAMP(var) ppc_getcounter(&var)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment