diff --git a/config/ChangeLog b/config/ChangeLog
index 30cb805b7..cb0b61a9a 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-07  Richard Sandiford  <richard@codesourcery.com>
+
+	* mt-sde (CFLAGS_FOR_TARGET): Add -mno-gpopt.
+	(CXXFLAGS_FOR_TARGET): Likewise.
+
 2007-08-18  Paul Brook  <paul@codesourcery.com>
             Joseph Myers  <joseph@codesourcery.com>
 
diff --git a/config/mt-sde b/config/mt-sde
index e74616105..fbdc081fe 100644
--- a/config/mt-sde
+++ b/config/mt-sde
@@ -1,8 +1,10 @@
 # We default to building libraries optimised for size.  We switch off
 # sibling-call optimization to permit interlinking of MIPS16 and
-# non-MIPS16 functions. The -mcode-xonly option allows MIPS16
-# libraries to run on Harvard-style split I/D memories, so long as
-# they have the D-to-I redirect for pc-relative loads.
-
-CFLAGS_FOR_TARGET = -Os -fno-optimize-sibling-calls -mcode-xonly
-CXXFLAGS_FOR_TARGET = -Os -fno-optimize-sibling-calls -mcode-xonly
+# non-MIPS16 functions.  The -mcode-xonly option allows MIPS16 libraries
+# to run on Harvard-style split I/D memories, so long as they have the
+# D-to-I redirect for PC-relative loads.  -mno-gpopt has two purposes:
+# it allows libraries to be used in situations where $gp != our _gp,
+# and it allows them to be built with -G8 while retaining link compability
+# with -G0 and -G4.
+CFLAGS_FOR_TARGET = -Os -fno-optimize-sibling-calls -mcode-xonly -mno-gpopt
+CXXFLAGS_FOR_TARGET = -Os -fno-optimize-sibling-calls -mcode-xonly -mno-gpopt