r15450 - packages/trunk/supertuxkart/debian/patches

[Vincent Cheng]

Author: vcheng
Date: 2015-06-04 05:02:39 +0000 (Thu, 04 Jun 2015)
New Revision: 15450

Modified:
   packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch
Log:
update armel FTBFS patch *again*, ideally for the last time...


Modified: packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch	2015-06-04 03:27:59 UTC (rev 15449)
+++ packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch	2015-06-04 05:02:39 UTC (rev 15450)
@@ -57,7 +57,7 @@
      bne     stackargsloop
      mov     sp, r12
  nomoreargs:
-+#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
++#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
 +    mov    lr, pc   /* older ARM didn't support blx */
 +    mov    pc, r4
 +#else
@@ -70,7 +70,7 @@
      bne     stackargslooparmFuncObjLast
      mov     sp, r12
  nomoreargsarmFuncObjLast:
-+#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
++#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
 +    mov    lr, pc   /* older ARM didn't support blx */
 +    mov    pc, r4
 +#else
@@ -83,7 +83,7 @@
      bne     stackargslooparmFuncR0ObjLast
      mov     sp, r12
  nomoreargsarmFuncR0ObjLast:
-+#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
++#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
 +    mov    lr, pc   /* older ARM didn't support blx */
 +    mov    pc, r4
 +#else
@@ -96,7 +96,7 @@
      bne     stackargslooparmFuncR0
      mov     sp, r12
  nomoreargsarmFuncR0:
-+#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
++#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
 +    mov    lr, pc   /* older ARM didn't support blx */
 +    mov    pc, r4
 +#else
@@ -109,7 +109,7 @@
      bne     stackargslooparmFuncR0R1
      mov     sp, r12
  nomoreargsarmFuncR0R1:
-+#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
++#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
 +    mov    lr, pc   /* older ARM didn't support blx */
 +    mov    pc, r4
 +#else
@@ -118,3 +118,48 @@
      add     sp, sp, r8
      ldmia   sp!, {r4-r8, pc}
  
+@@ -340,7 +365,7 @@
+     mov     sp, r12
+ 
+ nomoreargs:
+-#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
++#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+     mov    lr, pc   /* older ARM didn't support blx */
+     mov    pc, r4
+ #else
+@@ -427,7 +452,7 @@
+     mov     sp, r12
+ 
+ nomoreargsarmFuncObjLast:
+-#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
++#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+     mov    lr, pc
+     mov    pc, r4
+ #else
+@@ -520,7 +545,7 @@
+     mov     sp, r12
+ 
+ nomoreargsarmFuncR0ObjLast:
+-#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
++#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+     mov    lr, pc
+     mov    pc, r4
+ #else
+@@ -596,7 +621,7 @@
+     mov     sp, r12
+ 
+ nomoreargsarmFuncR0:
+-#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
++#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+     mov    lr, pc
+     mov    pc, r4
+ #else
+@@ -676,7 +701,7 @@
+     mov     sp, r12
+ 
+ nomoreargsarmFuncR0R1:
+-#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
++#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+     mov    lr, pc
+     mov    pc, r4
+ #else