diff -Nru python-greenlet-0.3.1/debian/changelog python-greenlet-0.3.1/debian/changelog
--- python-greenlet-0.3.1/debian/changelog	2012-08-25 15:05:43.000000000 +0100
+++ python-greenlet-0.3.1/debian/changelog	2013-01-04 21:55:06.000000000 +0000
@@ -1,3 +1,9 @@
+python-greenlet (0.3.1-2.1+rpi1) wheezy-staging; urgency=low
+
+  * use platform/switch_arm32_gcc.h from 0.4.0 to avoid compile errors
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 04 Jan 2013 21:48:28 +0000
+
 python-greenlet (0.3.1-2.1) wheezy-proposed-updates; urgency=low
 
   * Non-maintainer upload.
diff -Nru python-greenlet-0.3.1/debian/patches/series python-greenlet-0.3.1/debian/patches/series
--- python-greenlet-0.3.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ python-greenlet-0.3.1/debian/patches/series	2013-01-04 21:56:14.000000000 +0000
@@ -0,0 +1 @@
+switch_arm32_update.patch
diff -Nru python-greenlet-0.3.1/debian/patches/switch_arm32_update.patch python-greenlet-0.3.1/debian/patches/switch_arm32_update.patch
--- python-greenlet-0.3.1/debian/patches/switch_arm32_update.patch	1970-01-01 01:00:00.000000000 +0100
+++ python-greenlet-0.3.1/debian/patches/switch_arm32_update.patch	2013-01-04 21:56:37.000000000 +0000
@@ -0,0 +1,76 @@
+Description:  use platform/switch_arm32_gcc.h from 0.4.0 to avoid compile errors
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- python-greenlet-0.3.1.orig/platform/switch_arm32_gcc.h
++++ python-greenlet-0.3.1/platform/switch_arm32_gcc.h
+@@ -25,26 +25,51 @@
+ 
+ #ifdef SLP_EVAL
+ #define STACK_MAGIC 0
+-#define REGS_TO_SAVE /*"r1", "r2", "r3", "r4",*/ "r5", "r6", "fp", "ip", "lr"
++#define REG_SP "sp"
++#define REG_SPSP "sp,sp"
++#ifdef __thumb__
++#define REG_FP "r7"
++#define REG_FPFP "r7,r7"
++#define REGS_TO_SAVE_GENERAL "r4", "r5", "r6", "r8", "r9", "r10", "r11", "lr"
++#else
++#define REG_FP "fp"
++#define REG_FPFP "fp,fp"
++#define REGS_TO_SAVE_GENERAL "r4", "r5", "r6", "r7", "r8", "r9", "lr"
++#endif
++#if defined(__SOFTFP__)
++#define REGS_TO_SAVE REGS_TO_SAVE_GENERAL
++#elif defined(__VFP_FP__)
++#define REGS_TO_SAVE REGS_TO_SAVE_GENERAL, "d8", "d9", "d10", "d11", \
++                                           "d12", "d13", "d14", "d15"
++#elif defined(__MAVERICK__)
++#define REGS_TO_SAVE REGS_TO_SAVE_GENERAL, "mvf4", "mvf5", "mvf6", "mvf7", \
++                                           "mvf8", "mvf9", "mvf10", "mvf11", \
++                                           "mvf12", "mvf13", "mvf14", "mvf15"
++#else
++#define REGS_TO_SAVE REGS_TO_SAVE_GENERAL, "f4", "f5", "f6", "f7"
++#endif
+ 
+ static int
+ slp_switch(void)
+ {
++        void *fp;
+         register int *stackref, stsizediff;
+         __asm__ volatile ("" : : : REGS_TO_SAVE);
+-        __asm__ ("mov %0,sp" : "=g" (stackref));
++        __asm__ volatile ("mov r0," REG_FP "\n\tstr r0,%0" : "=m" (fp) : : "r0");
++        __asm__ ("mov %0," REG_SP : "=r" (stackref));
+         {
+                 SLP_SAVE_STATE(stackref, stsizediff);
+                 __asm__ volatile (
+-                    "add sp,sp,%0\n"
+-                    "add fp,fp,%0\n"
++                    "add " REG_SPSP ",%0\n"
++                    "add " REG_FPFP ",%0\n"
+                     :
+                     : "r" (stsizediff)
+                     );
+                 SLP_RESTORE_STATE();
+-                return 0;
+         }
++        __asm__ volatile ("ldr r0,%0\n\tmov " REG_FP ",r0" : : "m" (fp) : "r0");
+         __asm__ volatile ("" : : : REGS_TO_SAVE);
++        return 0;
+ }
+ 
+ #endif
+\ No newline at end of file