summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-20 11:20:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-11 16:59:18 +0100
commit947a22d0be6402f7c40b486897f029ead4c8cdea (patch)
treed1d884e3fb3a0523d73b1ee14d370cf4ef062aa2 /meta
parent0bec7a977ab3f4eecbceee9c447f9560688d80c5 (diff)
downloadpoky-947a22d0be6402f7c40b486897f029ead4c8cdea.tar.gz
gnu-efi: Fix build with gcc7
(From OE-Core rev: 7f14d7de88da7e6e1b6934f9c608d67d80dc8398) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch34
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb3
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch
new file mode 100644
index 0000000000..d0aeb2d560
--- /dev/null
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch
@@ -0,0 +1,34 @@
1From 676a8a9001f06808b4dbe0a545d76b5d9a8ebf48 Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>
3Date: Thu, 2 Feb 2017 13:51:27 -0500
4Subject: [PATCH] Mark our explicit fall through so -Wextra will work in gcc 7
5
6gcc 7 introduces detection of fall-through behavior in switch/case
7statements, and will warn if -Wimplicit-fallthrough is present and there
8is no comment stating that the fall-through is intentional. This is
9also triggered by -Wextra, as it enables -Wimplicit-fallthrough=1.
10
11This patch adds the comment in the one place we use fall-through.
12
13Signed-off-by: Peter Jones <pjones@redhat.com>
14---
15Upstream-Status: Pending
16
17 lib/print.c | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/lib/print.c b/lib/print.c
21index b8a9d38..cb732f0 100644
22--- a/lib/print.c
23+++ b/lib/print.c
24@@ -1131,6 +1131,7 @@ Returns:
25 case 'X':
26 Item.Width = Item.Long ? 16 : 8;
27 Item.Pad = '0';
28+ /* falls through */
29 case 'x':
30 ValueToHex (
31 Item.Scratch,
32--
332.12.2
34
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
index 6f235b7455..d6f9f536d0 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
@@ -16,7 +16,8 @@ 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 \ 18 file://gcc46-compatibility.patch \
19 " 19 file://0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch \
20 "
20 21
21SRC_URI[md5sum] = "1f719c9c135778aa6b087b89a1cc2423" 22SRC_URI[md5sum] = "1f719c9c135778aa6b087b89a1cc2423"
22SRC_URI[sha256sum] = "bd8fcd5914f18fc0e4ba948ab03b00013e528504f529c60739b748f6ef130b22" 23SRC_URI[sha256sum] = "bd8fcd5914f18fc0e4ba948ab03b00013e528504f529c60739b748f6ef130b22"