summaryrefslogtreecommitdiffstats
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:48:29 +0100
commit996ec1798e709d38a26d8871132cdc06310c9423 (patch)
tree0a1618491641d1a98251a34763cab8c18d00004e
parent53e09c5d14bb4f719e5c56fb1ac4918fe0d7dd5e (diff)
downloadpoky-996ec1798e709d38a26d8871132cdc06310c9423.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) (From OE-Core rev: 7afe15051516053303f6afef4d6fbb0a3872b411) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 0000000000..ced128a313
--- /dev/null
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch
@@ -0,0 +1,50 @@
1From 8a356d4b6a242ce63b73920d3ed33f88f9e12fe3 Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Sun, 6 Sep 2015 05:20:43 -0400
4Subject: [PATCH] gnu-efi: Make setjmp.S portable to ARM
5
6This patch fixes the following error:
7
8 .../lib/arm/setjmp.S:18: Error: unrecognized symbol type ""
9 .../lib/arm/setjmp.S:26: Error: unrecognized symbol type ""
10
11The problem is the assembly syntax that is used is not portable to ARM,
12where the '@' symbol is a comment:
13
14 > Note on targets where the @ character is the start of a comment
15 > (eg ARM) then another character is used instead. For example the
16 > ARM port uses the % character.
17
18(From https://sourceware.org/binutils/docs-2.25/as/Section.html#Section)
19
20Upstream-Status: Pending
21
22Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
23---
24 lib/arm/setjmp.S | 4 ++--
25 1 file changed, 2 insertions(+), 2 deletions(-)
26
27diff --git a/lib/arm/setjmp.S b/lib/arm/setjmp.S
28index 6e3fbf0..85c8705 100644
29--- a/lib/arm/setjmp.S
30+++ b/lib/arm/setjmp.S
31@@ -15,7 +15,7 @@ BASIS,
32 .text
33 .arm
34 .globl setjmp
35- .type setjmp, @function
36+ .type setjmp, %function
37 setjmp:
38 mov r3, r13
39 stmia r0, {r3-r12,r14}
40@@ -23,6 +23,6 @@ setjmp:
41 bx lr
42
43 .globl longjmp
44- .type longjmp, @function
45+ .type longjmp, %function
46 longjmp:
47 ldmia r0, {r3-r12,r14}
48--
491.9.1
50
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 8cc22ca66a..1a1ba40226 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
17SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ 17SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
18 file://parallel-make-archives.patch \ 18 file://parallel-make-archives.patch \
19 file://lib-Makefile-fix-parallel-issue.patch \ 19 file://lib-Makefile-fix-parallel-issue.patch \
20 file://gnu-efi-Make-setjmp.S-portable-to-ARM.patch \
20 " 21 "
21 22
22SRC_URI[md5sum] = "15a4bcbc18a9a5e8110ed955970622e6" 23SRC_URI[md5sum] = "15a4bcbc18a9a5e8110ed955970622e6"