f5250ecae7
- Refreshed patches: 55 (systemtap), 102 (lib64), 111 (no static lib), 114 (statvfs flags), 132 (unittest rpmbuild hooks), 134 (fix COUNT_ALLOCS in test_sys), 143 (tsc on ppc64), 146 (hashlib fips), 153 (test gdb noise), 157 (UID+GID overflows), 173 (ENOPROTOOPT in bind_port), 186 (dont raise from py_compile) - Removed patches: 129 (test_subprocess nonreadable dir - no longer fails in Koji), 142 (the mock issue that caused this is fixed) - Added patch 187 (remove thread atfork) - will be in next version - Refreshed script for checking pyc and pyo timestamps with new ignored files. - The fips patch is disabled for now until upstream makes a final decision what to do with sha3 implementation for 3.4.0.
59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
diff -up Python-2.7.2/Python/ceval.c.tsc-on-ppc Python-2.7.2/Python/ceval.c
|
|
--- Python-2.7.2/Python/ceval.c.tsc-on-ppc 2011-08-23 14:59:48.051300849 -0400
|
|
+++ Python-2.7.2/Python/ceval.c 2011-08-23 15:33:25.412162902 -0400
|
|
@@ -37,24 +37,42 @@ typedef unsigned long long uint64;
|
|
*/
|
|
#if defined(__ppc__) || defined (__powerpc__)
|
|
|
|
-#define READ_TIMESTAMP(var) ppc_getcounter(&var)
|
|
+#if defined( __powerpc64__) || defined(__LP64__)
|
|
+/* 64-bit PowerPC */
|
|
+#define READ_TIMESTAMP(var) ppc64_getcounter(&var)
|
|
+static void
|
|
+ppc64_getcounter(uint64 *v)
|
|
+{
|
|
+ /* On 64-bit PowerPC we can read the 64-bit timebase directly into a
|
|
+ 64-bit register */
|
|
+ uint64 timebase;
|
|
+#ifdef _ARCH_PWR4
|
|
+ asm volatile ("mfspr %0,268" : "=r" (timebase));
|
|
+#else
|
|
+ asm volatile ("mftb %0" : "=r" (timebase));
|
|
+#endif
|
|
+ *v = timebase;
|
|
+}
|
|
+
|
|
+#else
|
|
+/* 32-bit PowerPC */
|
|
+#define READ_TIMESTAMP(var) ppc32_getcounter(&var)
|
|
|
|
static void
|
|
-ppc_getcounter(uint64 *v)
|
|
+ppc32_getcounter(uint64 *v)
|
|
{
|
|
- unsigned long tbu, tb, tbu2;
|
|
+ union { long long ll; long ii[2]; } u;
|
|
+ long tmp;
|
|
|
|
loop:
|
|
- asm volatile ("mftbu %0" : "=r" (tbu) );
|
|
- asm volatile ("mftb %0" : "=r" (tb) );
|
|
- asm volatile ("mftbu %0" : "=r" (tbu2));
|
|
- if (__builtin_expect(tbu != tbu2, 0)) goto loop;
|
|
-
|
|
- /* The slightly peculiar way of writing the next lines is
|
|
- compiled better by GCC than any other way I tried. */
|
|
- ((long*)(v))[0] = tbu;
|
|
- ((long*)(v))[1] = tb;
|
|
+ asm volatile ("mftbu %0" : "=r" (u.ii[0]) );
|
|
+ asm volatile ("mftb %0" : "=r" (u.ii[1]) );
|
|
+ asm volatile ("mftbu %0" : "=r" (tmp));
|
|
+ if (__builtin_expect(u.ii[0] != tmp, 0)) goto loop;
|
|
+
|
|
+ *v = u.ll;
|
|
}
|
|
+#endif /* powerpc 32/64 bit */
|
|
|
|
#elif defined(__i386__)
|
|
|