diff mbox

Remove Vax Ultrix and VAX BSD support

Message ID 544134FC.8070904@redhat.com
State New
Headers show

Commit Message

Pedro Alves Oct. 17, 2014, 3:25 p.m. UTC
Here's a patch that removes support for VAX Ultrix and VAX (old) BSD.

Is the NEWS bit OK?  There are no mentions of Ultrix in the manuals,
other than in stabs.texinfo, but those should stay.

--------
From 9a0eb74577883efb0273a2893e36e9e15d20df36 Mon Sep 17 00:00:00 2001
From: Pedro Alves <palves@redhat.com>
Date: Fri, 17 Oct 2014 14:49:04 +0100
Subject: [PATCH] Remove Vax Ultrix and VAX BSD support

Built and tested on x86_64 Fedora 20, with --enable-targets=all.

gdb/
2014-10-17  Pedro Alves  <palves@redhat.com>

	* Makefile.in (ALLDEPFILES): Remove vax-nat.c.
	* NEWS (Removed targets): Add VAX BSD and VAX Ultrix.
	* config/vax/vax.mh: Delete.
	* configure.host: Move vax-*-bsd* and vax-*-ultrix* to the
	obsolete configurations section.
	* configure.tgt (vax-*-*): Don't mention 4.2BSD nor Ultrix.
	* vax-nat.c: Delete file.

gdb/testsuite/
2014-10-17  Pedro Alves  <palves@redhat.com>

	* gdb.base/corefile.exp: Remove references to ultrix.
	* gdb.base/interrupt.exp: Likewise.
	* gdb.base/whatis.exp: Likewise.
	* gdb.gdb/selftest.exp: Likewise.
	* gdb.threads/manythreads.exp: Likewise.
	* gdb.threads/print-threads.exp: Likewise.
	* gdb.threads/pthreads.exp:: Likewise.
	* gdb.threads/schedlock.exp: Likewise.
---
 gdb/Makefile.in                             |   2 +-
 gdb/NEWS                                    |   2 +
 gdb/config/vax/vax.mh                       |   2 -
 gdb/configure.host                          |   4 +-
 gdb/configure.tgt                           |   2 +-
 gdb/testsuite/gdb.base/corefile.exp         |   2 +-
 gdb/testsuite/gdb.base/interrupt.exp        |   1 -
 gdb/testsuite/gdb.base/whatis.exp           |   4 +-
 gdb/testsuite/gdb.gdb/selftest.exp          |   8 +--
 gdb/testsuite/gdb.threads/manythreads.exp   |   6 +-
 gdb/testsuite/gdb.threads/print-threads.exp |   6 +-
 gdb/testsuite/gdb.threads/pthreads.exp      |   6 +-
 gdb/testsuite/gdb.threads/schedlock.exp     |   6 +-
 gdb/vax-nat.c                               | 105 ----------------------------
 14 files changed, 15 insertions(+), 141 deletions(-)
 delete mode 100644 gdb/config/vax/vax.mh
 delete mode 100644 gdb/vax-nat.c

Comments

Eli Zaretskii Oct. 17, 2014, 3:42 p.m. UTC | #1
> Date: Fri, 17 Oct 2014 16:25:48 +0100
> From: Pedro Alves <palves@redhat.com>
> 
> Here's a patch that removes support for VAX Ultrix and VAX (old) BSD.
> 
> Is the NEWS bit OK?

Yes, thanks.
Pedro Alves Oct. 24, 2014, 5:08 p.m. UTC | #2
On 10/17/2014 04:25 PM, Pedro Alves wrote:
> Here's a patch that removes support for VAX Ultrix and VAX (old) BSD.

I've pushed this in now.

Thanks,
Pedro Alves
diff mbox

Patch

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 708ab95..1da8af6 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1698,7 +1698,7 @@  ALLDEPFILES = \
 	spu-linux-nat.c spu-tdep.c spu-multiarch.c solib-spu.c \
 	tilegx-linux-nat.c tilegx-tdep.c tilegx-linux-tdep.c \
 	v850-tdep.c \
