diff --git a/gas/ChangeLog b/gas/ChangeLog
index cf373d8281..d47f020b91 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-09  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config/tc-mips.c (s_cpsetup): Use '__gnu_local_gp' instead of '_gp'
+	for -mno-shared optimization.
+
 2005-03-09  Richard Sandiford  <rsandifo@redhat.com>
 
 	* config/tc-mips.c (MAX_VR4130_NOPS, MAX_DELAY_NOPS): New macros.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index c16125bf13..655be764c6 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -11824,7 +11824,7 @@ s_cpsetup (int ignore ATTRIBUTE_UNUSED)
       expressionS ex;
 
       ex.X_op = O_symbol;
-      ex.X_add_symbol = symbol_find_or_make ("_gp");
+      ex.X_add_symbol = symbol_find_or_make ("__gnu_local_gp");
       ex.X_op_symbol = NULL;
       ex.X_add_number = 0;