diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bdf728b6fff22f9d43c18a66460b7b7dc54050ae..16c9737f09a95c183295b2977508761162f52c4b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-09-29  Jeff Law  <law@redhat.com>
+
+	* config/i386/i386.c (ix86_adjust_stack_and_probe_stack_clash): Fix
+	typos and whitespace errors.
+	* config/i386/predicates.md (address_no_seg_operand): Likewise.
+	* config/s390/s390.c (s390_emit_prologue): Likewise.
+
 2017-09-29  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR target/81481
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index e282546c70875c204bc5457ecc01ccffb68c8d2e..98fb1ce47cbe6b0d3d86cf5c83f2bc47fd1a9d94 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -13967,7 +13967,7 @@ ix86_adjust_stack_and_probe_stack_clash (const HOST_WIDE_INT size)
 
      ?!? This should be revamped to work like aarch64 and s390 where
      we track the offset from the most recent probe.  Normally that
-     offset would be zero.  For a non-return function we would reset
+     offset would be zero.  For a noreturn function we would reset
      it to PROBE_INTERVAL - (STACK_BOUNDARY / BITS_PER_UNIT).   Then
      we just probe when we cross PROBE_INTERVAL.  */
   if (TREE_THIS_VOLATILE (cfun->decl))
@@ -14047,7 +14047,7 @@ ix86_adjust_stack_and_probe_stack_clash (const HOST_WIDE_INT size)
 			plus_constant (Pmode, sr.reg,
 				       m->fs.cfa_offset + rounded_size));
 	  RTX_FRAME_RELATED_P (insn) = 1;
-        }
+	}
 
       /* Step 3: the loop.  */
       rtx size_rtx = GEN_INT (rounded_size);
@@ -14060,7 +14060,7 @@ ix86_adjust_stack_and_probe_stack_clash (const HOST_WIDE_INT size)
 			plus_constant (Pmode, stack_pointer_rtx,
 				       m->fs.cfa_offset));
 	  RTX_FRAME_RELATED_P (insn) = 1;
-        }
+	}
       m->fs.sp_offset += rounded_size;
       emit_insn (gen_blockage ());
 
diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md
index f7854e942e551ea8957d55205528c74675b1fd6b..4e023afb1107ca2f9a7d391d879b0fce4d24eff3 100644
--- a/gcc/config/i386/predicates.md
+++ b/gcc/config/i386/predicates.md
@@ -1042,7 +1042,7 @@
 (define_predicate "SImode_address_operand"
   (match_code "subreg,zero_extend,and"))
 
-;; Return true if op if a valid address for LEA, and does not contain
+;; Return true if op is a valid address for LEA, and does not contain
 ;; a segment override.  Defined as a special predicate to allow
 ;; mode-less const_int operands pass to address_operand.
 (define_special_predicate "address_no_seg_operand"
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index d2671bae7bbaf9618b799c612894f97cae66785a..52a82df0044e4fcdd145a8005670978e2da81c61 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -11359,7 +11359,7 @@ s390_emit_prologue (void)
   /* When probing for stack-clash mitigation, we have to track the distance
      between the stack pointer and closest known reference.
 
-     Most of the time we have to make a worst cast assumption.  The
+     Most of the time we have to make a worst case assumption.  The
      only exception is when TARGET_BACKCHAIN is active, in which case
      we know *sp (offset 0) was written.  */
   HOST_WIDE_INT probe_interval