diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2015-09-09 08:26:06 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-21 15:39:36 +0100 |
| commit | 90e7cfebc6a9ac4b229b45c6a7dc95218efe55c5 (patch) | |
| tree | 8b805b14bd0ca5146c21a1ba941b19b45a0b4e92 /meta/recipes-devtools/syslinux | |
| parent | 2593dc1936d7e477769753b8c8f97b988ecc8823 (diff) | |
| download | openembedded-core-90e7cfebc6a9ac4b229b45c6a7dc95218efe55c5.tar.gz | |
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 <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/syslinux')
| -rw-r--r-- | meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-devtools/syslinux/syslinux_6.03.bb | 1 |
2 files changed, 38 insertions, 0 deletions
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 0000000000..6279258c2e --- /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 <steve.langasek@ubuntu.com> +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 ef9ae2fbea..94077da25d 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" |