diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6b6a1618b63..99f3442fe27 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-30  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config/mips/mips.c (mips_global_pointer): Don't try to use $25.
+
 2003-10-30  Richard Henderson  <rth@redhat.com>
 
 	* config/mips/mips.c (mips_build_builtin_va_list): Use runtime
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 73873bf15b2..46b27f2c356 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -6039,7 +6039,8 @@ mips_global_pointer (void)
     for (regno = GP_REG_FIRST; regno <= GP_REG_LAST; regno++)
       if (!regs_ever_live[regno]
 	  && call_used_regs[regno]
-	  && !fixed_regs[regno])
+	  && !fixed_regs[regno]
+	  && regno != PIC_FUNCTION_ADDR_REGNUM)
 	return regno;
 
   return GLOBAL_POINTER_REGNUM;