Index: gcc/expmed.h
===================================================================
--- gcc/expmed.h	2010-07-13 20:38:46.000000000 +0100
+++ gcc/expmed.h	2010-07-13 20:38:50.000000000 +0100
@@ -65,14 +65,6 @@ #define CHEAPER_MULT_COST(X,Y)  ((X)->co
 				 || ((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.
Index: gcc/defaults.h
===================================================================
--- gcc/defaults.h	2010-07-13 20:38:34.000000000 +0100
+++ gcc/defaults.h	2010-07-13 20:38:39.000000000 +0100
@@ -1033,6 +1033,10 @@ #define MAX_MOVE_MAX MOVE_MAX
 #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