diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0ce8cad7355..6af68b2bd1e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-13  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* expmed.h (MAX_BITS_PER_WORD): Move to...
+	* defaults.h (MAX_BITS_PER_WORD): ...here.
+
 2010-07-13  DJ Delorie  <dj@redhat.com>
 
 	* config/h8300/h8300.c (h8300_init_once): Default to
diff --git a/gcc/defaults.h b/gcc/defaults.h
index 336f386edf0..c2e68a742e3 100644
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -1033,6 +1033,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define MIN_UNITS_PER_WORD UNITS_PER_WORD
 #endif
 
+#ifndef MAX_BITS_PER_WORD
+#define MAX_BITS_PER_WORD BITS_PER_WORD
+#endif
+
 #ifndef STACK_POINTER_OFFSET
 #define STACK_POINTER_OFFSET    0
 #endif
diff --git a/gcc/expmed.h b/gcc/expmed.h
index bd12cd25c7b..37f57557120 100644
--- a/gcc/expmed.h
+++ b/gcc/expmed.h
@@ -65,14 +65,6 @@ struct mult_cost {
 				 || ((X)->cost == (Y)->cost	\
 				     && (X)->latency < (Y)->latency))
 
-/* For compilers that support multiple targets with different word sizes,
-   MAX_BITS_PER_WORD contains the biggest value of BITS_PER_WORD.  An example
-   is the H8/300(H) compiler.  */
-
-#ifndef MAX_BITS_PER_WORD
-#define MAX_BITS_PER_WORD BITS_PER_WORD
-#endif
-
 /* This structure records a sequence of operations.
    `ops' is the number of operations recorded.
    `cost' is their total cost.