From 90e7cfebc6a9ac4b229b45c6a7dc95218efe55c5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 9 Sep 2015 08:26:06 +0000 Subject: [PATCH] gnu-efi, syslinux: Support gcc < 4.7 This helps compiling the code with older gcc especially on older build hosts, additionally clang advertizes itself as gcc 4.2.1 so it helps compiling dependent modues using clang as well Signed-off-by: Khem Raj Signed-off-by: Ross Burton --- .../gnu-efi/gnu-efi/gcc46-compatibility.patch | 21 +++++++++++ meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb | 1 + .../syslinux/0010-gcc46-compatibility.patch | 37 +++++++++++++++++++ .../syslinux/syslinux_6.03.bb | 1 + 4 files changed, 60 insertions(+) create mode 100644 meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch create mode 100644 meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch new file mode 100644 index 00000000000..0ce6d7b0cb5 --- /dev/null +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch @@ -0,0 +1,21 @@ +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 +using legacy techniques to set the calling convention. We don't get type +checking, but at least it will still compile. + +Author: Steve Langasek +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 +@@ -25,8 +25,6 @@ Revision History + #if defined(GNU_EFI_USE_MS_ABI) + #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) + #define HAVE_USE_MS_ABI 1 +- #else +- #error Compiler is too old for GNU_EFI_USE_MS_ABI + #endif + #endif + diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb index 1a1ba402267..eca34599ce3 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb @@ -18,6 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ file://parallel-make-archives.patch \ file://lib-Makefile-fix-parallel-issue.patch \ file://gnu-efi-Make-setjmp.S-portable-to-ARM.patch \ + file://gcc46-compatibility.patch \ " SRC_URI[md5sum] = "15a4bcbc18a9a5e8110ed955970622e6" diff --git a/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch b/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch new file mode 100644 index 00000000000..6279258c2e5 --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch @@ -0,0 +1,37 @@ +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 +using legacy techniques to set the calling convention. We don't get type +checking, but at least it will still compile. + +Adapted from gnu-efi + +Author: Steve Langasek +Upstream-Status: Pending + +Index: syslinux-6.03/efi64/include/efi/x86_64/efibind.h +=================================================================== +--- syslinux-6.03.orig/efi64/include/efi/x86_64/efibind.h ++++ syslinux-6.03/efi64/include/efi/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)) + #define HAVE_USE_MS_ABI 1 +- #else +- #error Compiler is too old for GNU_EFI_USE_MS_ABI + #endif + #endif + +Index: syslinux-6.03/gnu-efi/gnu-efi-3.0/inc/x86_64/efibind.h +=================================================================== +--- syslinux-6.03.orig/gnu-efi/gnu-efi-3.0/inc/x86_64/efibind.h ++++ syslinux-6.03/gnu-efi/gnu-efi-3.0/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)) + #define HAVE_USE_MS_ABI 1 +- #else +- #error Compiler is too old for GNU_EFI_USE_MS_ABI + #endif + #endif + diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb index ef9ae2fbea8..94077da25de 100644 --- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb +++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb @@ -21,6 +21,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/syslinux-${PV}.tar.xz \ file://0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch \ file://0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch \ file://0009-linux-syslinux-implement-install_bootblock.patch \ + file://0010-gcc46-compatibility.patch \ " SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13" -- 2.47.2