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 @@ +From dc83b84dc8b4e71efce47143497aac6c126065cf Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Mon, 18 Jul 2016 08:40:29 -0700 +Subject: [PATCH] lib/aarch64/initplat.c: fix const qualifier + +Fixed: +initplat.c:44:35: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] + unsigned char *p = dest, *q = src; + ^~~ +cc1: all warnings being treated as errors + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + lib/aarch64/initplat.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/aarch64/initplat.c b/lib/aarch64/initplat.c +index 2ac03a7..aae7beb 100644 +--- a/lib/aarch64/initplat.c ++++ b/lib/aarch64/initplat.c +@@ -41,7 +41,8 @@ void *memset(void *s, int c, __SIZE_TYPE__ n) + + void *memcpy(void *dest, const void *src, __SIZE_TYPE__ n) + { +- unsigned char *p = dest, *q = src; ++ unsigned char *p = dest; ++ const unsigned char *q = src; + + while (n--) + *p++ = *q++; +-- +2.9.0 + 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 @@ -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 - |