aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2015-09-06 22:19:51 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-12 22:47:05 +0100
commit7afe15051516053303f6afef4d6fbb0a3872b411 (patch)
treec34b1dbe45d65781f08a706bf96ea68a71ace308 /meta/recipes-bsp
parentcf418deb32bf90479714e522e3fa309c41e47978 (diff)
downloadopenembedded-core-contrib-7afe15051516053303f6afef4d6fbb0a3872b411.tar.gz
gnu-efi: Make setjmp.S portable to ARM
This patch fixes the following error: .../lib/arm/setjmp.S:18: Error: unrecognized symbol type "" .../lib/arm/setjmp.S:26: Error: unrecognized symbol type "" The problem is the assembly syntax that is used is not portable to ARM, where the '@' symbol is a comment: > Note on targets where the @ character is the start of a comment > (eg ARM) then another character is used instead. For example the > ARM port uses the % character. (From https://sourceware.org/binutils/docs-2.25/as/Section.html#Section) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch50
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb1
2 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch
new file mode 100644
index 00000000000..ced128a3133
--- /dev/null
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch
@@ -0,0 +1,50 @@
+From 8a356d4b6a242ce63b73920d3ed33f88f9e12fe3 Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <wenzong.fan@windriver.com>
+Date: Sun, 6 Sep 2015 05:20:43 -0400
+Subject: [PATCH] gnu-efi: Make setjmp.S portable to ARM
+
+This patch fixes the following error:
+
+ .../lib/arm/setjmp.S:18: Error: unrecognized symbol type ""
+ .../lib/arm/setjmp.S:26: Error: unrecognized symbol type ""
+
+The problem is the assembly syntax that is used is not portable to ARM,
+where the '@' symbol is a comment:
+
+ > Note on targets where the @ character is the start of a comment
+ > (eg ARM) then another character is used instead. For example the
+ > ARM port uses the % character.
+
+(From https://sourceware.org/binutils/docs-2.25/as/Section.html#Section)
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+---
+ lib/arm/setjmp.S | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/arm/setjmp.S b/lib/arm/setjmp.S
+index 6e3fbf0..85c8705 100644
+--- a/lib/arm/setjmp.S
++++ b/lib/arm/setjmp.S
+@@ -15,7 +15,7 @@ BASIS,
+ .text
+ .arm
+ .globl setjmp
+- .type setjmp, @function
++ .type setjmp, %function
+ setjmp:
+ mov r3, r13
+ stmia r0, {r3-r12,r14}
+@@ -23,6 +23,6 @@ setjmp:
+ bx lr
+
+ .globl longjmp
+- .type longjmp, @function
++ .type longjmp, %function
+ longjmp:
+ ldmia r0, {r3-r12,r14}
+--
+1.9.1
+
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb
index 8cc22ca66aa..1a1ba402267 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb
@@ -17,6 +17,7 @@ LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=9;md5=2240d
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
file://parallel-make-archives.patch \
file://lib-Makefile-fix-parallel-issue.patch \
+ file://gnu-efi-Make-setjmp.S-portable-to-ARM.patch \
"
SRC_URI[md5sum] = "15a4bcbc18a9a5e8110ed955970622e6"