From: Peter Michael Green Date: Thu, 1 Mar 2018 16:45:18 +0000 (+0000) Subject: Commit Debian 3.0 (quilt) metadata X-Git-Tag: archive/raspbian/2.1-1+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f3d4727b18d3ef4c75ce476dcabfb29a7cedd6cc;p=ffcall.git Commit Debian 3.0 (quilt) metadata [dgit (4.3) quilt-fixup] --- diff --git a/debian/patches/auto-2.1-1+rpi1-340dec90ef4ef95fc0e8915603f18fed2a2ba159-1519922714 b/debian/patches/auto-2.1-1+rpi1-340dec90ef4ef95fc0e8915603f18fed2a2ba159-1519922714 new file mode 100644 index 0000000..efe8eef --- /dev/null +++ b/debian/patches/auto-2.1-1+rpi1-340dec90ef4ef95fc0e8915603f18fed2a2ba159-1519922714 @@ -0,0 +1,104 @@ +From: Raspbian forward porter +Subject: Automatically generated patch (2.1-1+rpi1) + +Last (up to) 3 git changes, FYI: + +commit 340dec90ef4ef95fc0e8915603f18fed2a2ba159 +Author: Peter Michael Green +Date: Thu Mar 1 16:44:02 2018 +0000 + + temporarily remove raspbian patch from quilt series. + +commit be7340fc6b35e1e169e9bf193c8019be86181b54 +Merge: d98d3e0 cc9ffe9 +Author: Peter Michael Green +Date: Thu Mar 1 16:36:29 2018 +0000 + + Manual merge of version 2.0-2+rpi1 and 2.1-1 to produce 2.1-1+rpi1 + +commit cc9ffe9ef47c99a2a877f16731d07c611aa844e9 +Merge: 9c1b23b 6411407 +Author: Sébastien Villemot +Date: Sat Feb 17 20:30:10 2018 +0000 + + Merge ffcall (2.1-1) import into refs/heads/workingbranch +--- + +--- 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 +@@ -15,7 +15,7 @@ + .global C(avcall_call) + .syntax unified + .arm +- .fpu vfpv3-d16 ++ .fpu vfpv2 + .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 +@@ -15,7 +15,7 @@ + .global C(callback_receiver) + .syntax unified + .arm +- .fpu vfpv3-d16 ++ .fpu vfpv2 + .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): + .global C(vacall_receiver) + .syntax unified + .arm +- .fpu vfpv3-d16 ++ .fpu vfpv2 + .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} diff --git a/debian/patches/series b/debian/patches/series index 1038e07..7bcaaa8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ mips-fpxx.patch +auto-2.1-1+rpi1-340dec90ef4ef95fc0e8915603f18fed2a2ba159-1519922714