diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 406234289ea5460ebb3f4ad6837dcef08c11dde7..5ad3bec3b48fb2cf67a130f663b40cc6a44a5302 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-30  Alan Modra  <amodra@bigpond.net.au>
+
+	PR target/36955
+	* config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Add
+	a use of pic_offset_table_rtx for -msecure-plt __tls_get_addr calls.
+
 2008-07-29  Jan Hubicka  <jh@suse.cz>
 
 	* c-decl.c (merge_decls): Do not handle DECL_INLINE.
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 0e03be0fe2a77f8d8846205d3d25aa212e7b9c46..e67b1a7fed8b344500e865a2ff908833c7e38f7e 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -3948,6 +3948,8 @@ rs6000_legitimize_tls_address (rtx addr, enum tls_model model)
 	  insn = emit_call_insn (insn);
 	  RTL_CONST_CALL_P (insn) = 1;
 	  use_reg (&CALL_INSN_FUNCTION_USAGE (insn), r3);
+	  if (DEFAULT_ABI == ABI_V4 && TARGET_SECURE_PLT && flag_pic)
+	    use_reg (&CALL_INSN_FUNCTION_USAGE (insn), pic_offset_table_rtx);
 	  insn = get_insns ();
 	  end_sequence ();
 	  emit_libcall_block (insn, dest, r3, addr);
@@ -3970,6 +3972,8 @@ rs6000_legitimize_tls_address (rtx addr, enum tls_model model)
 	  insn = emit_call_insn (insn);
 	  RTL_CONST_CALL_P (insn) = 1;
 	  use_reg (&CALL_INSN_FUNCTION_USAGE (insn), r3);
+	  if (DEFAULT_ABI == ABI_V4 && TARGET_SECURE_PLT && flag_pic)
+	    use_reg (&CALL_INSN_FUNCTION_USAGE (insn), pic_offset_table_rtx);
 	  insn = get_insns ();
 	  end_sequence ();
 	  tmp1 = gen_reg_rtx (Pmode);