Merged revisions 75984 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75984 | mark.dickinson | 2009-10-31 10:18:44 +0000 (Sat, 31 Oct 2009) | 12 lines

  Merged revisions 75982 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r75982 | mark.dickinson | 2009-10-31 10:11:28 +0000 (Sat, 31 Oct 2009) | 5 lines

    Issue #6603: Fix --with-tsc build failures on x86-64 that resulted
    from a gcc inline assembler peculiarity. (gcc's "A" constraint
    apparently means 'rax or rdx' in 64-bit mode, not edx:eax
    or rdx:rax as one might expect.)
  ........
................

diff --git a/Misc/NEWS b/Misc/NEWS
index c5ad09952893adce81a264537a35360a63854436..3593e3e0af85f3b78e674ad3d958056a3f7b879d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -130,6 +130,10 @@ Tests
 Build
 -----
 
+- Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it
+  compiles correctly under gcc on x86-64.  This fixes a reported
+  problem with the --with-tsc build on x86-64.
+
 - Issue #6802: Fix build issues on MacOSX 10.6
 
 - Issue #6801 : symmetric_difference_update also accepts |.

diff --git a/Python/ceval.c b/Python/ceval.c
index b5b5c272721a9c446bebeff5ffd18f9315ca8d41..8a24f115397852eda9e9da888b0650938c1c2823 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -51,11 +51,29 @@ ppc_getcounter(uint64 *v)
        ((long*)(v))[1] = tb;
 }
 
-#else /* this is for linux/x86 (and probably any other GCC/x86 combo) */
+#elif defined(__i386__)
+
+/* this is for linux/x86 (and probably any other GCC/x86 combo) */
 
 #define READ_TIMESTAMP(val) \
      __asm__ __volatile__("rdtsc" : "=A" (val))
 
+#elif defined(__x86_64__)
+
+/* for gcc/x86_64, the "A" constraint in DI mode means *either* rax *or* rdx;
+   not edx:eax as it does for i386.  Since rdtsc puts its result in edx:eax
+   even in 64-bit mode, we need to use "a" and "d" for the lower and upper
+   32-bit pieces of the result. */
+
+#define READ_TIMESTAMP(val) \
+    __asm__ __volatile__("rdtsc" : \
+                         "=a" (((int*)&(val))[0]), "=d" (((int*)&(val))[1]));
+
+
+#else
+
+#error "Don't know how to implement timestamp counter for this architecture"
+
 #endif
 
 void dump_tsc(int opcode, int ticked, uint64 inst0, uint64 inst1,