diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cc71db560c..55cc92c8ed 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-20  Yao Qi  <yao@codesourcery.com>
+
+	* amd64-tdep.c (amd64_classify): Add a blank line after the
+	example.  Move "*/" to a new line.
+	* arm-tdep.c (arm_vfp_cprc_sub_candidate): Likewise.
+	* arm-wince-tdep.c (arm_pe_skip_trampoline_code): Likewise.
+	* dwarf2read.c (psymtab_include_file_name): Likewise.
+
 2014-08-19  Andrew Burgess  <aburgess@broadcom.com>
 	    Pedro Alves  <palves@redhat.com>
 
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 173451f8e4..abd9c48f09 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -670,7 +670,9 @@ amd64_classify (struct type *type, enum amd64_reg_class class[2])
      struct complexT {
        T real;
        T imag;
-     };  */
+     };
+
+  */
   else if (code == TYPE_CODE_COMPLEX && len == 8)
     class[0] = AMD64_SSE;
   else if (code == TYPE_CODE_COMPLEX && len == 16)
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index db97fed1a9..9bc65079c5 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -3602,7 +3602,9 @@ arm_vfp_cprc_sub_candidate (struct type *t,
 	 {
 	   T real;
 	   T imag;
-	 };  */
+	 };
+
+      */
       switch (TYPE_LENGTH (t))
 	{
 	case 8:
diff --git a/gdb/arm-wince-tdep.c b/gdb/arm-wince-tdep.c
index 24f0e5b893..aff8d20e03 100644
--- a/gdb/arm-wince-tdep.c
+++ b/gdb/arm-wince-tdep.c
@@ -45,9 +45,12 @@ arm_pe_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
   CORE_ADDR next_pc;
 
   /* The format of an ARM DLL trampoline is:
+
        ldr  ip, [pc]
        ldr  pc, [ip]
-       .dw __imp_<func>  */
+       .dw __imp_<func>
+
+  */
 
   if (pc == 0
       || read_memory_unsigned_integer (pc + 0, 4, byte_order) != 0xe59fc000
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 11580cc632..157d7fb323 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -17125,7 +17125,9 @@ psymtab_include_file_name (const struct line_header *lh, int file_index,
 	 include_name = "hello.c"
 	 dir_name = "."
 	 DW_AT_comp_dir = comp_dir = "/tmp"
-	 DW_AT_name = "./hello.c"  */
+	 DW_AT_name = "./hello.c"
+
+      */
 
       if (dir_name != NULL)
 	{