summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/gnu-efi
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-10-06 18:40:12 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-15 14:16:11 +0100
commit81544697fe0c4e50ca3dd5d291a6214d612e3865 (patch)
tree5f5a7a682a924df610de4e90c2b451a92c88d34a /meta/recipes-bsp/gnu-efi
parentf937d49ab3d7bf709be024e54f9a06b5a35fb24d (diff)
downloadpoky-81544697fe0c4e50ca3dd5d291a6214d612e3865.tar.gz
gnu-efi: Do not use gcc-only options when building with clang
(From OE-Core rev: 385126d1f1cc6af5882b9a926295f4f54e657613) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/gnu-efi')
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-3.0.9-fix-clang-build.patch24
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb1
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-3.0.9-fix-clang-build.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-3.0.9-fix-clang-build.patch
new file mode 100644
index 0000000000..c6d660095e
--- /dev/null
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-3.0.9-fix-clang-build.patch
@@ -0,0 +1,24 @@
1Fix building with CLANG-9.0.0
2
3Fixes
4clang-9: error: unknown argument: '-maccumulate-outgoing-args'
5
6Upstream-Status: Submitted [https://sourceforge.net/p/gnu-efi/patches/70/]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9--- a/Make.defaults
10+++ b/Make.defaults
11@@ -110,10 +110,10 @@
12 || ( [ $(GCCVERSION) -eq "4" ] \
13 && [ $(GCCMINOR) -ge "7" ] ) ) \
14 && echo 1)
15- ifeq ($(GCCNEWENOUGH),1)
16- CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
17- else ifeq ($(USING_CLANG),clang)
18+ ifeq ($(USING_CLANG),clang)
19 CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11
20+ else ifeq ($(GCCNEWENOUGH),1)
21+ CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
22 endif
23
24 CFLAGS += -mno-red-zone
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 f844435472..6d4c303353 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,6 +15,7 @@ LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582
15SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ 15SRC_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://gnu-efi-3.0.9-fix-clang-build.patch \
18 " 19 "
19 20
20SRC_URI[md5sum] = "32af17b917545a693e549af2439c4a99" 21SRC_URI[md5sum] = "32af17b917545a693e549af2439c4a99"