diff options
Diffstat (limited to 'meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch')
| -rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch | 24 |
1 files changed, 19 insertions, 5 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 index 0ce6d7b0cb..69efd34e24 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch @@ -1,3 +1,8 @@ +From 8d16ae374c5d4d9fac45c002605a66cfb8c08be5 Mon Sep 17 00:00:00 2001 +From: Steve Langasek <steve.langasek@ubuntu.com> +Date: Wed, 9 Sep 2015 08:26:06 +0000 +Subject: [PATCH 3/3] gnu-efi, syslinux: Support gcc < 4.7 + don't break with old compilers and -DGNU_EFI_USE_MS_ABI It's entirely legitimate to request GNU_EFI_USE_MS_ABI even if the current compiler doesn't support it, and gnu-efi should transparently fall back to @@ -6,16 +11,25 @@ checking, but at least it will still compile. Author: Steve Langasek <steve.langasek@ubuntu.com> Upstream-Status: Pending -Index: gnu-efi-3.0.3/inc/x86_64/efibind.h -=================================================================== ---- gnu-efi-3.0.3.orig/inc/x86_64/efibind.h -+++ gnu-efi-3.0.3/inc/x86_64/efibind.h +[Rebased for 3.0.6] +Signed-off-by: California Sullivan <california.l.sullivan@intel.com> +--- + inc/x86_64/efibind.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h +index 4309f9f..02c0af1 100644 +--- a/inc/x86_64/efibind.h ++++ b/inc/x86_64/efibind.h @@ -25,8 +25,6 @@ Revision History #if defined(GNU_EFI_USE_MS_ABI) - #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) + #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))||(defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2))) #define HAVE_USE_MS_ABI 1 - #else - #error Compiler is too old for GNU_EFI_USE_MS_ABI #endif #endif +-- +2.9.4 + |