[lightning/f20] Fir FTBFS on the armv7hl plattform
Jochen Schmitt
s4504kr at fedoraproject.org
Fri Aug 30 15:04:57 UTC 2013
commit 53878dc2b593e100f75283f067e2c6c5e60e9da1
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Fri Aug 30 16:58:02 2013 +0200
Fir FTBFS on the armv7hl plattform
lightning-2.0.0-armv7hl.patch | 45 +++++++++++++++++++++++++++++++++++++++++
lightning.spec | 9 ++++++-
2 files changed, 52 insertions(+), 2 deletions(-)
---
diff --git a/lightning-2.0.0-armv7hl.patch b/lightning-2.0.0-armv7hl.patch
new file mode 100644
index 0000000..14e0b74
--- /dev/null
+++ b/lightning-2.0.0-armv7hl.patch
@@ -0,0 +1,45 @@
+From b8770059dc1872567e76a827d461e45dc67f6462 Mon Sep 17 00:00:00 2001
+From: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
+Date: Thu, 29 Aug 2013 17:08:05 -0300
+Subject: [PATCH] Correct wrong test and update of arm thumb offset
+ information.
+
+ * lib/jit_arm-cpu.c, lib/jit_arm.c: Correct wrong test and update
+ of the thumb offset information, when checking if needing to
+ patch a jump from arm to thumb mode. The problem would happen when
+ remapping the code buffer, and the new address being lower than
+ the previous one.
+---
+ ChangeLog | 8 ++++++++
+ lib/jit_arm-cpu.c | 2 +-
+ lib/jit_arm.c | 1 +
+ 3 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/lib/jit_arm-cpu.c b/lib/jit_arm-cpu.c
+index c324f00..71d178d 100644
+--- a/lib/jit_arm-cpu.c
++++ b/lib/jit_arm-cpu.c
+@@ -3755,7 +3755,7 @@ _patch_at(jit_state_t *_jit,
+ } u;
+ u.w = instr;
+ if (kind == arm_patch_jump) {
+- if (jit_thumb_p() && instr >= _jitc->thumb) {
++ if (jit_thumb_p() && (jit_uword_t)instr >= _jitc->thumb) {
+ code2thumb(thumb.s[0], thumb.s[1], u.s[0], u.s[1]);
+ if ((thumb.i & THUMB2_B) == THUMB2_B) {
+ d = ((label - instr) >> 1) - 2;
+diff --git a/lib/jit_arm.c b/lib/jit_arm.c
+index 59c9d93..1cc444f 100644
+--- a/lib/jit_arm.c
++++ b/lib/jit_arm.c
+@@ -810,6 +810,7 @@ _emit_code(jit_state_t *_jit)
+ } undo;
+
+ _jitc->function = NULL;
++ _jitc->thumb = 0;
+
+ jit_reglive_setup();
+
+--
+1.8.3.1
+
diff --git a/lightning.spec b/lightning.spec
index 66b2f85..c5215e7 100644
--- a/lightning.spec
+++ b/lightning.spec
@@ -1,6 +1,6 @@
Name: lightning
Version: 2.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for generating assembly code on run time
Group: Development/Libraries
@@ -8,7 +8,8 @@ License: LGPLv2+
URL: http://www.gnu.org/software/lightning/lightning.html
Source0: ftp://ftp.gnu.org/gnu/lightning/lightning-%{version}.tar.gz
-ExcludeArch: armv7hl
+# Patch taken from upstream git repository
+Patch1: lightning-2.0.0-armv7hl.patch
BuildRequires: prelink
@@ -30,6 +31,7 @@ ligthing package
%prep
%setup -q
+%patch1 -p1 -b .armv7hl
%build
%configure
@@ -67,6 +69,9 @@ fi
%{_infodir}/lightning.info.gz
%changelog
+* Fri Aug 30 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.0.0-2
+- Fir FTBFS on the armv7hl plattform
+
* Sat Aug 24 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.0.0-1
- New upstream release
- Support for more architectures
More information about the scm-commits
mailing list