summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-extended/uwsgi/files/Add-explicit-breaks-to-avoid-implicit-passthrough.patch
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2017-08-23 15:20:48 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2017-08-24 09:58:54 -0400
commit0330cdf2c1b4494568de8785ac56ca734616e196 (patch)
tree7eb4d52955689e50da215acc0690b2b3216e6a8c /meta-openstack/recipes-extended/uwsgi/files/Add-explicit-breaks-to-avoid-implicit-passthrough.patch
parent945e7af04b58cede0c4210b61671886b45b005dc (diff)
downloadmeta-cloud-services-0330cdf2c1b4494568de8785ac56ca734616e196.tar.gz
uwsgi: fixups for gcc 7.x
Apply several upstream patches to fixup fallthrough switch statements. This fixes build failures such as: | core/hash.c:44:13: error: this statement may fall through [-Werror=implicit-fallthrough=] | h ^= key[2] << 16; | ~~^~~~~~~~~~~~~~~ | core/hash.c:45:7: note: here | case 2: | ^~~~ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-extended/uwsgi/files/Add-explicit-breaks-to-avoid-implicit-passthrough.patch')
-rw-r--r--meta-openstack/recipes-extended/uwsgi/files/Add-explicit-breaks-to-avoid-implicit-passthrough.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/meta-openstack/recipes-extended/uwsgi/files/Add-explicit-breaks-to-avoid-implicit-passthrough.patch b/meta-openstack/recipes-extended/uwsgi/files/Add-explicit-breaks-to-avoid-implicit-passthrough.patch
new file mode 100644
index 0000000..4b9c015
--- /dev/null
+++ b/meta-openstack/recipes-extended/uwsgi/files/Add-explicit-breaks-to-avoid-implicit-passthrough.patch
@@ -0,0 +1,50 @@
1From 0a14d0f0425f00421a69f0ca8e09a92cfdfc6a36 Mon Sep 17 00:00:00 2001
2From: Paul Tagliamonte <paultag@gmail.com>
3Date: Mon, 7 Aug 2017 11:18:56 -0400
4Subject: [PATCH] Add explicit breaks to avoid implicit passthrough.
5
6commit 0a14d0f0425f00421a69f0ca8e09a92cfdfc6a36 from upstream
7git://github.com/unbit/uwsgi.git
8
9-Werror=implicit-fallthrough was added in gcc 7.1, which will
10throw a compile error if a switch has an implicit passthrough.
11
12Seeing as how this switch doesn't appear to depend on passthrough to
13function correctly, I've added explicit breaks to the switch.
14
15From https://gcc.gnu.org/gcc-7/changes.html:
16
17-Wimplicit-fallthrough warns when a switch case falls through. This
18warning has five different levels. The compiler is able to parse a wide
19range of fallthrough comments, depending on the level. It also handles
20control-flow statements, such as ifs. It's possible to suppress the
21warning by either adding a fallthrough comment, or by using a null
22statement: __attribute__ ((fallthrough)); (C, C++), or [[fallthrough]];
23(C++17), or [[gnu::fallthrough]]; (C++11/C++14). This warning is enabled
24by -Wextra.
25---
26 core/hash.c | 3 +++
27 1 file changed, 3 insertions(+)
28
29diff --git a/core/hash.c b/core/hash.c
30index a1288fa..9ae6bd2 100644
31--- a/core/hash.c
32+++ b/core/hash.c
33@@ -42,11 +42,14 @@ static uint32_t murmur2_hash(char *key, uint64_t keylen) {
34 switch (keylen) {
35 case 3:
36 h ^= key[2] << 16;
37+ break;
38 case 2:
39 h ^= key[1] << 8;
40+ break;
41 case 1:
42 h ^= key[0];
43 h *= 0x5bd1e995;
44+ break;
45 }
46
47 h ^= h >> 13;
48--
492.7.4
50