diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 563aff009de..9bdd53f6a01 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-03  Richard Sandiford  <richard@codesourcery.com>
+
+	* config/mips/mips.md (fetchop_bit): Use define_code_iterator
+	rather than define_code_macro.
+
 2007-09-03  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	* gcc.c (xputenv): New function.
diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md
index 368da18077c..6cda709aca0 100644
--- a/gcc/config/mips/mips.md
+++ b/gcc/config/mips/mips.md
@@ -609,7 +609,7 @@
 				 (ungt "ult")])
 
 ;; Atomic fetch bitwise operations.
-(define_code_macro fetchop_bit [ior xor and])
+(define_code_iterator fetchop_bit [ior xor and])
 
 ;; <immediate_insn> expands to the name of the insn that implements
 ;; a particular code to operate in immediate values.