diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch | 35 | ||||
-rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb | 1 |
2 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch deleted file mode 100644 index 69efd34e24..0000000000 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 8d16ae374c5d4d9fac45c002605a66cfb8c08be5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Steve Langasek <steve.langasek@ubuntu.com> | ||
3 | Date: Wed, 9 Sep 2015 08:26:06 +0000 | ||
4 | Subject: [PATCH 3/3] gnu-efi, syslinux: Support gcc < 4.7 | ||
5 | |||
6 | don't break with old compilers and -DGNU_EFI_USE_MS_ABI | ||
7 | It's entirely legitimate to request GNU_EFI_USE_MS_ABI even if the current | ||
8 | compiler doesn't support it, and gnu-efi should transparently fall back to | ||
9 | using legacy techniques to set the calling convention. We don't get type | ||
10 | checking, but at least it will still compile. | ||
11 | |||
12 | Author: Steve Langasek <steve.langasek@ubuntu.com> | ||
13 | Upstream-Status: Pending | ||
14 | [Rebased for 3.0.6] | ||
15 | Signed-off-by: California Sullivan <california.l.sullivan@intel.com> | ||
16 | --- | ||
17 | inc/x86_64/efibind.h | 2 -- | ||
18 | 1 file changed, 2 deletions(-) | ||
19 | |||
20 | diff --git a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h | ||
21 | index 4309f9f..02c0af1 100644 | ||
22 | --- a/inc/x86_64/efibind.h | ||
23 | +++ b/inc/x86_64/efibind.h | ||
24 | @@ -25,8 +25,6 @@ Revision History | ||
25 | #if defined(GNU_EFI_USE_MS_ABI) | ||
26 | #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))||(defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2))) | ||
27 | #define HAVE_USE_MS_ABI 1 | ||
28 | - #else | ||
29 | - #error Compiler is too old for GNU_EFI_USE_MS_ABI | ||
30 | #endif | ||
31 | #endif | ||
32 | |||
33 | -- | ||
34 | 2.9.4 | ||
35 | |||
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb index 0667191fbe..f844435472 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb | |||
@@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582 | |||
15 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ | 15 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ |
16 | file://parallel-make-archives.patch \ | 16 | file://parallel-make-archives.patch \ |
17 | file://lib-Makefile-fix-parallel-issue.patch \ | 17 | file://lib-Makefile-fix-parallel-issue.patch \ |
18 | file://gcc46-compatibility.patch \ | ||
19 | " | 18 | " |
20 | 19 | ||
21 | SRC_URI[md5sum] = "32af17b917545a693e549af2439c4a99" | 20 | SRC_URI[md5sum] = "32af17b917545a693e549af2439c4a99" |