[COMMIT] Prepare Solaris x86 for 64-bit Solaris 10

Mark Kettenis kettenis@gnu.org
Sun Oct 31 15:35:00 GMT 2004


   Date: Sat, 30 Oct 2004 16:59:28 -0400
   From: Andrew Cagney <cagney@gnu.org>

   What we're not going to add is screwed up #include inheritance, can you 
   revert that?

Damn.  I'd hoped I could get away with that.  Well, here's a different
approach.  Spreads the logic over two files so it becomes a bit more
difficult to keep things in synch.

Committed,

Mark


Index: ChangeLog
from  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.

Index: i386v4-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/i386v4-nat.c,v
retrieving revision 1.14
diff -u -p -r1.14 i386v4-nat.c
--- i386v4-nat.c 27 Jun 2004 21:52:21 -0000 1.14
+++ i386v4-nat.c 31 Oct 2004 15:32:18 -0000
@@ -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, in
 
 #endif /* HAVE_FPREGSET_T */
 
+#endif /* not 64-bit.  */
+
 #endif /* HAVE_SYS_PROCFS_H */
Index: i386-sol2-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-sol2-nat.c,v
retrieving revision 1.1
diff -u -p -r1.1 i386-sol2-nat.c
--- i386-sol2-nat.c 30 Oct 2004 19:49:37 -0000 1.1
+++ i386-sol2-nat.c 31 Oct 2004 15:32:18 -0000
@@ -72,7 +72,6 @@ fill_fpregset (prfpregset_t *fpregs, int
 
 #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
Index: config/i386/i386sol2.mh
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/i386sol2.mh,v
retrieving revision 1.10
diff -u -p -r1.10 i386sol2.mh
--- config/i386/i386sol2.mh 30 Oct 2004 19:49:41 -0000 1.10
+++ config/i386/i386sol2.mh 31 Oct 2004 15:32:18 -0000
@@ -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



More information about the Gdb-patches mailing list