[Python-apps-commits] r5790 - in packages/pyrit/trunk/debian/patches (1 file)

[chrisk-guest at users.alioth.debian.org]

    Date: Wednesday, July 7, 2010 @ 20:08:42
  Author: chrisk-guest
Revision: 5790

Disable PADLOCK, which is currently enabled unconditionally on i386

Modified:
  packages/pyrit/trunk/debian/patches/0008-disable-optimizations-on-i386.patch

Modified: packages/pyrit/trunk/debian/patches/0008-disable-optimizations-on-i386.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0008-disable-optimizations-on-i386.patch	2010-07-07 20:06:38 UTC (rev 5789)
+++ packages/pyrit/trunk/debian/patches/0008-disable-optimizations-on-i386.patch	2010-07-07 20:08:42 UTC (rev 5790)
@@ -5,15 +5,34 @@
 Disable SSE2 support on i386 as we cannot guarantee that all i386 processors
 support this instruction set.
 
+This is a Debian-specific fix. This if is expected to disappear in later
+revisions of Pyrit (e.g. by building multiple extensions, optimized for various
+platforms).
+
 Bug: http://code.google.com/p/pyrit/issues/detail?id=24
 Last-Update: 2010-07-06
 Index: pyrit-0.3.0/cpyrit/_cpyrit_cpu.h
 ===================================================================
---- pyrit-0.3.0.orig/cpyrit/_cpyrit_cpu.h	2010-07-06 23:50:59.265843532 +0200
-+++ pyrit-0.3.0/cpyrit/_cpyrit_cpu.h	2010-07-07 00:00:06.593840568 +0200
-@@ -36,7 +36,9 @@
+--- pyrit-0.3.0.orig/cpyrit/_cpyrit_cpu.h	2010-05-20 11:52:08.000000000 +0200
++++ pyrit-0.3.0/cpyrit/_cpyrit_cpu.h	2010-07-07 17:08:17.225842958 +0200
+@@ -19,7 +19,6 @@
+ */
  
+ #ifdef __i386__
+-    #define COMPILE_PADLOCK
+     #if defined(linux)
+         #define MCTX_EIP(context) ((context)->uc_mcontext.gregs[REG_EIP])
+     #elif defined(__APPLE__)
+@@ -29,14 +28,14 @@
+             #define MCTX_EIP(context) (*((unsigned long*)&(context)->uc_mcontext->ss.eip))
+         #endif
+         #define MAP_ANONYMOUS MAP_ANON
+-    #else
+-        #undef COMPILE_PADLOCK
+     #endif
+ #endif
  
+ 
  #if (defined(__i386__) || defined(__x86_64__))
 -    #define COMPILE_SSE2
 +    #ifdef __x86_64__