diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2009-11-18 09:15:55 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-11-18 09:15:55 +0000 |
| commit | 15387c72d5cf1a77a5a0afa6750dae73a8dbc12f (patch) | |
| tree | ab55e077002322c8f245c79c87c6a6f2f7b0ed2e /recipes/llvm | |
| parent | 7f3d2b172af63fc894f80eece075434b2c5fbbc5 (diff) | |
| parent | e4e52ba358c094952ec868d32524a26dfa4bae89 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/llvm')
| -rw-r--r-- | recipes/llvm/llvm-gcc4-cross_svn.bb | 2 | ||||
| -rw-r--r-- | recipes/llvm/llvm-gcc4_svn.bb | 2 | ||||
| -rw-r--r-- | recipes/llvm/llvm2.6/BX_to_BLX.patch | 13 | ||||
| -rw-r--r-- | recipes/llvm/llvm2.6_2.6.bb | 3 | ||||
| -rw-r--r-- | recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb (renamed from recipes/llvm/llvm2.7-native_2.6+svnr20090916.bb) | 4 | ||||
| -rw-r--r-- | recipes/llvm/llvm2.7/BX_to_BLX.patch | 13 | ||||
| -rw-r--r-- | recipes/llvm/llvm2.7_2.6+svnr20091007.bb (renamed from recipes/llvm/llvm2.7_2.6+svnr20090916.bb) | 7 |
7 files changed, 36 insertions, 8 deletions
diff --git a/recipes/llvm/llvm-gcc4-cross_svn.bb b/recipes/llvm/llvm-gcc4-cross_svn.bb index 4cd5ae1db6..5257713dc2 100644 --- a/recipes/llvm/llvm-gcc4-cross_svn.bb +++ b/recipes/llvm/llvm-gcc4-cross_svn.bb @@ -4,7 +4,7 @@ LICENSE = "various" DEPENDS = "llvm2.5-native" -PV = "2.1+svnr${SRCREV}" +PV = "2.1+svnr${SRCPV}" PR = "r1" diff --git a/recipes/llvm/llvm-gcc4_svn.bb b/recipes/llvm/llvm-gcc4_svn.bb index 6a39362080..74ac5807ae 100644 --- a/recipes/llvm/llvm-gcc4_svn.bb +++ b/recipes/llvm/llvm-gcc4_svn.bb @@ -4,7 +4,7 @@ LICENSE = "various" DEPENDS = "llvm2.5-native" -PV = "2.0+svnr${SRCREV}" +PV = "2.0+svnr${SRCPV}" PR = "r1" 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+svnr20091007.bb index ab0bbc5aa8..ada81c625d 100644 --- a/recipes/llvm/llvm2.7-native_2.6+svnr20090916.bb +++ b/recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb @@ -1,8 +1,8 @@ require llvm-native.inc -SRCREV = "82130" +SRCREV = "83459" -PV = "2.6+svnr${SRCREV}" +PV = "2.6+svnr${SRCPV}" PR = "r0" 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+svnr20091007.bb index 022657c5ff..142e15ea4f 100644 --- a/recipes/llvm/llvm2.7_2.6+svnr20090916.bb +++ b/recipes/llvm/llvm2.7_2.6+svnr20091007.bb @@ -1,8 +1,8 @@ require llvm.inc -SRCREV = "82130" +SRCREV = "83459" -PV = "2.6+svnr${SRCREV}" +PV = "2.6+svnr${SRCPV}" PR = "r0" @@ -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} \ |