[19.11,1/4] build: allow compile with stricter fallthrough warnings

Message ID 20190725143831.25116-2-bruce.richardson@intel.com
State New
Delegated to: Thomas Monjalon
Headers show
Series
  • synchronise meson warnings with make
Related show

Checks

Context Check Description
ci/intel-Performance-Testing success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Bruce Richardson July 25, 2019, 2:38 p.m.
DPDK currently compiles with implicit-fallthrough=2 warning level. With gcc
-Wextra flag, the default level is 3, so some minor changes are needed to
support this in DPDK.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 3 ++-
 drivers/net/fm10k/base/meson.build     | 3 ++-
 lib/librte_cmdline/cmdline_parse_num.c | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

Patch

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 6a6ed890a..728915d4a 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2521,7 +2521,8 @@  bond_ethdev_link_update(struct rte_eth_dev *ethdev, int wait_to_complete)
 				bond_ctx->mode4.slave_link.link_autoneg;
 		ethdev->data->dev_link.link_duplex =
 				bond_ctx->mode4.slave_link.link_duplex;
-		/* fall through to update link speed */
+		/* fall through */
+		/* to update link speed */
 	case BONDING_MODE_ROUND_ROBIN:
 	case BONDING_MODE_BALANCE:
 	case BONDING_MODE_TLB:
diff --git a/drivers/net/fm10k/base/meson.build b/drivers/net/fm10k/base/meson.build
index 5525cdc82..9e1022fef 100644
--- a/drivers/net/fm10k/base/meson.build
+++ b/drivers/net/fm10k/base/meson.build
@@ -12,7 +12,8 @@  sources = [
 
 error_cflags = ['-Wno-unused-parameter', '-Wno-unused-value',
 	'-Wno-strict-aliasing', '-Wno-format-extra-args',
-	'-Wno-unused-variable', '-Wno-missing-field-initializers'
+	'-Wno-unused-variable', '-Wno-missing-field-initializers',
+	'-Wno-implicit-fallthrough'
 ]
 c_args = cflags
 if allow_experimental_apis
diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/librte_cmdline/cmdline_parse_num.c
index 182ac12f0..478f181b4 100644
--- a/lib/librte_cmdline/cmdline_parse_num.c
+++ b/lib/librte_cmdline/cmdline_parse_num.c
@@ -196,7 +196,7 @@  cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res,
 
 		case HEX:
 			st = HEX_OK;
-			/* fall-through no break */
+			/* fall-through */
 		case HEX_OK:
 			if (c >= '0' && c <= '9') {
 				if (add_to_res(c - '0', &res1, 16) < 0)