-	vax-nat.c vax-tdep.c vaxbsd-nat.c vaxnbsd-tdep.c \
+	vax-tdep.c vaxbsd-nat.c vaxnbsd-tdep.c \
 	windows-nat.c windows-tdep.c \
 	xcoffread.c \
 	xstormy16-tdep.c \
diff --git a/gdb/NEWS b/gdb/NEWS
index e48085c..a5bd643 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -52,6 +52,8 @@  Support for these obsolete configurations has been removed.
 Alpha running OSF/1 (or Tru64)		alpha*-*-osf*
 SGI Irix-5.x				mips-*-irix5*
 SGI Irix-6.x				mips-*-irix6*
+VAX running (4.2 - 4.3 Reno) BSD 	vax-*-bsd*
+VAX running Ultrix 			vax-*-ultrix*
 
 *** Changes in GDB 7.8
 
diff --git a/gdb/config/vax/vax.mh b/gdb/config/vax/vax.mh
deleted file mode 100644
index d8d7f6f..0000000
--- a/gdb/config/vax/vax.mh
+++ /dev/null
@@ -1,2 +0,0 @@ 
-# Host: VAX running 4.2BSD or Ultrix
-NATDEPFILES= vax-nat.o fork-child.o inf-ptrace.o
diff --git a/gdb/configure.host b/gdb/configure.host
index 43e41fb..d07be4b 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -41,7 +41,9 @@  case $host in
  m68*-*-netbsd* | \
  sparc-*-netbsd* | \
  rs6000-*-lynxos* | \
+ vax-*-bsd* | \
  vax-*-netbsd* | \
+ vax-*-ultrix* | \
  null)
     echo "*** Configuration $host is obsolete." >&2
     echo "*** Support has been REMOVED." >&2
@@ -168,11 +170,9 @@  sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*)
 
 tilegx-*-linux*)	gdb_host=linux ;;
 
-vax-*-bsd*)		gdb_host=vax ;;
 vax-*-netbsdelf* | vax-*-knetbsd*-gnu)
 			gdb_host=nbsdelf ;;
 vax-*-openbsd*)		gdb_host=obsd ;;
-vax-*-ultrix*)		gdb_host=vax ;;
 
 x86_64-*-linux*)	gdb_host=linux64 ;;
 x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index b4d0c8f..1d7f54b 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -630,7 +630,7 @@  vax-*-openbsd*)
 	gdb_target_obs="vax-tdep.o vaxobsd-tdep.o"
 	;;
 vax-*-*)
-	# Target: VAX running 4.2BSD or Ultrix
+	# Target: VAX
 	gdb_target_obs="vax-tdep.o"
 	;;
 
diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp
index bde2de8..5275d40 100644
--- a/gdb/testsuite/gdb.base/corefile.exp
+++ b/gdb/testsuite/gdb.base/corefile.exp
@@ -161,7 +161,7 @@  gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(.*\\).*" "up in corefile.exp"
 # Test ability to read mmap'd data
 
 gdb_test "x/8bd buf1" ".*:.*0.*1.*2.*3.*4.*5.*6.*7" "accessing original mmap data in core file"
