[patchv4 1/2] Remove a.out NetBSD and OpenBSD hosta and targets

[Jan Kratochvil <jan.kratochvil@redhat.com>]

On Fri, 20 Sep 2013 11:24:28 +0200, Mark Kettenis wrote:
> There's a bit of a problem here.  The removal of some of the -netbsd*
> stuff will also remove support for some of the NetBSD ELF targets.
> That should not happen.  So I think you should:
> 
> 1. Drop the configure.tgt bit from this diff.  The removal of a.out
>    support should only affect *native* builds.

OK, I see now that the targets support is indifferent for a.out vs. ELF.

One could additionally disable a.out targets (and permit their *elf
counterparts) but that would be needless limitation of GDB.
> 

> 2. Adjust the NEWS to only list the old OpenBSD/i386 and explicit
>    NetBSD a.out bits.

Not sure I understood, the NEWS file lists only the explicit hosts.


On Fri, 20 Sep 2013 10:43:24 +0200, Pedro Alves wrote:
> Should we add these to the "Configuration $host is obsolete"
> case at the top of gdb/configure.host?

Done.


Thanks,
Jan


gdb/
2013-09-21  Jan Kratochvil  <jan.kratochvil@redhat.com>

	Remove a.out NetBSD and OpenBSD hosts.
	* NEWS (Removed native configurations): New.
	* config/arm/nbsdaout.mh: Remove.
	* config/i386/nbsdaout.mh: Remove.
	* config/i386/obsdaout.mh: Remove.
	* config/m68k/nbsdaout.mh: Remove.
	* config/sparc/nbsdaout.mh: Remove.
	* config/vax/nbsdaout.mh: Remove.
	* configure.host (arm*-*-netbsd*, i[34567]86-*-netbsd*)
	(i[34567]86-*-openbsd[0-2].*, i[34567]86-*-openbsd3.[0-3])
	(m68*-*-netbsd*, sparc-*-netbsd*, vax-*-netbsd*): Add them to obsolete
	error.
	(arm*-*-netbsd*, i[34567]86-*-netbsd*, i[34567]86-*-openbsd[0-2].*)
	(i[34567]86-*-openbsd3.[0-3], m68*-*-netbsd*, sparc-*-netbsdaout*)
	(sparc-*-netbsd*, vax-*-netbsd*): Remove.

--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -25,6 +25,19 @@ Nios II ELF 			nios2*-*-elf
 Nios II GNU/Linux		nios2*-*-linux
 Texas Instruments MSP430	msp430*-*-elf
 
+* Removed native configurations
+
+Support for these a.out NetBSD and OpenBSD obsolete configurations has
+been removed.  ELF variants of these configurations are kept supported.
+
+arm*-*-netbsd*              but arm*-*-netbsdelf*       is kept supported.
+i[34567]86-*-netbsd*        but i[34567]86-*-netbsdelf* is kept supported.
+i[34567]86-*-openbsd[0-2].* but i[34567]86-*-openbsd*   is kept supported.
+i[34567]86-*-openbsd3.[0-3]
+m68*-*-netbsd*              but m68*-*-netbsdelf*       is kept supported.
+sparc-*-netbsd*             but sparc-*-netbsdelf*      is kept supported.
+vax-*-netbsd*               but vax-*-netbsdelf*        is kept supported.
+
 * New commands:
 catch rethrow
   Like "catch throw", but catches a re-thrown exception.
--- a/gdb/config/arm/nbsdaout.mh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Host: NetBSD/arm
-NATDEPFILES= fork-child.o inf-ptrace.o armnbsd-nat.o \
-	solib-sunos.o
--- a/gdb/config/i386/nbsdaout.mh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Host: NetBSD/i386 a.out
-NATDEPFILES= fork-child.o inf-ptrace.o \
-	nbsd-nat.o i386bsd-nat.o i386nbsd-nat.o bsd-kvm.o \
-	solib-sunos.o
-
-LOADLIBES= -lkvm
--- a/gdb/config/i386/obsdaout.mh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Host: OpenBSD/i386 a.out
-NATDEPFILES= fork-child.o inf-ptrace.o \
-	i386bsd-nat.o i386nbsd-nat.o i386obsd-nat.o bsd-kvm.o \
-	solib-sunos.o
-
-LOADLIBES= -lkvm
--- a/gdb/config/m68k/nbsdaout.mh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Host: NetBSD/m68k a.out
-NATDEPFILES= m68kbsd-nat.o fork-child.o inf-ptrace.o \
-	solib-sunos.o
-
-LOADLIBES= -lkvm
--- a/gdb/config/sparc/nbsdaout.mh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Host: NetBSD/sparc a.out
-NATDEPFILES= fork-child.o inf-ptrace.o \
-	sparc-nat.o sparcnbsd-nat.o bsd-kvm.o solib-sunos.o
-
-LOADLIBES= -lkvm
--- a/gdb/config/vax/nbsdaout.mh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Host: NetBSD/vax a.out
-NATDEPFILES= fork-child.o inf-ptrace.o \
-	vaxbsd-nat.o bsd-kvm.o \
-	solib-sunos.o
-
-LOADLIBES= -lkvm
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -13,12 +13,21 @@
 # The default is $host_cpu.
 
 case $host in
