Fix quilt patch.

diff --git a/debian/patches/raspbian.patch b/debian/patches/raspbian.patch
index 2be9df86102bbb73693221ad81bf85a7b4b0a240..d22d4f853f6b9490348fc1e98cb4f339b8cce11b 100644 (file)
--- a/debian/patches/raspbian.patch
+++ b/debian/patches/raspbian.patch
@@ -3,15 +3,8 @@ Description: ffcall changes for raspbian.
    * Mark binaries as armv6 not armv7
 Author: Peter Michael Green <plugwash@raspbian.org>
 
---- ffcall-2.1.orig/avcall/avcall-armhf-macro.S
-+++ ffcall-2.1/avcall/avcall-armhf-macro.S
-@@ -1,5 +1,5 @@
- #include "asm-arm.h"
--      .arch armv7-a
-+      .arch armv6
-       .eabi_attribute 28, 1
-       .eabi_attribute 20, 1
-       .eabi_attribute 21, 1
+--- ffcall-2.2.orig/avcall/avcall-armhf-macro.S
++++ ffcall-2.2/avcall/avcall-armhf-macro.S
 @@ -15,7 +15,7 @@
        .global C(avcall_call)
        .syntax unified
@@ -21,15 +14,8 @@ Author: Peter Michael Green <plugwash@raspbian.org>
        .type   avcall_call, %function
  FUNBEGIN(avcall_call)
        // args = 0, pretend = 0, frame = 0
---- ffcall-2.1.orig/callback/vacall_r/vacall-armhf-macro.S
-+++ ffcall-2.1/callback/vacall_r/vacall-armhf-macro.S
-@@ -1,5 +1,5 @@
- #include "asm-arm.h"
--      .arch armv7-a
-+      .arch armv6
-       .eabi_attribute 28, 1
-       .eabi_attribute 20, 1
-       .eabi_attribute 21, 1
+--- ffcall-2.2.orig/callback/vacall_r/vacall-armhf-macro.S
++++ ffcall-2.2/callback/vacall_r/vacall-armhf-macro.S
 @@ -15,7 +15,7 @@
        .global C(callback_receiver)
        .syntax unified
@@ -39,26 +25,9 @@ Author: Peter Michael Green <plugwash@raspbian.org>
        .type   callback_receiver, %function
  FUNBEGIN(callback_receiver)
        // args = 28, pretend = 0, frame = 176
---- ffcall-2.1.orig/vacall/vacall-armhf-macro.S
-+++ ffcall-2.1/vacall/vacall-armhf-macro.S
-@@ -1,6 +1,6 @@
- #include "asm-arm.h"
- #ifdef __PIC__
--      .arch armv7-a
-+      .arch armv6
-       .eabi_attribute 28, 1
-       .eabi_attribute 20, 1
-       .eabi_attribute 21, 1
-@@ -150,7 +150,7 @@ L(31):
-       .word   C(vacall_function)(GOT)
-       FUNEND(vacall_receiver)
- #else
--      .arch armv7-a
-+      .arch armv6
-       .eabi_attribute 28, 1
-       .eabi_attribute 20, 1
-       .eabi_attribute 21, 1
-@@ -166,7 +166,7 @@ L(31):
+--- ffcall-2.2.orig/vacall/vacall-armhf-macro.S
++++ ffcall-2.2/vacall/vacall-armhf-macro.S
+@@ -169,7 +169,7 @@ L(32):
        .global C(vacall_receiver)
        .syntax unified
        .arm
@@ -67,17 +36,3 @@ Author: Peter Michael Green <plugwash@raspbian.org>
        .type   vacall_receiver, %function
  FUNBEGIN(vacall_receiver)
        // args = 20, pretend = 16, frame = 176
-@@ -176,8 +176,11 @@ FUNBEGIN(vacall_receiver)
-       push    {r4, r5, fp, lr}
-       add     fp, sp, $12
-       add     lr, fp, $4
--      movw    r4, $:lower16:C(vacall_function)
--      movt    r4, $:upper16:C(vacall_function)
-+      #raspbian mod, replace movw/movt with ldr psuedo-instruction
-+      #movw   r4, $:lower16:C(vacall_function)
-+      #movt   r4, $:upper16:C(vacall_function)
-+      ldr r4, =C(vacall_function)
-+      #end raspbian mod.
-       sub     sp, sp, $176
-       add     r5, fp, $20
-       stm     lr, {r0, r1, r2, r3}