[oe-commits] Xerxes Rånby : llvm2.6: Added BX_to_BLX. patch inorder to stabilize LLVM JIT on ARM

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 3b4c9f8d74d6414e8e8e52142d788fa919a28e5e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3b4c9f8d74d6414e8e8e52142d788fa919a28e5e

Author: Xerxes Rånby <xerxes at zafena.se>
Date:   Tue Nov 17 16:59:49 2009 +0100

llvm2.6: Added BX_to_BLX.patch inorder to stabilize LLVM JIT on ARM
llvm2.7: Updated to newer SVN snapshot
	 Added BX_to_BLX.patch inorder to stabilize LLVM JIT on ARM

---

 recipes/llvm/llvm2.6/BX_to_BLX.patch               |   13 +++++++++++++
 recipes/llvm/llvm2.6_2.6.bb                        |    3 ++-
 ...90916.bb => llvm2.7-native_2.6+svnr20091007.bb} |    2 +-
 recipes/llvm/llvm2.7/BX_to_BLX.patch               |   13 +++++++++++++
 ...svnr20090916.bb => llvm2.7_2.6+svnr20091007.bb} |    5 +++--
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/recipes/llvm/llvm2.6/BX_to_BLX.patch b/recipes/llvm/llvm2.6/BX_to_BLX.patch
new file mode 100644
index 0000000..7cf3676
--- /dev/null
+++ b/recipes/llvm/llvm2.6/BX_to_BLX.patch
@@ -0,0 +1,13 @@
+Index: llvm/lib/Target/ARM/ARMInstrInfo.td
+===================================================================
+--- llvm.orig/lib/Target/ARM/ARMInstrInfo.td	2009-10-06 12:35:26.000000000 +0000
++++ llvm/lib/Target/ARM/ARMInstrInfo.td	2009-10-06 12:36:03.000000000 +0000
+@@ -645,7 +645,7 @@
+                   IIC_Br, "mov lr, pc\n\tbx $func",
+                   [(ARMcall_nolink GPR:$func)]>,
+            Requires<[IsARM, IsNotDarwin]> {
+-    let Inst{7-4}   = 0b0001;
++    let Inst{7-4}   = 0b0011;
+     let Inst{19-8}  = 0b111111111111;
+     let Inst{27-20} = 0b00010010;
+   }
diff --git a/recipes/llvm/llvm2.6_2.6.bb b/recipes/llvm/llvm2.6_2.6.bb
index 40dabb4..909bb95 100644
--- a/recipes/llvm/llvm2.6_2.6.bb
+++ b/recipes/llvm/llvm2.6_2.6.bb
@@ -1,12 +1,13 @@
 require llvm.inc
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "llvm-common llvm2.6-native"
 
 SRC_URI += "\
   file://fix-build.patch;patch=1 \
   file://llvm-debugonly-zeroormore.patch;patch=1;pnum=0 \
+  file://BX_to_BLX.patch;patch=1 \
 "
 
 LLVM_RELEASE = "2.6"
diff --git a/recipes/llvm/llvm2.7-native_2.6+svnr20090916.bb b/recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb
similarity index 93%
rename from recipes/llvm/llvm2.7-native_2.6+svnr20090916.bb
rename to recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb
index a0cf7c5..ada81c6 100644
--- a/recipes/llvm/llvm2.7-native_2.6+svnr20090916.bb
+++ b/recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb
@@ -1,6 +1,6 @@
 require llvm-native.inc
 
-SRCREV = "82130"
+SRCREV = "83459"
 
 PV = "2.6+svnr${SRCPV}"
 
diff --git a/recipes/llvm/llvm2.7/BX_to_BLX.patch b/recipes/llvm/llvm2.7/BX_to_BLX.patch
new file mode 100644
index 0000000..7cf3676
--- /dev/null
+++ b/recipes/llvm/llvm2.7/BX_to_BLX.patch
@@ -0,0 +1,13 @@
+Index: llvm/lib/Target/ARM/ARMInstrInfo.td
+===================================================================
+--- llvm.orig/lib/Target/ARM/ARMInstrInfo.td	2009-10-06 12:35:26.000000000 +0000
++++ llvm/lib/Target/ARM/ARMInstrInfo.td	2009-10-06 12:36:03.000000000 +0000
+@@ -645,7 +645,7 @@
+                   IIC_Br, "mov lr, pc\n\tbx $func",
+                   [(ARMcall_nolink GPR:$func)]>,
+            Requires<[IsARM, IsNotDarwin]> {
+-    let Inst{7-4}   = 0b0001;
++    let Inst{7-4}   = 0b0011;
+     let Inst{19-8}  = 0b111111111111;
+     let Inst{27-20} = 0b00010010;
+   }
diff --git a/recipes/llvm/llvm2.7_2.6+svnr20090916.bb b/recipes/llvm/llvm2.7_2.6+svnr20091007.bb
similarity index 88%
rename from recipes/llvm/llvm2.7_2.6+svnr20090916.bb
rename to recipes/llvm/llvm2.7_2.6+svnr20091007.bb
index 4c4aac3..142e15e 100644
--- a/recipes/llvm/llvm2.7_2.6+svnr20090916.bb
+++ b/recipes/llvm/llvm2.7_2.6+svnr20091007.bb
@@ -1,6 +1,6 @@
 require llvm.inc
 
-SRCREV = "82130"
+SRCREV = "83459"
 
 PV = "2.6+svnr${SRCPV}"
 
@@ -11,7 +11,8 @@ DEPENDS = "llvm-common llvm2.7-native"
 SRC_URI = "\
   svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \
   file://llvm-debugonly-zeroormore.patch;patch=1 \
-"
+  file://BX_to_BLX.patch;patch=1 \
+  "
 
 EXTRA_OECMAKE += "\
         -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \