diff options
Diffstat (limited to 'meta/recipes-bsp/gnu-efi/gnu-efi')
-rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi/aarch64-initplat.c-fix-const-qualifier.patch | 35 | ||||
-rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch | 50 |
2 files changed, 35 insertions, 50 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/aarch64-initplat.c-fix-const-qualifier.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/aarch64-initplat.c-fix-const-qualifier.patch new file mode 100644 index 0000000000..965f074ebe --- /dev/null +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/aarch64-initplat.c-fix-const-qualifier.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From dc83b84dc8b4e71efce47143497aac6c126065cf Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Mon, 18 Jul 2016 08:40:29 -0700 | ||
4 | Subject: [PATCH] lib/aarch64/initplat.c: fix const qualifier | ||
5 | |||
6 | Fixed: | ||
7 | initplat.c:44:35: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] | ||
8 | unsigned char *p = dest, *q = src; | ||
9 | ^~~ | ||
10 | cc1: all warnings being treated as errors | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | --- | ||
16 | lib/aarch64/initplat.c | 3 ++- | ||
17 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/lib/aarch64/initplat.c b/lib/aarch64/initplat.c | ||
20 | index 2ac03a7..aae7beb 100644 | ||
21 | --- a/lib/aarch64/initplat.c | ||
22 | +++ b/lib/aarch64/initplat.c | ||
23 | @@ -41,7 +41,8 @@ void *memset(void *s, int c, __SIZE_TYPE__ n) | ||
24 | |||
25 | void *memcpy(void *dest, const void *src, __SIZE_TYPE__ n) | ||
26 | { | ||
27 | - unsigned char *p = dest, *q = src; | ||
28 | + unsigned char *p = dest; | ||
29 | + const unsigned char *q = src; | ||
30 | |||
31 | while (n--) | ||
32 | *p++ = *q++; | ||
33 | -- | ||
34 | 2.9.0 | ||
35 | |||
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 deleted file mode 100644 index ced128a313..0000000000 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
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 | |||