diff -urpN src/gdb/mn10300-tdep.c dev/gdb/mn10300-tdep.c
--- src/gdb/mn10300-tdep.c	2007-11-05 05:32:22.000000000 +0100
+++ dev/gdb/mn10300-tdep.c	2007-11-06 10:37:39.000000000 +0100
@@ -328,7 +328,7 @@ set_reg_offsets (struct frame_info *fi, 
 
   trad_frame_set_this_base (cache, base);
 
-  if (AM33_MODE == 2)
+  if (gdbarch_tdep (current_gdbarch)->am33_mode == 2)
     {
       /* If bit N is set in fpregmask, fsN is saved on the stack.
 	 The floating point registers are saved in ascending order.
@@ -384,7 +384,7 @@ set_reg_offsets (struct frame_info *fi, 
       trad_frame_set_reg_addr (cache, E_D2_REGNUM, base + offset);
       offset += 4;
     }
-  if (AM33_MODE)
+  if (gdbarch_tdep (current_gdbarch)->am33_mode)
     {
       if (movm_args & movm_exother_bit)
         {
@@ -603,7 +603,7 @@ mn10300_analyze_prologue (struct frame_i
 	goto finish_prologue;
     }
 
-  if (AM33_MODE == 2)
+  if (gdbarch_tdep (current_gdbarch)->am33_mode == 2)
     {
       /* Determine if any floating point registers are to be saved.
 	 Look for one of the following three prologue formats:
diff -urpN src/gdb/mn10300-tdep.h dev/gdb/mn10300-tdep.h
--- src/gdb/mn10300-tdep.h	2007-08-23 20:08:36.000000000 +0200
+++ dev/gdb/mn10300-tdep.h	2007-11-06 10:38:52.000000000 +0100
@@ -77,4 +77,3 @@ struct gdbarch_tdep
   int am33_mode;
 };
 
-#define AM33_MODE (gdbarch_tdep (current_gdbarch)->am33_mode)