From c5cb628eeb96398b5217685586a8abbbfff8660a Mon Sep 17 00:00:00 2001
From: Kyrylo Tkachov <kyrylo.tkachov@arm.com>
Date: Tue, 27 Sep 2016 13:38:55 +0000
Subject: [PATCH] [ARM] Fix -Wimplicit-fallthrough warnings

	* config/arm/arm.c (const_ok_for_op): Use "Fall through" comment form
	expected by -Wimplicit-fallthrough.
	(thumb1_size_rtx_costs): Likewise.
	(thumb2_reorg): Likewise.
	(tls_mentioned_p): Add "Fall through" comment.
	(thumb2_reorg): Likewise.
	* config/arm/arm-builtins.c (arm_expand_neon_args): Use "Fall through"
	comment form expected by -Wimplicit-fallthrough.

From-SVN: r240537
---
 gcc/ChangeLog                 | 11 +++++++++++
 gcc/config/arm/arm-builtins.c |  6 +++---
 gcc/config/arm/arm.c          |  8 ++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2fe256cc63c..374a0841b7d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2016-09-27  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* config/arm/arm.c (const_ok_for_op): Use "Fall through" comment form
+	expected by -Wimplicit-fallthrough.
+	(thumb1_size_rtx_costs): Likewise.
+	(thumb2_reorg): Likewise.
+	(tls_mentioned_p): Add "Fall through" comment.
+	(thumb2_reorg): Likewise.
+	* config/arm/arm-builtins.c (arm_expand_neon_args): Use "Fall through"
+	comment form expected by -Wimplicit-fallthrough.
+
 2016-09-27  Martin Liska  <mliska@suse.cz>
 
 	PR gcov-profile/46266
diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c
index 70bcc07405f..4fafefc4050 100644
--- a/gcc/config/arm/arm-builtins.c
+++ b/gcc/config/arm/arm-builtins.c
@@ -2153,9 +2153,9 @@ arm_expand_neon_args (rtx target, machine_mode map_mode, int fcode,
 		  enum machine_mode vmode = mode[argc - 1];
 		  neon_lane_bounds (op[argc], 0, GET_MODE_NUNITS (vmode), exp);
 		}
-	      /* Fall through - if the lane index isn't a constant then
-		 the next case will error.  */
-
+	      /* If the lane index isn't a constant then the next
+		 case will error.  */
+	      /* Fall through.  */
 	    case NEON_ARG_CONSTANT:
 constant_arg:
 	      if (!(*insn_data[icode].operand[opno].predicate)
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index feb54cbc64a..705fa0078f0 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -4001,8 +4001,7 @@ const_ok_for_op (HOST_WIDE_INT i, enum rtx_code code)
 	  && ((i & 0xfffff000) == 0
 	      || ((-i) & 0xfffff000) == 0))
 	return 1;
-      /* else fall through.  */
-
+      /* Fall through.  */
     case COMPARE:
     case EQ:
     case NE:
@@ -9129,7 +9128,7 @@ thumb1_size_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer)
 	  || (GET_CODE (XEXP (x, 1)) == MULT
 	      && power_of_two_operand (XEXP (XEXP (x, 1), 1), SImode)))
 	return COSTS_N_INSNS (2);
-      /* On purpose fall through for normal RTX.  */
+      /* Fall through.  */
     case COMPARE:
     case NEG:
     case NOT:
@@ -13371,6 +13370,7 @@ tls_mentioned_p (rtx x)
       if (XINT (x, 1) == UNSPEC_TLS)
 	return 1;
 
+    /* Fall through.  */
     default:
       return 0;
     }
@@ -17568,7 +17568,7 @@ thumb2_reorg (void)
 			 test the global flag here.  */
 		      if (!optimize_size)
 			break;
-		      /* else fall through.  */
+		      /* Fall through.  */
 		    case AND:
 		    case IOR:
 		    case XOR: