summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub/files/0004-Fix-remaining-cases-of-gcc-7-fallthrough-warning.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-21 14:09:47 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-09 14:34:35 +0000
commit250ca947da463841f7c1858c293e17a7e824d637 (patch)
treeed842d44901af9f987ff769ee9dc36184d2fede9 /meta/recipes-bsp/grub/files/0004-Fix-remaining-cases-of-gcc-7-fallthrough-warning.patch
parent666076dfc0528442a1098354dcc5d64672dd38ee (diff)
downloadpoky-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/0004-Fix-remaining-cases-of-gcc-7-fallthrough-warning.patch')
-rw-r--r--meta/recipes-bsp/grub/files/0004-Fix-remaining-cases-of-gcc-7-fallthrough-warning.patch175
1 files changed, 175 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0004-Fix-remaining-cases-of-gcc-7-fallthrough-warning.patch b/meta/recipes-bsp/grub/files/0004-Fix-remaining-cases-of-gcc-7-fallthrough-warning.patch
new file mode 100644
index 0000000000..78a70a2dab
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/0004-Fix-remaining-cases-of-gcc-7-fallthrough-warning.patch
@@ -0,0 +1,175 @@
1From d454509bb866d4eaefbb558d94dd0ef0228830eb Mon Sep 17 00:00:00 2001
2From: Vladimir Serbinenko <phcoder@gmail.com>
3Date: Wed, 12 Apr 2017 01:42:38 +0000
4Subject: [PATCH 4/4] Fix remaining cases of gcc 7 fallthrough warning.
5
6They are all intended, so just add the relevant comment.
7---
8Upstream-Status: Backport
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11 grub-core/kern/ia64/dl.c | 1 +
12 grub-core/kern/mips/dl.c | 1 +
13 grub-core/kern/sparc64/dl.c | 1 +
14 grub-core/loader/i386/coreboot/chainloader.c | 1 +
15 4 files changed, 4 insertions(+)
16
17Index: grub-2.00/grub-core/kern/ia64/dl.c
18===================================================================
19--- grub-2.00.orig/grub-core/kern/ia64/dl.c
20+++ grub-2.00/grub-core/kern/ia64/dl.c
21@@ -257,6 +257,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t
22 case R_IA64_LTOFF22:
23 if (ELF_ST_TYPE (sym->st_info) == STT_FUNC)
24 value = *(grub_uint64_t *) sym->st_value + rel->r_addend;
25+ /* Fallthrough. */
26 case R_IA64_LTOFF_FPTR22:
27 *gpptr = value;
28 add_value_to_slot_21 (addr, (grub_addr_t) gpptr - (grub_addr_t) gp);
29Index: grub-2.00/grub-core/disk/diskfilter.c
30===================================================================
31--- grub-2.00.orig/grub-core/disk/diskfilter.c
32+++ grub-2.00/grub-core/disk/diskfilter.c
33@@ -71,10 +71,12 @@ is_lv_readable (struct grub_diskfilter_l
34 case GRUB_DISKFILTER_RAID6:
35 if (!easily)
36 need--;
37+ /* Fallthrough. */
38 case GRUB_DISKFILTER_RAID4:
39 case GRUB_DISKFILTER_RAID5:
40 if (!easily)
41 need--;
42+ /* Fallthrough. */
43 case GRUB_DISKFILTER_STRIPED:
44 break;
45
46@@ -507,6 +509,7 @@ read_segment (struct grub_diskfilter_seg
47 if (seg->node_count == 1)
48 return grub_diskfilter_read_node (&seg->nodes[0],
49 sector, size, buf);
50+ /* Fallthrough. */
51 case GRUB_DISKFILTER_MIRROR:
52 case GRUB_DISKFILTER_RAID10:
53 {
54Index: grub-2.00/grub-core/font/font.c
55===================================================================
56--- grub-2.00.orig/grub-core/font/font.c
57+++ grub-2.00/grub-core/font/font.c
58@@ -1297,6 +1297,7 @@ blit_comb (const struct grub_unicode_gly
59 - grub_font_get_xheight (combining_glyphs[i]->font) - 1;
60 if (space <= 0)
61 space = 1 + (grub_font_get_xheight (main_glyph->font)) / 8;
62+ /* Fallthrough. */
63
64 case GRUB_UNICODE_STACK_ATTACHED_ABOVE:
65 do_blit (combining_glyphs[i], targetx,
66@@ -1338,6 +1339,7 @@ blit_comb (const struct grub_unicode_gly
67 + combining_glyphs[i]->height);
68 if (space <= 0)
69 space = 1 + (grub_font_get_xheight (main_glyph->font)) / 8;
70+ /* Fallthrough. */
71
72 case GRUB_UNICODE_STACK_ATTACHED_BELOW:
73 do_blit (combining_glyphs[i], targetx, -(bounds.y - space));
74Index: grub-2.00/grub-core/fs/udf.c
75===================================================================
76--- grub-2.00.orig/grub-core/fs/udf.c
77+++ grub-2.00/grub-core/fs/udf.c
78@@ -970,6 +970,7 @@ grub_udf_read_symlink (grub_fshelp_node_
79 case 1:
80 if (ptr[1])
81 goto fail;
82+ break;
83 case 2:
84 /* in 4 bytes. out: 1 byte. */
85 optr = out;
86Index: grub-2.00/grub-core/lib/legacy_parse.c
87===================================================================
88--- grub-2.00.orig/grub-core/lib/legacy_parse.c
89+++ grub-2.00/grub-core/lib/legacy_parse.c
90@@ -626,6 +626,7 @@ grub_legacy_parse (const char *buf, char
91 {
92 case TYPE_FILE_NO_CONSUME:
93 hold_arg = 1;
94+ /* Fallthrough. */
95 case TYPE_PARTITION:
96 case TYPE_FILE:
97 args[i] = adjust_file (curarg, curarglen);
98Index: grub-2.00/grub-core/lib/libgcrypt-grub/cipher/rijndael.c
99===================================================================
100--- grub-2.00.orig/grub-core/lib/libgcrypt-grub/cipher/rijndael.c
101+++ grub-2.00/grub-core/lib/libgcrypt-grub/cipher/rijndael.c
102@@ -96,7 +96,8 @@ do_setkey (RIJNDAEL_context *ctx, const
103 static int initialized = 0;
104 static const char *selftest_failed=0;
105 int ROUNDS;
106- int i,j, r, t, rconpointer = 0;
107+ unsigned int i, t, rconpointer = 0;
108+ int j, r;
109 int KC;
110 union
111 {
112Index: grub-2.00/grub-core/mmap/efi/mmap.c
113===================================================================
114--- grub-2.00.orig/grub-core/mmap/efi/mmap.c
115+++ grub-2.00/grub-core/mmap/efi/mmap.c
116@@ -72,6 +72,7 @@ grub_efi_mmap_iterate (grub_memory_hook_
117 GRUB_MEMORY_AVAILABLE);
118 break;
119 }
120+ /* Fallthrough. */
121 case GRUB_EFI_RUNTIME_SERVICES_CODE:
122 hook (desc->physical_start, desc->num_pages * 4096,
123 GRUB_MEMORY_CODE);
124@@ -86,6 +87,7 @@ grub_efi_mmap_iterate (grub_memory_hook_
125 grub_printf ("Unknown memory type %d, considering reserved\n",
126 desc->type);
127
128+ /* Fallthrough. */
129 case GRUB_EFI_BOOT_SERVICES_DATA:
130 if (!avoid_efi_boot_services)
131 {
132@@ -93,6 +95,7 @@ grub_efi_mmap_iterate (grub_memory_hook_
133 GRUB_MEMORY_AVAILABLE);
134 break;
135 }
136+ /* Fallthrough. */
137 case GRUB_EFI_RESERVED_MEMORY_TYPE:
138 case GRUB_EFI_RUNTIME_SERVICES_DATA:
139 case GRUB_EFI_MEMORY_MAPPED_IO:
140Index: grub-2.00/grub-core/normal/charset.c
141===================================================================
142--- grub-2.00.orig/grub-core/normal/charset.c
143+++ grub-2.00/grub-core/normal/charset.c
144@@ -858,6 +858,7 @@ grub_bidi_line_logical_to_visual (const
145 case GRUB_BIDI_TYPE_R:
146 case GRUB_BIDI_TYPE_AL:
147 bidi_needed = 1;
148+ /* Fallthrough. */
149 default:
150 {
151 if (join_state == JOIN_FORCE)
152Index: grub-2.00/grub-core/video/bochs.c
153===================================================================
154--- grub-2.00.orig/grub-core/video/bochs.c
155+++ grub-2.00/grub-core/video/bochs.c
156@@ -351,6 +351,7 @@ grub_video_bochs_setup (unsigned int wid
157 case 32:
158 framebuffer.mode_info.reserved_mask_size = 8;
159 framebuffer.mode_info.reserved_field_pos = 24;
160+ /* Fallthrough. */
161
162 case 24:
163 framebuffer.mode_info.red_mask_size = 8;
164Index: grub-2.00/grub-core/video/cirrus.c
165===================================================================
166--- grub-2.00.orig/grub-core/video/cirrus.c
167+++ grub-2.00/grub-core/video/cirrus.c
168@@ -431,6 +431,7 @@ grub_video_cirrus_setup (unsigned int wi
169 case 32:
170 framebuffer.mode_info.reserved_mask_size = 8;
171 framebuffer.mode_info.reserved_field_pos = 24;
172+ /* Fallthrough. */
173
174 case 24:
175 framebuffer.mode_info.red_mask_size = 8;
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-24 09:49:26 +0000