diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a3bad8c4211..c158a0880d9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-01  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* config/rs6000/rs6000.md (neg<mode>2): Make this a parameterized name.
+	(allocate_stack): Use that name.  Simplify.
+
 2019-07-01  Martin Sebor  <msebor@redhat.com>
 
 	PR middle-end/90923
@@ -5,7 +10,7 @@
 	(hash_map::get_or_insert): Same.  Reformat comment.
 	* hash-set.h (hash_set::add): On insertion invoke element ctor.
 	* hash-map-tests.c (test_map_of_type_with_ctor_and_dtor): New.
- 	* hash-set-tests.c (test_map_of_type_with_ctor_and_dtor): New.
+	* hash-set-tests.c (test_map_of_type_with_ctor_and_dtor): New.
 	* hash-table.h (hash_table::operator=): Prevent copy assignment.
 	 (hash_table::hash_table (const hash_table&)): Use copy ctor
 	 instead of assignment to copy elements.
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 5947a43440b..233b896472d 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -2249,7 +2249,7 @@
   [(set_attr "type" "add")])
 
 
-(define_insn "neg<mode>2"
+(define_insn "@neg<mode>2"
   [(set (match_operand:GPR 0 "gpc_reg_operand" "=r")
 	(neg:GPR (match_operand:GPR 1 "gpc_reg_operand" "r")))]
   ""
@@ -9816,10 +9816,7 @@
     {
       operands[1] = force_reg (Pmode, operands[1]);
       neg_op0 = gen_reg_rtx (Pmode);
-      if (TARGET_32BIT)
-	emit_insn (gen_negsi2 (neg_op0, operands[1]));
-      else
-	emit_insn (gen_negdi2 (neg_op0, operands[1]));
+      emit_insn (gen_neg2 (Pmode, neg_op0, operands[1]));
     }
   else
     neg_op0 = GEN_INT (-INTVAL (operands[1]));