From dd17361a8490516f622d98802f2cbcb472712b32 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sep 04 2013 20:51:11 +0000 Subject: Add -arm patch to fix clisp build failure. --- diff --git a/ffcall-arm.patch b/ffcall-arm.patch new file mode 100644 index 0000000..facf415 --- /dev/null +++ b/ffcall-arm.patch @@ -0,0 +1,40 @@ +--- ./callback/trampoline_r/cache-armel.c.orig 2009-04-27 10:44:13.000000000 -0600 ++++ ./callback/trampoline_r/cache-armel.c 2013-09-04 14:40:00.000000000 -0600 +@@ -15,5 +15,5 @@ void __TR_clear_cache (char *first_addr, + register unsigned long _beg __asm ("a1") = first_addr; + register unsigned long _end __asm ("a2") = last_addr; + register unsigned long _flg __asm ("a3") = 0; +- __asm __volatile__ ("swi 0x9f0002" : : "r" (_beg), "r" (_end), "r" (_flg)); ++ __asm __volatile__ ("swi 0x0f0002" : : "r" (_beg), "r" (_end), "r" (_flg)); + } +--- ./callback/trampoline_r/cache-armel.s.orig 2009-04-27 10:44:13.000000000 -0600 ++++ ./callback/trampoline_r/cache-armel.s 2013-09-04 14:40:00.000000000 -0600 +@@ -12,7 +12,7 @@ __TR_clear_cache: + @ lr needed for prologue + mov r2, #0 + #APP +- swi 0x9f0002 ++ swi 0x0f0002 + bx lr + .size __TR_clear_cache, .-__TR_clear_cache + .ident "GCC: (GNU) 3.4.4 (release) (CodeSourcery ARM 2005q3-2)" +--- ./trampoline/cache-armel.c.orig 2009-04-27 10:44:14.000000000 -0600 ++++ ./trampoline/cache-armel.c 2013-09-04 14:40:00.000000000 -0600 +@@ -15,5 +15,5 @@ void __TR_clear_cache (char *first_addr, + register unsigned long _beg __asm ("a1") = first_addr; + register unsigned long _end __asm ("a2") = last_addr; + register unsigned long _flg __asm ("a3") = 0; +- __asm __volatile__ ("swi 0x9f0002" : : "r" (_beg), "r" (_end), "r" (_flg)); ++ __asm __volatile__ ("swi 0x0f0002" : : "r" (_beg), "r" (_end), "r" (_flg)); + } +--- ./trampoline/cache-armel.s.orig 2009-04-27 10:44:14.000000000 -0600 ++++ ./trampoline/cache-armel.s 2013-09-04 14:40:00.000000000 -0600 +@@ -17,7 +17,7 @@ __TR_clear_cache: + ldr r1, [sp, #0] + mov r2, #0 + #APP +- swi 0x9f0002 ++ swi 0x0f0002 + add sp, sp, #8 + bx lr + .size __TR_clear_cache, .-__TR_clear_cache diff --git a/ffcall.spec b/ffcall.spec index c2c3b13..c2ca29c 100644 --- a/ffcall.spec +++ b/ffcall.spec @@ -8,7 +8,7 @@ Name: ffcall Version: 1.10 -Release: 11.20120424cvs%{?dist} +Release: 12.20120424cvs%{?dist} Summary: Libraries for foreign function call interfaces Group: System Environment/Libraries @@ -23,6 +23,9 @@ Source0: %{name}-20120424cvs.tar.xz # This patch will not be sent upstream. It removes the possibility of using # mprotect() to make memory executable, as that runs afoul of SELinux. Patch0: %{name}-trampoline.patch +# Upstream is dead, so this patch will not be sent. Update some uses of OABI +# on ARM to their EABI equivalents. +Patch1: %{name}-arm.patch Provides: %{name}-static = %{version}-%{release} @@ -42,6 +45,7 @@ packages are: %prep %setup -q -n ffcall %patch0 +%patch1 # Remove prebuilt object files find . -name \*.o | xargs rm -f @@ -85,6 +89,9 @@ done %changelog +* Wed Sep 4 2013 Jerry James - 1.10-12.20120424cvs +- Add -arm patch to fix clisp build failure + * Sat Aug 03 2013 Fedora Release Engineering - 1.10-11.20120424cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild