* i386v4-nat.c (supply_gregset, supply_fpregset, fill_gregset)

(fill_fpregset): Do not compile for 64-bit systems.
* i386-sol2-nat.c: Don't include "i386v4-nat.c".
* Makefile.in (i386-sol2-nat.o): Update dependencies.
* config/i386/i386sol2.mh (NATDEPFILES): Add back i386v4-nat.c.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 26f9b2e..ac2f04c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-31  Mark Kettenis  <kettenis@gnu.org>
+
+       * i386v4-nat.c (supply_gregset, supply_fpregset, fill_gregset)
+       (fill_fpregset): Do not compile for 64-bit systems.
+       * i386-sol2-nat.c: Don't include "i386v4-nat.c".
+       * Makefile.in (i386-sol2-nat.o): Update dependencies.
+       * config/i386/i386sol2.mh (NATDEPFILES): Add back i386v4-nat.c.
+
 2004-10-30  Andrew Cagney  <cagney@gnu.org>
 
        * mdebugread.h: Include "coff/sym.h" and "coff/symconst.h".

diff --git a/gdb/config/i386/i386sol2.mh b/gdb/config/i386/i386sol2.mh
index f63a751..4c0750e 100644 (file)
--- a/gdb/config/i386/i386sol2.mh
+++ b/gdb/config/i386/i386sol2.mh
@@ -1,4 +1,4 @@
 # Host: Solaris x86
-NATDEPFILES= fork-child.o i386-sol2-nat.o \
+NATDEPFILES= fork-child.o i386v4-nat.o i386-sol2-nat.o \
        procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o gcore.o
 NAT_FILE= nm-i386sol2.h

diff --git a/gdb/i386-sol2-nat.c b/gdb/i386-sol2-nat.c
index 60cd8e9..cdfb631 100644 (file)
--- a/gdb/i386-sol2-nat.c
+++ b/gdb/i386-sol2-nat.c
@@ -72,7 +72,6 @@ fill_fpregset (prfpregset_t *fpregs, int regnum)
 
 #else
 
-/* 32-bit Solaris x86 is very similar to SVR4.  */
-#include "i386v4-nat.c"
+/* For 32-bit Solaris x86, we use the Unix SVR4 code in i386v4-nat.c.  */
 
 #endif

diff --git a/gdb/i386v4-nat.c b/gdb/i386v4-nat.c
index a2f3cd3..c21b9ea 100644 (file)
--- a/gdb/i386v4-nat.c
+++ b/gdb/i386v4-nat.c
@@ -37,7 +37,9 @@
 
 #include <sys/procfs.h>
 
-/* Prototypes for supply_gregset etc. */
+/* We must not compile this code for 64-bit Solaris x86.  */
+#if !defined (PR_MODEL_NATIVE) || (PR_MODEL_NATIVE == PR_MODEL_ILP32)
+
 #include "gregset.h"
 
 /* The `/proc' interface divides the target machine's register set up
@@ -158,4 +160,6 @@ fill_fpregset (fpregset_t *fpregsetp, int regno)
 
 #endif /* HAVE_FPREGSET_T */
 
+#endif /* not 64-bit.  */
+
 #endif /* HAVE_SYS_PROCFS_H */