From 8674be792462bc4469b04723484c63ab4c7ad895 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 20 Sep 2018 10:10:07 +0200 Subject: Fold i386-v4-nat.c into i386-sol2-nat.c I've been carrying around the following patch for some time. I noticed that both i386-sol2-nat.c and i386-v4-nat.c are Solaris-only now and it seems confusing to carry both around. So this patch merges i386-v4-nat.c into i386-sol2-nat.c, simplifying it in a couple of places, like removing checks for macros that are always defined. Tested on 64-bit Solaris 11.5/x86 (amd64-pc-solaris2.11) and 32-bit Solaris 11.3/x86 (i386-pc-solaris2.11) half a year ago. * i386-v4-nat.c (regmap, supply_gregset, fill_gregset) (supply_fpregset, fill_fpregset): Move ... * i386-sol2-nat.c [PR_MODEL_NATIVE != PR_MODEL_LP64]: ... here. Remove HAVE_GREGSET_T, HAVE_FPREGET_T guards. Remove references to ioctl-based procfs. Include . Remove PR_MODEL_NATIVE guards. * configure.nat (NATDEPFILES): Remove i386-v4-nat.o. * Makefile.in (ALLDEPFILES): Remove i386-v4-nat.c. --- gdb/configure.nat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gdb/configure.nat') diff --git a/gdb/configure.nat b/gdb/configure.nat index feddeaa..10bf65f 100644 --- a/gdb/configure.nat +++ b/gdb/configure.nat @@ -465,7 +465,7 @@ case ${gdb_host} in i386) # Host: Solaris x86_64 NATDEPFILES="${NATDEPFILES} \ - amd64-nat.o i386-v4-nat.o i386-sol2-nat.o" + amd64-nat.o i386-sol2-nat.o" ;; sparc) # Host: Solaris SPARC & UltraSPARC -- cgit v1.1