-setup_xfail "*-*-sunos*" "*-*-ultrix*" "*-*-aix*"
+setup_xfail "*-*-sunos*" "*-*-aix*"
 set test "accessing mmapped data in core file"
 gdb_test_multiple "x/8bd buf2" "$test" {
     -re ".*:.*0.*1.*2.*3.*4.*5.*6.*7.*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
index 6c166cc..e717343 100644
--- a/gdb/testsuite/gdb.base/interrupt.exp
+++ b/gdb/testsuite/gdb.base/interrupt.exp
@@ -113,7 +113,6 @@  if ![file exists $binfile] then {
 		# other machines as well.
 
 		setup_xfail "sparc*-*-solaris2*"
-		setup_xfail "mips-*-ultrix*"
 		setup_xfail "i*86-*-solaris2*"
 		setup_xfail "*-*-sysv4*"
 		setup_xfail "vax-*-*"
diff --git a/gdb/testsuite/gdb.base/whatis.exp b/gdb/testsuite/gdb.base/whatis.exp
index 40df24a..7673657 100644
--- a/gdb/testsuite/gdb.base/whatis.exp
+++ b/gdb/testsuite/gdb.base/whatis.exp
@@ -44,14 +44,14 @@  clean_restart $binfile
 
 # Define a procedure to set up an xfail for all targets that put out a
 # `long' type as an `int' type.
-# Sun/Ultrix cc have this problem.
+# Sun cc has this problem.
 # It was said that COFF targets can not distinguish int from long either.
 
 proc setup_xfail_on_long_vs_int {} {
     global gcc_compiled
 
     if {!$gcc_compiled} {
-	setup_xfail "*-sun-sunos4*" "*-*-ultrix*" "i*86-sequent-bsd*"
+	setup_xfail "*-sun-sunos4*" "i*86-sequent-bsd*"
     }
 }
 
diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index cd066f4..0b11e12 100644
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -300,12 +300,8 @@  proc test_with_self { executable } {
 
     # We'll need this when we send a ^C to GDB.  Need to do it before we
     # run the program and gdb starts saving and restoring tty states.
-    # On Ultrix, we don't need it and it is really slow (because shell_escape
-    # doesn't use vfork).
-    if ![istarget "*-*-ultrix*"] then {
-	gdb_test "shell stty intr '^C'" ".*" \
-	    "set interrupt character in test_with_self"
-    }
+    gdb_test "shell stty intr '^C'" ".*" \
+	"set interrupt character in test_with_self"
 
     # FIXME: If we put this after the run to main, the first list
     # command doesn't print the same line as the current line where
diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp
index c35d6ab..3fe7882 100644
--- a/gdb/testsuite/gdb.threads/manythreads.exp
+++ b/gdb/testsuite/gdb.threads/manythreads.exp
@@ -35,11 +35,7 @@  runto_main
 
 # We'll need this when we send_gdb a ^C to GDB.  Need to do it before we
 # run the program and gdb starts saving and restoring tty states.
-# On Ultrix, we don't need it and it is really slow (because shell_escape
-# doesn't use vfork).
-if ![istarget "*-*-ultrix*"] then {
-    gdb_test "shell stty intr '^C'" ".*"
-}
+gdb_test "shell stty intr '^C'" ".*"
 
 set message "first continue"
 gdb_test_multiple "continue" "first continue" {
diff --git a/gdb/testsuite/gdb.threads/print-threads.exp b/gdb/testsuite/gdb.threads/print-threads.exp
index 7b2bfe3..8325596 100644
--- a/gdb/testsuite/gdb.threads/print-threads.exp
+++ b/gdb/testsuite/gdb.threads/print-threads.exp
@@ -40,11 +40,7 @@  gdb_test_no_output "set width 0"
 
 # We'll need this when we send_gdb a ^C to GDB.  Need to do it before we
 # run the program and gdb starts saving and restoring tty states.
-# On Ultrix, we don't need it and it is really slow (because shell_escape
-# doesn't use vfork).
-if ![istarget "*-*-ultrix*"] then {
-    gdb_test "shell stty intr '^C'" ".*"
-}
+gdb_test "shell stty intr '^C'" ".*"
 
 proc test_all_threads { name kill } {
     global gdb_prompt inferior_exited_re
diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
index 990dfaa..5ac3ade 100644
--- a/gdb/testsuite/gdb.threads/pthreads.exp
+++ b/gdb/testsuite/gdb.threads/pthreads.exp
@@ -40,11 +40,7 @@  gdb_test_no_output "set width 0"
 
 # We'll need this when we send_gdb a ^C to GDB.  Need to do it before we
 # run the program and gdb starts saving and restoring tty states.
-# On Ultrix, we don't need it and it is really slow (because shell_escape
-# doesn't use vfork).
-if ![istarget "*-*-ultrix*"] then {
-    gdb_test "shell stty intr '^C'" ".*"
-}
+gdb_test "shell stty intr '^C'" ".*"
 
 proc all_threads_running {} {
     global gdb_prompt
diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.threads/schedlock.exp
index e105689..c32ed0c 100644
--- a/gdb/testsuite/gdb.threads/schedlock.exp
+++ b/gdb/testsuite/gdb.threads/schedlock.exp
@@ -130,11 +130,7 @@  gdb_reinitialize_dir $srcdir/$subdir
 
 # We'll need this when we send_gdb a ^C to GDB.  Need to do it before we
 # run the program and gdb starts saving and restoring tty states.
-# On Ultrix, we don't need it and it is really slow (because shell_escape
-# doesn't use vfork).
-if ![istarget "*-*-ultrix*"] then {
-    gdb_test "shell stty intr '^C'" ".*"
-}
+gdb_test "shell stty intr '^C'" ".*"
 
 gdb_load ${binfile}
 
diff --git a/gdb/vax-nat.c b/gdb/vax-nat.c
deleted file mode 100644
index c39ae29..0000000
--- a/gdb/vax-nat.c
+++ /dev/null
@@ -1,105 +0,0 @@ 
-/* Native-dependent code for VAX UNIXen (including older BSD's).
-
-   Copyright (C) 2004-2014 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include "defs.h"
-#include "inferior.h"
-
-#include <sys/types.h>
-#include <sys/dir.h>
-#include <sys/user.h>
-
-#ifdef HAVE_SYS_PTRACE_H
-#include <sys/ptrace.h>
-#endif
-
-#ifndef PT_READ_U
-#define PT_READ_U 3
-#endif
-
-#ifdef SYS_REG_H
-/* UNIX 32V and derivatives (including 3BSD).  */
-#include <sys/reg.h>
-#else
-/* 4.2BSD and derivatives.  */
-#include <machine/reg.h>
-#endif
-
-#include "vax-tdep.h"
-#include "inf-ptrace.h"
-
-/* Address of the user structure.  This is the value for 32V; 3BSD
-   uses a different value, but hey, who's still using those systems?  */
-static CORE_ADDR vax_kernel_u_addr = 0x80020000;
-
-/* Location of the user's stored registers; usage is `u.u_ar0[XX]'.
-   For 4.2BSD and ULTRIX these are negative!  See <machine/reg.h>.  */
-static int vax_register_index[] =
-{
-  R0, R1, R2, R3, R4, R5,
-  R6, R7, R8, R9, R10, R11,
-  AP, FP, SP, PC, PS
-};
-
-static CORE_ADDR
-vax_register_u_addr (CORE_ADDR u_ar0, int regnum)
-{
-  gdb_assert (regnum >= 0 && regnum < ARRAY_SIZE (vax_register_index));
-
-  /* Type is `int *u_ar0'.  See <sys/user.h>.  */
-  return u_ar0 + vax_register_index[regnum - VAX_R0_REGNUM] * 4;
-}
-
-static CORE_ADDR
-vax_register_u_offset (struct gdbarch *gdbarch, int regnum, int store_p)
-{
-  size_t u_ar0_offset = offsetof (struct user, u_ar0);
-  CORE_ADDR u_ar0;
-  int pid;
-
-  errno = 0;
-  pid = ptid_get_pid (inferior_ptid);
-  u_ar0 = ptrace (PT_READ_U, pid, u_ar0_offset, 0);
-  if (errno)
-    perror_with_name (_("Unable to determine location of registers"));
-
-  return vax_register_u_addr (u_ar0, regnum) - vax_kernel_u_addr;
-}
-
-
-#include <nlist.h>
-
-#ifndef _PATH_UNIX
-#define _PATH_UNIX "/vmunix"
-#endif
-
-/* Provide a prototype to silence -Wmissing-prototypes.  */
-void _initialize_vax_nat (void);
-
-void
-_initialize_vax_nat (void)
-{
-  struct nlist names[2];
-
-  names[0].n_name = "_u";
-  names[1].n_name = NULL;
-  if (nlist (_PATH_UNIX, names) == 0)
-    vax_kernel_u_addr = names[0].n_value;
-
-  add_target (inf_ptrace_trad_target (vax_register_u_offset));
-}