+ arm*-*-netbsdelf* | \
+ i[34567]86-*-netbsdelf* | \
+ m68*-*-netbsdelf* | \
+ sparc-*-netbsdelf* | \
+ vax-*-netbsdelf*)
+    ;;
  alpha*-*-osf1* | \
  alpha*-*-osf2* | \
+ arm*-*-netbsd* | \
  hppa*-*-hiux* | \
  i[34567]86-ncr-* | \
  i[34567]86-*-dgux* | \
  i[34567]86-*-lynxos* | \
+ i[34567]86-*-netbsd* | \
+ i[34567]86-*-openbsd[0-2].* | i[34567]86-*-openbsd3.[0-3] | \
  i[34567]86-*-sco3.2v5* | \
  i[34567]86-*-sco3.2v4* | \
  i[34567]86-*-sco* | \
@@ -29,7 +38,10 @@ case $host in
  i[34567]86-*-unixware* | \
  i[34567]86-*-sysv* | \
  i[34567]86-*-isc* | \
+ m68*-*-netbsd* | \
+ sparc-*-netbsd* | \
  rs6000-*-lynxos* | \
+ vax-*-netbsd* | \
  null)
     echo "*** Configuration $host is obsolete." >&2
     echo "*** Support has been REMOVED." >&2
@@ -78,7 +90,6 @@ alpha*-*-openbsd*)	gdb_host=nbsd ;;
 arm*-*-linux*)		gdb_host=linux ;;
 arm*-*-netbsdelf* | arm*-*-knetbsd*-gnu)
 			gdb_host=nbsdelf ;;
-arm*-*-netbsd*)		gdb_host=nbsdaout ;;
 arm*-*-openbsd*)	gdb_host=nbsdelf ;;
 
 hppa*-*-hpux*)
@@ -91,7 +102,6 @@ i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
 			gdb_host=fbsd ;;
 i[34567]86-*-netbsdelf* | i[34567]86-*-knetbsd*-gnu)
 			gdb_host=nbsdelf ;;
-i[34567]86-*-netbsd*)	gdb_host=nbsdaout ;;
 i[34567]86-*-go32*)	gdb_host=go32 ;;
 i[34567]86-*-mingw32*)	gdb_host=mingw
 			gdb_host_obs=mingw-hdep.o
@@ -100,8 +110,6 @@ i[34567]86-*-msdosdjgpp*) gdb_host=go32 ;;
 i[34567]86-*-linux*)	gdb_host=linux ;;
 i[34567]86-*-gnu*)	gdb_host=i386gnu ;;
 i[3456]86-*-nto*) 	gdb_host=nto ;;
-i[34567]86-*-openbsd[0-2].* | i[34567]86-*-openbsd3.[0-3])
-			gdb_host=obsdaout ;;
 i[34567]86-*-openbsd*)	gdb_host=obsd ;;
 i[34567]86-*-solaris2.1[0-9]* | x86_64-*-solaris2.1[0-9]*)
 			gdb_host=sol2-64 ;;
@@ -114,7 +122,6 @@ ia64-*-linux*)		gdb_host=linux ;;
 m68*-*-linux*)		gdb_host=linux ;;
 m68*-*-netbsdelf* | m68*-*-knetbsd*-gnu)
 			gdb_host=nbsdelf ;;
-m68*-*-netbsd*)		gdb_host=nbsdaout ;;
 m68*-*-openbsd*)	gdb_host=obsd ;;
 
 m88*-*-openbsd*)	gdb_host=obsd ;;
@@ -154,8 +161,6 @@ sparc-*-linux*)		gdb_host=linux ;;
 sparc64-*-linux*)	gdb_host=linux64 ;;
 sparc-*-netbsdelf* | sparc-*-knetbsd*-gnu)
 			gdb_host=nbsdelf ;;
-sparc-*-netbsdaout*)	gdb_host=nbsdaout ;;
-sparc-*-netbsd*)	gdb_host=nbsdaout ;;
 sparc64-*-netbsd* | sparc64-*-knetbsd*-gnu)
 			gdb_host=nbsd64 ;;
 sparc-*-openbsd*)	gdb_host=nbsdelf ;;
@@ -169,7 +174,6 @@ tilegx-*-linux*)	gdb_host=linux ;;
 vax-*-bsd*)		gdb_host=vax ;;
 vax-*-netbsdelf* | vax-*-knetbsd*-gnu)
 			gdb_host=nbsdelf ;;
-vax-*-netbsd*)		gdb_host=nbsdaout ;;
 vax-*-openbsd*)		gdb_host=obsd ;;
 vax-*-ultrix*)		gdb_host=vax ;;