diff --git a/gas/ChangeLog b/gas/ChangeLog
index bee9664ad1..3253a9fdc6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (match_simd_size): Break long line.
+	(match_mem_size): Likewise.
+
 2018-07-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/tc-i386.c (match_reg_size): Renamed to ...
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 02de778397..c4ccffc75f 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1916,11 +1916,12 @@ match_operand_size (const insn_template *t, unsigned int wanted,
 	       && !t->operand_types[wanted].bitfield.tbyte));
 }
 
-/* Return 1 if there is no conflict in SIMD register between operand GIVEN
-   and opeand WANTED for instruction template T.  */
+/* Return 1 if there is no conflict in SIMD register between operand
+   GIVEN and opeand WANTED for instruction template T.  */
 
 static INLINE int
-match_simd_size (const insn_template *t, unsigned int wanted, unsigned int given)
+match_simd_size (const insn_template *t, unsigned int wanted,
+		 unsigned int given)
 {
   return !((i.types[given].bitfield.xmmword
 	    && !t->operand_types[wanted].bitfield.xmmword)
@@ -1934,7 +1935,8 @@ match_simd_size (const insn_template *t, unsigned int wanted, unsigned int given
    and opeand WANTED for instruction template T.  */
 
 static INLINE int
-match_mem_size (const insn_template *t, unsigned int wanted, unsigned int given)
+match_mem_size (const insn_template *t, unsigned int wanted,
+		unsigned int given)
 {
   return (match_operand_size (t, wanted, given)
 	  && !((i.types[given].bitfield.unspecified