diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ba4a8b5ead5..4b62eb41e43 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-19  Richard Sandiford  <richard@codesourcery.com>
+
+	* config/m68k/m68k.h (EXTRA_CONSTRAINT): Stop the 'T' constraint
+	from accepting 's' constraints if flag_pic.
+
 2007-01-19  Richard Sandiford  <richard@codesourcery.com>
 
 	* config/m68k/m68k.md (bordered, bunordered, buneq, bunge, bungt)
diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index e85c1d9b5fa..5ab14616224 100644
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -526,7 +526,7 @@ extern enum reg_class regno_reg_class[];
 	  || GET_CODE (XEXP (OP, 0)) == CONST))		\
    : 							\
    (CODE) == 'T'					\
-   ? ( !TARGET_PCREL 					\
+   ? (!flag_pic						\
       && (GET_CODE (OP) == SYMBOL_REF			\
 	  || GET_CODE (OP) == LABEL_REF			\
 	  || GET_CODE (OP) == CONST))			\