From 3b4c9f8d74d6414e8e8e52142d788fa919a28e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xerxes=20R=C3=A5nby?= Date: Tue, 17 Nov 2009 16:59:49 +0100 Subject: 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 ++- recipes/llvm/llvm2.7-native_2.6+svnr20090916.bb | 16 ---------------- recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb | 16 ++++++++++++++++ recipes/llvm/llvm2.7/BX_to_BLX.patch | 13 +++++++++++++ recipes/llvm/llvm2.7_2.6+svnr20090916.bb | 24 ------------------------ recipes/llvm/llvm2.7_2.6+svnr20091007.bb | 25 +++++++++++++++++++++++++ 7 files changed, 69 insertions(+), 41 deletions(-) create mode 100644 recipes/llvm/llvm2.6/BX_to_BLX.patch delete mode 100644 recipes/llvm/llvm2.7-native_2.6+svnr20090916.bb create mode 100644 recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb create mode 100644 recipes/llvm/llvm2.7/BX_to_BLX.patch delete mode 100644 recipes/llvm/llvm2.7_2.6+svnr20090916.bb create mode 100644 recipes/llvm/llvm2.7_2.6+svnr20091007.bb 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 0000000000..7cf36766af --- /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 40dabb4fba..909bb95b00 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+svnr20090916.bb deleted file mode 100644 index a0cf7c5fb2..0000000000 --- a/recipes/llvm/llvm2.7-native_2.6+svnr20090916.bb +++ /dev/null @@ -1,16 +0,0 @@ -require llvm-native.inc - -SRCREV = "82130" - -PV = "2.6+svnr${SRCPV}" - -PR = "r0" - -SRC_URI = "\ - svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \ - file://llvm-debugonly-zeroormore.patch;patch=1 \ -" - -S = "${WORKDIR}/trunk" - -LLVM_RELEASE = "2.7" diff --git a/recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb b/recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb new file mode 100644 index 0000000000..ada81c625d --- /dev/null +++ b/recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb @@ -0,0 +1,16 @@ +require llvm-native.inc + +SRCREV = "83459" + +PV = "2.6+svnr${SRCPV}" + +PR = "r0" + +SRC_URI = "\ + svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \ + file://llvm-debugonly-zeroormore.patch;patch=1 \ +" + +S = "${WORKDIR}/trunk" + +LLVM_RELEASE = "2.7" 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 0000000000..7cf36766af --- /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+svnr20090916.bb deleted file mode 100644 index 4c4aac3968..0000000000 --- a/recipes/llvm/llvm2.7_2.6+svnr20090916.bb +++ /dev/null @@ -1,24 +0,0 @@ -require llvm.inc - -SRCREV = "82130" - -PV = "2.6+svnr${SRCPV}" - -PR = "r0" - -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 \ -" - -EXTRA_OECMAKE += "\ - -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \ - -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \ - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ - " - -S = "${WORKDIR}/trunk" - -LLVM_RELEASE = "2.7" diff --git a/recipes/llvm/llvm2.7_2.6+svnr20091007.bb b/recipes/llvm/llvm2.7_2.6+svnr20091007.bb new file mode 100644 index 0000000000..142e15ea4f --- /dev/null +++ b/recipes/llvm/llvm2.7_2.6+svnr20091007.bb @@ -0,0 +1,25 @@ +require llvm.inc + +SRCREV = "83459" + +PV = "2.6+svnr${SRCPV}" + +PR = "r0" + +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} \ + -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ + " + +S = "${WORKDIR}/trunk" + +LLVM_RELEASE = "2.7" -- cgit v1.2.3