diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b7852169855..d74730bc5c0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2018-01-15  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	Backport from mainline
+	2018-01-10  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR target/83629
+	* config/rs6000/rs6000.md (load_toc_v4_PIC_2, load_toc_v4_PIC_3b,
+	load_toc_v4_PIC_3c): Wrap const term in CONST RTL.
+
 2018-01-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	Backport from mainline
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 8c3ccda8d91..fe6653628c0 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -10662,27 +10662,33 @@
 
 (define_insn "load_toc_v4_PIC_2"
   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-	(mem:SI (plus:SI (match_operand:SI 1 "gpc_reg_operand" "b")
-		   (minus:SI (match_operand:SI 2 "immediate_operand" "s")
-			     (match_operand:SI 3 "immediate_operand" "s")))))]
+	(mem:SI (plus:SI
+		  (match_operand:SI 1 "gpc_reg_operand" "b")
+		  (const
+		    (minus:SI (match_operand:SI 2 "immediate_operand" "s")
+			      (match_operand:SI 3 "immediate_operand" "s"))))))]
   "TARGET_ELF && DEFAULT_ABI == ABI_V4 && flag_pic == 2"
   "lwz %0,%2-%3(%1)"
   [(set_attr "type" "load")])
 
 (define_insn "load_toc_v4_PIC_3b"
   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-	(plus:SI (match_operand:SI 1 "gpc_reg_operand" "b")
-		 (high:SI
-		   (minus:SI (match_operand:SI 2 "symbol_ref_operand" "s")
-			     (match_operand:SI 3 "symbol_ref_operand" "s")))))]
+	(plus:SI
+	  (match_operand:SI 1 "gpc_reg_operand" "b")
+	  (high:SI
+	    (const
+	      (minus:SI (match_operand:SI 2 "symbol_ref_operand" "s")
+			(match_operand:SI 3 "symbol_ref_operand" "s"))))))]
   "TARGET_ELF && TARGET_SECURE_PLT && DEFAULT_ABI == ABI_V4 && flag_pic"
   "addis %0,%1,%2-%3@ha")
 
 (define_insn "load_toc_v4_PIC_3c"
   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-	(lo_sum:SI (match_operand:SI 1 "gpc_reg_operand" "b")
-		   (minus:SI (match_operand:SI 2 "symbol_ref_operand" "s")
-			     (match_operand:SI 3 "symbol_ref_operand" "s"))))]
+	(lo_sum:SI
+	  (match_operand:SI 1 "gpc_reg_operand" "b")
+	  (const
+	    (minus:SI (match_operand:SI 2 "symbol_ref_operand" "s")
+		      (match_operand:SI 3 "symbol_ref_operand" "s")))))]
   "TARGET_ELF && TARGET_SECURE_PLT && DEFAULT_ABI == ABI_V4 && flag_pic"
   "addi %0,%1,%2-%3@l")
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5a2684da808..1579cba5372 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2018-01-15  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	Backport from mainline
+	2018-01-10  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR target/83629
+	* gcc.target/powerpc/pr83629.c: New testcase.
+
+	2018-01-12  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR target/83629
+	* gcc.target/powerpc/pr83629.c: Require ilp32.
+
 2018-01-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	Backport from mainline
diff --git a/gcc/testsuite/gcc.target/powerpc/pr83629.c b/gcc/testsuite/gcc.target/powerpc/pr83629.c
new file mode 100644
index 00000000000..ae00e145952
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr83629.c
@@ -0,0 +1,10 @@
+/* { dg-require-effective-target ilp32 } */
+/* { dg-options "-O2 -fPIC -frename-registers --param=sched-autopref-queue-depth=0 -mcpu=603" } */
+
+extern void bar (void *);
+
+void
+foo (void)
+{
+  bar ("");
+}