10 files changed, 0 insertions, 1791 deletions

diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
deleted file mode 100644
index 2608e3c9b335..000000000000
--- a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
+++ /dev/null
@@ -1,974 +0,0 @@
-/* Live and postmortem kernel debugging functions for FreeBSD.
-   Copyright 1996 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 2 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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "defs.h"
-
-#include <errno.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <sys/sysctl.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/proc.h>
-#include <sys/user.h>
-#include "frame.h"  /* required by inferior.h */
-#include "inferior.h"
-#include "symtab.h"
-#include "symfile.h"
-#include "objfiles.h"
-#include "command.h"
-#include "bfd.h"
-#include "target.h"
-#include "gdbcore.h"
-#include <sys/stat.h>
-#include <unistd.h>
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-
-#include <machine/vmparam.h>
-#include <machine/pcb.h>
-#include <machine/tss.h>
-#include <machine/frame.h>
-
-static void kcore_files_info PARAMS ((struct target_ops *));
-
-static void kcore_close PARAMS ((int));
-
-static void get_kcore_registers PARAMS ((int));
-
-static int kcore_xfer_kmem PARAMS ((CORE_ADDR, char *, int, int, struct target_ops *));
-
-static int xfer_umem PARAMS ((CORE_ADDR, char *, int, int));
-
-static CORE_ADDR ksym_lookup PARAMS ((const char *));
-
-static int read_pcb PARAMS ((int, CORE_ADDR));
-
-static struct proc * curProc PARAMS ((void));
-
-static int set_proc_context PARAMS ((CORE_ADDR paddr));
-
-static void kcore_open PARAMS ((char *filename, int from_tty));
-
-static void kcore_detach PARAMS ((char *args, int from_tty));
-
-static void set_proc_cmd PARAMS ((char *arg, int from_tty));
-
-static void set_cpu_cmd PARAMS ((char *arg, int from_tty));
-
-static CORE_ADDR kvtophys PARAMS ((int, CORE_ADDR));
-
-static int physrd PARAMS ((int, u_int, char*, int));
-
-static int kvm_open PARAMS ((const char *efile, char *cfile, char *sfile,
-			     int perm, char *errout));
-
-static int kvm_close PARAMS ((int fd));
-
-static int kvm_write PARAMS ((int core_kd, CORE_ADDR memaddr,
-			      char *myaddr, int len));
-
-static int kvm_read PARAMS ((int core_kd, CORE_ADDR memaddr,
-			     char *myaddr, int len));
-
-static int kvm_uread PARAMS ((int core_kd, struct proc *p,
-			      CORE_ADDR memaddr, char *myaddr,
-			      int len));
-
-static int kernel_core_file_hook PARAMS ((int fd, CORE_ADDR addr,
-					  char *buf, int len));
-
-static struct kinfo_proc * kvm_getprocs PARAMS ((int cfd, int op,
-						CORE_ADDR proc, int *cnt));
-
-extern struct target_ops kcore_ops;	/* Forward decl */
-
-/* Non-zero means we are debugging a kernel core file */
-int kernel_debugging = 0;
-int kernel_writablecore = 0;
-
-static char *core_file;
-static int core_kd = -1;
-static struct proc *cur_proc;
-static CORE_ADDR kernel_start;
-
-static int ncpus;
-static int cpuid;
-static CORE_ADDR prv_space;	/* per-cpu private space */
-static int prv_space_size;
-#define prv_start	(prv_space + cpuid * prv_space_size)
-
-/*
- * Read the "thing" at kernel address 'addr' into the space pointed to
- * by point.  The length of the "thing" is determined by the type of p.
- * Result is non-zero if transfer fails.
- */
-#define kvread(addr, p) \
-	(target_read_memory ((CORE_ADDR)(addr), (char *)(p), sizeof(*(p))))
-
-
-
-/*
- * The following is FreeBSD-specific hackery to decode special frames
- * and elide the assembly-language stub.  This could be made faster by
- * defining a frame_type field in the machine-dependent frame information,
- * but we don't think that's too important right now.
- */
-enum frametype { tf_normal, tf_trap, tf_interrupt, tf_syscall };
-
-CORE_ADDR
-fbsd_kern_frame_saved_pc (fr)
-struct frame_info *fr;
-{
-       struct minimal_symbol *sym;
-       CORE_ADDR this_saved_pc;
-       enum frametype frametype;
-
-       this_saved_pc = read_memory_integer (fr->frame + 4, 4);
-       sym = lookup_minimal_symbol_by_pc (this_saved_pc);
-       frametype = tf_normal;
-       if (sym != NULL) {
-               if (strcmp (SYMBOL_NAME(sym), "calltrap") == 0)
-                       frametype = tf_trap;
-               else if (strncmp (SYMBOL_NAME(sym), "Xresume", 7) == 0)
-                       frametype = tf_interrupt;
-               else if (strcmp (SYMBOL_NAME(sym), "Xsyscall") == 0)
-                       frametype = tf_syscall;
-       }
-
-       switch (frametype) {
-       case tf_normal:
-               return (this_saved_pc);
-
-#define oEIP   offsetof(struct trapframe, tf_eip)
-
-       case tf_trap:
-               return (read_memory_integer (fr->frame + 8 + oEIP, 4));
-
-       case tf_interrupt:
-               return (read_memory_integer (fr->frame + 16 + oEIP, 4));
-
-       case tf_syscall:
-               return (read_memory_integer (fr->frame + 8 + oEIP, 4));
-#undef oEIP
-       }
-}
-
-static CORE_ADDR
-ksym_lookup (name)
-const char *name;
-{
-	struct minimal_symbol *sym;
-
-	sym = lookup_minimal_symbol (name, NULL, NULL);
-	if (sym == NULL)
-		error ("kernel symbol `%s' not found.", name);
-
-	return SYMBOL_VALUE_ADDRESS (sym);
-}
-
-static struct proc *
-curProc ()
-{
-  struct proc *p;
-  CORE_ADDR addr = ksym_lookup ("gd_curproc") + prv_start;
-
-  if (kvread (addr, &p))
-    error ("cannot read proc pointer at %x\n", addr);
-  return p;
-}
-
-/*
- * Set the process context to that of the proc structure at
- * system address paddr.
- */
-static int
-set_proc_context (paddr)
-	CORE_ADDR paddr;
-{
-  struct proc p;
-
-  if (paddr < kernel_start)
-    return (1);
-
-  cur_proc = (struct proc *)paddr;
-#ifdef notyet
-  set_kernel_boundaries (cur_proc);
-#endif
-
-  /* Fetch all registers from core file */
-  target_fetch_registers (-1);
-
-  /* Now, set up the frame cache, and print the top of stack */
-  flush_cached_frames ();
-  set_current_frame (create_new_frame (read_fp (), read_pc ()));
-  select_frame (get_current_frame (), 0);
-  return (0);
-}
-
-/* Discard all vestiges of any previous core file
-   and mark data and stack spaces as empty.  */
-
-/* ARGSUSED */
-static void
-kcore_close (quitting)
-     int quitting;
-{
-  inferior_pid = 0;	/* Avoid confusion from thread stuff */
-
-  if (core_kd)
-    {
-      kvm_close (core_kd);
-      free (core_file);
-      core_file = NULL;
-      core_kd = -1;
-    }
-}
-
-/* This routine opens and sets up the core file bfd */
-
-static void
-kcore_open (filename, from_tty)
-     char *filename;
-     int from_tty;
-{
-  const char *p;
-  struct cleanup *old_chain;
-  char buf[256], *cp;
-  int ontop;
-  CORE_ADDR addr;
-  struct pcb pcb;
-
-  target_preopen (from_tty);
-
-  unpush_target (&kcore_ops);
-
-  if (!filename)
-    {
-      /*error (core_kd?*/
-      error ( (core_kd >= 0)?
-	     "No core file specified.  (Use `detach' to stop debugging a core file.)"
-	     : "No core file specified.");
-    }
-
-  filename = tilde_expand (filename);
-  if (filename[0] != '/')
-    {
-      cp = concat (current_directory, "/", filename, NULL);
-      free (filename);
-      filename = cp;
-    }
-
-  old_chain = make_cleanup (free, filename);
-
-  /*
-   * gdb doesn't really do anything if the exec-file couldn't
-   * be opened (in that case exec_bfd is NULL). Usually that's
-   * no big deal, but kvm_open needs the exec-file's name,
-   * which results in dereferencing a NULL pointer, a real NO-NO !
-   * So, check here if the open of the exec-file succeeded.
-   */
-  if (exec_bfd == NULL) /* the open failed */
-    error ("kgdb could not open the exec-file, please check the name you used !");
-
-  core_kd = kvm_open (exec_bfd->filename, filename, NULL,
-		      kernel_writablecore? O_RDWR : O_RDONLY, "kgdb: ");
-  if (core_kd < 0)
-    perror_with_name (filename);
-
-  /* Looks semi-reasonable. Toss the old core file and work on the new. */
-
-  discard_cleanups (old_chain);	/* Don't free filename any more */
-  core_file = filename;
-  ontop = !push_target (&kcore_ops);
-
-  kernel_start = bfd_get_start_address (exec_bfd); /* XXX */
-
-  /* print out the panic string if there is one */
-  if (kvread (ksym_lookup ("panicstr"), &addr) == 0
-      && addr != 0
-      && target_read_memory (addr, buf, sizeof (buf)) == 0)
-    {
-      for (cp = buf; cp < &buf[sizeof (buf)] && *cp; cp++)
-	if (!isascii (*cp) || (!isprint (*cp) && !isspace (*cp)))
-	  *cp = '?';
-      *cp = '\0';
-      if (buf[0] != '\0')
-	printf ("panicstr: %s\n", buf);
-    }
-
-  /* Print all the panic messages if possible. */
-  if (symfile_objfile != NULL)
-    {
-      printf ("panic messages:\n---\n");
-      snprintf (buf, sizeof buf,
-		"/sbin/dmesg -N %s -M %s | \
-		 /usr/bin/awk '/^(panic:|Fatal trap) / { printing = 1 } \
-			       { if (printing) print $0 }'",
-		symfile_objfile->name, filename);
-      fflush(stdout);
-      system (buf);
-      printf ("---\n");
-    }
-
-  if (!ontop)
-    {
-      warning ("you won't be able to access this core file until you terminate\n\
-your %s; do ``info files''", target_longname);
-      return;
-    }
-
-  /* we may need this later */
-  cur_proc = (struct proc *)curProc ();
-  /* Now, set up the frame cache, and print the top of stack */
-  flush_cached_frames ();
-  set_current_frame (create_new_frame (read_fp (), read_pc ()));
-  select_frame (get_current_frame (), 0);
-  print_stack_frame (selected_frame, selected_frame_level, 1);
-}
-
-static void
-kcore_detach (args, from_tty)
-     char *args;
-     int from_tty;
-{
-  if (args)
-    error ("Too many arguments");
-  unpush_target (&kcore_ops);
-  reinit_frame_cache ();
-  if (from_tty)
-    printf_filtered ("No kernel core file now.\n");
-}
-
-/* Get the registers out of a core file.  This is the machine-
-   independent part.  Fetch_core_registers is the machine-dependent
-   part, typically implemented in the xm-file for each architecture.  */
-
-/* We just get all the registers, so we don't use regno.  */
-/* ARGSUSED */
-static void
-get_kcore_registers (regno)
-     int regno;
-{
-  struct user *uaddr;
-
-  /* find the pcb for the current process */
-  if (cur_proc == NULL || kvread (&cur_proc->p_addr, &uaddr))
-    error ("cannot read u area ptr for proc at %#x", cur_proc);
-  if (read_pcb (core_kd, (CORE_ADDR)&uaddr->u_pcb) < 0)
-    error ("cannot read pcb at %#x", &uaddr->u_pcb);
-}
-
-static void
-kcore_files_info (t)
-     struct target_ops *t;
-{
-  printf ("\t`%s'\n", core_file);
-}
-
-static int
-kcore_xfer_kmem (memaddr, myaddr, len, write, target)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-     int write;
-     struct target_ops *target;
-{
-  int ns;
-  int nu;
-
-  if (memaddr >= (CORE_ADDR)VM_MAXUSER_ADDRESS)
-    nu = 0;
-  else
-    {
-      nu = xfer_umem (memaddr, myaddr, len, write);
-      if (nu <= 0)
-	return (0);
-      if (nu == len)
-	return (nu);
-      memaddr += nu;
-      if (memaddr != (CORE_ADDR)VM_MAXUSER_ADDRESS)
-	return (nu);
-      myaddr += nu;
-      len -= nu;
-    }
-
-  ns = (write ? kvm_write : kvm_read) (core_kd, memaddr, myaddr, len);
-  if (ns < 0)
-    ns = 0;
-
-  return (nu + ns);
-}
-
-static int
-xfer_umem (memaddr, myaddr, len, write)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-     int write; /* ignored */
-{
-  int n;
-  struct proc proc;
-
-  if (cur_proc == NULL || kvread (cur_proc, &proc))
-    error ("cannot read proc at %#x", cur_proc);
-  n = kvm_uread (core_kd, &proc, memaddr, myaddr, len) ;
-
-  if (n < 0)
-    return 0;
-  return n;
-}
-
-#define	KERNOFF		((unsigned)KERNBASE)
-#define	INKERNEL(x)	((x) >= KERNOFF)
-
-static CORE_ADDR sbr;
-static CORE_ADDR curpcb;
-static int found_pcb;
-static int devmem;
-static int kfd;
-static struct pcb pcb;
-
-static void
-set_proc_cmd (arg, from_tty)
-     char *arg;
-     int from_tty;
-{
-  CORE_ADDR paddr;
-  struct kinfo_proc *kp;
-  int cnt = 0;
-
-  if (!arg)
-    error_no_arg ("proc address for new current process");
-  if (!kernel_debugging)
-    error ("not debugging kernel");
-
-  paddr = (CORE_ADDR)parse_and_eval_address (arg);
-  /* assume it's a proc pointer if it's in the kernel */
-  if (paddr >= kernel_start) {
-    if (set_proc_context(paddr))
-      error("invalid proc address");
-    } else {
-      kp = kvm_getprocs(core_kd, KERN_PROC_PID, paddr, &cnt);
-      if (!cnt)
-        error("invalid pid");
-      if (set_proc_context((CORE_ADDR)kp->kp_eproc.e_paddr))
-        error("invalid proc address");
-  }
-}
-
-static void
-set_cpu_cmd (arg, from_tty)
-     char *arg;
-     int from_tty;
-{
-  CORE_ADDR paddr;
-  struct kinfo_proc *kp;
-  int cpu, cfd;
-
-  if (!arg)
-    error_no_arg ("cpu number");
-  if (!kernel_debugging)
-    error ("not debugging kernel");
-  if (!ncpus)
-    error ("not debugging SMP kernel");
-
-  cpu = (int)parse_and_eval_address (arg);
-  if (cpu < 0 || cpu > ncpus)
-    error ("cpu number out of range");
-  cpuid = cpu;
-
-  cfd = core_kd;
-  curpcb = kvtophys(cfd, ksym_lookup ("gd_curpcb") + prv_start);
-  physrd (cfd, curpcb, (char*)&curpcb, sizeof curpcb);
-
-  if (!devmem)
-    paddr = ksym_lookup ("dumppcb") - KERNOFF;
-  else
-    paddr = kvtophys (cfd, curpcb);
-  read_pcb (cfd, paddr);
-  printf ("initial pcb at %lx\n", (unsigned long)paddr);
-
-  if ((cur_proc = curProc()))
-    target_fetch_registers (-1);
-
-  /* Now, set up the frame cache, and print the top of stack */
-  flush_cached_frames ();
-  set_current_frame (create_new_frame (read_fp (), read_pc ()));
-  select_frame (get_current_frame (), 0);
-  print_stack_frame (selected_frame, selected_frame_level, 1);
-}
-
-/* substitutes for the stuff in libkvm which doesn't work */
-/* most of this was taken from the old kgdb */
-
-/* we don't need all this stuff, but the call should look the same */
-
-static int
-kvm_open (efile, cfile, sfile, perm, errout)
-     const char *efile;
-     char *cfile;
-     char *sfile;		/* makes this kvm_open more compatible to the one in libkvm */
-     int perm;
-     char *errout;		/* makes this kvm_open more compatible to the one in libkvm */
-{
-  struct stat stb;
-  int cfd;
-  CORE_ADDR paddr;
-
-  if ((cfd = open (cfile, perm, 0)) < 0)
-    return (cfd);
-
-  fstat (cfd, &stb);
-  if ((stb.st_mode & S_IFMT) == S_IFCHR
-      && stb.st_rdev == makedev (2, 0))
-    {
-      devmem = 1;
-      kfd = open ("/dev/kmem", perm, 0);
-    }
-
-  if (lookup_minimal_symbol("mp_ncpus", NULL, NULL)) {
-    physrd(cfd, ksym_lookup("mp_ncpus") - KERNOFF,
-	   (char*)&ncpus, sizeof(ncpus));
-    prv_space = ksym_lookup("SMP_prvspace");
-    prv_space_size = (int)ksym_lookup("gd_idlestack_top");
-    printf ("SMP %d cpus\n", ncpus);
-  } else {
-    ncpus = 0;
-    prv_space = 0;
-    prv_space_size = 0;
-  }
-  cpuid = 0;
-
-  physrd (cfd, ksym_lookup ("IdlePTD") - KERNOFF, (char*)&sbr, sizeof sbr);
-  printf ("IdlePTD %lu\n", (unsigned long)sbr);
-  curpcb = kvtophys(cfd, ksym_lookup ("gd_curpcb") + prv_start);
-  physrd (cfd, curpcb, (char*)&curpcb, sizeof curpcb);
-
-  found_pcb = 1; /* for vtophys */
-  if (!devmem)
-    paddr = ksym_lookup ("dumppcb") - KERNOFF;
-  else
-    paddr = kvtophys (cfd, curpcb);
-  read_pcb (cfd, paddr);
-  printf ("initial pcb at %lx\n", (unsigned long)paddr);
-
-  return (cfd);
-}
-
-static int
-kvm_close (fd)
-     int fd;
-{
-  return (close (fd));
-}
-
-static int
-kvm_write (core_kd, memaddr, myaddr, len)
-     int core_kd;
-     CORE_ADDR memaddr;
-     char *myaddr;
-{
-  int cc;
-
-  if (devmem)
-    {
-      if (kfd > 0)
-	{
-	  /*
-	   * Just like kvm_read, only we write.
-	   */
-	  errno = 0;
-	  if (lseek (kfd, (off_t)memaddr, 0) < 0
-	      && errno != 0)
-	    {
-	      error ("kvm_write:invalid address (%x)", memaddr);
-	      return (0);
-	    }
-	  cc = write (kfd, myaddr, len);
-	  if (cc < 0)
-	    {
-	      error ("kvm_write:write failed");
-	      return (0);
-	    }
-	  else if (cc < len)
-	    error ("kvm_write:short write");
-	  return (cc);
-	}
-      else
-	return (0);
-    }
-  else
-    {
-      printf ("kvm_write not implemented for dead kernels\n");
-      return (0);
-    }
-  /* NOTREACHED */
-}
-
-static int
-kvm_read (core_kd, memaddr, myaddr, len)
-     int core_kd;
-     CORE_ADDR memaddr;
-     char *myaddr;
-{
-  return (kernel_core_file_hook (core_kd, memaddr, myaddr, len));
-}
-
-static int
-kvm_uread (core_kd, p, memaddr, myaddr, len)
-     int core_kd;
-     register struct proc *p;
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-{
-  register char *cp;
-  char procfile[MAXPATHLEN];
-  ssize_t amount;
-  int fd;
-
-  if (devmem) 
-    {
-      sprintf (procfile, "/proc/%d/mem", p->p_pid);
-      fd = open (procfile, O_RDONLY, 0);
-      if (fd < 0)
-	{
-	  error ("cannot open %s", procfile);
-	  close (fd);
-	  return (0);
-	}
-
-      cp = myaddr;
-      while (len > 0)
-	{
-	  errno = 0;
-	  if (lseek (fd, (off_t)memaddr, 0) == -1 && errno != 0)
-	    {
-	      error ("invalid address (%x) in %s", memaddr, procfile);
-	      break;
-	    }
-	  amount = read (fd, cp, len);
-	  if (amount < 0)
-	    {
-	      error ("error reading %s", procfile);
-	      break;
-	    }
-	  if (amount == 0)
-	    {
-	      error ("EOF reading %s", procfile);
-	      break;
-	    }
-	  cp += amount;
-	  memaddr += amount;
-	  len -= amount;
-	}
-
-      close (fd);
-      return ((ssize_t) (cp - myaddr));
-    }
-  else
-    return (kernel_core_file_hook (core_kd, memaddr, myaddr, len));
-}
-
-static struct kinfo_proc kp;
-
-/*
- * try to do what kvm_proclist in libkvm would do
- */
-static int
-kvm_proclist (cfd, pid, p, cnt)
-int cfd, pid, *cnt;
-struct proc *p;
-{
-  struct proc lp;
-
-  for (; p != NULL; p = lp.p_list.le_next) {
-      if (!kvm_read(cfd, (CORE_ADDR)p, (char *)&lp, sizeof (lp)))
-            return (0);
-       if (lp.p_pid != pid)
-           continue;
-       kp.kp_eproc.e_paddr = p;
-       *cnt = 1;
-       return (1);
-  }
-  *cnt = 0;
-  return (0);
-}
-
-/*
- * try to do what kvm_deadprocs in libkvm would do
- */
-static struct kinfo_proc *
-kvm_deadprocs (cfd, pid, cnt)
-int cfd, pid, *cnt;
-{
-  CORE_ADDR allproc, zombproc;
-  struct proc *p;
-
-  allproc = ksym_lookup("allproc");
-  if (kvm_read(cfd, allproc, (char *)&p, sizeof (p)) == 0)
-      return (NULL);
-  kvm_proclist (cfd, pid, p, cnt);
-  if (!*cnt) {
-      zombproc = ksym_lookup("zombproc");
-      if (kvm_read(cfd, zombproc, (char *)&p, sizeof (p)) == 0)
-           return (NULL);
-       kvm_proclist (cfd, pid, p, cnt);
-  }
-  return (&kp);
-}
-
-/*
- * try to do what kvm_getprocs in libkvm would do
- */
-static struct kinfo_proc *
-kvm_getprocs (cfd, op, proc, cnt)
-int cfd, op, *cnt;
-CORE_ADDR proc;
-{
-  int mib[4], size;
-
-  *cnt = 0;
-  /* assume it's a pid */
-  if (devmem) { /* "live" kernel, use sysctl */
-      mib[0] = CTL_KERN;
-      mib[1] = KERN_PROC;
-      mib[2] = KERN_PROC_PID;
-      mib[3] = (int)proc;
-      size = sizeof (kp);
-      if (sysctl (mib, 4, &kp, &size, NULL, 0) < 0) {
-            perror("sysctl");
-            *cnt = 0;
-            return (NULL);
-      }
-      if (!size)
-            *cnt = 0;
-      else
-            *cnt = 1;
-      return (&kp);
-  } else
-      return (kvm_deadprocs (cfd, (int)proc, cnt));
-}
-
-static int
-physrd (cfd, addr, dat, len)
-     int cfd;
-     u_int addr;
-     char *dat;
-     int len;
-{
-  if (lseek (cfd, (off_t)addr, L_SET) == -1)
-    return (-1);
-  return (read (cfd, dat, len));
-}
-
-static CORE_ADDR
-kvtophys (fd, addr)
-     int fd;
-     CORE_ADDR addr;
-{
-  CORE_ADDR v;
-  unsigned int pte;
-  static CORE_ADDR PTD = -1;
-  CORE_ADDR current_ptd;
-
-  /*
-   * We may no longer have a linear system page table...
-   *
-   * Here's the scoop.  IdlePTD contains the physical address
-   * of a page table directory that always maps the kernel.
-   * IdlePTD is in memory that is mapped 1-to-1, so we can
-   * find it easily given its 'virtual' address from ksym_lookup().
-   * For hysterical reasons, the value of IdlePTD is stored in sbr.
-   *
-   * To look up a kernel address, we first convert it to a 1st-level
-   * address and look it up in IdlePTD.  This gives us the physical
-   * address of a page table page; we extract the 2nd-level part of
-   * VA and read the 2nd-level pte.  Finally, we add the offset part
-   * of the VA into the physical address from the pte and return it.
-   *
-   * User addresses are a little more complicated.  If we don't have
-   * a current PCB from read_pcb(), we use PTD, which is the (fixed)
-   * virtual address of the current ptd.  Since it's NOT in 1-to-1
-   * kernel space, we must look it up using IdlePTD.  If we do have
-   * a pcb, we get the ptd from pcb_ptd.
-   */
-
-  if (INKERNEL (addr))
-    current_ptd = sbr;
-  else if (found_pcb == 0)
-    {
-      if (PTD == -1)
-	PTD = kvtophys (fd, ksym_lookup ("PTD"));
-      current_ptd = PTD;
-    }
-  else
-    current_ptd = pcb.pcb_cr3;
-
-  /*
-   * Read the first-level page table (ptd).
-   */
-  v = current_ptd + ( (unsigned)addr >> PDRSHIFT) * sizeof pte;
-  if (physrd (fd, v, (char *)&pte, sizeof pte) < 0 || (pte&PG_V) == 0)
-    return (~0);
-
-  if (pte & PG_PS)
-    {
-      /*
-       * No second-level page table; ptd describes one 4MB page.
-       * (We assume that the kernel wouldn't set PG_PS without enabling
-       * it cr0, and that the kernel doesn't support 36-bit physical
-       * addresses).
-       */
-#define	PAGE4M_MASK	(NBPDR - 1)
-#define	PG_FRAME4M	(~PAGE4M_MASK)
-      addr = (pte & PG_FRAME4M) + (addr & PAGE4M_MASK);
-    }
-  else
-    {
-      /*
-       * Read the second-level page table.
-       */
-      v = (pte&PG_FRAME) + ((addr >> PAGE_SHIFT)&(NPTEPG-1)) * sizeof pte;
-      if (physrd (fd, v, (char *) &pte, sizeof (pte)) < 0 || (pte&PG_V) == 0)
-	return (~0);
-
-      addr = (pte & PG_FRAME) + (addr & PAGE_MASK);
-    }
-#if 0
-  printf ("vtophys (%x) -> %x\n", oldaddr, addr);
-#endif
-  return (addr);
-}
-
-static int
-read_pcb (fd, uaddr)
-     int fd;
-     CORE_ADDR uaddr;
-{
-  int i;
-  int noreg;
-  CORE_ADDR nuaddr = uaddr;
-
-  /* need this for the `proc' command to work */
-  if (INKERNEL(uaddr))
-      nuaddr = kvtophys(fd, uaddr);
-
-  if (physrd (fd, nuaddr, (char *)&pcb, sizeof pcb) < 0)
-    {
-      error ("cannot read pcb at %x\n", uaddr);
-      return (-1);
-    }
-
-  /*
-   * get the register values out of the sys pcb and
-   * store them where `read_register' will find them.
-   */
-  /*
-   * XXX many registers aren't available.
-   * XXX for the non-core case, the registers are stale - they are for
-   *     the last context switch to the debugger.
-   * XXX gcc's register numbers aren't all #defined in tm-i386.h.
-   */
-  noreg = 0;
-  for (i = 0; i < 3; ++i)		/* eax,ecx,edx */
-    supply_register (i, (char *)&noreg);
-  supply_register (3, (char *)&pcb.pcb_ebx);
-  supply_register (SP_REGNUM, (char *)&pcb.pcb_esp);
-  supply_register (FP_REGNUM, (char *)&pcb.pcb_ebp);
-  supply_register (6, (char *)&pcb.pcb_esi);
-  supply_register (7, (char *)&pcb.pcb_edi);
-  supply_register (PC_REGNUM, (char *)&pcb.pcb_eip);
-  for (i = 9; i < 14; ++i)		/* eflags, cs, ss, ds, es, fs */
-    supply_register (i, (char *)&noreg);
-  supply_register (15, (char *)&pcb.pcb_gs);
-
-  /* XXX 80387 registers? */
-}
-
-/*
- * read len bytes from kernel virtual address 'addr' into local
- * buffer 'buf'.  Return numbert of bytes if read ok, 0 otherwise.  On read
- * errors, portion of buffer not read is zeroed.
- */
-
-static int
-kernel_core_file_hook (fd, addr, buf, len)
-     int fd;
-     CORE_ADDR addr;
-     char *buf;
-     int len;
-{
-  int i;
-  CORE_ADDR paddr;
-  register char *cp;
-  int cc;
-
-  cp = buf;
-
-  while (len > 0)
-    {
-      paddr = kvtophys (fd, addr);
-      if (paddr == ~0)
-	{
-	  memset (buf, '\000', len);
-	  break;
-	}
-      /* we can't read across a page boundary */
-      i = min (len, PAGE_SIZE - (addr & PAGE_MASK));
-      if ( (cc = physrd (fd, paddr, cp, i)) <= 0)
-	{
-	  memset (cp, '\000', len);
-	  return (cp - buf);
-	}
-      cp += cc;
-      addr += cc;
-      len -= cc;
-    }
-  return (cp - buf);
-}
-
-static struct target_ops kcore_ops;
-
-void
-_initialize_kcorelow()
-{
-  kcore_ops.to_shortname = "kcore";
-  kcore_ops.to_longname = "Kernel core dump file";
-  kcore_ops.to_doc =
-    "Use a core file as a target.  Specify the filename of the core file.";
-  kcore_ops.to_open = kcore_open;
-  kcore_ops.to_close = kcore_close;
-  kcore_ops.to_attach = find_default_attach;
-  kcore_ops.to_detach = kcore_detach;
-  kcore_ops.to_fetch_registers = get_kcore_registers;
-  kcore_ops.to_xfer_memory = kcore_xfer_kmem;
-  kcore_ops.to_files_info = kcore_files_info;
-  kcore_ops.to_create_inferior = find_default_create_inferior;
-  kcore_ops.to_stratum = kcore_stratum;
-  kcore_ops.to_has_memory = 1;
-  kcore_ops.to_has_stack = 1;
-  kcore_ops.to_has_registers = 1;
-  kcore_ops.to_magic = OPS_MAGIC;
-
-  add_target (&kcore_ops);
-  add_com ("proc", class_obscure, set_proc_cmd, "Set current process context");
-  add_com ("cpu", class_obscure, set_cpu_cmd, "Set current cpu");
-}
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64 b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
deleted file mode 100644
index 96c0bc74af5b..000000000000
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# $FreeBSD$
-#
-
-SRCS+=		i386-dis.c
-CFLAGS+=	-DARCH_i386
diff --git a/gnu/usr.bin/cvs/cvs/prepend_args.c b/gnu/usr.bin/cvs/cvs/prepend_args.c
deleted file mode 100644
index 12322ce48bdf..000000000000
--- a/gnu/usr.bin/cvs/cvs/prepend_args.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* prepend_args.c - utilility programs for manpiulating argv[]
-   Copyright (C) 1999 Free Software Foundation, Inc.
-
-   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 2, 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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-/* $FreeBSD$ */
-
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include "cvs.h"
-#include "prepend_args.h"
-
-
-/* Find the white-space-separated options specified by OPTIONS, and
-   using BUF to store copies of these options, set ARGV[0], ARGV[1],
-   etc. to the option copies.  Return the number N of options found.
-   Do not set ARGV[N] to NULL.  If ARGV is NULL, do not store ARGV[0]
-   etc.  Backslash can be used to escape whitespace (and backslashes).  */
-static int
-prepend_args (options, buf, argv)
-     char const *options;
-     char *buf;
-     char **argv;
-{
-  char const *o = options;
-  char *b = buf;
-  int n = 0;
-
-  for (;;)
-    {
-      while (isspace ((unsigned char) *o))
-	o++;
-      if (!*o)
-	return n;
-      if (argv)
-	argv[n] = b;
-      n++;
-
-      do
-	if ((*b++ = *o++) == '\\' && *o)
-	  b[-1] = *o++;
-      while (*o && ! isspace ((unsigned char) *o));
-
-      *b++ = '\0';
-    }
-}
-
-/* Prepend the whitespace-separated options in OPTIONS to the argument
-   vector of a main program with argument count *PARGC and argument
-   vector *PARGV.  */
-void
-prepend_default_options (options, pargc, pargv)
-     char const *options;
-     int *pargc;
-     char ***pargv;
-{
-  if (options)
-    {
-      char *buf = xmalloc (strlen (options) + 1);
-      int prepended = prepend_args (options, buf, (char **) NULL);
-      int argc = *pargc;
-      char * const *argv = *pargv;
-      char **pp = (char **) xmalloc ((prepended + argc + 1) * sizeof *pp);
-      *pargc = prepended + argc;
-      *pargv = pp;
-      *pp++ = *argv++;
-      pp += prepend_args (options, buf, pp);
-      while ((*pp++ = *argv++))
-	continue;
-    }
-}
diff --git a/gnu/usr.bin/cvs/cvs/prepend_args.h b/gnu/usr.bin/cvs/cvs/prepend_args.h
deleted file mode 100644
index 6708442ec124..000000000000
--- a/gnu/usr.bin/cvs/cvs/prepend_args.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* prepend_args.h - utilility programs for manpiulating argv[]
-   Copyright (C) 1999 Free Software Foundation, Inc.
-
-   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 2, 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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-/* $FreeBSD$ */
-
-/* This code, taken from GNU Grep, originally used the "PARAM" macro, as the
-   current GNU coding standards requires.  Older GNU code used the "PROTO"
-   macro, before the GNU coding standards replaced it.  We use the older
-   form here to keep from having to include another file in cvs/src/main.c.  */
-
-void prepend_default_options PROTO ((char const *, int *, char ***));
diff --git a/gnu/usr.bin/cvs/lib/config.h.proto b/gnu/usr.bin/cvs/lib/config.h.proto
deleted file mode 100644
index 4de42413f50e..000000000000
--- a/gnu/usr.bin/cvs/lib/config.h.proto
+++ /dev/null
@@ -1,279 +0,0 @@
-/* $FreeBSD$ */
-/* config.h.  Generated automatically by configure.  */
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-
-/* Define if the closedir function returns void instead of int.  */
-/* #undef CLOSEDIR_VOID */
-
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef gid_t */
-
-/* Define if you support file names longer than 14 characters.  */
-#define HAVE_LONG_FILE_NAMES 1
-
-/* Define if your struct stat has st_blksize.  */
-#define HAVE_ST_BLKSIZE 1
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define if utime(file, NULL) sets file's timestamp to the present.  */
-#define HAVE_UTIME_NULL 1
-
-/* Define if you have <vfork.h>.  */
-/* #undef HAVE_VFORK_H */
-
-/* Define if on MINIX.  */
-/* #undef _MINIX */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef mode_t */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
-
-/* Define if the system does not provide POSIX.1 features except
-   with this defined.  */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef uid_t */
-
-/* Define vfork as fork if vfork does not work.  */
-/* #undef vfork */
-
-/* Define if you have MIT Kerberos version 4 available.  */
-/* #undef HAVE_KERBEROS */
-
-/* Define if you have GSSAPI with MIT Kerberos version 5 available.  */
-/* #undef HAVE_GSSAPI */
-
-/* Define if GSS_C_NT_HOSTBASED_SERVICE is defined in the gssapi.h
-   header file.  Only relevant when using GSSAPI.  */
-/* #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE */
-
-/* Define if you want CVS to be able to be a remote repository client.  */
-#define CLIENT_SUPPORT 1
-
-/* Define if you want CVS to be able to serve repositories to remote
-   clients.  */
-#define SERVER_SUPPORT 1
-
-/* Define if you want to use the password authenticated server.  */
-#define AUTH_SERVER_SUPPORT 1
-
-/* Define if you want encryption support.  */
-/* #undef ENCRYPTION */
-
-/* Define if you have the connect function.  */
-/* #undef HAVE_CONNECT */
-
-/* Define if this system supports chown(), link(), and friends.  */
-#define PRESERVE_PERMISSIONS_SUPPORT 1
-
-/* Define if you have memchr (always for CVS).  */
-#define HAVE_MEMCHR 1
-
-/* Define if you have strchr (always for CVS).  */
-#define HAVE_STRCHR 1
-
-/* Define if utime requires write access to the file (true on Windows,
-   but not Unix).  */
-/* #undef UTIME_EXPECTS_WRITABLE */
-
-/* Define if setmode is required when writing binary data to stdout.  */
-/* #undef USE_SETMODE_STDOUT */
-
-/* Define if the diff library should use setmode for binary files.
-   FIXME: Why two different macros for setmode?  */
-/* #undef HAVE_SETMODE */
-
-/* Define if you have the crypt function.  */
-#define HAVE_CRYPT 1
-
-/* Define if you have the fchdir function.  */
-#define HAVE_FCHDIR 1
-
-/* Define if you have the fchmod function.  */
-#define HAVE_FCHMOD 1
-
-/* Define if you have the fsync function.  */
-#define HAVE_FSYNC 1
-
-/* Define if you have the ftime function.  */
-/* #undef HAVE_FTIME */
-
-/* Define if you have the ftruncate function.  */
-#define HAVE_FTRUNCATE 1
-
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if you have the getspnam function.  */
-/* #undef HAVE_GETSPNAM */
-
-/* Define if you have the initgroups function.  */
-#define HAVE_INITGROUPS 1
-
-/* Define if you have the krb_get_err_text function.  */
-/* #undef HAVE_KRB_GET_ERR_TEXT */
-
-/* Define if you have the mktemp function.  */
-#define HAVE_MKTEMP 1
-
-/* Define if you have the putenv function.  */
-#define HAVE_PUTENV 1
-
-/* Define if you have the readlink function.  */
-#define HAVE_READLINK 1
-
-/* Define if you have the sigaction function.  */
-#define HAVE_SIGACTION 1
-
-/* Define if you have the sigblock function.  */
-#define HAVE_SIGBLOCK 1
-
-/* Define if you have the sigprocmask function.  */
-#define HAVE_SIGPROCMASK 1
-
-/* Define if you have the sigsetmask function.  */
-#define HAVE_SIGSETMASK 1
-
-/* Define if you have the sigvec function.  */
-#define HAVE_SIGVEC 1
-
-/* Define if you have the tempnam function.  */
-#define HAVE_TEMPNAM 1
-
-/* Define if you have the timezone function.  */
-#define HAVE_TIMEZONE 1
-
-/* Define if you have the tzset function.  */
-#define HAVE_TZSET 1
-
-/* Define if you have the vprintf function.  */
-#define HAVE_VPRINTF 1
-
-/* Define if you have the wait3 function.  */
-#define HAVE_WAIT3 1
-
-/* Define if you have the <direct.h> header file.  */
-/* #undef HAVE_DIRECT_H */
-
-/* Define if you have the <dirent.h> header file.  */
-#define HAVE_DIRENT_H 1
-
-/* Define if you have the <errno.h> header file.  */
-#define HAVE_ERRNO_H 1
-
-/* Define if you have the <fcntl.h> header file.  */
-#define HAVE_FCNTL_H 1
-
-/* Define if you have the <gssapi.h> header file.  */
-/* #undef HAVE_GSSAPI_H */
-
-/* Define if you have the <gssapi/gssapi.h> header file.  */
-/* #undef HAVE_GSSAPI_GSSAPI_H */
-
-/* Define if you have the <gssapi/gssapi_generic.h> header file.  */
-/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
-
-/* Define if you have the <io.h> header file.  */
-/* #undef HAVE_IO_H */
-
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <memory.h> header file.  */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the <ndbm.h> header file.  */
-#define HAVE_NDBM_H 1
-
-/* Define if you have the <ndir.h> header file.  */
-/* #undef HAVE_NDIR_H */
-
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <sys/bsdtypes.h> header file.  */
-/* #undef HAVE_SYS_BSDTYPES_H */
-
-/* Define if you have the <sys/dir.h> header file.  */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define if you have the <sys/file.h> header file.  */
-#define HAVE_SYS_FILE_H 1
-
-/* Define if you have the <sys/ndir.h> header file.  */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define if you have the <sys/resource.h> header file.  */
-#define HAVE_SYS_RESOURCE_H 1
-
-/* Define if you have the <sys/select.h> header file.  */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define if you have the <sys/time.h> header file.  */
-#define HAVE_SYS_TIME_H 1
-
-/* Define if you have the <sys/timeb.h> header file.  */
-#define HAVE_SYS_TIMEB_H 1
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the <utime.h> header file.  */
-#define HAVE_UTIME_H 1
-
-/* Define if you have the crypt library (-lcrypt).  */
-#define HAVE_LIBCRYPT 1
-
-/* Define if you have the gen library (-lgen).  */
-/* #undef HAVE_LIBGEN */
-
-/* Define if you have the inet library (-linet).  */
-/* #undef HAVE_LIBINET */
-
-/* Define if you have the nsl library (-lnsl).  */
-/* #undef HAVE_LIBNSL */
-
-/* Define if you have the nsl_s library (-lnsl_s).  */
-/* #undef HAVE_LIBNSL_S */
-
-/* Define if you have the sec library (-lsec).  */
-/* #undef HAVE_LIBSEC */
-
-/* Define if you have the socket library (-lsocket).  */
-/* #undef HAVE_LIBSOCKET */
diff --git a/gnu/usr.bin/gdb/doc/inc-hist.diff b/gnu/usr.bin/gdb/doc/inc-hist.diff
deleted file mode 100644
index fdd212081cd3..000000000000
--- a/gnu/usr.bin/gdb/doc/inc-hist.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-*** hsuser.texinfo	Fri May  1 23:48:48 1998
---- inc-hist.texi	Mon Jun 30 22:57:58 1997
-***************
-*** 34,42 ****
-  @end ifset
-  @ifclear BashFeatures
-  This chapter describes how to use the GNU History Library interactively,
-! from a user's standpoint.  It should be considered a user's guide.  For
-! information on using the GNU History Library in your own programs,
-! @pxref{Programming with GNU History}.
-  @end ifclear
-  
-  @ifset BashFeatures
---- 34,43 ----
-  @end ifset
-  @ifclear BashFeatures
-  This chapter describes how to use the GNU History Library interactively,
-! from a user's standpoint.
-! @c It should be considered a user's guide.  For
-! @c information on using the GNU History Library in your own programs,
-! @c @pxref{Programming with GNU History}.
-  @end ifclear
-  
-  @ifset BashFeatures
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
deleted file mode 100644
index 3f9d50617ba1..000000000000
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ /dev/null
@@ -1,33 +0,0 @@
-#	@(#)Makefile.dev	6.2 (Berkeley) 3/16/91
-# Client Makefiles define DEV and DEVFILES and provide rules for
-# individual font files
-#
-# $FreeBSD$
-
-.include "../Makefile.cfg"
-
-FONTDIR?=	/usr/share/groff_font
-DEVICEDIR?=	$(FONTDIR)/dev$(DEV)
-FONTOWN?=	${BINOWN}
-FONTGRP?=	${BINGRP}
-FONTMODE?=	${NOBINMODE}
-
-all:	$(DEVFILES)
-
-.for f in $(DEVFILES)
-.if exists(${.OBJDIR}/$f)
-beforeinstall:: ${.OBJDIR}/$f
-	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
-		${.OBJDIR}/$f $(DESTDIR)$(DEVICEDIR)
-.elif exists(${.CURDIR}/$f)
-beforeinstall:: ${.CURDIR}/$f
-	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
-		${.CURDIR}/$f $(DESTDIR)$(DEVICEDIR)
-.else
-beforeinstall:: $(DIST_DIR)/$f
-	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
-		$(DIST_DIR)/$f $(DESTDIR)$(DEVICEDIR)
-.endif
-.endfor
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty
deleted file mode 100644
index b745c0247f00..000000000000
--- a/gnu/usr.bin/groff/font/Makefile.tty
+++ /dev/null
@@ -1,55 +0,0 @@
-#	@(#)Makefile.tty	6.1 (Berkeley) 3/3/91
-#
-# Modified for Berkeley Unix by Donn Seeley, donn@okeeffe.berkeley.edu
-#
-#Copyright (C) 1989, 1990 Free Software Foundation, Inc.
-#     Written by James Clark (jjc@jclark.uucp)
-#
-#This file is part of groff.
-#
-#groff 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 1, or (at your option) any later
-#version.
-#
-#groff 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 groff; see the file LICENSE.  If not, write to the Free Software
-#Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-.MAIN: all
-
-RES=240
-CPI=10
-LPI=6
-FONTS=R I B BI S L
-
-DEVFILES=$(FONTS) DESC
-CLEANFILES=$(DEVFILES)
-
-$(FONTS): R.proto
-	@${ECHO} Making $@
-	@(charwidth=`echo  $(RES) / $(CPI) | bc` ; \
- 	 sed -e "s/^name [A-Z]*$$/name $@/" \
-	     -e "s/^\\([^	]*\\)	[0-9]+	/\\1	$$charwidth	/" \
-	     -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
-	     -e "s/^internalname .*$$/internalname $@/" \
-	     -e "/^internalname/s/BI/3/" \
-	     -e "/^internalname/s/B/2/" \
-	     -e "/^internalname/s/I/1/" \
-	     -e "/^internalname .*[^ 0-9]/d" \
-	     ${DIST_DIR}/R.proto >$@)
-
-DESC: DESC.proto
-	@${ECHO} Making $@
-	@sed -e "s/^res .*$$/res $(RES)/" \
-	    -e "s/^hor .*$$/hor `echo $(RES) / $(CPI) | bc`/" \
-	    -e "s/^vert .*$$/vert `echo $(RES) / $(LPI) | bc`/" \
-	    -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
-	    ${DIST_DIR}/DESC.proto >$@
-
-beforeinstall:: ${DEVFILES}
diff --git a/gnu/usr.bin/groff/font/devkoi8-r/R.proto b/gnu/usr.bin/groff/font/devkoi8-r/R.proto
deleted file mode 100644
index 1b327d93b49b..000000000000
--- a/gnu/usr.bin/groff/font/devkoi8-r/R.proto
+++ /dev/null
@@ -1,299 +0,0 @@
-name R
-internalname 0
-spacewidth 24
-charset
-!	24	0	0041
-"	24	0	0042
-lq	"
-rq	"
-#	24	0	0043
-sh	"
-$	24	0	0044
-Do	"
-%	24	0	0045
-&	24	0	0046
-'	24	0	0047
-aa	"
-fm	"
-aq	"
-(	24	0	0050
-)	24	0	0051
-*	24	0	0052
-**	"
-+	24	0	0053
-pl	"
-,	24	0	0054
-\-	24	0	0055
-hy	"
--	"
-mi	"
-en	"
-em      "
-.	24	0	0056
-/	24	0	0057
-sl	"
-f/	"
-0	24	0	0060
-1	24	0	0061
-2	24	0	0062
-3	24	0	0063
-4	24	0	0064
-5	24	0	0065
-6	24	0	0066
-7	24	0	0067
-8	24	0	0070
-9	24	0	0071
-:	24	0	0072
-;	24	0	0073
-<	24	0	0074
-la	"
-fo	"
-=	24	0	0075
-eq	"
->	24	0	0076
-ra	"
-fc	"
-?	24	0	0077
-@	24	0	0100
-at	"
-A	24	0	0101
-*A	"
-B	24	0	0102
-*B	"
-C	24	0	0103
-D	24	0	0104
-E	24	0	0105
-*E	"
-F	24	0	0106
-G	24	0	0107
-H	24	0	0110
-*Y	"
-I	24	0	0111
-*I	"
-J	24	0	0112
-K	24	0	0113
-*K	"
-L	24	0	0114
-M	24	0	0115
-*M	"
-N	24	0	0116
-*N	"
-O	24	0	0117
-ci	"
-*O	"
-P	24	0	0120
-*R	"
-Q	24	0	0121
-R	24	0	0122
-S	24	0	0123
-T	24	0	0124
-*T	"
-U	24	0	0125
-V	24	0	0126
-W	24	0	0127
-X	24	0	0130
-*X	"
-Y	24	0	0131
-*U	"
-Z	24	0	0132
-*Z	"
-[	24	0	0133
-lB	"
-\	24	0	0134
-rs	"
-]	24	0	0135
-rB	"
-a^	24	0	0136
-^	"
-ha	"
-_	24	0	0137
-ru	"
-ul	"
-`	24	0	0140
-oq	"
-ga	"
-a	24	0	0141
-b	24	0	0142
-c	24	0	0143
-d	24	0	0144
-e	24	0	0145
-f	24	0	0146
-g	24	0	0147
-h	24	0	0150
-i	24	0	0151
-.i	"
-j	24	0	0152
-k	24	0	0153
-l	24	0	0154
-m	24	0	0155
-n	24	0	0156
-o	24	0	0157
-*o	"
-:o	"
-/o	"
-p	24	0	0160
-q	24	0	0161
-r	24	0	0162
-s	24	0	0163
-t	24	0	0164
-u	24	0	0165
-v	24	0	0166
-w	24	0	0167
-x	24	0	0170
-mu	"
-y	24	0	0171
-z	24	0	0172
-lC	24	0	0173
-{	"
-ba	24	0	0174
-or	"
-bv	"
-br	"
-|	"
-lb	"
-lc	"
-lf	"
-lk	"
-lt	"
-rb	"
-rc	"
-rf	"
-rk	"
-rt	"
-rC	24	0	0175
-}	"
-a~	24	0	0176
-~	"
-ap	"
-ti	"
-char135 24      0       0207
-char136 24      0       0210
-char137 24      0       0211
-char138 24      0       0212
-char139 24      0       0213
-char140 24      0       0214
-char141 24      0       0215
-char142 24      0       0216
-char143 24      0       0217
-char144 24      0       0220
-char145 24      0       0221
-char146 24      0       0222
-char147 24      0       0223
-bu      24      0       0224
-char148 "
-char149 24      0       0225
-char150 24      0       0226
-~=      24      0       0227
-char151 "
-<=      24      0       0230
-char152 "
->=      24      0       0231
-char153 "
-char155 24      0       0233
-de      24      0       0234
-char156 "
-S2      24      0       0235
-char157 "
-md      24      0       0236
-char158 "
-di      24      0       0237
-char159 "
-char160 24      0       0240
-char161 24      0       0241
-char162 24      0       0242
-char163 24      0       0243
-:e      "
-char164 24      0       0244
-char165 24      0       0245
-char166 24      0       0246
-char167 24      0       0247
-char168 24      0       0250
-char169 24      0       0251
-char170 24      0       0252
-char171 24      0       0253
-char172 24      0       0254
-char173 24      0       0255
-char174 24      0       0256
-char175 24      0       0257
-char176 24      0       0260
-char177 24      0       0261
-char178 24      0       0262
-char179 24      0       0263
-:E      "
-char180 24      0       0264
-char181 24      0       0265
-char182 24      0       0266
-char183 24      0       0267
-char184 24      0       0270
-char185 24      0       0271
-char186 24      0       0272
-char187 24      0       0273
-char188 24      0       0274
-char189 24      0       0275
-char190 24      0       0276
-co      24      0       0277
-char191 "
-char192 24      0       0300
-char193 24      0       0301
-char194 24      0       0302
-char195 24      0       0303
-char196 24      0       0304
-char197 24      0       0305
-char198 24      0       0306
-char199 24      0       0307
-char200 24      0       0310
-char201 24      0       0311
-char202 24      0       0312
-char203 24      0       0313
-char204 24      0       0314
-char205 24      0       0315
-char206 24      0       0316
-char207 24      0       0317
-char208 24      0       0320
-char209 24      0       0321
-char210 24      0       0322
-char211 24      0       0323
-char212 24      0       0324
-char213 24      0       0325
-char214 24      0       0326
-char215 24      0       0327
-char216 24      0       0330
-char217 24      0       0331
-char218 24      0       0332
-char219 24      0       0333
-char220 24      0       0334
-char221 24      0       0335
-char222 24      0       0336
-char223 24      0       0337
-char224 24      0       0340
-char225 24      0       0341
-char226 24      0       0342
-char227 24      0       0343
-char228 24      0       0344
-char229 24      0       0345
-char230 24      0       0346
-char231 24      0       0347
-char232 24      0       0350
-char233 24      0       0351
-char234 24      0       0352
-char235 24      0       0353
-char236 24      0       0354
-char237 24      0       0355
-char238 24      0       0356
-char239 24      0       0357
-char240 24      0       0360
-char241 24      0       0361
-char242 24      0       0362
-char243 24      0       0363
-char244 24      0       0364
-char245 24      0       0365
-char246 24      0       0366
-char247 24      0       0367
-char248 24      0       0370
-char249 24      0       0371
-char250 24      0       0372
-char251 24      0       0373
-char252 24      0       0374
-char253 24      0       0375
-char254 24      0       0376
-char255 24      0       0377
diff --git a/gnu/usr.bin/groff/src/include/defs.h b/gnu/usr.bin/groff/src/include/defs.h
deleted file mode 100644
index df2efba57eab..000000000000
--- a/gnu/usr.bin/groff/src/include/defs.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#define PROG_PREFIX ""
-#define DEVICE "ps"
-#define FONTPATH "/usr/share/groff_font"
-#define MACROPATH "/usr/share/tmac"
-#define INDEX_SUFFIX ".i"
-#define COMMON_WORDS_FILE "/usr/share/dict/eign"
-#define DEFAULT_INDEX_DIR "/usr/share/dict/papers"
-#define DEFAULT_INDEX_NAME "Ind"
-#define DEFAULT_INDEX "/usr/share/dict/papers/Ind"