* i386-tdep.h (FPU_REG_RAW_SIZE): Define unconditionally.

* i387-nat.c, i387-tdep.c: Unconditionally include "i386-tdep.h".
* config/i386/tm-i386.h (FPU_REG_RAW_SIZE): Removed.
(SIZEOF_FPU_REGS): Don't use FPU_REG_RAW_SIZE here.

gdb/ChangeLog

@@ -1,3 +1,10 @@
+2001-11-11  Mark Kettenis  <kettenis@elgar.my.domain>
+
+	* i386-tdep.h (FPU_REG_RAW_SIZE): Define unconditionally.
+	* i387-nat.c, i387-tdep.c: Unconditionally include "i386-tdep.h".
+	* config/i386/tm-i386.h (FPU_REG_RAW_SIZE): Removed.
+	(SIZEOF_FPU_REGS): Don't use FPU_REG_RAW_SIZE here.
+
 2001-11-12  Jim Blandy  <jimb@redhat.com>
 
 	Patch from Andreas Schwab <schwab@suse.de>:

gdb/config/i386/tm-i386.h

@@ -176,8 +176,6 @@ extern CORE_ADDR i386_saved_pc_after_call (struct frame_info *frame);
 #define IS_FP_REGNUM(n) (FP0_REGNUM <= (n) && (n) <= FP7_REGNUM)
 #define IS_SSE_REGNUM(n) (XMM0_REGNUM <= (n) && (n) <= XMM7_REGNUM)
 
-#define FPU_REG_RAW_SIZE (10)
-
 /* Return the name of register REG.  */
 
 #define REGISTER_NAME(reg) i386_register_name ((reg))
@@ -203,7 +201,7 @@ extern int i386_dwarf_reg_to_regnum (int reg);
    file, so summing up the sizes of those portions actually present
    yields REGISTER_BYTES.  */
 #define SIZEOF_GREGS (NUM_GREGS * 4)
-#define SIZEOF_FPU_REGS (8 * FPU_REG_RAW_SIZE)
+#define SIZEOF_FPU_REGS (8 * 10)
 #define SIZEOF_FPU_CTRL_REGS \
   ((LAST_FPU_CTRL_REGNUM - FIRST_FPU_CTRL_REGNUM + 1) * 4)
 #define SIZEOF_SSE_REGS (8 * 16 + 4)

gdb/i386-tdep.h

@@ -22,9 +22,7 @@
 #ifndef I386_TDEP_H
 #define I386_TDEP_H
 
-#if !defined (FPU_REG_RAW_SIZE) || (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
 #define FPU_REG_RAW_SIZE 10
-#endif
 
 #if !defined (XMM0_REGNUM) || (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
 #define XMM0_REGNUM FIRST_XMM_REGNUM

gdb/i387-nat.c

@@ -24,10 +24,7 @@
 #include "regcache.h"
 
 #include "i387-nat.h"
-
-#if GDB_MULTI_ARCH > 0
 #include "i386-tdep.h"
-#endif
 
 /* FIXME: kettenis/2000-05-21: Right now more than a few i386 targets
    define their own routines to manage the floating-point registers in

gdb/i387-tdep.c

@@ -30,9 +30,7 @@
 #include "gdb_assert.h"
 #include "doublest.h"
 
-#if GDB_MULTI_ARCH >0
 #include "i386-tdep.h"
-#endif
 
 /* FIXME: Eliminate the next two functions when we have the time to
    change all the callers.  */