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>
This commit is contained in:
Wenzong Fan 2015-09-06 22:19:51 -04:00 committed by Richard Purdie
parent 53e09c5d14
commit 996ec1798e
2 changed files with 51 additions and 0 deletions

View File

@ -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

View File

@ -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"