Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 8a356d4b6a242ce63b73920d3ed33f88f9e12fe3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Wenzong Fan <wenzong.fan@windriver.com> |
| 3 | Date: Sun, 6 Sep 2015 05:20:43 -0400 |
| 4 | Subject: [PATCH] gnu-efi: Make setjmp.S portable to ARM |
| 5 | |
| 6 | This 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 | |
| 11 | The problem is the assembly syntax that is used is not portable to ARM, |
| 12 | where 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 | |
| 20 | Upstream-Status: Pending |
| 21 | |
| 22 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
| 23 | --- |
| 24 | lib/arm/setjmp.S | 4 ++-- |
| 25 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 26 | |
| 27 | diff --git a/lib/arm/setjmp.S b/lib/arm/setjmp.S |
| 28 | index 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 | -- |
| 49 | 1.9.1 |
| 50 | |