summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-09-04 12:40:37 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 13:46:18 (GMT)
commitc24befffaf90b883b5844fc6a7084337af694f3f (patch)
treec35db878b411600eb519287e01848f3ffa3d9668
parent80048ceebfa7dfb018bfaf2775ff994f8e5d820d (diff)
downloadpoky-c24befffaf90b883b5844fc6a7084337af694f3f.tar.gz
linux-yocto/3.2/3.4: arm: Fix linking errors with binutils 2.23
Updating the 3.2/3.4 linux-yocto SRCREVs to pickup the following fix: arm: Fix linking errors with binutils 2.23 We end up with linking errors on arm using latest binutils because we are linking asm generated objects which use -march=all generating different attributes into object and use some c objects e.g. misc.o which use different march therefore generating a different set of attributes into object. When linking is done the ld complains since it finds incompatible attributes and ends up with errors like error: DIV usage mismatch between arch/arm/boot/compressed/head.o and output error: DIV usage mismatch between arch/arm/boot/compressed/misc.o and output error: DIV usage mismatch between arch/arm/boot/compressed/decompress.o and output error: DIV usage mismatch between arch/arm/boot/compressed/lib1funcs.o and output This patch fixes it by providing correct march to assembly routines which than matches with output of ld. Signed-off-by: Khem Raj <raj.khem@gmail.com> (From OE-Core rev: e67ffb708522a622d149641ea09b249259ed3fb4) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.2.bb12
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb12
5 files changed, 17 insertions, 17 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
index e2aa67d..05362ef 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
@@ -8,8 +8,8 @@ LINUX_KERNEL_TYPE = "preempt-rt"
8 8
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "01c5c310886e87e785db5c3bb776deb5ed2e03b2" 11SRCREV_machine ?= "c094363010bd4645e65cc8845dd23e513ac894d1"
12SRCREV_machine_qemuppc ?= "9f5b45a730b902ed8a0809c9542512188e8fcabf" 12SRCREV_machine_qemuppc ?= "8e63a7522e4901c1312f7f53e490027070ffc057"
13SRCREV_meta ?= "486f7aec824b4127e91ef53228823e996b3696f0" 13SRCREV_meta ?= "486f7aec824b4127e91ef53228823e996b3696f0"
14 14
15PR = "${INC_PR}.0" 15PR = "${INC_PR}.0"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index 322ee5c..9cc7e99 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -8,8 +8,8 @@ LINUX_KERNEL_TYPE = "preempt-rt"
8 8
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "e8b22d297b61fb6f107f769042d47235c571da74" 11SRCREV_machine ?= "eb9c0669c66041eeae72b853011ec31ad81cc35d"
12SRCREV_machine_qemuppc ?= "9cdefb26d9a263430f98d642aff6551ae925fce8" 12SRCREV_machine_qemuppc ?= "76add8441a2b6ed26bcc9268819782b2eec99001"
13SRCREV_meta ?= "463299bc2e533e1bd38b0053ae7b210980f269c3" 13SRCREV_meta ?= "463299bc2e533e1bd38b0053ae7b210980f269c3"
14 14
15PR = "${INC_PR}.0" 15PR = "${INC_PR}.0"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb
index 38a4e6c..2bd7eee 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb
@@ -12,7 +12,7 @@ LINUX_VERSION ?= "3.2.18"
12 12
13KMETA = "meta" 13KMETA = "meta"
14 14
15SRCREV_machine ?= "2f986ab91c08c16f8d201518b11be0e367eb0e14" 15SRCREV_machine ?= "da6291c46f37e2fb799d964c807d8d57ea89c375"
16SRCREV_meta ?= "486f7aec824b4127e91ef53228823e996b3696f0" 16SRCREV_meta ?= "486f7aec824b4127e91ef53228823e996b3696f0"
17 17
18PR = "${INC_PR}.0" 18PR = "${INC_PR}.0"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
index b17e479..ba4b536 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
@@ -9,12 +9,12 @@ KBRANCH_qemuarm = "standard/default/arm-versatile-926ejs"
9 9
10LINUX_VERSION ?= "3.2.18" 10LINUX_VERSION ?= "3.2.18"
11 11
12SRCREV_machine_qemuarm ?= "2ea2477e2965569517671ec03fa9496214e8bff1" 12SRCREV_machine_qemuarm ?= "c721e94f7cd1b1ae7da5edc52076c771b2e9d134"
13SRCREV_machine_qemumips ?= "17eb00dec08ef91acfb6d7adca81cb6e344b6c68" 13SRCREV_machine_qemumips ?= "2172812072c372cc704dac5e1654da81d6eabad3"
14SRCREV_machine_qemuppc ?= "14be92545abd339033570620e84ec2ae6780be29" 14SRCREV_machine_qemuppc ?= "800615ccdce45f6900b841954fa2f47987bb2a95"
15SRCREV_machine_qemux86 ?= "34e76349ed6cb7cadbbf94a5b34712d139703c8a" 15SRCREV_machine_qemux86 ?= "9e23973679d82a54dda697f539243fdea612e878"
16SRCREV_machine_qemux86-64 ?= "f3625121d459b8e38f7528c2f5d2feb6078d0de9" 16SRCREV_machine_qemux86-64 ?= "d7823aebcf7f724f50e30f245e5e71b3b4db1a0b"
17SRCREV_machine ?= "7cc31a952f78b8f8e8469eed93c23e9675a8eeb5" 17SRCREV_machine ?= "06882fc16a4e965872e7faacb91da1497efd9ac3"
18SRCREV_meta ?= "486f7aec824b4127e91ef53228823e996b3696f0" 18SRCREV_meta ?= "486f7aec824b4127e91ef53228823e996b3696f0"
19 19
20PR = "${INC_PR}.1" 20PR = "${INC_PR}.1"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index edb87da..06bcb9a 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -3,12 +3,12 @@ require recipes-kernel/linux/linux-yocto.inc
3KBRANCH_DEFAULT = "standard/base" 3KBRANCH_DEFAULT = "standard/base"
4KBRANCH = "${KBRANCH_DEFAULT}" 4KBRANCH = "${KBRANCH_DEFAULT}"
5 5
6SRCREV_machine_qemuarm ?= "67376c621baf82ce51657246896647ababf5aa7c" 6SRCREV_machine_qemuarm ?= "84d8ee32265eea5d60f57a2f70bd3b9a0fb9213d"
7SRCREV_machine_qemumips ?= "7a8c1836ce33d49ff68e549e9415538a7419e3dc" 7SRCREV_machine_qemumips ?= "ba0e336d4527080233c3c410989d4f351529ee4e"
8SRCREV_machine_qemuppc ?= "5a3c4cf87fd94add818880a158e8e5a9e07303c9" 8SRCREV_machine_qemuppc ?= "e82b8a111430e3820b11f507863c4b8e8734ed8e"
9SRCREV_machine_qemux86 ?= "a4c7a048fe3407e8eea0020db4a9c41d3feb8247" 9SRCREV_machine_qemux86 ?= "0985844fa6235422c67ef269952fa4e765f252f9"
10SRCREV_machine_qemux86-64 ?= "a4c7a048fe3407e8eea0020db4a9c41d3feb8247" 10SRCREV_machine_qemux86-64 ?= "0985844fa6235422c67ef269952fa4e765f252f9"
11SRCREV_machine ?= "a4c7a048fe3407e8eea0020db4a9c41d3feb8247" 11SRCREV_machine ?= "0985844fa6235422c67ef269952fa4e765f252f9"
12SRCREV_meta ?= "463299bc2e533e1bd38b0053ae7b210980f269c3" 12SRCREV_meta ?= "463299bc2e533e1bd38b0053ae7b210980f269c3"
13 13
14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" 14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"