diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-21 14:09:47 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-09 14:34:35 +0000 |
commit | 250ca947da463841f7c1858c293e17a7e824d637 (patch) | |
tree | ed842d44901af9f987ff769ee9dc36184d2fede9 /meta/recipes-bsp/grub/files/0003-Add-gnulib-fix-gcc7-fallthrough.diff.patch | |
parent | 666076dfc0528442a1098354dcc5d64672dd38ee (diff) | |
download | poky-250ca947da463841f7c1858c293e17a7e824d637.tar.gz |
grub: Fix build with gcc7
backport patches from upsteam and adapt them to 2.0 codebase
(From OE-Core rev: 347976bf08158d1aa46dfea6f0f9d6dcc0d97395)
(From OE-Core rev: 74da4a06619558b34752d3588fd965a7994106e3)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub/files/0003-Add-gnulib-fix-gcc7-fallthrough.diff.patch')
-rw-r--r-- | meta/recipes-bsp/grub/files/0003-Add-gnulib-fix-gcc7-fallthrough.diff.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0003-Add-gnulib-fix-gcc7-fallthrough.diff.patch b/meta/recipes-bsp/grub/files/0003-Add-gnulib-fix-gcc7-fallthrough.diff.patch new file mode 100644 index 0000000000..fcfbf5cdf6 --- /dev/null +++ b/meta/recipes-bsp/grub/files/0003-Add-gnulib-fix-gcc7-fallthrough.diff.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 007f0b407f72314ec832d77e15b83ea40b160037 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrei Borzenkov <arvidjaar@gmail.com> | ||
3 | Date: Tue, 4 Apr 2017 19:37:47 +0300 | ||
4 | Subject: [PATCH 3/4] Add gnulib-fix-gcc7-fallthrough.diff | ||
5 | |||
6 | As long as the code is not upstream, add it as explicit patch for the | ||
7 | case of gnulib refresh. | ||
8 | --- | ||
9 | Upstream-Status: Backport | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | |||
12 | grub-core/gnulib-fix-gcc7-fallthrough.diff | 14 ++++++++++++++ | ||
13 | 1 file changed, 14 insertions(+) | ||
14 | create mode 100644 grub-core/gnulib-fix-gcc7-fallthrough.diff | ||
15 | |||
16 | diff --git a/grub-core/gnulib-fix-gcc7-fallthrough.diff b/grub-core/gnulib-fix-gcc7-fallthrough.diff | ||
17 | new file mode 100644 | ||
18 | index 0000000..9802e2d | ||
19 | --- /dev/null | ||
20 | +++ b/grub-core/gnulib-fix-gcc7-fallthrough.diff | ||
21 | @@ -0,0 +1,14 @@ | ||
22 | +diff --git grub-core/gnulib/regexec.c grub-core/gnulib/regexec.c | ||
23 | +index f632cd4..a7776f0 100644 | ||
24 | +--- grub-core/gnulib/regexec.c | ||
25 | ++++ grub-core/gnulib/regexec.c | ||
26 | +@@ -4099,6 +4099,9 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node, | ||
27 | + case OP_UTF8_PERIOD: | ||
28 | + if (ch >= ASCII_CHARS) | ||
29 | + return false; | ||
30 | ++#if defined __GNUC__ && __GNUC__ >= 7 | ||
31 | ++ __attribute__ ((fallthrough)); | ||
32 | ++#endif | ||
33 | + /* FALLTHROUGH */ | ||
34 | + #endif | ||
35 | + case OP_PERIOD: | ||
36 | -- | ||
37 | 1.9.1 | ||
38 | |||