Patchwork Remove ioctl-based procfs support on Solaris

login
register
mail settings
Submitter Rainer Orth
Date Nov. 30, 2017, 1:40 p.m.
Message ID <yddshcvc2ap.fsf@CeBiTec.Uni-Bielefeld.DE>
Download mbox | patch
Permalink /patch/24629/
State New
Headers show

Comments

Rainer Orth - Nov. 30, 2017, 1:40 p.m.
Hi Pedro,

> On 09/27/2017 09:43 AM, Rainer Orth wrote:
>
>> The following patch on top of the previous one should address all this,
>> and John's comment as well.
>
> Thanks.  I have no further comments.

I've now finished testing the patch.  Except for adapting to one change
in gdb/configure.ac and regenerating gdb/configure and
gdb/gdbserver/configure, it still applies cleanly to current mainline.

For testing, I've run parallel make -k check on

* 64-bit Solaris 11.4, SPARC and x86
* 32 and 64-bit Solaris 11.3, SPARC and x86
* 64-bit Solaris 10/x86

I couldn't test on 32-bit Solaris 11.4, though:

(top-gdb) b main
Breakpoint 3 at 0x26b3a4: file /vol/src/gnu/gdb/gdb/local/gdb/gdb.c, line 25.
(top-gdb) run
Starting program: /vol/obj/gnu/gdb/gdb/12-sparcv7.no-largefile/gdb/gdb 
procfs: init_inferior, get_traced_signals line 4347, /proc/25606: Value too large for defined data type.
procfs: fetch_registers, get_gregs line 3236, /proc/25606: Value too large for defined data type.

I'll have to investigate closer what's going on here, but that problem
already exists before my patch.  I suspect that procfs cleanups
(removing support for the old non-structured procfs) are the culprit
here.

Solaris 10 testing is hampered by the fact that in a default build,
every single test FAILs.  It turned out that this happens because the
(gdb) prompt is followed by ESC [ K (gdb):

(gdb) (gdb) set height 0

while with --disable-tui I get the expected

(gdb) set height 0

This happens both with the system libcurses and with libncurses.
Haven't yet found out why.

On top of all this, testsuite results vary a bit even for subsequent
make -jN -k check runs in the same tree, and AFAICS there are no
systematic regressions in results without and with my patch.

I guess this is as good as we can get right now, so I suppose the patch
is ok for mainline now?

Thanks.
        Rainer
Pedro Alves - Nov. 30, 2017, 2:51 p.m.
On 11/30/2017 01:40 PM, Rainer Orth wrote:

> I guess this is as good as we can get right now, so I suppose the patch
> is ok for mainline now?

Go for it!

Thanks much for doing this.

Pedro Alves

Patch

# HG changeset patch
# Parent  94a80909496a9e80e1e416399af58dcfaa064354
Remove ioctl-based procfs support on Solaris

diff --git a/gdb/common/common.m4 b/gdb/common/common.m4
--- a/gdb/common/common.m4
+++ b/gdb/common/common.m4
@@ -26,7 +26,7 @@  AC_DEFUN([GDB_AC_COMMON], [
   AM_LANGINFO_CODESET
 
   AC_CHECK_HEADERS(linux/perf_event.h locale.h memory.h signal.h dnl
-		   sys/resource.h sys/socket.h sys/syscall.h dnl
+		   sys/resource.h sys/socket.h dnl
 		   sys/un.h sys/wait.h dnl
 		   thread_db.h wait.h dnl
 		   termios.h)
diff --git a/gdb/configure.ac b/gdb/configure.ac
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1305,17 +1305,11 @@  AC_HEADER_STDC
 # elf_hp.h is for HP/UX 64-bit shared library support.
 AC_CHECK_HEADERS([nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \
                   thread_db.h \
-		  sys/fault.h \
 		  sys/file.h sys/filio.h sys/ioctl.h sys/param.h \
 		  sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \
-		  sys/reg.h sys/debugreg.h sys/select.h sys/syscall.h \
+		  sys/reg.h sys/debugreg.h sys/select.h \
 		  termios.h elf_hp.h \
 		  dlfcn.h])
-AC_CHECK_HEADERS(sys/proc.h, [], [],
-[#if HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-])
 AC_CHECK_HEADERS(sys/user.h, [], [],
 [#if HAVE_SYS_PARAM_H
 # include <sys/param.h>
@@ -1533,21 +1527,6 @@  AC_CHECK_MEMBERS([struct ptrace_lwpinfo.
 AC_CHECK_MEMBERS([struct ptrace_lwpinfo.pl_syscall_code], [], [],
                  [#include <sys/ptrace.h>])
 
-# Detect which type of /proc is in use, such as for Solaris.
-
-if test "${target}" = "${host}"; then
-  case "${host}" in
-  *-*-sysv4.2* | *-*-sysv5* )
-      AC_DEFINE(NEW_PROC_API, 1,
-      [Define if you want to use new multi-fd /proc interface.])
-      ;;
-  *-*-solaris2.[[6789]] | *-*-solaris2.1[[0-9]]*)
-      AC_DEFINE(NEW_PROC_API, 1,
-      [Define if you want to use new multi-fd /proc interface.])
-      ;;
-  esac
-fi
-
 if test "$ac_cv_header_sys_procfs_h" = yes; then
   BFD_HAVE_SYS_PROCFS_TYPE(gregset_t)
   BFD_HAVE_SYS_PROCFS_TYPE(fpregset_t)
@@ -1556,11 +1535,6 @@  if test "$ac_cv_header_sys_procfs_h" = y
   BFD_HAVE_SYS_PROCFS_TYPE(prgregset32_t)
   BFD_HAVE_SYS_PROCFS_TYPE(lwpid_t)
   BFD_HAVE_SYS_PROCFS_TYPE(psaddr_t)
-  BFD_HAVE_SYS_PROCFS_TYPE(prsysent_t)
-  BFD_HAVE_SYS_PROCFS_TYPE(pr_sigset_t)
-  BFD_HAVE_SYS_PROCFS_TYPE(pr_sigaction64_t)
-  BFD_HAVE_SYS_PROCFS_TYPE(pr_siginfo64_t)
-
 
   dnl Check for broken prfpregset_t type
 
diff --git a/gdb/i386-sol2-nat.c b/gdb/i386-sol2-nat.c
--- a/gdb/i386-sol2-nat.c
+++ b/gdb/i386-sol2-nat.c
@@ -138,9 +138,7 @@  void
   /* Fill in the generic procfs methods.  */
   t = procfs_target ();
 
-#ifdef NEW_PROC_API	/* Solaris 6 and above can do HW watchpoints.  */
   procfs_use_watchpoints (t);
-#endif
 
 #if defined (PR_MODEL_NATIVE) && (PR_MODEL_NATIVE == PR_MODEL_LP64)
   amd64_native_gregset32_reg_offset = amd64_sol2_gregset32_reg_offset;
diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -28,9 +28,7 @@ 
 
 #include <inttypes.h>
 
-#ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
-#endif
 
 #if HAVE_LINUX_PERF_EVENT_H && defined(SYS_perf_event_open)
 #include <unistd.h>
diff --git a/gdb/proc-api.c b/gdb/proc-api.c
--- a/gdb/proc-api.c
+++ b/gdb/proc-api.c
@@ -1,4 +1,4 @@ 
-/* Machine independent support for SVR4 /proc (process file system) for GDB.
+/* Machine independent support for Solaris /proc (process file system) for GDB.
 
    Copyright (C) 1999-2017 Free Software Foundation, Inc.
 
@@ -22,26 +22,18 @@ 
 
 /*
  * Pretty-print trace of api calls to the /proc api
- * (ioctl or read/write calls).
- * 
  */
 
 #include "defs.h"
 #include "gdbcmd.h"
 #include "completer.h"
 
-#if defined (NEW_PROC_API)
 #define _STRUCTURED_PROC 1
-#endif
 
 #include <sys/types.h>
 #include <sys/procfs.h>
-#ifdef HAVE_SYS_PROC_H
 #include <sys/proc.h>	/* for struct proc */
-#endif
-#ifdef HAVE_SYS_USER_H
 #include <sys/user.h>	/* for struct user */
-#endif
 #include <fcntl.h>	/* for O_RDWR etc.  */
 #include "gdb_wait.h"
 
@@ -91,361 +83,34 @@  set_procfs_file_cmd (const char *args,
   procfs_file = NULL;
 }
 
-
-#ifndef NEW_PROC_API
-
-static struct trans ioctl_table[] = {
-#ifdef PIOCACINFO			/* irix */
-  { PIOCACINFO,    "PIOCACINFO",   "get process account info" },
-#endif
-  { PIOCACTION,    "PIOCACTION",   "get signal action structs" },
-#ifdef PIOCARGUMENTS			/* osf */
-  { PIOCARGUMENTS, "PIOCARGUMENTS", "command line args" },
-#endif
-#ifdef PIOCAUXV				/* solaris aux vectors */
-  { PIOCAUXV,      "PIOCAUXV",     "get aux vector" },
-  { PIOCNAUXV,     "PIOCNAUXV",    "get number of aux vector entries" },
-#endif /* AUXV */
-  { PIOCCFAULT,    "PIOCCFAULT",   "clear current fault" },
-  { PIOCCRED,      "PIOCCRED",     "get process credentials" },
-#ifdef PIOCENEVCTRS			/* irix event counters */
-  { PIOCENEVCTRS,    "PIOCENEVCTRS",    "acquire and start event counters" },
-  { PIOCGETEVCTRL,   "PIOCGETEVCTRL",   "get control info of event counters" },
-  { PIOCGETEVCTRS,   "PIOCGETEVCTRS",   "dump event counters" },
-  { PIOCGETPREVCTRS, "PIOCGETPREVCTRS", "dump event counters & prusage info" },
-  { PIOCRELEVCTRS,   "PIOCRELEVCTRS",   "release/stop event counters" },
-  { PIOCSETEVCTRL,   "PIOCSETEVCTRL",   "set control info of event counters" },
-  { PIOCGETPTIMER,   "PIOCGETPTIMER",   "get process timers" },
-#endif	/* irix event counters */
-  { PIOCGENTRY,    "PIOCGENTRY",   "get traced syscall entry set" },
-#if defined (PIOCGETPR)
-  { PIOCGETPR,     "PIOCGETPR",    "read struct proc" },
-#endif
-#if defined (PIOCGETU)
-  { PIOCGETU,      "PIOCGETU",     "read user area" },
-#endif
-#if defined (PIOCGETUTK) && (defined(KERNEL) || defined(SHOW_UTT)) /* osf */
-  { PIOCGETUTK,  "PIOCGETUTK", "get the utask struct" },
-#endif
-  { PIOCGEXIT,     "PIOCGEXIT",    "get traced syscall exit  set" },
-  { PIOCGFAULT,    "PIOCGFAULT",   "get traced fault set" },
-#ifdef PIOCGFPCR			/* osf */
-  { PIOCGFPCR,     "PIOCGFPCR",    "get FP control register" },
-  { PIOCSFPCR,     "PIOCSFPCR",    "set FP conrtol register" },
-#endif
-  { PIOCGFPREG,    "PIOCGFPREG",   "get floating point registers" },
-  { PIOCGHOLD,     "PIOCGHOLD",    "get held signal set" },
-  { PIOCGREG,      "PIOCGREG",     "get general registers" },
-  { PIOCGROUPS,    "PIOCGROUPS",   "get supplementary groups" },
-#ifdef PIOCGSPCACT			/* osf */
-  { PIOCGSPCACT,   "PIOCGSPCACT",  "get special action" },
-  { PIOCSSPCACT,   "PIOCSSPCACT",  "set special action" },
-#endif
-  { PIOCGTRACE,    "PIOCGTRACE",   "get traced signal set" },
-#ifdef PIOCGWATCH			/* irix watchpoints */
-  { PIOCGWATCH,    "PIOCGWATCH",   "get watchpoint" },
-  { PIOCSWATCH,    "PIOCSWATCH",   "set watchpoint" },
-  { PIOCNWATCH,    "PIOCNWATCH",   "get number of watchpoints" },
-#endif	/* irix watchpoints */
-#ifdef PIOCGWIN				/* solaris sparc */
-  { PIOCGWIN,      "PIOCGWIN",     "get gwindows_t" },
-#endif
-#ifdef PIOCGXREG			/* solaris sparc extra regs */
-  { PIOCGXREGSIZE, "PIOCXREGSIZE", "get extra register state size" },
-  { PIOCGXREG,     "PIOCGXREG",    "get extra register state" },
-  { PIOCSXREG,     "PIOCSXREG",    "set extra register state" },
-#endif /* XREG */
-  { PIOCKILL,      "PIOCKILL",     "send signal" },
-#ifdef PIOCLDT				/* solaris i386 */
-  { PIOCLDT,       "PIOCLDT",      "get LDT" },
-  { PIOCNLDT,      "PIOCNLDT",     "get number of LDT entries" },
-#endif
-#ifdef PIOCLSTATUS			/* solaris */
-  { PIOCLSTATUS,   "PIOCLSTATUS",  "get status of all lwps" },
-  { PIOCLUSAGE,    "PIOCLUSAGE",   "get resource usage of all lwps" },
-  { PIOCOPENLWP,   "PIOCOPENLWP",  "get lwp file descriptor" },
-  { PIOCLWPIDS,    "PIOCLWPIDS",   "get lwp identifiers" },
-#endif /* LWP */
-  { PIOCMAP,       "PIOCMAP",      "get memory map information" },
-  { PIOCMAXSIG,    "PIOCMAXSIG",   "get max signal number" },
-  { PIOCNICE,      "PIOCNICE",     "set nice priority" },
-  { PIOCNMAP,      "PIOCNMAP",     "get number of memory mappings" },
-  { PIOCOPENM,     "PIOCOPENM",    "open mapped object for reading" },
-#ifdef PIOCOPENMOBS			/* osf */
-  { PIOCOPENMOBS,  "PIOCOPENMOBS", "open mapped object" },
-#endif
-#ifdef PIOCOPENPD	/* solaris */
-  { PIOCOPENPD,    "PIOCOPENPD",   "get page data file descriptor" },
-#endif
-  { PIOCPSINFO,    "PIOCPSINFO",   "get ps(1) information" },
-  { PIOCRESET,     "PIOCRESET",    "reset process flags" },
-  { PIOCRFORK,     "PIOCRFORK",    "reset inherit-on-fork flag" },
-  { PIOCRRLC,      "PIOCRRLC",     "reset run-on-last-close flag" },
-  { PIOCRUN,       "PIOCRUN",      "make process runnable" },
-#ifdef PIOCSAVECCNTRS			/* irix */
-  { PIOCSAVECCNTRS, "PIOCSAVECCNTRS", "parent gets child cntrs" },
-#endif
-  { PIOCSENTRY,    "PIOCSENTRY",   "set traced syscall entry set" },
-  { PIOCSET,       "PIOCSET",      "set process flags" },
-  { PIOCSEXIT,     "PIOCSEXIT",    "set traced syscall exit  set" },
-  { PIOCSFAULT,    "PIOCSFAULT",   "set traced fault set" },
-  { PIOCSFORK,     "PIOCSFORK",    "set inherit-on-fork flag" },
-  { PIOCSFPREG,    "PIOCSFPREG",   "set floating point registers" },
-  { PIOCSHOLD,     "PIOCSHOLD",    "set held signal set" },
-  { PIOCSREG,      "PIOCSREG",     "set general registers" },
-  { PIOCSRLC,      "PIOCSRLC",     "set run-on-last-close flag" },
-  { PIOCSSIG,      "PIOCSSIG",     "set current signal" },
-  { PIOCSTATUS,    "PIOCSTATUS",   "get process status" },
-  { PIOCSTOP,      "PIOCSTOP",     "post stop request" },
-  { PIOCSTRACE,    "PIOCSTRACE",   "set traced signal set" },
-  { PIOCUNKILL,    "PIOCUNKILL",   "delete a signal" },
-#ifdef PIOCUSAGE	/* solaris */
-  { PIOCUSAGE,     "PIOCUSAGE",    "get resource usage" },
-#endif
-  { PIOCWSTOP,     "PIOCWSTOP",    "wait for process to stop" },
-
-#ifdef PIOCNTHR				/* osf threads */
-  { PIOCNTHR,      "PIOCNTHR",     "get thread count" },
-  { PIOCRTINH,     "PIOCRTINH",    "reset inherit-on-thread-creation" },
-  { PIOCSTINH,     "PIOCSTINH",    "set   inherit-on-thread-creation" },
-  { PIOCTLIST,     "PIOCTLIST",    "get thread ids" },
-  { PIOCXPTH,      "PIOCXPTH",     "translate port to thread handle" },
-  { PIOCTRUN,      "PIOCTRUN",     "make thread runnable" },
-  { PIOCTSTATUS,   "PIOCTSTATUS",  "get thread status" },
-  { PIOCTSTOP,     "PIOCTSTOP",    "stop a thread" },
-  /* ... TGTRACE TSTRACE TSSIG TKILL TUNKILL TCFAULT TGFAULT TSFAULT
-     TGFPREG TSFPREG TGREG TSREG TACTION TTERM TABRUN TGENTRY TSENTRY
-     TGEXIT TSEXIT TSHOLD ... thread functions */
-#endif /* osf threads */
-  { -1,            NULL,           NULL }
-};
-
-int
-ioctl_with_trace (int fd, long opcode, void *ptr, char *file, int line)
-{
-  int i = 0;
-  int ret;
-  int arg1;
-
-  prepare_to_trace ();
-
-  if (procfs_trace)
-    {
-      for (i = 0; ioctl_table[i].name != NULL; i++)
-	if (ioctl_table[i].value == opcode)
-	  break;
-
-      if (info_verbose)
-	fprintf (procfs_file ? procfs_file : stdout, 
-		 "%s:%d -- ", file, line);
-      switch (opcode) {
-      case PIOCSET:
-	arg1 = ptr ? *(long *) ptr : 0;
-	fprintf (procfs_file ? procfs_file : stdout, 
-		 "ioctl (PIOCSET,   %s) %s\n", 
-		 arg1 == PR_FORK  ? "PR_FORK"  :
-		 arg1 == PR_RLC   ? "PR_RLC"   :
-#ifdef PR_ASYNC
-		 arg1 == PR_ASYNC ? "PR_ASYNC" :
-#endif
-		 "<unknown flag>",
-		 info_verbose ? ioctl_table[i].desc : "");
-	break;
-      case PIOCRESET:
-	arg1 = ptr ? *(long *) ptr : 0;
-	fprintf (procfs_file ? procfs_file : stdout, 
-		 "ioctl (PIOCRESET, %s) %s\n", 
-		 arg1 == PR_FORK  ? "PR_FORK"  :
-		 arg1 == PR_RLC   ? "PR_RLC"   :
-#ifdef PR_ASYNC
-		 arg1 == PR_ASYNC ? "PR_ASYNC" :
-#endif
-		 "<unknown flag>",
-		 info_verbose ? ioctl_table[i].desc : "");
-	break;
-      case PIOCSTRACE:
-	fprintf (procfs_file ? procfs_file : stdout, 
-		 "ioctl (PIOCSTRACE) ");
-	proc_prettyfprint_signalset (procfs_file ? procfs_file : stdout,
-				     (sigset_t *) ptr, 0);
-	break;
-      case PIOCSFAULT:
-	fprintf (procfs_file ? procfs_file : stdout, 
-		 "ioctl (%s) ", 
-		 opcode == PIOCSFAULT ? "PIOCSFAULT" : "PIOCGFAULT");
-	proc_prettyfprint_faultset (procfs_file ? procfs_file : stdout,
-				    (fltset_t *) ptr, 0);
-	break;
-      case PIOCSENTRY:
-	fprintf (procfs_file ? procfs_file : stdout, 
-		 "ioctl (%s) ", 
-		 opcode == PIOCSENTRY ? "PIOCSENTRY" : "PIOCGENTRY");
-	proc_prettyfprint_syscalls (procfs_file ? procfs_file : stdout,
-				    (sysset_t *) ptr, 0);
-	break;
-      case PIOCSEXIT:
-	fprintf (procfs_file ? procfs_file : stdout, 
-		 "ioctl (%s) ", 
-		 opcode == PIOCSEXIT ? "PIOCSEXIT" : "PIOCGEXIT");
-	proc_prettyfprint_syscalls (procfs_file ? procfs_file : stdout,
-				    (sysset_t *) ptr, 0);
-	break;
-      case PIOCSHOLD:
-	fprintf (procfs_file ? procfs_file : stdout, 
-		 "ioctl (%s) ", 
-		 opcode == PIOCSHOLD ? "PIOCSHOLD" : "PIOCGHOLD");
-	proc_prettyfprint_signalset (procfs_file ? procfs_file : stdout,
-				     (sigset_t *) ptr, 0);
-	break;
-      case PIOCSSIG:
-	fprintf (procfs_file ? procfs_file : stdout, 
-		 "ioctl (PIOCSSIG) ");
-	proc_prettyfprint_signal (procfs_file ? procfs_file : stdout,
-				  ptr ? ((siginfo_t *) ptr)->si_signo : 0, 
-				  0);
-	fprintf (procfs_file ? procfs_file : stdout, "\n");
-	break;
-      case PIOCRUN:
-	fprintf (procfs_file ? procfs_file : stdout, 
-		 "ioctl (PIOCRUN) ");
-	
-	arg1 = ptr ? *(long *) ptr : 0;
-	if (arg1 & PRCSIG)
-	  fprintf (procfs_file ? procfs_file : stdout, "clearSig ");
-	if (arg1 & PRCFAULT)
-	  fprintf (procfs_file ? procfs_file : stdout, "clearFlt ");
-	if (arg1 & PRSTRACE)
-	  fprintf (procfs_file ? procfs_file : stdout, "setTrace ");
-	if (arg1 & PRSHOLD)
-	  fprintf (procfs_file ? procfs_file : stdout, "setHold ");
-	if (arg1 & PRSFAULT)
-	  fprintf (procfs_file ? procfs_file : stdout, "setFlt ");
-	if (arg1 & PRSVADDR)
-	  fprintf (procfs_file ? procfs_file : stdout, "setVaddr ");
-	if (arg1 & PRSTEP)
-	  fprintf (procfs_file ? procfs_file : stdout, "step ");
-	if (arg1 & PRSABORT)
-	  fprintf (procfs_file ? procfs_file : stdout, "syscallAbort ");
-	if (arg1 & PRSTOP)
-	  fprintf (procfs_file ? procfs_file : stdout, "stopReq ");
-	  
-	fprintf (procfs_file ? procfs_file : stdout, "\n");
-	break;
-      case PIOCKILL:
-	fprintf (procfs_file ? procfs_file : stdout, 
-		 "ioctl (PIOCKILL) ");
-	proc_prettyfprint_signal (procfs_file ? procfs_file : stdout,
-				  ptr ? *(long *) ptr : 0, 0);
-	fprintf (procfs_file ? procfs_file : stdout, "\n");
-	break;
-#ifdef PIOCSSPCACT
-      case PIOCSSPCACT:
-	fprintf (procfs_file ? procfs_file : stdout, 
-		 "ioctl (PIOCSSPCACT) ");
-	arg1 = ptr ? *(long *) ptr : 0;
-	if (arg1 & PRFS_STOPFORK)
-	  fprintf (procfs_file ? procfs_file : stdout, "stopFork ");
-	if (arg1 & PRFS_STOPEXEC)
-	  fprintf (procfs_file ? procfs_file : stdout, "stopExec ");
-	if (arg1 & PRFS_STOPTERM)
-	  fprintf (procfs_file ? procfs_file : stdout, "stopTerm ");
-	if (arg1 & PRFS_STOPTCR)
-	  fprintf (procfs_file ? procfs_file : stdout, "stopThreadCreate ");
-	if (arg1 & PRFS_STOPTTERM)
-	  fprintf (procfs_file ? procfs_file : stdout, "stopThreadTerm ");
-	if (arg1 & PRFS_KOLC)
-	  fprintf (procfs_file ? procfs_file : stdout, "killOnLastClose ");
-	fprintf (procfs_file ? procfs_file : stdout, "\n");
-	break;
-#endif /* PIOCSSPCACT */
-      default:
-	if (ioctl_table[i].name)
-	  fprintf (procfs_file ? procfs_file : stdout, 
-		   "ioctl (%s) %s\n", 
-		   ioctl_table[i].name,
-		   info_verbose ? ioctl_table[i].desc : "");
-	else
-	  fprintf (procfs_file ? procfs_file : stdout, 
-		   "ioctl (<unknown %ld (0x%lx)) \n", opcode, opcode);
-	break;
-      }
-      if (procfs_file)
-	fflush (procfs_file);
-    }
-  errno = 0;
-  ret = ioctl (fd, opcode, ptr);
-  if (procfs_trace && ret < 0)
-    {
-      fprintf (procfs_file ? procfs_file : stdout, 
-	       "[ioctl (%s) FAILED! (%s)]\n",
-	       ioctl_table[i].name != NULL ? 
-	       ioctl_table[i].name : "<unknown>",
-	       safe_strerror (errno));
-      if (procfs_file)
-	fflush (procfs_file);
-    }
-
-  return ret;
-}
-
-#else	/* NEW_PROC_API */
-
 static struct trans rw_table[] = {
-#ifdef PCAGENT			/* solaris */
   { PCAGENT,  "PCAGENT",  "create agent lwp with regs from argument" },
-#endif
   { PCCFAULT, "PCCFAULT", "clear current fault" },
-#ifdef PCCSIG			/* solaris */
   { PCCSIG,   "PCCSIG",   "clear current signal" },
-#endif
-#ifdef PCDSTOP			/* solaris */
   { PCDSTOP,  "PCDSTOP",  "post stop request" },
-#endif
   { PCKILL,   "PCKILL",   "post a signal" },
-#ifdef PCNICE			/* solaris */
   { PCNICE,   "PCNICE",   "set nice priority" },
-#endif
-#ifdef PCREAD			/* solaris */
   { PCREAD,   "PCREAD",   "read from the address space" },
   { PCWRITE,  "PCWRITE",  "write to the address space" },
-#endif
   { PCRUN,    "PCRUN",    "make process/lwp runnable" },
-#ifdef PCSASRS			/* solaris 2.7 only */
   { PCSASRS,  "PCSASRS",  "set ancillary state registers" },
-#endif
-#ifdef PCSCRED			/* solaris */
   { PCSCRED,  "PCSCRED",  "set process credentials" },
-#endif
   { PCSENTRY, "PCSENTRY", "set traced syscall entry set" },
   { PCSET,    "PCSET",    "set modes" },
   { PCSEXIT,  "PCSEXIT",  "set traced syscall exit  set" },
   { PCSFAULT, "PCSFAULT", "set traced fault set" },
   { PCSFPREG, "PCSFPREG", "set floating point registers" },
-#ifdef PCSHOLD			/* solaris */
   { PCSHOLD,  "PCSHOLD",  "set signal mask" },
-#endif
   { PCSREG,   "PCSREG",   "set general registers" },
   { PCSSIG,   "PCSSIG",   "set current signal" },
   { PCSTOP,   "PCSTOP",   "post stop request and wait" },
   { PCSTRACE, "PCSTRACE", "set traced signal set" },
-#ifdef PCSVADDR			/* solaris */
   { PCSVADDR, "PCSVADDR", "set pc virtual address" },
-#endif
-#ifdef PCSXREG			/* solaris sparc only */
   { PCSXREG,  "PCSXREG",  "set extra registers" },
-#endif
-#ifdef PCTWSTOP			/* solaris */
   { PCTWSTOP, "PCTWSTOP", "wait for stop, with timeout arg" },
-#endif
-#ifdef PCUNKILL			/* solaris */
   { PCUNKILL, "PCUNKILL", "delete a pending signal" },
-#endif
-#ifdef PCUNSET			/* solaris */
   { PCUNSET,  "PCUNSET",  "unset modes" },
-#endif
-#ifdef PCWATCH			/* solaris */
   { PCWATCH,  "PCWATCH",  "set/unset watched memory area" },
-#endif
   { PCWSTOP,  "PCWSTOP",  "wait for process/lwp to stop, no timeout" },
   { 0,        NULL,      NULL }
 };
@@ -476,27 +141,16 @@  write_with_trace (int fd, void *varg, si
 		 "write (PCSET,   %s) %s\n", 
 		 arg[1] == PR_FORK  ? "PR_FORK"  :
 		 arg[1] == PR_RLC   ? "PR_RLC"   :
-#ifdef PR_ASYNC
 		 arg[1] == PR_ASYNC ? "PR_ASYNC" :
-#endif
 		 "<unknown flag>",
 		 info_verbose ? rw_table[i].desc : "");
 	break;
-#ifdef PCUNSET
       case PCUNSET:
-#endif
-#ifdef PCRESET
-#if PCRESET != PCUNSET
-      case PCRESET:
-#endif
-#endif
 	fprintf (procfs_file ? procfs_file : stdout, 
 		 "write (PCRESET, %s) %s\n", 
 		 arg[1] == PR_FORK  ? "PR_FORK"  :
 		 arg[1] == PR_RLC   ? "PR_RLC"   :
-#ifdef PR_ASYNC
 		 arg[1] == PR_ASYNC ? "PR_ASYNC" :
-#endif
 		 "<unknown flag>",
 		 info_verbose ? rw_table[i].desc : "");
 	break;
@@ -524,14 +178,12 @@  write_with_trace (int fd, void *varg, si
 	proc_prettyfprint_syscalls (procfs_file ? procfs_file : stdout,
 				    (sysset_t *) &arg[1], 0);
 	break;
-#ifdef PCSHOLD
       case PCSHOLD:
 	fprintf (procfs_file ? procfs_file : stdout, 
 		 "write (PCSHOLD) ");
 	proc_prettyfprint_signalset (procfs_file ? procfs_file : stdout,
 				     (sigset_t *) &arg[1], 0);
 	break;
-#endif
       case PCSSIG:
 	fprintf (procfs_file ? procfs_file : stdout, 
 		 "write (PCSSIG) ");
@@ -550,14 +202,10 @@  write_with_trace (int fd, void *varg, si
 	  fprintf (procfs_file ? procfs_file : stdout, "clearFlt ");
 	if (arg[1] & PRSTEP)
 	  fprintf (procfs_file ? procfs_file : stdout, "step ");
-#ifdef PRSABORT
 	if (arg[1] & PRSABORT)
 	  fprintf (procfs_file ? procfs_file : stdout, "syscallAbort ");
-#endif
-#ifdef PRSTOP
 	if (arg[1] & PRSTOP)
 	  fprintf (procfs_file ? procfs_file : stdout, "stopReq ");
-#endif
 	  
 	fprintf (procfs_file ? procfs_file : stdout, "\n");
 	break;
@@ -630,8 +278,6 @@  lseek_with_trace (int fd, off_t offset, 
   return ret;
 }
 
-#endif /* NEW_PROC_API */
-
 int
 open_with_trace (char *filename, int mode, char *file, int line)
 {
diff --git a/gdb/proc-events.c b/gdb/proc-events.c
--- a/gdb/proc-events.c
+++ b/gdb/proc-events.c
@@ -1,4 +1,4 @@ 
-/* Machine-independent support for SVR4 /proc (process file system)
+/* Machine-independent support for Solaris /proc (process file system)
 
    Copyright (C) 1999-2017 Free Software Foundation, Inc.
 
@@ -30,18 +30,12 @@ 
 
 #include "defs.h"
 
-#ifdef NEW_PROC_API
 #define _STRUCTURED_PROC 1
-#endif
 
 #include <sys/types.h>
 #include <sys/procfs.h>
-#ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
-#endif
-#ifdef HAVE_SYS_FAULT_H
 #include <sys/fault.h>
-#endif
 
 #include "proc-utils.h"
 
@@ -69,248 +63,97 @@  static const char *syscall_table[MAX_SYS
 static void
 init_syscall_table (void)
 {
-#ifdef SYS_BSD_getime
-  syscall_table[SYS_BSD_getime] = "BSD_getime";
-#endif
-#ifdef SYS_BSDgetpgrp
-  syscall_table[SYS_BSDgetpgrp] = "BSDgetpgrp";
-#endif
-#ifdef SYS_BSDsetpgrp
-  syscall_table[SYS_BSDsetpgrp] = "BSDsetpgrp";
-#endif
-#ifdef SYS_acancel
-  syscall_table[SYS_acancel] = "acancel";
-#endif
-#ifdef SYS_accept
   syscall_table[SYS_accept] = "accept";
-#endif
 #ifdef SYS_access
   syscall_table[SYS_access] = "access";
 #endif
-#ifdef SYS_acct
   syscall_table[SYS_acct] = "acct";
+  syscall_table[SYS_acctctl] = "acctctl";
+  syscall_table[SYS_acl] = "acl";
+#ifdef SYS_adi
+  syscall_table[SYS_adi] = "adi";
 #endif
-#ifdef SYS_acl
-  syscall_table[SYS_acl] = "acl";
-#endif
-#ifdef SYS_aclipc
-  syscall_table[SYS_aclipc] = "aclipc";
-#endif
-#ifdef SYS_adjtime
   syscall_table[SYS_adjtime] = "adjtime";
-#endif
-#ifdef SYS_afs_syscall
-  syscall_table[SYS_afs_syscall] = "afs_syscall";
-#endif
-#ifdef SYS_alarm
   syscall_table[SYS_alarm] = "alarm";
-#endif
-#ifdef SYS_alt_plock
-  syscall_table[SYS_alt_plock] = "alt_plock";
-#endif
-#ifdef SYS_alt_sigpending
-  syscall_table[SYS_alt_sigpending] = "alt_sigpending";
-#endif
-#ifdef SYS_async
-  syscall_table[SYS_async] = "async";
-#endif
-#ifdef SYS_async_daemon
-  syscall_table[SYS_async_daemon] = "async_daemon";
-#endif
-#ifdef SYS_audcntl
-  syscall_table[SYS_audcntl] = "audcntl";
-#endif
-#ifdef SYS_audgen
-  syscall_table[SYS_audgen] = "audgen";
-#endif
-#ifdef SYS_auditbuf
-  syscall_table[SYS_auditbuf] = "auditbuf";
-#endif
-#ifdef SYS_auditctl
-  syscall_table[SYS_auditctl] = "auditctl";
-#endif
-#ifdef SYS_auditdmp
-  syscall_table[SYS_auditdmp] = "auditdmp";
-#endif
-#ifdef SYS_auditevt
-  syscall_table[SYS_auditevt] = "auditevt";
-#endif
-#ifdef SYS_auditlog
-  syscall_table[SYS_auditlog] = "auditlog";
-#endif
-#ifdef SYS_auditsys
   syscall_table[SYS_auditsys] = "auditsys";
-#endif
-#ifdef SYS_bind
+  syscall_table[SYS_autofssys] = "autofssys";
   syscall_table[SYS_bind] = "bind";
-#endif
-#ifdef SYS_block
-  syscall_table[SYS_block] = "block";
-#endif
-#ifdef SYS_brk
+  syscall_table[SYS_brand] = "brand";
   syscall_table[SYS_brk] = "brk";
-#endif
-#ifdef SYS_cachectl
-  syscall_table[SYS_cachectl] = "cachectl";
-#endif
-#ifdef SYS_cacheflush
-  syscall_table[SYS_cacheflush] = "cacheflush";
-#endif
-#ifdef SYS_cancelblock
-  syscall_table[SYS_cancelblock] = "cancelblock";
-#endif
-#ifdef SYS_cg_bind
-  syscall_table[SYS_cg_bind] = "cg_bind";
-#endif
-#ifdef SYS_cg_current
-  syscall_table[SYS_cg_current] = "cg_current";
-#endif
-#ifdef SYS_cg_ids
-  syscall_table[SYS_cg_ids] = "cg_ids";
-#endif
-#ifdef SYS_cg_info
-  syscall_table[SYS_cg_info] = "cg_info";
-#endif
-#ifdef SYS_cg_memloc
-  syscall_table[SYS_cg_memloc] = "cg_memloc";
-#endif
-#ifdef SYS_cg_processors
-  syscall_table[SYS_cg_processors] = "cg_processors";
-#endif
-#ifdef SYS_chdir
   syscall_table[SYS_chdir] = "chdir";
-#endif
-#ifdef SYS_chflags
-  syscall_table[SYS_chflags] = "chflags";
-#endif
 #ifdef SYS_chmod
   syscall_table[SYS_chmod] = "chmod";
 #endif
 #ifdef SYS_chown
   syscall_table[SYS_chown] = "chown";
 #endif
-#ifdef SYS_chroot
   syscall_table[SYS_chroot] = "chroot";
-#endif
-#ifdef SYS_clocal
-  syscall_table[SYS_clocal] = "clocal";
-#endif
-#ifdef SYS_clock_getres
+  syscall_table[SYS_cladm] = "cladm";
   syscall_table[SYS_clock_getres] = "clock_getres";
-#endif
-#ifdef SYS_clock_gettime
   syscall_table[SYS_clock_gettime] = "clock_gettime";
-#endif
-#ifdef SYS_clock_settime
   syscall_table[SYS_clock_settime] = "clock_settime";
-#endif
-#ifdef SYS_close
   syscall_table[SYS_close] = "close";
-#endif
-#ifdef SYS_connect
   syscall_table[SYS_connect] = "connect";
-#endif
-#ifdef SYS_context
   syscall_table[SYS_context] = "context";
-#endif
+  syscall_table[SYS_corectl] = "corectl";
+  syscall_table[SYS_cpc] = "cpc";
 #ifdef SYS_creat
   syscall_table[SYS_creat] = "creat";
 #endif
 #ifdef SYS_creat64
   syscall_table[SYS_creat64] = "creat64";
 #endif
-#ifdef SYS_devstat
-  syscall_table[SYS_devstat] = "devstat";
-#endif
-#ifdef SYS_dmi
-  syscall_table[SYS_dmi] = "dmi";
-#endif
-#ifdef SYS_door
   syscall_table[SYS_door] = "door";
-#endif
-#ifdef SYS_dshmsys
-  syscall_table[SYS_dshmsys] = "dshmsys";
-#endif
 #ifdef SYS_dup
   syscall_table[SYS_dup] = "dup";
 #endif
-#ifdef SYS_dup2
-  syscall_table[SYS_dup2] = "dup2";
-#endif
 #ifdef SYS_evsys
   syscall_table[SYS_evsys] = "evsys";
 #endif
 #ifdef SYS_evtrapret
   syscall_table[SYS_evtrapret] = "evtrapret";
 #endif
+  syscall_table[SYS_exacctsys] = "exacctsys";
 #ifdef SYS_exec
   syscall_table[SYS_exec] = "exec";
 #endif
-#ifdef SYS_exec_with_loader
-  syscall_table[SYS_exec_with_loader] = "exec_with_loader";
+  syscall_table[SYS_execve] = "execve";
+  syscall_table[SYS_exit] = "exit";
+#ifdef SYS_faccessat
+  syscall_table[SYS_faccessat] = "faccessat";
 #endif
-#ifdef SYS_execv
-  syscall_table[SYS_execv] = "execv";
-#endif
-#ifdef SYS_execve
-  syscall_table[SYS_execve] = "execve";
-#endif
-#ifdef SYS_exit
-  syscall_table[SYS_exit] = "exit";
-#endif
-#ifdef SYS_exportfs
-  syscall_table[SYS_exportfs] = "exportfs";
-#endif
-#ifdef SYS_facl
   syscall_table[SYS_facl] = "facl";
-#endif
-#ifdef SYS_fchdir
   syscall_table[SYS_fchdir] = "fchdir";
-#endif
-#ifdef SYS_fchflags
-  syscall_table[SYS_fchflags] = "fchflags";
-#endif
 #ifdef SYS_fchmod
   syscall_table[SYS_fchmod] = "fchmod";
 #endif
+#ifdef SYS_fchmodat
+  syscall_table[SYS_fchmodat] = "fchmodat";
+#endif
 #ifdef SYS_fchown
   syscall_table[SYS_fchown] = "fchown";
 #endif
-#ifdef SYS_fchroot
+#ifdef SYS_fchownat
+  syscall_table[SYS_fchownat] = "fchownat";
+#endif
   syscall_table[SYS_fchroot] = "fchroot";
-#endif
-#ifdef SYS_fcntl
   syscall_table[SYS_fcntl] = "fcntl";
-#endif
-#ifdef SYS_fdatasync
-  syscall_table[SYS_fdatasync] = "fdatasync";
-#endif
-#ifdef SYS_fdevstat
-  syscall_table[SYS_fdevstat] = "fdevstat";
-#endif
-#ifdef SYS_fdsync
   syscall_table[SYS_fdsync] = "fdsync";
-#endif
-#ifdef SYS_filepriv
-  syscall_table[SYS_filepriv] = "filepriv";
-#endif
-#ifdef SYS_flock
-  syscall_table[SYS_flock] = "flock";
-#endif
-#ifdef SYS_flvlfile
-  syscall_table[SYS_flvlfile] = "flvlfile";
-#endif
-#ifdef SYS_fork
-  syscall_table[SYS_fork] = "fork";
-#endif
 #ifdef SYS_fork1
   syscall_table[SYS_fork1] = "fork1";
 #endif
 #ifdef SYS_forkall
   syscall_table[SYS_forkall] = "forkall";
 #endif
-#ifdef SYS_fpathconf
+#ifdef SYS_forksys
+  syscall_table[SYS_forksys] = "forksys";
+#endif
   syscall_table[SYS_fpathconf] = "fpathconf";
+#ifdef SYS_frealpathat
+  syscall_table[SYS_frealpathat] = "frealpathat";
+#endif
+#ifdef SYS_fsat
+  syscall_table[SYS_fsat] = "fsat";
 #endif
 #ifdef SYS_fstat
   syscall_table[SYS_fstat] = "fstat";
@@ -318,860 +161,270 @@  init_syscall_table (void)
 #ifdef SYS_fstat64
   syscall_table[SYS_fstat64] = "fstat64";
 #endif
-#ifdef SYS_fstatfs
+#ifdef SYS_fstatat
+  syscall_table[SYS_fstatat] = "fstatat";
+#endif
+#ifdef SYS_fstatat64
+  syscall_table[SYS_fstatat64] = "fstatat64";
+#endif
   syscall_table[SYS_fstatfs] = "fstatfs";
-#endif
-#ifdef SYS_fstatvfs
   syscall_table[SYS_fstatvfs] = "fstatvfs";
-#endif
-#ifdef SYS_fstatvfs64
   syscall_table[SYS_fstatvfs64] = "fstatvfs64";
-#endif
-#ifdef SYS_fsync
-  syscall_table[SYS_fsync] = "fsync";
-#endif
-#ifdef SYS_ftruncate
-  syscall_table[SYS_ftruncate] = "ftruncate";
-#endif
-#ifdef SYS_ftruncate64
-  syscall_table[SYS_ftruncate64] = "ftruncate64";
-#endif
-#ifdef SYS_fuser
-  syscall_table[SYS_fuser] = "fuser";
-#endif
 #ifdef SYS_fxstat
   syscall_table[SYS_fxstat] = "fxstat";
 #endif
-#ifdef SYS_get_sysinfo
-  syscall_table[SYS_get_sysinfo] = "get_sysinfo";
+  syscall_table[SYS_getcwd] = "getcwd";
+  syscall_table[SYS_getdents] = "getdents";
+  syscall_table[SYS_getdents64] = "getdents64";
+  syscall_table[SYS_getgid] = "getgid";
+  syscall_table[SYS_getgroups] = "getgroups";
+  syscall_table[SYS_getitimer] = "getitimer";
+  syscall_table[SYS_getloadavg] = "getloadavg";
+  syscall_table[SYS_getmsg] = "getmsg";
+  syscall_table[SYS_getpagesizes] = "getpagesizes";
+  syscall_table[SYS_getpeername] = "getpeername";
+  syscall_table[SYS_getpid] = "getpid";
+  syscall_table[SYS_getpmsg] = "getpmsg";
+#ifdef SYS_getrandom
+  syscall_table[SYS_getrandom] = "getrandom";
 #endif
-#ifdef SYS_getaddressconf
-  syscall_table[SYS_getaddressconf] = "getaddressconf";
+  syscall_table[SYS_getrlimit] = "getrlimit";
+  syscall_table[SYS_getrlimit64] = "getrlimit64";
+  syscall_table[SYS_getsockname] = "getsockname";
+  syscall_table[SYS_getsockopt] = "getsockopt";
+  syscall_table[SYS_gettimeofday] = "gettimeofday";
+  syscall_table[SYS_getuid] = "getuid";
+  syscall_table[SYS_gtty] = "gtty";
+  syscall_table[SYS_hrtsys] = "hrtsys";
+  syscall_table[SYS_inst_sync] = "inst_sync";
+  syscall_table[SYS_install_utrap] = "install_utrap";
+  syscall_table[SYS_ioctl] = "ioctl";
+#ifdef SYS_issetugid
+  syscall_table[SYS_issetugid] = "issetugid";
 #endif
-#ifdef SYS_getcontext
-  syscall_table[SYS_getcontext] = "getcontext";
-#endif
-#ifdef SYS_getdents
-  syscall_table[SYS_getdents] = "getdents";
-#endif
-#ifdef SYS_getdents64
-  syscall_table[SYS_getdents64] = "getdents64";
-#endif
-#ifdef SYS_getdirentries
-  syscall_table[SYS_getdirentries] = "getdirentries";
-#endif
-#ifdef SYS_getdomainname
-  syscall_table[SYS_getdomainname] = "getdomainname";
-#endif
-#ifdef SYS_getdtablesize
-  syscall_table[SYS_getdtablesize] = "getdtablesize";
-#endif
-#ifdef SYS_getfh
-  syscall_table[SYS_getfh] = "getfh";
-#endif
-#ifdef SYS_getfsstat
-  syscall_table[SYS_getfsstat] = "getfsstat";
-#endif
-#ifdef SYS_getgid
-  syscall_table[SYS_getgid] = "getgid";
-#endif
-#ifdef SYS_getgroups
-  syscall_table[SYS_getgroups] = "getgroups";
-#endif
-#ifdef SYS_gethostid
-  syscall_table[SYS_gethostid] = "gethostid";
-#endif
-#ifdef SYS_gethostname
-  syscall_table[SYS_gethostname] = "gethostname";
-#endif
-#ifdef SYS_getitimer
-  syscall_table[SYS_getitimer] = "getitimer";
-#endif
-#ifdef SYS_getksym
-  syscall_table[SYS_getksym] = "getksym";
-#endif
-#ifdef SYS_getlogin
-  syscall_table[SYS_getlogin] = "getlogin";
-#endif
-#ifdef SYS_getmnt
-  syscall_table[SYS_getmnt] = "getmnt";
-#endif
-#ifdef SYS_getmsg
-  syscall_table[SYS_getmsg] = "getmsg";
-#endif
-#ifdef SYS_getpagesize
-  syscall_table[SYS_getpagesize] = "getpagesize";
-#endif
-#ifdef SYS_getpeername
-  syscall_table[SYS_getpeername] = "getpeername";
-#endif
-#ifdef SYS_getpgid
-  syscall_table[SYS_getpgid] = "getpgid";
-#endif
-#ifdef SYS_getpgrp
-  syscall_table[SYS_getpgrp] = "getpgrp";
-#endif
-#ifdef SYS_getpid
-  syscall_table[SYS_getpid] = "getpid";
-#endif
-#ifdef SYS_getpmsg
-  syscall_table[SYS_getpmsg] = "getpmsg";
-#endif
-#ifdef SYS_getpriority
-  syscall_table[SYS_getpriority] = "getpriority";
-#endif
-#ifdef SYS_getrlimit
-  syscall_table[SYS_getrlimit] = "getrlimit";
-#endif
-#ifdef SYS_getrlimit64
-  syscall_table[SYS_getrlimit64] = "getrlimit64";
-#endif
-#ifdef SYS_getrusage
-  syscall_table[SYS_getrusage] = "getrusage";
-#endif
-#ifdef SYS_getsid
-  syscall_table[SYS_getsid] = "getsid";
-#endif
-#ifdef SYS_getsockname
-  syscall_table[SYS_getsockname] = "getsockname";
-#endif
-#ifdef SYS_getsockopt
-  syscall_table[SYS_getsockopt] = "getsockopt";
-#endif
-#ifdef SYS_gettimeofday
-  syscall_table[SYS_gettimeofday] = "gettimeofday";
-#endif
-#ifdef SYS_getuid
-  syscall_table[SYS_getuid] = "getuid";
-#endif
-#ifdef SYS_gtty
-  syscall_table[SYS_gtty] = "gtty";
-#endif
-#ifdef SYS_hrtsys
-  syscall_table[SYS_hrtsys] = "hrtsys";
-#endif
-#ifdef SYS_inst_sync
-  syscall_table[SYS_inst_sync] = "inst_sync";
-#endif
-#ifdef SYS_install_utrap
-  syscall_table[SYS_install_utrap] = "install_utrap";
-#endif
-#ifdef SYS_invlpg
-  syscall_table[SYS_invlpg] = "invlpg";
-#endif
-#ifdef SYS_ioctl
-  syscall_table[SYS_ioctl] = "ioctl";
-#endif
-#ifdef SYS_kaio
   syscall_table[SYS_kaio] = "kaio";
-#endif
-#ifdef SYS_keyctl
-  syscall_table[SYS_keyctl] = "keyctl";
-#endif
-#ifdef SYS_kill
   syscall_table[SYS_kill] = "kill";
-#endif
-#ifdef SYS_killpg
-  syscall_table[SYS_killpg] = "killpg";
-#endif
-#ifdef SYS_kloadcall
-  syscall_table[SYS_kloadcall] = "kloadcall";
-#endif
-#ifdef SYS_kmodcall
-  syscall_table[SYS_kmodcall] = "kmodcall";
-#endif
-#ifdef SYS_ksigaction
-  syscall_table[SYS_ksigaction] = "ksigaction";
-#endif
-#ifdef SYS_ksigprocmask
-  syscall_table[SYS_ksigprocmask] = "ksigprocmask";
-#endif
-#ifdef SYS_ksigqueue
-  syscall_table[SYS_ksigqueue] = "ksigqueue";
-#endif
+  syscall_table[SYS_labelsys] = "labelsys";
 #ifdef SYS_lchown
   syscall_table[SYS_lchown] = "lchown";
 #endif
+  syscall_table[SYS_lgrpsys] = "lgrpsys";
 #ifdef SYS_link
   syscall_table[SYS_link] = "link";
 #endif
-#ifdef SYS_listen
+#ifdef SYS_linkat
+  syscall_table[SYS_linkat] = "linkat";
+#endif
   syscall_table[SYS_listen] = "listen";
-#endif
-#ifdef SYS_llseek
   syscall_table[SYS_llseek] = "llseek";
-#endif
-#ifdef SYS_lseek
   syscall_table[SYS_lseek] = "lseek";
-#endif
-#ifdef SYS_lseek64
-  syscall_table[SYS_lseek64] = "lseek64";
-#endif
 #ifdef SYS_lstat
   syscall_table[SYS_lstat] = "lstat";
 #endif
 #ifdef SYS_lstat64
   syscall_table[SYS_lstat64] = "lstat64";
 #endif
-#ifdef SYS_lvldom
-  syscall_table[SYS_lvldom] = "lvldom";
-#endif
-#ifdef SYS_lvlequal
-  syscall_table[SYS_lvlequal] = "lvlequal";
-#endif
-#ifdef SYS_lvlfile
-  syscall_table[SYS_lvlfile] = "lvlfile";
-#endif
-#ifdef SYS_lvlipc
-  syscall_table[SYS_lvlipc] = "lvlipc";
-#endif
-#ifdef SYS_lvlproc
-  syscall_table[SYS_lvlproc] = "lvlproc";
-#endif
-#ifdef SYS_lvlvfs
-  syscall_table[SYS_lvlvfs] = "lvlvfs";
-#endif
-#ifdef SYS_lwp_alarm
-  syscall_table[SYS_lwp_alarm] = "lwp_alarm";
-#endif
-#ifdef SYS_lwp_cond_broadcast
   syscall_table[SYS_lwp_cond_broadcast] = "lwp_cond_broadcast";
-#endif
-#ifdef SYS_lwp_cond_signal
   syscall_table[SYS_lwp_cond_signal] = "lwp_cond_signal";
-#endif
-#ifdef SYS_lwp_cond_wait
   syscall_table[SYS_lwp_cond_wait] = "lwp_cond_wait";
-#endif
-#ifdef SYS_lwp_continue
   syscall_table[SYS_lwp_continue] = "lwp_continue";
-#endif
-#ifdef SYS_lwp_create
   syscall_table[SYS_lwp_create] = "lwp_create";
-#endif
-#ifdef SYS_lwp_exit
+  syscall_table[SYS_lwp_detach] = "lwp_detach";
   syscall_table[SYS_lwp_exit] = "lwp_exit";
-#endif
-#ifdef SYS_lwp_getprivate
-  syscall_table[SYS_lwp_getprivate] = "lwp_getprivate";
-#endif
-#ifdef SYS_lwp_info
   syscall_table[SYS_lwp_info] = "lwp_info";
-#endif
 #ifdef SYS_lwp_kill
   syscall_table[SYS_lwp_kill] = "lwp_kill";
 #endif
-#ifdef SYS_lwp_mutex_init
-  syscall_table[SYS_lwp_mutex_init] = "lwp_mutex_init";
-#endif
 #ifdef SYS_lwp_mutex_lock
   syscall_table[SYS_lwp_mutex_lock] = "lwp_mutex_lock";
 #endif
-#ifdef SYS_lwp_mutex_trylock
+  syscall_table[SYS_lwp_mutex_register] = "lwp_mutex_register";
+  syscall_table[SYS_lwp_mutex_timedlock] = "lwp_mutex_timedlock";
   syscall_table[SYS_lwp_mutex_trylock] = "lwp_mutex_trylock";
+  syscall_table[SYS_lwp_mutex_unlock] = "lwp_mutex_unlock";
+  syscall_table[SYS_lwp_mutex_wakeup] = "lwp_mutex_wakeup";
+#ifdef SYS_lwp_name
+  syscall_table[SYS_lwp_name] = "lwp_name";
 #endif
-#ifdef SYS_lwp_mutex_unlock
-  syscall_table[SYS_lwp_mutex_unlock] = "lwp_mutex_unlock";
-#endif
-#ifdef SYS_lwp_private
+  syscall_table[SYS_lwp_park] = "lwp_park";
   syscall_table[SYS_lwp_private] = "lwp_private";
-#endif
-#ifdef SYS_lwp_self
+  syscall_table[SYS_lwp_rwlock_sys] = "lwp_rwlock_sys";
   syscall_table[SYS_lwp_self] = "lwp_self";
-#endif
-#ifdef SYS_lwp_sema_post
   syscall_table[SYS_lwp_sema_post] = "lwp_sema_post";
-#endif
-#ifdef SYS_lwp_sema_trywait
+  syscall_table[SYS_lwp_sema_timedwait] = "lwp_sema_timedwait";
   syscall_table[SYS_lwp_sema_trywait] = "lwp_sema_trywait";
-#endif
 #ifdef SYS_lwp_sema_wait
   syscall_table[SYS_lwp_sema_wait] = "lwp_sema_wait";
 #endif
-#ifdef SYS_lwp_setprivate
-  syscall_table[SYS_lwp_setprivate] = "lwp_setprivate";
+  syscall_table[SYS_lwp_sigmask] = "lwp_sigmask";
+#ifdef SYS_lwp_sigqueue
+  syscall_table[SYS_lwp_sigqueue] = "lwp_sigqueue";
 #endif
-#ifdef SYS_lwp_sigredirect
-  syscall_table[SYS_lwp_sigredirect] = "lwp_sigredirect";
-#endif
-#ifdef SYS_lwp_suspend
   syscall_table[SYS_lwp_suspend] = "lwp_suspend";
-#endif
-#ifdef SYS_lwp_wait
   syscall_table[SYS_lwp_wait] = "lwp_wait";
-#endif
 #ifdef SYS_lxstat
   syscall_table[SYS_lxstat] = "lxstat";
 #endif
-#ifdef SYS_madvise
-  syscall_table[SYS_madvise] = "madvise";
+  syscall_table[SYS_memcntl] = "memcntl";
+#ifdef SYS_memsys
+  syscall_table[SYS_memsys] = "memsys";
 #endif
-#ifdef SYS_memcntl
-  syscall_table[SYS_memcntl] = "memcntl";
-#endif
-#ifdef SYS_mincore
   syscall_table[SYS_mincore] = "mincore";
-#endif
-#ifdef SYS_mincore
-  syscall_table[SYS_mincore] = "mincore";
-#endif
 #ifdef SYS_mkdir
   syscall_table[SYS_mkdir] = "mkdir";
 #endif
-#ifdef SYS_mkmld
-  syscall_table[SYS_mkmld] = "mkmld";
+#ifdef SYS_mkdirat
+  syscall_table[SYS_mkdirat] = "mkdirat";
 #endif
 #ifdef SYS_mknod
   syscall_table[SYS_mknod] = "mknod";
 #endif
-#ifdef SYS_mldmode
-  syscall_table[SYS_mldmode] = "mldmode";
+#ifdef SYS_mknodat
+  syscall_table[SYS_mknodat] = "mknodat";
 #endif
-#ifdef SYS_mmap
   syscall_table[SYS_mmap] = "mmap";
+  syscall_table[SYS_mmap64] = "mmap64";
+#ifdef SYS_mmapobj
+  syscall_table[SYS_mmapobj] = "mmapobj";
 #endif
-#ifdef SYS_mmap64
-  syscall_table[SYS_mmap64] = "mmap64";
-#endif
-#ifdef SYS_modadm
-  syscall_table[SYS_modadm] = "modadm";
-#endif
-#ifdef SYS_modctl
   syscall_table[SYS_modctl] = "modctl";
-#endif
-#ifdef SYS_modload
-  syscall_table[SYS_modload] = "modload";
-#endif
-#ifdef SYS_modpath
-  syscall_table[SYS_modpath] = "modpath";
-#endif
-#ifdef SYS_modstat
-  syscall_table[SYS_modstat] = "modstat";
-#endif
-#ifdef SYS_moduload
-  syscall_table[SYS_moduload] = "moduload";
-#endif
-#ifdef SYS_mount
   syscall_table[SYS_mount] = "mount";
-#endif
-#ifdef SYS_mprotect
   syscall_table[SYS_mprotect] = "mprotect";
-#endif
-#ifdef SYS_mremap
-  syscall_table[SYS_mremap] = "mremap";
-#endif
-#ifdef SYS_msfs_syscall
-  syscall_table[SYS_msfs_syscall] = "msfs_syscall";
-#endif
-#ifdef SYS_msgctl
-  syscall_table[SYS_msgctl] = "msgctl";
-#endif
-#ifdef SYS_msgget
-  syscall_table[SYS_msgget] = "msgget";
-#endif
-#ifdef SYS_msgrcv
-  syscall_table[SYS_msgrcv] = "msgrcv";
-#endif
-#ifdef SYS_msgsnd
-  syscall_table[SYS_msgsnd] = "msgsnd";
-#endif
-#ifdef SYS_msgsys
   syscall_table[SYS_msgsys] = "msgsys";
-#endif
-#ifdef SYS_msleep
-  syscall_table[SYS_msleep] = "msleep";
-#endif
-#ifdef SYS_msync
-  syscall_table[SYS_msync] = "msync";
-#endif
-#ifdef SYS_munmap
   syscall_table[SYS_munmap] = "munmap";
-#endif
-#ifdef SYS_mvalid
-  syscall_table[SYS_mvalid] = "mvalid";
-#endif
-#ifdef SYS_mwakeup
-  syscall_table[SYS_mwakeup] = "mwakeup";
-#endif
-#ifdef SYS_naccept
-  syscall_table[SYS_naccept] = "naccept";
-#endif
-#ifdef SYS_nanosleep
   syscall_table[SYS_nanosleep] = "nanosleep";
-#endif
-#ifdef SYS_nfssvc
-  syscall_table[SYS_nfssvc] = "nfssvc";
-#endif
-#ifdef SYS_nfssys
   syscall_table[SYS_nfssys] = "nfssys";
-#endif
-#ifdef SYS_ngetpeername
-  syscall_table[SYS_ngetpeername] = "ngetpeername";
-#endif
-#ifdef SYS_ngetsockname
-  syscall_table[SYS_ngetsockname] = "ngetsockname";
-#endif
-#ifdef SYS_nice
   syscall_table[SYS_nice] = "nice";
-#endif
-#ifdef SYS_nrecvfrom
-  syscall_table[SYS_nrecvfrom] = "nrecvfrom";
-#endif
-#ifdef SYS_nrecvmsg
-  syscall_table[SYS_nrecvmsg] = "nrecvmsg";
-#endif
-#ifdef SYS_nsendmsg
-  syscall_table[SYS_nsendmsg] = "nsendmsg";
-#endif
-#ifdef SYS_ntp_adjtime
   syscall_table[SYS_ntp_adjtime] = "ntp_adjtime";
-#endif
-#ifdef SYS_ntp_gettime
   syscall_table[SYS_ntp_gettime] = "ntp_gettime";
-#endif
-#ifdef SYS_nuname
-  syscall_table[SYS_nuname] = "nuname";
-#endif
-#ifdef SYS_obreak
-  syscall_table[SYS_obreak] = "obreak";
-#endif
-#ifdef SYS_old_accept
-  syscall_table[SYS_old_accept] = "old_accept";
-#endif
-#ifdef SYS_old_fstat
-  syscall_table[SYS_old_fstat] = "old_fstat";
-#endif
-#ifdef SYS_old_getpeername
-  syscall_table[SYS_old_getpeername] = "old_getpeername";
-#endif
-#ifdef SYS_old_getpgrp
-  syscall_table[SYS_old_getpgrp] = "old_getpgrp";
-#endif
-#ifdef SYS_old_getsockname
-  syscall_table[SYS_old_getsockname] = "old_getsockname";
-#endif
-#ifdef SYS_old_killpg
-  syscall_table[SYS_old_killpg] = "old_killpg";
-#endif
-#ifdef SYS_old_lstat
-  syscall_table[SYS_old_lstat] = "old_lstat";
-#endif
-#ifdef SYS_old_recv
-  syscall_table[SYS_old_recv] = "old_recv";
-#endif
-#ifdef SYS_old_recvfrom
-  syscall_table[SYS_old_recvfrom] = "old_recvfrom";
-#endif
-#ifdef SYS_old_recvmsg
-  syscall_table[SYS_old_recvmsg] = "old_recvmsg";
-#endif
-#ifdef SYS_old_send
-  syscall_table[SYS_old_send] = "old_send";
-#endif
-#ifdef SYS_old_sendmsg
-  syscall_table[SYS_old_sendmsg] = "old_sendmsg";
-#endif
-#ifdef SYS_old_sigblock
-  syscall_table[SYS_old_sigblock] = "old_sigblock";
-#endif
-#ifdef SYS_old_sigsetmask
-  syscall_table[SYS_old_sigsetmask] = "old_sigsetmask";
-#endif
-#ifdef SYS_old_sigvec
-  syscall_table[SYS_old_sigvec] = "old_sigvec";
-#endif
-#ifdef SYS_old_stat
-  syscall_table[SYS_old_stat] = "old_stat";
-#endif
-#ifdef SYS_old_vhangup
-  syscall_table[SYS_old_vhangup] = "old_vhangup";
-#endif
-#ifdef SYS_old_wait
-  syscall_table[SYS_old_wait] = "old_wait";
-#endif
-#ifdef SYS_oldquota
-  syscall_table[SYS_oldquota] = "oldquota";
-#endif
-#ifdef SYS_online
-  syscall_table[SYS_online] = "online";
-#endif
 #ifdef SYS_open
   syscall_table[SYS_open] = "open";
 #endif
 #ifdef SYS_open64
   syscall_table[SYS_open64] = "open64";
 #endif
-#ifdef SYS_ovadvise
-  syscall_table[SYS_ovadvise] = "ovadvise";
+#ifdef SYS_openat
+  syscall_table[SYS_openat] = "openat";
 #endif
-#ifdef SYS_p_online
+#ifdef SYS_openat64
+  syscall_table[SYS_openat64] = "openat64";
+#endif
   syscall_table[SYS_p_online] = "p_online";
-#endif
-#ifdef SYS_pagelock
-  syscall_table[SYS_pagelock] = "pagelock";
-#endif
-#ifdef SYS_pathconf
   syscall_table[SYS_pathconf] = "pathconf";
-#endif
-#ifdef SYS_pause
   syscall_table[SYS_pause] = "pause";
-#endif
-#ifdef SYS_pgrpsys
+  syscall_table[SYS_pcsample] = "pcsample";
   syscall_table[SYS_pgrpsys] = "pgrpsys";
-#endif
-#ifdef SYS_pid_block
-  syscall_table[SYS_pid_block] = "pid_block";
-#endif
-#ifdef SYS_pid_unblock
-  syscall_table[SYS_pid_unblock] = "pid_unblock";
-#endif
-#ifdef SYS_pipe
   syscall_table[SYS_pipe] = "pipe";
-#endif
 #ifdef SYS_plock
   syscall_table[SYS_plock] = "plock";
 #endif
 #ifdef SYS_poll
   syscall_table[SYS_poll] = "poll";
 #endif
-#ifdef SYS_prctl
-  syscall_table[SYS_prctl] = "prctl";
-#endif
-#ifdef SYS_pread
+  syscall_table[SYS_pollsys] = "pollsys";
+  syscall_table[SYS_port] = "port";
   syscall_table[SYS_pread] = "pread";
-#endif
-#ifdef SYS_pread64
   syscall_table[SYS_pread64] = "pread64";
-#endif
-#ifdef SYS_pread64
-  syscall_table[SYS_pread64] = "pread64";
-#endif
-#ifdef SYS_prepblock
-  syscall_table[SYS_prepblock] = "prepblock";
-#endif
-#ifdef SYS_priocntl
-  syscall_table[SYS_priocntl] = "priocntl";
-#endif
-#ifdef SYS_priocntllst
-  syscall_table[SYS_priocntllst] = "priocntllst";
-#endif
-#ifdef SYS_priocntlset
-  syscall_table[SYS_priocntlset] = "priocntlset";
-#endif
-#ifdef SYS_priocntlsys
   syscall_table[SYS_priocntlsys] = "priocntlsys";
-#endif
-#ifdef SYS_procblk
-  syscall_table[SYS_procblk] = "procblk";
-#endif
+  syscall_table[SYS_privsys] = "privsys";
 #ifdef SYS_processor_bind
   syscall_table[SYS_processor_bind] = "processor_bind";
 #endif
-#ifdef SYS_processor_exbind
-  syscall_table[SYS_processor_exbind] = "processor_exbind";
-#endif
 #ifdef SYS_processor_info
   syscall_table[SYS_processor_info] = "processor_info";
 #endif
-#ifdef SYS_procpriv
-  syscall_table[SYS_procpriv] = "procpriv";
+#ifdef SYS_processor_sys
+  syscall_table[SYS_processor_sys] = "processor_sys";
 #endif
-#ifdef SYS_profil
   syscall_table[SYS_profil] = "profil";
-#endif
-#ifdef SYS_proplist_syscall
-  syscall_table[SYS_proplist_syscall] = "proplist_syscall";
-#endif
-#ifdef SYS_pset
   syscall_table[SYS_pset] = "pset";
-#endif
-#ifdef SYS_ptrace
-  syscall_table[SYS_ptrace] = "ptrace";
-#endif
-#ifdef SYS_putmsg
   syscall_table[SYS_putmsg] = "putmsg";
-#endif
-#ifdef SYS_putpmsg
   syscall_table[SYS_putpmsg] = "putpmsg";
-#endif
-#ifdef SYS_pwrite
   syscall_table[SYS_pwrite] = "pwrite";
-#endif
-#ifdef SYS_pwrite64
   syscall_table[SYS_pwrite64] = "pwrite64";
-#endif
-#ifdef SYS_quotactl
-  syscall_table[SYS_quotactl] = "quotactl";
-#endif
-#ifdef SYS_rdblock
-  syscall_table[SYS_rdblock] = "rdblock";
-#endif
-#ifdef SYS_read
+  syscall_table[SYS_rctlsys] = "rctlsys";
   syscall_table[SYS_read] = "read";
-#endif
 #ifdef SYS_readlink
   syscall_table[SYS_readlink] = "readlink";
 #endif
-#ifdef SYS_readv
+#ifdef SYS_readlinkat
+  syscall_table[SYS_readlinkat] = "readlinkat";
+#endif
   syscall_table[SYS_readv] = "readv";
+  syscall_table[SYS_recv] = "recv";
+  syscall_table[SYS_recvfrom] = "recvfrom";
+#ifdef SYS_recvmmsg
+  syscall_table[SYS_recvmmsg] = "recvmmsg";
 #endif
-#ifdef SYS_reboot
-  syscall_table[SYS_reboot] = "reboot";
-#endif
-#ifdef SYS_recv
-  syscall_table[SYS_recv] = "recv";
-#endif
-#ifdef SYS_recvfrom
-  syscall_table[SYS_recvfrom] = "recvfrom";
-#endif
-#ifdef SYS_recvmsg
   syscall_table[SYS_recvmsg] = "recvmsg";
+#ifdef SYS_reflinkat
+  syscall_table[SYS_reflinkat] = "reflinkat";
 #endif
 #ifdef SYS_rename
   syscall_table[SYS_rename] = "rename";
 #endif
-#ifdef SYS_resolvepath
+#ifdef SYS_renameat
+  syscall_table[SYS_renameat] = "renameat";
+#endif
   syscall_table[SYS_resolvepath] = "resolvepath";
-#endif
-#ifdef SYS_revoke
-  syscall_table[SYS_revoke] = "revoke";
-#endif
-#ifdef SYS_rfsys
-  syscall_table[SYS_rfsys] = "rfsys";
-#endif
 #ifdef SYS_rmdir
   syscall_table[SYS_rmdir] = "rmdir";
 #endif
-#ifdef SYS_rpcsys
   syscall_table[SYS_rpcsys] = "rpcsys";
-#endif
-#ifdef SYS_sbrk
-  syscall_table[SYS_sbrk] = "sbrk";
-#endif
-#ifdef SYS_schedctl
+  syscall_table[SYS_rusagesys] = "rusagesys";
   syscall_table[SYS_schedctl] = "schedctl";
-#endif
-#ifdef SYS_secadvise
-  syscall_table[SYS_secadvise] = "secadvise";
-#endif
 #ifdef SYS_secsys
   syscall_table[SYS_secsys] = "secsys";
 #endif
-#ifdef SYS_security
-  syscall_table[SYS_security] = "security";
+  syscall_table[SYS_semsys] = "semsys";
+  syscall_table[SYS_send] = "send";
+  syscall_table[SYS_sendfilev] = "sendfilev";
+#ifdef SYS_sendmmsg
+  syscall_table[SYS_sendmmsg] = "sendmmsg";
 #endif
-#ifdef SYS_select
-  syscall_table[SYS_select] = "select";
+  syscall_table[SYS_sendmsg] = "sendmsg";
+  syscall_table[SYS_sendto] = "sendto";
+  syscall_table[SYS_setegid] = "setegid";
+  syscall_table[SYS_seteuid] = "seteuid";
+  syscall_table[SYS_setgid] = "setgid";
+  syscall_table[SYS_setgroups] = "setgroups";
+  syscall_table[SYS_setitimer] = "setitimer";
+  syscall_table[SYS_setregid] = "setregid";
+  syscall_table[SYS_setreuid] = "setreuid";
+  syscall_table[SYS_setrlimit] = "setrlimit";
+  syscall_table[SYS_setrlimit64] = "setrlimit64";
+  syscall_table[SYS_setsockopt] = "setsockopt";
+  syscall_table[SYS_setuid] = "setuid";
+  syscall_table[SYS_sharefs] = "sharefs";
+  syscall_table[SYS_shmsys] = "shmsys";
+  syscall_table[SYS_shutdown] = "shutdown";
+#ifdef SYS_sidsys
+  syscall_table[SYS_sidsys] = "sidsys";
 #endif
-#ifdef SYS_semctl
-  syscall_table[SYS_semctl] = "semctl";
-#endif
-#ifdef SYS_semget
-  syscall_table[SYS_semget] = "semget";
-#endif
-#ifdef SYS_semop
-  syscall_table[SYS_semop] = "semop";
-#endif
-#ifdef SYS_semsys
-  syscall_table[SYS_semsys] = "semsys";
-#endif
-#ifdef SYS_send
-  syscall_table[SYS_send] = "send";
-#endif
-#ifdef SYS_sendmsg
-  syscall_table[SYS_sendmsg] = "sendmsg";
-#endif
-#ifdef SYS_sendto
-  syscall_table[SYS_sendto] = "sendto";
-#endif
-#ifdef SYS_set_program_attributes
-  syscall_table[SYS_set_program_attributes] = "set_program_attributes";
-#endif
-#ifdef SYS_set_speculative
-  syscall_table[SYS_set_speculative] = "set_speculative";
-#endif
-#ifdef SYS_set_sysinfo
-  syscall_table[SYS_set_sysinfo] = "set_sysinfo";
-#endif
-#ifdef SYS_setcontext
-  syscall_table[SYS_setcontext] = "setcontext";
-#endif
-#ifdef SYS_setdomainname
-  syscall_table[SYS_setdomainname] = "setdomainname";
-#endif
-#ifdef SYS_setegid
-  syscall_table[SYS_setegid] = "setegid";
-#endif
-#ifdef SYS_seteuid
-  syscall_table[SYS_seteuid] = "seteuid";
-#endif
-#ifdef SYS_setgid
-  syscall_table[SYS_setgid] = "setgid";
-#endif
-#ifdef SYS_setgroups
-  syscall_table[SYS_setgroups] = "setgroups";
-#endif
-#ifdef SYS_sethostid
-  syscall_table[SYS_sethostid] = "sethostid";
-#endif
-#ifdef SYS_sethostname
-  syscall_table[SYS_sethostname] = "sethostname";
-#endif
-#ifdef SYS_setitimer
-  syscall_table[SYS_setitimer] = "setitimer";
-#endif
-#ifdef SYS_setlogin
-  syscall_table[SYS_setlogin] = "setlogin";
-#endif
-#ifdef SYS_setpgid
-  syscall_table[SYS_setpgid] = "setpgid";
-#endif
-#ifdef SYS_setpgrp
-  syscall_table[SYS_setpgrp] = "setpgrp";
-#endif
-#ifdef SYS_setpriority
-  syscall_table[SYS_setpriority] = "setpriority";
-#endif
-#ifdef SYS_setregid
-  syscall_table[SYS_setregid] = "setregid";
-#endif
-#ifdef SYS_setreuid
-  syscall_table[SYS_setreuid] = "setreuid";
-#endif
-#ifdef SYS_setrlimit
-  syscall_table[SYS_setrlimit] = "setrlimit";
-#endif
-#ifdef SYS_setrlimit64
-  syscall_table[SYS_setrlimit64] = "setrlimit64";
-#endif
-#ifdef SYS_setsid
-  syscall_table[SYS_setsid] = "setsid";
-#endif
-#ifdef SYS_setsockopt
-  syscall_table[SYS_setsockopt] = "setsockopt";
-#endif
-#ifdef SYS_settimeofday
-  syscall_table[SYS_settimeofday] = "settimeofday";
-#endif
-#ifdef SYS_setuid
-  syscall_table[SYS_setuid] = "setuid";
-#endif
-#ifdef SYS_sgi
-  syscall_table[SYS_sgi] = "sgi";
-#endif
-#ifdef SYS_sgifastpath
-  syscall_table[SYS_sgifastpath] = "sgifastpath";
-#endif
-#ifdef SYS_sgikopt
-  syscall_table[SYS_sgikopt] = "sgikopt";
-#endif
-#ifdef SYS_sginap
-  syscall_table[SYS_sginap] = "sginap";
-#endif
-#ifdef SYS_shmat
-  syscall_table[SYS_shmat] = "shmat";
-#endif
-#ifdef SYS_shmctl
-  syscall_table[SYS_shmctl] = "shmctl";
-#endif
-#ifdef SYS_shmdt
-  syscall_table[SYS_shmdt] = "shmdt";
-#endif
-#ifdef SYS_shmget
-  syscall_table[SYS_shmget] = "shmget";
-#endif
-#ifdef SYS_shmsys
-  syscall_table[SYS_shmsys] = "shmsys";
-#endif
-#ifdef SYS_shutdown
-  syscall_table[SYS_shutdown] = "shutdown";
-#endif
-#ifdef SYS_sigaction
   syscall_table[SYS_sigaction] = "sigaction";
-#endif
-#ifdef SYS_sigaltstack
   syscall_table[SYS_sigaltstack] = "sigaltstack";
-#endif
-#ifdef SYS_sigaltstack
-  syscall_table[SYS_sigaltstack] = "sigaltstack";
-#endif
-#ifdef SYS_sigblock
-  syscall_table[SYS_sigblock] = "sigblock";
-#endif
 #ifdef SYS_signal
   syscall_table[SYS_signal] = "signal";
 #endif
-#ifdef SYS_signotify
   syscall_table[SYS_signotify] = "signotify";
+  syscall_table[SYS_sigpending] = "sigpending";
+  syscall_table[SYS_sigprocmask] = "sigprocmask";
+  syscall_table[SYS_sigqueue] = "sigqueue";
+#ifdef SYS_sigresend
+  syscall_table[SYS_sigresend] = "sigresend";
 #endif
-#ifdef SYS_signotifywait
-  syscall_table[SYS_signotifywait] = "signotifywait";
+  syscall_table[SYS_sigsendsys] = "sigsendsys";
+  syscall_table[SYS_sigsuspend] = "sigsuspend";
+  syscall_table[SYS_sigtimedwait] = "sigtimedwait";
+  syscall_table[SYS_so_socket] = "so_socket";
+  syscall_table[SYS_so_socketpair] = "so_socketpair";
+  syscall_table[SYS_sockconfig] = "sockconfig";
+#ifdef SYS_sparc_fixalign
+  syscall_table[SYS_sparc_fixalign] = "sparc_fixalign";
 #endif
-#ifdef SYS_sigpending
-  syscall_table[SYS_sigpending] = "sigpending";
-#endif
-#ifdef SYS_sigpoll
-  syscall_table[SYS_sigpoll] = "sigpoll";
-#endif
-#ifdef SYS_sigprocmask
-  syscall_table[SYS_sigprocmask] = "sigprocmask";
-#endif
-#ifdef SYS_sigqueue
-  syscall_table[SYS_sigqueue] = "sigqueue";
-#endif
-#ifdef SYS_sigreturn
-  syscall_table[SYS_sigreturn] = "sigreturn";
-#endif
-#ifdef SYS_sigsendset
-  syscall_table[SYS_sigsendset] = "sigsendset";
-#endif
-#ifdef SYS_sigsendsys
-  syscall_table[SYS_sigsendsys] = "sigsendsys";
-#endif
-#ifdef SYS_sigsetmask
-  syscall_table[SYS_sigsetmask] = "sigsetmask";
-#endif
-#ifdef SYS_sigstack
-  syscall_table[SYS_sigstack] = "sigstack";
-#endif
-#ifdef SYS_sigsuspend
-  syscall_table[SYS_sigsuspend] = "sigsuspend";
-#endif
-#ifdef SYS_sigvec
-  syscall_table[SYS_sigvec] = "sigvec";
-#endif
-#ifdef SYS_sigwait
-  syscall_table[SYS_sigwait] = "sigwait";
-#endif
-#ifdef SYS_sigwaitprim
-  syscall_table[SYS_sigwaitprim] = "sigwaitprim";
-#endif
-#ifdef SYS_sleep
-  syscall_table[SYS_sleep] = "sleep";
-#endif
-#ifdef SYS_so_socket
-  syscall_table[SYS_so_socket] = "so_socket";
-#endif
-#ifdef SYS_so_socketpair
-  syscall_table[SYS_so_socketpair] = "so_socketpair";
-#endif
-#ifdef SYS_sockconfig
-  syscall_table[SYS_sockconfig] = "sockconfig";
-#endif
-#ifdef SYS_socket
-  syscall_table[SYS_socket] = "socket";
-#endif
-#ifdef SYS_socketpair
-  syscall_table[SYS_socketpair] = "socketpair";
-#endif
-#ifdef SYS_sproc
-  syscall_table[SYS_sproc] = "sproc";
-#endif
-#ifdef SYS_sprocsp
-  syscall_table[SYS_sprocsp] = "sprocsp";
-#endif
-#ifdef SYS_sstk
-  syscall_table[SYS_sstk] = "sstk";
+  syscall_table[SYS_sparc_utrap_install] = "sparc_utrap_install";
+#ifdef SYS_spawn
+  syscall_table[SYS_spawn] = "spawn";
 #endif
 #ifdef SYS_stat
   syscall_table[SYS_stat] = "stat";
@@ -1179,153 +432,73 @@  init_syscall_table (void)
 #ifdef SYS_stat64
   syscall_table[SYS_stat64] = "stat64";
 #endif
-#ifdef SYS_statfs
   syscall_table[SYS_statfs] = "statfs";
-#endif
-#ifdef SYS_statvfs
   syscall_table[SYS_statvfs] = "statvfs";
-#endif
-#ifdef SYS_statvfs64
   syscall_table[SYS_statvfs64] = "statvfs64";
-#endif
-#ifdef SYS_stime
   syscall_table[SYS_stime] = "stime";
-#endif
-#ifdef SYS_stty
   syscall_table[SYS_stty] = "stty";
-#endif
-#ifdef SYS_subsys_info
-  syscall_table[SYS_subsys_info] = "subsys_info";
-#endif
-#ifdef SYS_swapctl
-  syscall_table[SYS_swapctl] = "swapctl";
-#endif
-#ifdef SYS_swapon
-  syscall_table[SYS_swapon] = "swapon";
-#endif
 #ifdef SYS_symlink
   syscall_table[SYS_symlink] = "symlink";
 #endif
-#ifdef SYS_sync
+#ifdef SYS_symlinkat
+  syscall_table[SYS_symlinkat] = "symlinkat";
+#endif
   syscall_table[SYS_sync] = "sync";
-#endif
-#ifdef SYS_sys3b
-  syscall_table[SYS_sys3b] = "sys3b";
-#endif
-#ifdef SYS_syscall
   syscall_table[SYS_syscall] = "syscall";
-#endif
-#ifdef SYS_sysconfig
   syscall_table[SYS_sysconfig] = "sysconfig";
-#endif
-#ifdef SYS_sysfs
   syscall_table[SYS_sysfs] = "sysfs";
-#endif
-#ifdef SYS_sysi86
   syscall_table[SYS_sysi86] = "sysi86";
-#endif
-#ifdef SYS_sysinfo
-  syscall_table[SYS_sysinfo] = "sysinfo";
-#endif
-#ifdef SYS_sysmips
-  syscall_table[SYS_sysmips] = "sysmips";
-#endif
 #ifdef SYS_syssun
   syscall_table[SYS_syssun] = "syssun";
 #endif
-#ifdef SYS_systeminfo
+#ifdef SYS_system_stats
+  syscall_table[SYS_system_stats] = "system_stats";
+#endif
   syscall_table[SYS_systeminfo] = "systeminfo";
-#endif
-#ifdef SYS_table
-  syscall_table[SYS_table] = "table";
-#endif
-#ifdef SYS_time
+  syscall_table[SYS_tasksys] = "tasksys";
   syscall_table[SYS_time] = "time";
-#endif
-#ifdef SYS_timedwait
-  syscall_table[SYS_timedwait] = "timedwait";
-#endif
-#ifdef SYS_timer_create
   syscall_table[SYS_timer_create] = "timer_create";
-#endif
-#ifdef SYS_timer_delete
   syscall_table[SYS_timer_delete] = "timer_delete";
-#endif
-#ifdef SYS_timer_getoverrun
   syscall_table[SYS_timer_getoverrun] = "timer_getoverrun";
-#endif
-#ifdef SYS_timer_gettime
   syscall_table[SYS_timer_gettime] = "timer_gettime";
-#endif
-#ifdef SYS_timer_settime
   syscall_table[SYS_timer_settime] = "timer_settime";
-#endif
-#ifdef SYS_times
   syscall_table[SYS_times] = "times";
-#endif
-#ifdef SYS_truncate
-  syscall_table[SYS_truncate] = "truncate";
-#endif
-#ifdef SYS_truncate64
-  syscall_table[SYS_truncate64] = "truncate64";
-#endif
-#ifdef SYS_tsolsys
-  syscall_table[SYS_tsolsys] = "tsolsys";
-#endif
-#ifdef SYS_uadmin
   syscall_table[SYS_uadmin] = "uadmin";
-#endif
-#ifdef SYS_ulimit
+  syscall_table[SYS_ucredsys] = "ucredsys";
   syscall_table[SYS_ulimit] = "ulimit";
-#endif
-#ifdef SYS_umask
   syscall_table[SYS_umask] = "umask";
-#endif
 #ifdef SYS_umount
   syscall_table[SYS_umount] = "umount";
 #endif
-#ifdef SYS_uname
+  syscall_table[SYS_umount2] = "umount2";
   syscall_table[SYS_uname] = "uname";
-#endif
-#ifdef SYS_unblock
-  syscall_table[SYS_unblock] = "unblock";
-#endif
 #ifdef SYS_unlink
   syscall_table[SYS_unlink] = "unlink";
 #endif
-#ifdef SYS_unmount
-  syscall_table[SYS_unmount] = "unmount";
-#endif
-#ifdef SYS_usleep_thread
-  syscall_table[SYS_usleep_thread] = "usleep_thread";
-#endif
-#ifdef SYS_uswitch
-  syscall_table[SYS_uswitch] = "uswitch";
-#endif
-#ifdef SYS_utc_adjtime
-  syscall_table[SYS_utc_adjtime] = "utc_adjtime";
-#endif
-#ifdef SYS_utc_gettime
-  syscall_table[SYS_utc_gettime] = "utc_gettime";
+#ifdef SYS_unlinkat
+  syscall_table[SYS_unlinkat] = "unlinkat";
 #endif
 #ifdef SYS_utime
   syscall_table[SYS_utime] = "utime";
 #endif
+#ifdef SYS_utimensat
+  syscall_table[SYS_utimensat] = "utimensat";
+#endif
 #ifdef SYS_utimes
   syscall_table[SYS_utimes] = "utimes";
 #endif
-#ifdef SYS_utssys
+#ifdef SYS_utimesys
+  syscall_table[SYS_utimesys] = "utimesys";
+#endif
   syscall_table[SYS_utssys] = "utssys";
+  syscall_table[SYS_uucopy] = "uucopy";
+  syscall_table[SYS_uucopystr] = "uucopystr";
+  syscall_table[SYS_uuidsys] = "uuidsys";
+#ifdef SYS_va_mask
+  syscall_table[SYS_va_mask] = "va_mask";
 #endif
-#ifdef SYS_vfork
   syscall_table[SYS_vfork] = "vfork";
-#endif
-#ifdef SYS_vhangup
   syscall_table[SYS_vhangup] = "vhangup";
-#endif
-#ifdef SYS_vtrace
-  syscall_table[SYS_vtrace] = "vtrace";
-#endif
 #ifdef SYS_wait
   syscall_table[SYS_wait] = "wait";
 #endif
@@ -1335,24 +508,16 @@  init_syscall_table (void)
 #ifdef SYS_waitsys
   syscall_table[SYS_waitsys] = "waitsys";
 #endif
-#ifdef SYS_write
   syscall_table[SYS_write] = "write";
-#endif
-#ifdef SYS_writev
   syscall_table[SYS_writev] = "writev";
-#endif
-#ifdef SYS_xenix
-  syscall_table[SYS_xenix] = "xenix";
-#endif
 #ifdef SYS_xmknod
   syscall_table[SYS_xmknod] = "xmknod";
 #endif
 #ifdef SYS_xstat
   syscall_table[SYS_xstat] = "xstat";
 #endif
-#ifdef SYS_yield
   syscall_table[SYS_yield] = "yield";
-#endif
+  syscall_table[SYS_zone] = "zone";
 }
 
 /* Prettyprint syscall NUM.  */
@@ -1415,130 +580,41 @@  static struct trans signal_table[] =
 
   /* All other signals need preprocessor conditionals.  */
 
-#ifdef SIGHUP
   { SIGHUP, "SIGHUP", "Hangup" },
-#endif
-#ifdef SIGQUIT
   { SIGQUIT, "SIGQUIT", "Quit (ASCII FS)" },
-#endif
-#ifdef SIGTRAP
   { SIGTRAP, "SIGTRAP", "Trace trap" },		/* not reset when caught */
-#endif
-#ifdef SIGIOT
   { SIGIOT, "SIGIOT", "IOT instruction" },
-#endif
-#ifdef SIGEMT
   { SIGEMT, "SIGEMT", "EMT instruction" },
-#endif
-#ifdef SIGKILL
   { SIGKILL, "SIGKILL", "Kill" },	/* Solaris: cannot be caught/ignored */
-#endif
-#ifdef SIGBUS
   { SIGBUS, "SIGBUS", "Bus error" },
-#endif
-#ifdef SIGSYS
   { SIGSYS, "SIGSYS", "Bad argument to system call" },
-#endif
-#ifdef SIGPIPE
   { SIGPIPE, "SIGPIPE", "Write to pipe with no one to read it" },
-#endif
-#ifdef SIGALRM
   { SIGALRM, "SIGALRM", "Alarm clock" },
-#endif
-#ifdef SIGUSR1
   { SIGUSR1, "SIGUSR1", "User defined signal 1" },
-#endif
-#ifdef SIGUSR2
   { SIGUSR2, "SIGUSR2", "User defined signal 2" },
-#endif
-#ifdef SIGCHLD
   { SIGCHLD, "SIGCHLD", "Child status changed" },	/* Posix version */
-#endif
-#ifdef SIGCLD
   { SIGCLD, "SIGCLD", "Child status changed" },		/* Solaris version */
-#endif
-#ifdef SIGPWR
   { SIGPWR, "SIGPWR", "Power-fail restart" },
-#endif
-#ifdef SIGWINCH
   { SIGWINCH, "SIGWINCH", "Window size change" },
-#endif
-#ifdef SIGURG
   { SIGURG, "SIGURG", "Urgent socket condition" },
-#endif
-#ifdef SIGPOLL
   { SIGPOLL, "SIGPOLL", "Pollable event" },
-#endif
-#ifdef SIGIO
   { SIGIO, "SIGIO", "Socket I/O possible" },	/* alias for SIGPOLL */
-#endif
-#ifdef SIGSTOP
   { SIGSTOP, "SIGSTOP", "Stop, not from tty" },	/* cannot be caught or
 						   ignored */
-#endif
-#ifdef SIGTSTP
   { SIGTSTP, "SIGTSTP", "User stop from tty" },
-#endif
-#ifdef SIGCONT
   { SIGCONT, "SIGCONT", "Stopped process has been continued" },
-#endif
-#ifdef SIGTTIN
   { SIGTTIN, "SIGTTIN", "Background tty read attempted" },
-#endif
-#ifdef SIGTTOU
   { SIGTTOU, "SIGTTOU", "Background tty write attempted" },
-#endif
-#ifdef SIGVTALRM
   { SIGVTALRM, "SIGVTALRM", "Virtual timer expired" },
-#endif
-#ifdef SIGPROF
   { SIGPROF, "SIGPROF", "Profiling timer expired" },
-#endif
-#ifdef SIGXCPU
   { SIGXCPU, "SIGXCPU", "Exceeded CPU limit" },
-#endif
-#ifdef SIGXFSZ
   { SIGXFSZ, "SIGXFSZ", "Exceeded file size limit" },
-#endif
-#ifdef SIGWAITING
   { SIGWAITING, "SIGWAITING", "Process's LWPs are blocked" },
-#endif
-#ifdef SIGLWP
   { SIGLWP, "SIGLWP", "Used by thread library" },
-#endif
-#ifdef SIGFREEZE
   { SIGFREEZE, "SIGFREEZE", "Used by CPR" },
-#endif
-#ifdef SIGTHAW
   { SIGTHAW, "SIGTHAW", "Used by CPR" },
-#endif
-#ifdef SIGCANCEL
   { SIGCANCEL, "SIGCANCEL", "Used by libthread" },
-#endif
-#ifdef SIGLOST
   { SIGLOST, "SIGLOST", "Resource lost" },
-#endif
-#ifdef SIG32
-  { SIG32, "SIG32", "Reserved for kernel usage (Irix)" },
-#endif
-#ifdef SIGPTINTR
-  { SIGPTINTR, "SIGPTINTR", "Posix 1003.1b" },
-#endif
-#ifdef SIGTRESCHED
-  { SIGTRESCHED, "SIGTRESCHED", "Posix 1003.1b" },
-#endif
-#ifdef SIGINFO
-  { SIGINFO, "SIGINFO", "Information request" },
-#endif
-#ifdef SIGRESV
-  { SIGRESV, "SIGRESV", "Reserved by Digital for future use" },
-#endif
-#ifdef SIGAIO
-  { SIGAIO, "SIGAIO", "Asynchronous I/O signal" },
-#endif
-#ifdef SIGLIBRT
-  { SIGLIBRT, "SIGLIBRT", "Used by librt" },
-#endif
 
   /* FIXME: add real-time signals.  */
 };
@@ -1601,51 +677,18 @@  proc_prettyprint_signalset (sigset_t *si
 
 static struct trans fault_table[] =
 {
-#ifdef FLTILL
   { FLTILL, "FLTILL", "Illegal instruction" },
-#endif
-#ifdef FLTPRIV
   { FLTPRIV, "FLTPRIV", "Privileged instruction" },
-#endif
-#ifdef FLTBPT
   { FLTBPT, "FLTBPT", "Breakpoint trap" },
-#endif
-#ifdef FLTTRACE
   { FLTTRACE, "FLTTRACE", "Trace trap" },
-#endif
-#ifdef FLTACCESS
   { FLTACCESS, "FLTACCESS", "Memory access fault" },
-#endif
-#ifdef FLTBOUNDS
   { FLTBOUNDS, "FLTBOUNDS", "Memory bounds violation" },
-#endif
-#ifdef FLTIOVF
   { FLTIOVF, "FLTIOVF", "Integer overflow" },
-#endif
-#ifdef FLTIZDIV
   { FLTIZDIV, "FLTIZDIV", "Integer zero divide" },
-#endif
-#ifdef FLTFPE
   { FLTFPE, "FLTFPE", "Floating-point exception" },
-#endif
-#ifdef FLTSTACK
   { FLTSTACK, "FLTSTACK", "Unrecoverable stack fault" },
-#endif
-#ifdef FLTPAGE
   { FLTPAGE, "FLTPAGE", "Recoverable page fault" },
-#endif
-#ifdef FLTPCINVAL
-  { FLTPCINVAL, "FLTPCINVAL", "Invalid PC exception" },
-#endif
-#ifdef FLTWATCH
   { FLTWATCH, "FLTWATCH", "User watchpoint" },
-#endif
-#ifdef FLTKWATCH
-  { FLTKWATCH, "FLTKWATCH", "Kernel watchpoint" },
-#endif
-#ifdef FLTSCWATCH
-  { FLTSCWATCH, "FLTSCWATCH", "Hit a store conditional on a watched page" },
-#endif
 };
 
 /* Work horse.  Accepts an index into the fault table, prints it
diff --git a/gdb/proc-flags.c b/gdb/proc-flags.c
--- a/gdb/proc-flags.c
+++ b/gdb/proc-flags.c
@@ -1,4 +1,4 @@ 
-/* Machine independent support for SVR4 /proc (process file system) for GDB.
+/* Machine independent support for Solaris /proc (process file system) for GDB.
    Copyright (C) 1999-2017 Free Software Foundation, Inc.
    Written by Michael Snyder at Cygnus Solutions.
    Based on work by Fred Fish, Stu Grossman, Geoff Noer, and others.
@@ -27,9 +27,7 @@ 
 
 #include "defs.h"
 
-#if defined (NEW_PROC_API)
 #define _STRUCTURED_PROC 1
-#endif
 
 #include <sys/types.h>
 #include <sys/procfs.h>
@@ -52,220 +50,44 @@  struct trans {
 
 static struct trans pr_flag_table[] =
 {
-#if defined (PR_STOPPED)
-  /* Sol2.5: lwp is stopped
-   * Sol2.6: lwp is stopped
-   * Sol2.7: lwp is stopped
-   * IRIX6:  process is stopped
-   * OSF:    task/thread is stopped
-   * UW:     LWP is stopped
-   */
+  /* lwp is stopped */
   { PR_STOPPED, "PR_STOPPED", "Process (LWP) is stopped" },
-#endif
-#if defined (PR_ISTOP)
-  /* Sol2.5: lwp is stopped on an event of interest
-   * Sol2.6: lwp is stopped on an event of interest
-   * Sol2.7: lwp is stopped on an event of interest
-   * IRIX6:  process is stopped on event of interest
-   * OSF:    task/thread stopped on event of interest
-   * UW:     LWP stopped on an event of interest
-   */
+  /* lwp is stopped on an event of interest */
   { PR_ISTOP, "PR_ISTOP", "Stopped on an event of interest" },
-#endif
-#if defined (PR_DSTOP)
-  /* Sol2.5: lwp has a stop directive in effect
-   * Sol2.6: lwp has a stop directive in effect
-   * Sol2.7: lwp has a stop directive in effect
-   * IRIX6:  process has stop directive in effect
-   * OSF:    task/thread has stop directive in effect
-   * UW:     A stop directive is in effect
-   */
+  /* lwp has a stop directive in effect */
   { PR_DSTOP, "PR_DSTOP", "A stop directive is in effect" },
-#endif
-#if defined (PR_STEP)
-  /* Sol2.5: lwp has a single-step directive in effect
-   * Sol2.6: lwp has a single-step directive in effect
-   * Sol2.7: lwp has a single-step directive in effect
-   * IRIX6:  process has single step pending
-   */
+  /* lwp has a single-step directive in effect */
   { PR_STEP, "PR_STEP", "A single step directive is in effect" },
-#endif
-#if defined (PR_ASLEEP)
-  /* Sol2.5: lwp is sleeping in a system call
-   * Sol2.6: lwp is sleeping in a system call
-   * Sol2.7: lwp is sleeping in a system call
-   * IRIX6:  process is in an interruptible sleep
-   * OSF:    task/thread is asleep within a system call
-   * UW:     LWP is sleep()ing in a system call
-   */
+  /* lwp is sleeping in a system call */
   { PR_ASLEEP, "PR_ASLEEP", "Sleeping in an (interruptible) system call" },
-#endif
-#if defined (PR_PCINVAL)
-  /* Sol2.5: contents of pr_instr undefined
-   * Sol2.6: contents of pr_instr undefined
-   * Sol2.7: contents of pr_instr undefined
-   * IRIX6:  current pc is invalid
-   * OSF:    program counter contains invalid address
-   * UW:     %pc refers to an invalid virtual address
-   */
+  /* contents of pr_instr undefined */
   { PR_PCINVAL, "PR_PCINVAL", "PC (pr_instr) is invalid" },
-#endif
-#if defined (PR_ASLWP)
-  /* Sol2.5: this lwp is the aslwp
-   * Sol2.6: this lwp is the aslwp
-   * Sol2.7: this lwp is the aslwp
-   */
+  /* this lwp is the aslwp */
   { PR_ASLWP, "PR_ASLWP", "This is the asynchronous signal LWP" },
-#endif
-#if defined (PR_AGENT)
-  /* Sol2.6: this lwp is the /proc agent lwp
-   * Sol2.7: this lwp is the /proc agent lwp
-   */
+  /* this lwp is the /proc agent lwp */
   { PR_AGENT, "PR_AGENT", "This is the /proc agent LWP" },
-#endif
-#if defined (PR_ISSYS)
-  /* Sol2.5: system process
-   * Sol2.6: this is a system process
-   * Sol2.7: this is a system process
-   * IRIX6:  process is a system process
-   * OSF:    task/thread is a system task/thread
-   * UW:     System process
-   */
+  /* this is a system process */
   { PR_ISSYS, "PR_ISSYS", "Is a system process/thread" },
-#endif
-#if defined (PR_VFORKP)
-  /* Sol2.6: process is the parent of a vfork()d child
-   * Sol2.7: process is the parent of a vfork()d child
-   */
+  /* process is the parent of a vfork()d child */
   { PR_VFORKP, "PR_VFORKP", "Process is the parent of a vforked child" },
-#endif
-#ifdef PR_ORPHAN
-  /* Sol2.6: process's process group is orphaned
-   * Sol2.7: process's process group is orphaned
-   */
+  /* process's process group is orphaned */
   { PR_ORPHAN, "PR_ORPHAN", "Process's process group is orphaned" },
-#endif
-#if defined (PR_FORK)
-  /* Sol2.5: inherit-on-fork is in effect
-   * Sol2.6: inherit-on-fork is in effect
-   * Sol2.7: inherit-on-fork is in effect
-   * IRIX6:  process has inherit-on-fork flag set
-   * OSF:    task/thread has inherit-on-fork flag set
-   * UW:     inherit-on-fork is in effect
-   */
+  /* inherit-on-fork is in effect */
   { PR_FORK, "PR_FORK", "Inherit-on-fork is in effect" },
-#endif
-#if defined (PR_RLC)
-  /* Sol2.5: run-on-last-close is in effect
-   * Sol2.6: run-on-last-close is in effect
-   * Sol2.7: run-on-last-close is in effect
-   * IRIX6:  process has run-on-last-close flag set
-   * OSF:    task/thread has run-on-last-close flag set
-   * UW:     Run-on-last-close is in effect
-   */
+  /* run-on-last-close is in effect */
   { PR_RLC, "PR_RLC", "Run-on-last-close is in effect" },
-#endif
-#if defined (PR_KLC)
-  /* Sol2.5: kill-on-last-close is in effect
-   * Sol2.6: kill-on-last-close is in effect
-   * Sol2.7: kill-on-last-close is in effect
-   * IRIX6:  process has kill-on-last-close flag set
-   * OSF:    kill-on-last-close, superceeds RLC
-   * UW:     kill-on-last-close is in effect
-   */
+  /* kill-on-last-close is in effect */
   { PR_KLC, "PR_KLC", "Kill-on-last-close is in effect" },
-#endif
-#if defined (PR_ASYNC)
-  /* Sol2.5: asynchronous-stop is in effect
-   * Sol2.6: asynchronous-stop is in effect
-   * Sol2.7: asynchronous-stop is in effect
-   * OSF:    asynchronous stop mode is in effect
-   * UW:     asynchronous stop mode is in effect
-   */
+  /* asynchronous-stop is in effect */
   { PR_ASYNC, "PR_ASYNC", "Asynchronous stop is in effect" },
-#endif
-#if defined (PR_MSACCT)
-  /* Sol2.5: micro-state usage accounting is in effect
-   * Sol2.6: micro-state usage accounting is in effect
-   * Sol2.7: micro-state usage accounting is in effect
-   */
+  /* micro-state usage accounting is in effect */
   { PR_MSACCT, "PR_MSACCT", "Microstate accounting enabled" },
-#endif
-#if defined (PR_BPTADJ)
-  /* Sol2.5: breakpoint trap pc adjustment is in effect
-   * Sol2.6: breakpoint trap pc adjustment is in effect
-   * Sol2.7: breakpoint trap pc adjustment is in effect
-   */
+  /* breakpoint trap pc adjustment is in effect */
   { PR_BPTADJ, "PR_BPTADJ", "Breakpoint PC adjustment in effect" },
-#endif
-#if defined (PR_PTRACE)
-  /* Note: different meanings on Solaris and Irix 6
-   * Sol2.5: obsolete, never set in SunOS5.0
-   * Sol2.6: ptrace-compatibility mode is in effect
-   * Sol2.7: ptrace-compatibility mode is in effect
-   * IRIX6:  process is traced with ptrace() too
-   * OSF:    task/thread is being traced by ptrace
-   * UW:     Process is being controlled by ptrace(2)
-   */
+  /* ptrace-compatibility mode is in effect */
   { PR_PTRACE, "PR_PTRACE", "Process is being controlled by ptrace" },
-#endif
-#if defined (PR_PCOMPAT)
-  /* Note: PCOMPAT on Sol2.5 means same thing as PTRACE on Sol2.6
-   * Sol2.5 (only): ptrace-compatibility mode is in effect
-   */
-  { PR_PCOMPAT, "PR_PCOMPAT", "Ptrace compatibility mode in effect" },
-#endif
-#ifdef PR_MSFORK
-  /* Sol2.6: micro-state accounting inherited on fork
-   * Sol2.7: micro-state accounting inherited on fork
-   */
+  /* micro-state accounting inherited on fork */
   { PR_MSFORK, "PR_PCOMPAT", "Micro-state accounting inherited on fork" },
-#endif
-
-#ifdef PR_ISKTHREAD
-  /* Irix6: process is a kernel thread */
-  { PR_ISKTHREAD, "PR_KTHREAD", "Process is a kernel thread" },
-#endif
-
-#ifdef PR_ABORT
-  /* OSF (only): abort the current stop condition */
-  { PR_ABORT, "PR_ABORT", "Abort the current stop condition" },
-#endif
-
-#ifdef PR_TRACING
-  /* OSF: task is traced */
-  { PR_TRACING, "PR_TRACING", "Task is traced" },
-#endif
-
-#ifdef PR_STOPFORK
-  /* OSF: stop child on fork */
-  { PR_STOPFORK, "PR_STOPFORK", "Stop child on fork" },
-#endif
-
-#ifdef PR_STOPEXEC
-  /* OSF: stop on exec */
-  { PR_STOPEXEC, "PR_STOPEXEC", "Stop on exec" },
-#endif
-
-#ifdef PR_STOPTERM
-  /* OSF: stop on task exit */
-  { PR_STOPTERM, "PR_STOPTERM", "Stop on task exit" },
-#endif
-
-#ifdef PR_STOPTCR
-  /* OSF: stop on thread creation */
-  { PR_STOPTCR, "PR_STOPTCR", "Stop on thread creation" },
-#endif
-
-#ifdef PR_STOPTTERM
-  /* OSF: stop on thread exit */
-  { PR_STOPTTERM, "PR_STOPTTERM", "Stop on thread exit" },
-#endif
-
-#ifdef PR_USCHED
-  /* OSF: user level scheduling is in effect */
-  { PR_USCHED, "PR_USCHED", "User level scheduling is in effect" },
-#endif
 };
 
 void
diff --git a/gdb/proc-why.c b/gdb/proc-why.c
--- a/gdb/proc-why.c
+++ b/gdb/proc-why.c
@@ -1,4 +1,4 @@ 
-/* Machine-independent support for SVR4 /proc (process file system)
+/* Machine-independent support for Solaris /proc (process file system)
 
    Copyright (C) 1999-2017 Free Software Foundation, Inc.
 
@@ -20,9 +20,7 @@ 
 
 #include "defs.h"
 
-#ifdef NEW_PROC_API
 #define _STRUCTURED_PROC 1
-#endif
 
 #include <sys/types.h>
 #include <sys/procfs.h>
@@ -47,55 +45,15 @@  struct trans
 
 static struct trans pr_why_table[] =
 {
-#if defined (PR_REQUESTED)
-  /* All platforms.  */
   { PR_REQUESTED, "PR_REQUESTED", 
     "Directed to stop by debugger via P(IO)CSTOP or P(IO)CWSTOP" },
-#endif
-#if defined (PR_SIGNALLED)
-  /* All platforms.  */
   { PR_SIGNALLED, "PR_SIGNALLED", "Receipt of a traced signal" },
-#endif
-#if defined (PR_SYSENTRY)
-  /* All platforms.  */
   { PR_SYSENTRY, "PR_SYSENTRY", "Entry to a traced system call" },
-#endif
-#if defined (PR_SYSEXIT)
-  /* All platforms.  */
   { PR_SYSEXIT, "PR_SYSEXIT", "Exit from a traced system call" },
-#endif
-#if defined (PR_JOBCONTROL)
-  /* All platforms.  */
   { PR_JOBCONTROL, "PR_JOBCONTROL", "Default job control stop signal action" },
-#endif
-#if defined (PR_FAULTED)
-  /* All platforms.  */
   { PR_FAULTED, "PR_FAULTED", "Incurred a traced hardware fault" },
-#endif
-#if defined (PR_SUSPENDED)
-  /* Solaris only.  */
   { PR_SUSPENDED, "PR_SUSPENDED", "Process suspended" },
-#endif
-#if defined (PR_CHECKPOINT)
-  /* Solaris only.  */
   { PR_CHECKPOINT, "PR_CHECKPOINT", "Process stopped at checkpoint" },
-#endif
-#if defined (PR_FORKSTOP)
-  /* OSF/1 only.  */
-  { PR_FORKSTOP, "PR_FORKSTOP", "Process stopped at end of fork call" },
-#endif
-#if defined (PR_TCRSTOP)
-  /* OSF/1 only.  */
-  { PR_TCRSTOP, "PR_TCRSTOP", "Process stopped on thread creation" },
-#endif
-#if defined (PR_TTSTOP)
-  /* OSF/1 only.  */
-  { PR_TTSTOP, "PR_TTSTOP", "Process stopped on thread termination" },
-#endif
-#if defined (PR_DEAD)
-  /* OSF/1 only.  */
-  { PR_DEAD, "PR_DEAD", "Process stopped in exit system call" },
-#endif
 };
 
 /* Pretty-print the pr_why field of a `struct prstatus' or `struct
@@ -118,42 +76,25 @@  proc_prettyfprint_why (FILE *file, unsig
 	  fprintf (file, ": %s ", pr_why_table[i].desc);
 
 	switch (why) {
-#ifdef PR_REQUESTED
 	case PR_REQUESTED:
 	  break;		/* Nothing more to print.  */
-#endif
-#ifdef PR_SIGNALLED
 	case PR_SIGNALLED:
 	  proc_prettyfprint_signal (file, what, verbose);
 	  break;
-#endif
-#ifdef PR_FAULTED
 	case PR_FAULTED:
 	  proc_prettyfprint_fault (file, what, verbose);
 	  break;
-#endif
-#ifdef PR_SYSENTRY
 	case PR_SYSENTRY:
 	  fprintf (file, "Entry to ");
 	  proc_prettyfprint_syscall (file, what, verbose);
 	  break;
-#endif
-#ifdef PR_SYSEXIT
 	case PR_SYSEXIT:
 	  fprintf (file, "Exit from ");
 	  proc_prettyfprint_syscall (file, what, verbose);
 	  break;
-#endif
-#ifdef PR_JOBCONTROL
 	case PR_JOBCONTROL:
 	  proc_prettyfprint_signal (file, what, verbose);
 	  break;
-#endif
-#ifdef PR_DEAD
-	case PR_DEAD:
-	  fprintf (file, "Exit status: %ld\n", what);
-	  break;
-#endif
 	default:
 	  fprintf (file, "Unknown why %ld, what %ld\n", why, what);
 	  break;
diff --git a/gdb/procfs.c b/gdb/procfs.c
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -1,4 +1,4 @@ 
-/* Machine independent support for SVR4 /proc (process file system) for GDB.
+/* Machine independent support for Solaris /proc (process file system) for GDB.
 
    Copyright (C) 1999-2017 Free Software Foundation, Inc.
 
@@ -33,17 +33,11 @@ 
 #include "nat/fork-inferior.h"
 #include "filestuff.h"
 
-#if defined (NEW_PROC_API)
 #define _STRUCTURED_PROC 1	/* Should be done by configure script.  */
-#endif
 
 #include <sys/procfs.h>
-#ifdef HAVE_SYS_FAULT_H
 #include <sys/fault.h>
-#endif
-#ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
-#endif
 #include "gdb_wait.h"
 #include <signal.h>
 #include <ctype.h>
@@ -57,13 +51,6 @@ 
    /proc file system, which is used on many versions of Unix
    as a means for debuggers to control other processes.
 
-   Examples of the systems that use this interface are:
-
-     Irix
-     Solaris
-     OSF
-     AIX5
-
    /proc works by imitating a file system: you open a simulated file
    that represents the process you wish to interact with, and perform
    operations on that "file" in order to examine or change the state
@@ -75,22 +62,11 @@ 
      One that uses the ioctl system call, and another that uses read
      and write system calls.
 
-   This module has to support both /proc interfaces.  This means that
-   there are two different ways of doing every basic operation.
-
-   In order to keep most of the code simple and clean, I have defined
-   an interface "layer" which hides all these system calls.  An ifdef
-   (NEW_PROC_API) determines which interface we are using, and most or
-   all occurrances of this ifdef should be confined to this interface
-   layer.  */
-
-/* Determine which /proc API we are using: The ioctl API defines
-   PIOCSTATUS, while the read/write (multiple fd) API never does.  */
-
-#ifdef NEW_PROC_API
+   This module supports only the Solaris version of the read/write
+   interface.  */
+
 #include <sys/types.h>
 #include <dirent.h>	/* opendir/readdir, for listing the LWP's */
-#endif
 
 #include <fcntl.h>	/* for O_RDONLY */
 #include <unistd.h>	/* for "X_OK" */
@@ -141,8 +117,8 @@  static const char *procfs_pid_to_str (st
 static int proc_find_memory_regions (struct target_ops *self,
 				     find_memory_region_ftype, void *);
 
-static char * procfs_make_note_section (struct target_ops *self,
-					bfd *, int *);
+static char *procfs_make_note_section (struct target_ops *self,
+				       bfd *, int *);
 
 static int procfs_can_use_hw_breakpoint (struct target_ops *self,
 					 enum bptype, int, int);
@@ -223,94 +199,11 @@  procfs_target (void)
    Put any typedefs, defines etc. here that are required for the
    unification of code that handles different versions of /proc.  */
 
-#ifdef NEW_PROC_API		/* Solaris 7 && 8 method for watchpoints */
-#ifdef WA_READ
-     enum { READ_WATCHFLAG  = WA_READ,
-	    WRITE_WATCHFLAG = WA_WRITE,
-	    EXEC_WATCHFLAG  = WA_EXEC,
-	    AFTER_WATCHFLAG = WA_TRAPAFTER
-     };
-#endif
-#else				/* Irix method for watchpoints */
-     enum { READ_WATCHFLAG  = MA_READ,
-	    WRITE_WATCHFLAG = MA_WRITE,
-	    EXEC_WATCHFLAG  = MA_EXEC,
-	    AFTER_WATCHFLAG = 0		/* trapafter not implemented */
-     };
-#endif
-
-/* gdb_sigset_t */
-#ifdef HAVE_PR_SIGSET_T
-typedef pr_sigset_t gdb_sigset_t;
-#else
-typedef sigset_t gdb_sigset_t;
-#endif
-
-/* sigaction */
-#ifdef HAVE_PR_SIGACTION64_T
-typedef pr_sigaction64_t gdb_sigaction_t;
-#else
-typedef struct sigaction gdb_sigaction_t;
-#endif
-
-/* siginfo */
-#ifdef HAVE_PR_SIGINFO64_T
-typedef pr_siginfo64_t gdb_siginfo_t;
-#else
-typedef siginfo_t gdb_siginfo_t;
-#endif
-
-/* On mips-irix, praddset and prdelset are defined in such a way that
-   they return a value, which causes GCC to emit a -Wunused error
-   because the returned value is not used.  Prevent this warning
-   by casting the return value to void.  On sparc-solaris, this issue
-   does not exist because the definition of these macros already include
-   that cast to void.  */
-#define gdb_praddset(sp, flag) ((void) praddset (sp, flag))
-#define gdb_prdelset(sp, flag) ((void) prdelset (sp, flag))
-
-/* gdb_premptysysset */
-#ifdef premptysysset
-#define gdb_premptysysset premptysysset
-#else
-#define gdb_premptysysset premptyset
-#endif
-
-/* praddsysset */
-#ifdef praddsysset
-#define gdb_praddsysset praddsysset
-#else
-#define gdb_praddsysset gdb_praddset
-#endif
-
-/* prdelsysset */
-#ifdef prdelsysset
-#define gdb_prdelsysset prdelsysset
-#else
-#define gdb_prdelsysset gdb_prdelset
-#endif
-
-/* prissyssetmember */
-#ifdef prissyssetmember
-#define gdb_pr_issyssetmember prissyssetmember
-#else
-#define gdb_pr_issyssetmember prismember
-#endif
-
-/* As a feature test, saying ``#if HAVE_PRSYSENT_T'' everywhere isn't
-   as intuitively descriptive as it could be, so we'll define
-   DYNAMIC_SYSCALLS to mean the same thing.  Anyway, at the time of
-   this writing, this feature is only found on AIX5 systems and
-   basically means that the set of syscalls is not fixed.  I.e,
-   there's no nice table that one can #include to get all of the
-   syscall numbers.  Instead, they're stored in /proc/PID/sysent
-   for each process.  We are at least guaranteed that they won't
-   change over the lifetime of the process.  But each process could
-   (in theory) have different syscall numbers.  */
-#ifdef HAVE_PRSYSENT_T
-#define DYNAMIC_SYSCALLS
-#endif
-
+enum { READ_WATCHFLAG  = WA_READ,
+       WRITE_WATCHFLAG = WA_WRITE,
+       EXEC_WATCHFLAG  = WA_EXEC,
+       AFTER_WATCHFLAG = WA_TRAPAFTER
+};
 
 
 /* =================== STRUCT PROCINFO "MODULE" =================== */
@@ -334,33 +227,13 @@  typedef siginfo_t gdb_siginfo_t;
    information about any random process without interfering with the
    inferior's procinfo information.  */
 
-#ifdef NEW_PROC_API
 /* format strings for /proc paths */
-# ifndef CTL_PROC_NAME_FMT
-#  define MAIN_PROC_NAME_FMT   "/proc/%d"
-#  define CTL_PROC_NAME_FMT    "/proc/%d/ctl"
-#  define AS_PROC_NAME_FMT     "/proc/%d/as"
-#  define MAP_PROC_NAME_FMT    "/proc/%d/map"
-#  define STATUS_PROC_NAME_FMT "/proc/%d/status"
-#  define MAX_PROC_NAME_SIZE sizeof("/proc/99999/lwp/8096/lstatus")
-# endif
-/* the name of the proc status struct depends on the implementation */
-typedef pstatus_t   gdb_prstatus_t;
-typedef lwpstatus_t gdb_lwpstatus_t;
-#else /* ! NEW_PROC_API */
-/* format strings for /proc paths */
-# ifndef CTL_PROC_NAME_FMT
-#  define MAIN_PROC_NAME_FMT   "/proc/%05d"
-#  define CTL_PROC_NAME_FMT    "/proc/%05d"
-#  define AS_PROC_NAME_FMT     "/proc/%05d"
-#  define MAP_PROC_NAME_FMT    "/proc/%05d"
-#  define STATUS_PROC_NAME_FMT "/proc/%05d"
-#  define MAX_PROC_NAME_SIZE sizeof("/proc/ttttppppp")
-# endif
-/* The name of the proc status struct depends on the implementation.  */
-typedef prstatus_t gdb_prstatus_t;
-typedef prstatus_t gdb_lwpstatus_t;
-#endif /* NEW_PROC_API */
+#define MAIN_PROC_NAME_FMT   "/proc/%d"
+#define CTL_PROC_NAME_FMT    "/proc/%d/ctl"
+#define AS_PROC_NAME_FMT     "/proc/%d/as"
+#define MAP_PROC_NAME_FMT    "/proc/%d/map"
+#define STATUS_PROC_NAME_FMT "/proc/%d/status"
+#define MAX_PROC_NAME_SIZE sizeof("/proc/99999/lwp/8096/lstatus")
 
 typedef struct procinfo {
   struct procinfo *next;
@@ -371,39 +244,19 @@  typedef struct procinfo {
   int was_stopped;
   int ignore_next_sigstop;
 
-  /* The following four fd fields may be identical, or may contain
-     several different fd's, depending on the version of /proc
-     (old ioctl or new read/write).  */
-
   int ctl_fd;			/* File descriptor for /proc control file */
-
-  /* The next three file descriptors are actually only needed in the
-     read/write, multiple-file-descriptor implemenation
-     (NEW_PROC_API).  However, to avoid a bunch of #ifdefs in the
-     code, we will use them uniformly by (in the case of the ioctl
-     single-file-descriptor implementation) filling them with copies
-     of the control fd.  */
   int status_fd;		/* File descriptor for /proc status file */
   int as_fd;			/* File descriptor for /proc as file */
 
   char pathname[MAX_PROC_NAME_SIZE];	/* Pathname to /proc entry */
 
   fltset_t saved_fltset;	/* Saved traced hardware fault set */
-  gdb_sigset_t saved_sigset;	/* Saved traced signal set */
-  gdb_sigset_t saved_sighold;	/* Saved held signal set */
+  sigset_t saved_sigset;	/* Saved traced signal set */
+  sigset_t saved_sighold;	/* Saved held signal set */
   sysset_t *saved_exitset;	/* Saved traced system call exit set */
   sysset_t *saved_entryset;	/* Saved traced system call entry set */
 
-  gdb_prstatus_t prstatus;	/* Current process status info */
-
-#ifndef NEW_PROC_API
-  gdb_fpregset_t fpregset;	/* Current floating point registers */
-#endif
-
-#ifdef DYNAMIC_SYSCALLS
-  int num_syscalls;		/* Total number of syscalls */
-  char **syscall_names;		/* Syscall number to name map */
-#endif
+  pstatus_t prstatus;		/* Current process status info */
 
   struct procinfo *thread_list;
 
@@ -420,18 +273,12 @@  static char errmsg[128];	/* shared error
 static procinfo *find_procinfo_or_die (int pid, int tid);
 static procinfo *find_procinfo (int pid, int tid);
 static procinfo *create_procinfo (int pid, int tid);
-static void destroy_procinfo (procinfo * p);
+static void destroy_procinfo (procinfo *p);
 static void do_destroy_procinfo_cleanup (void *);
-static void dead_procinfo (procinfo * p, const char *msg, int killp);
-static int open_procinfo_files (procinfo * p, int which);
-static void close_procinfo_files (procinfo * p);
-static int sysset_t_size (procinfo *p);
-static sysset_t *sysset_t_alloc (procinfo * pi);
-#ifdef DYNAMIC_SYSCALLS
-static void load_syscalls (procinfo *pi);
-static void free_syscalls (procinfo *pi);
-static int find_syscall (procinfo *pi, const char *name);
-#endif /* DYNAMIC_SYSCALLS */
+static void dead_procinfo (procinfo *p, const char *msg, int killp);
+static int open_procinfo_files (procinfo *p, int which);
+static void close_procinfo_files (procinfo *p);
+static sysset_t *sysset_t_alloc (procinfo *pi);
 
 static int iterate_over_mappings
   (procinfo *pi, find_memory_region_ftype child_func, void *data,
@@ -439,7 +286,7 @@  static int iterate_over_mappings
 		void *data));
 
 /* The head of the procinfo list: */
-static procinfo * procinfo_list;
+static procinfo *procinfo_list;
 
 /* Search the procinfo list.  Return a pointer to procinfo, or NULL if
    not found.  */
@@ -523,11 +370,8 @@  open_with_retry (const char *pathname, i
   return status;
 }
 
-/* Open the file descriptor for the process or LWP.  If NEW_PROC_API
-   is defined, we only open the control file descriptor; the others
-   are opened lazily as needed.  Otherwise (if not NEW_PROC_API),
-   there is only one real file descriptor, but we keep multiple copies
-   of it so that the code that uses them does not have to be #ifdef'd.
+/* Open the file descriptor for the process or LWP.  We only open the
+   control file descriptor; the others are opened lazily as needed.
    Returns the file descriptor, or zero for failure.  */
 
 enum { FD_CTL, FD_STATUS, FD_AS };
@@ -535,15 +379,12 @@  enum { FD_CTL, FD_STATUS, FD_AS };
 static int
 open_procinfo_files (procinfo *pi, int which)
 {
-#ifdef NEW_PROC_API
   char tmp[MAX_PROC_NAME_SIZE];
-#endif
   int  fd;
 
   /* This function is getting ALMOST long enough to break up into
      several.  Here is some rationale:
 
-     NEW_PROC_API (Solaris 2.6, Solaris 2.7):
      There are several file descriptors that may need to be open
        for any given process or LWP.  The ones we're intereted in are:
 	 - control	 (ctl)	  write-only	change the state
@@ -562,30 +403,8 @@  open_procinfo_files (procinfo *pi, int w
 	   /proc/<proc-id>/lwp/<lwp-id>/lwpctl
 	   /proc/<proc-id>/lwp/<lwp-id>/lwpstatus
        An LWP has no map or address space file descriptor, since
-       the memory map and address space are shared by all LWPs.
-
-     Everyone else (Solaris 2.5, Irix, OSF)
-       There is only one file descriptor for each process or LWP.
-       For convenience, we copy the same file descriptor into all
-       three fields of the procinfo struct (ctl_fd, status_fd, and
-       as_fd, see NEW_PROC_API above) so that code that uses them
-       doesn't need any #ifdef's.
-	 Pathname for all:
-	   /proc/<proc-id>
-
-       Solaris 2.5 LWP's:
-	 Each LWP has an independent file descriptor, but these
-	 are not obtained via the 'open' system call like the rest:
-	 instead, they're obtained thru an ioctl call (PIOCOPENLWP)
-	 to the file descriptor of the parent process.
-
-       OSF threads:
-	 These do not even have their own independent file descriptor.
-	 All operations are carried out on the file descriptor of the
-	 parent process.  Therefore we just call open again for each
-	 thread, getting a new handle for the same 'file'.  */
-
-#ifdef NEW_PROC_API
+       the memory map and address space are shared by all LWPs.  */
+
   /* In this case, there are several different file descriptors that
      we might be asked to open.  The control file descriptor will be
      opened early, but the others will be opened lazily as they are
@@ -625,50 +444,6 @@  open_procinfo_files (procinfo *pi, int w
   default:
     return 0;		/* unknown file descriptor */
   }
-#else  /* not NEW_PROC_API */
-  /* In this case, there is only one file descriptor for each procinfo
-     (ie. each process or LWP).  In fact, only the file descriptor for
-     the process can actually be opened by an 'open' system call.  The
-     ones for the LWPs have to be obtained thru an IOCTL call on the
-     process's file descriptor.
-
-     For convenience, we copy each procinfo's single file descriptor
-     into all of the fields occupied by the several file descriptors
-     of the NEW_PROC_API implementation.  That way, the code that uses
-     them can be written without ifdefs.  */
-
-
-#ifdef PIOCTSTATUS	/* OSF */
-  /* Only one FD; just open it.  */
-  if ((fd = open_with_retry (pi->pathname, O_RDWR)) < 0)
-    return 0;
-#else			/* Sol 2.5, Irix, other?  */
-  if (pi->tid == 0)	/* Master procinfo for the process */
-    {
-      fd = open_with_retry (pi->pathname, O_RDWR);
-      if (fd < 0)
-	return 0;	/* fail */
-    }
-  else			/* LWP thread procinfo */
-    {
-#ifdef PIOCOPENLWP	/* Sol 2.5, thread/LWP */
-      procinfo *process;
-      int lwpid = pi->tid;
-
-      /* Find the procinfo for the entire process.  */
-      if ((process = find_procinfo (pi->pid, 0)) == NULL)
-	return 0;	/* fail */
-
-      /* Now obtain the file descriptor for the LWP.  */
-      if ((fd = ioctl (process->ctl_fd, PIOCOPENLWP, &lwpid)) < 0)
-	return 0;	/* fail */
-#else			/* Irix, other?  */
-      return 0;		/* Don't know how to open threads.  */
-#endif	/* Sol 2.5 PIOCOPENLWP */
-    }
-#endif	/* OSF     PIOCTSTATUS */
-  pi->ctl_fd = pi->as_fd = pi->status_fd = fd;
-#endif	/* NEW_PROC_API */
 
   return 1;		/* success */
 }
@@ -696,10 +471,6 @@  create_procinfo (int pid, int tid)
   pi->pid = pid;
   pi->tid = tid;
 
-#ifdef DYNAMIC_SYSCALLS
-  load_syscalls (pi);
-#endif
-
   pi->saved_entryset = sysset_t_alloc (pi);
   pi->saved_exitset = sysset_t_alloc (pi);
 
@@ -712,11 +483,7 @@  create_procinfo (int pid, int tid)
     }
   else
     {
-#ifdef NEW_PROC_API
       sprintf (pi->pathname, "/proc/%05d/lwp/%d", pid, tid);
-#else
-      sprintf (pi->pathname, MAIN_PROC_NAME_FMT, pid);
-#endif
       pi->next = parent->thread_list;
       parent->thread_list = pi;
     }
@@ -730,12 +497,10 @@  close_procinfo_files (procinfo *pi)
 {
   if (pi->ctl_fd > 0)
     close (pi->ctl_fd);
-#ifdef NEW_PROC_API
   if (pi->as_fd > 0)
     close (pi->as_fd);
   if (pi->status_fd > 0)
     close (pi->status_fd);
-#endif
   pi->ctl_fd = pi->as_fd = pi->status_fd = 0;
 }
 
@@ -761,9 +526,6 @@  destroy_one_procinfo (procinfo **list, p
   close_procinfo_files (pi);
 
   /* Step three: free the memory.  */
-#ifdef DYNAMIC_SYSCALLS
-  free_syscalls (pi);
-#endif
   xfree (pi->saved_entryset);
   xfree (pi->saved_exitset);
   xfree (pi);
@@ -822,180 +584,14 @@  dead_procinfo (procinfo *pi, const char 
   error ("%s", msg);
 }
 
-/* Returns the (complete) size of a sysset_t struct.  Normally, this
-   is just sizeof (sysset_t), but in the case of Monterey/64, the
-   actual size of sysset_t isn't known until runtime.  */
-
-static int
-sysset_t_size (procinfo * pi)
+/* Allocate and (partially) initialize a sysset_t struct.  */
+
+static sysset_t *
+sysset_t_alloc (procinfo *pi)
 {
-#ifndef DYNAMIC_SYSCALLS
-  return sizeof (sysset_t);
-#else
-  return sizeof (sysset_t) - sizeof (uint64_t)
-    + sizeof (uint64_t) * ((pi->num_syscalls + (8 * sizeof (uint64_t) - 1))
-			   / (8 * sizeof (uint64_t)));
-#endif
+  return (sysset_t *) xmalloc (sizeof (sysset_t));
 }
 
-/* Allocate and (partially) initialize a sysset_t struct.  */
-
-static sysset_t *
-sysset_t_alloc (procinfo * pi)
-{
-  sysset_t *ret;
-  int size = sysset_t_size (pi);
-
-  ret = (sysset_t *) xmalloc (size);
-#ifdef DYNAMIC_SYSCALLS
-  ret->pr_size = ((pi->num_syscalls + (8 * sizeof (uint64_t) - 1))
-		  / (8 * sizeof (uint64_t)));
-#endif
-  return ret;
-}
-
-#ifdef DYNAMIC_SYSCALLS
-
-/* Extract syscall numbers and names from /proc/<pid>/sysent.  Initialize
-   pi->num_syscalls with the number of syscalls and pi->syscall_names
-   with the names.  (Certain numbers may be skipped in which case the
-   names for these numbers will be left as NULL.)  */
-
-#define MAX_SYSCALL_NAME_LENGTH 256
-#define MAX_SYSCALLS 65536
-
-static void
-load_syscalls (procinfo *pi)
-{
-  char pathname[MAX_PROC_NAME_SIZE];
-  int sysent_fd;
-  prsysent_t header;
-  prsyscall_t *syscalls;
-  int i, size, maxcall;
-  struct cleanup *cleanups;
-
-  pi->num_syscalls = 0;
-  pi->syscall_names = 0;
-
-  /* Open the file descriptor for the sysent file.  */
-  sprintf (pathname, "/proc/%d/sysent", pi->pid);
-  sysent_fd = open_with_retry (pathname, O_RDONLY);
-  if (sysent_fd < 0)
-    {
-      error (_("load_syscalls: Can't open /proc/%d/sysent"), pi->pid);
-    }
-  cleanups = make_cleanup_close (sysent_fd);
-
-  size = sizeof header - sizeof (prsyscall_t);
-  if (read (sysent_fd, &header, size) != size)
-    {
-      error (_("load_syscalls: Error reading /proc/%d/sysent"), pi->pid);
-    }
-
-  if (header.pr_nsyscalls == 0)
-    {
-      error (_("load_syscalls: /proc/%d/sysent contains no syscalls!"),
-	     pi->pid);
-    }
-
-  size = header.pr_nsyscalls * sizeof (prsyscall_t);
-  syscalls = xmalloc (size);
-  make_cleanup (free_current_contents, &syscalls);
-
-  if (read (sysent_fd, syscalls, size) != size)
-    error (_("load_syscalls: Error reading /proc/%d/sysent"), pi->pid);
-
-  /* Find maximum syscall number.  This may not be the same as
-     pr_nsyscalls since that value refers to the number of entries
-     in the table.  (Also, the docs indicate that some system
-     call numbers may be skipped.)  */
-
-  maxcall = syscalls[0].pr_number;
-
-  for (i = 1; i <  header.pr_nsyscalls; i++)
-    if (syscalls[i].pr_number > maxcall
-	&& syscalls[i].pr_nameoff > 0
-	&& syscalls[i].pr_number < MAX_SYSCALLS)
-      maxcall = syscalls[i].pr_number;
-
-  pi->num_syscalls = maxcall+1;
-  pi->syscall_names = XNEWVEC (char *, pi->num_syscalls);
-
-  for (i = 0; i < pi->num_syscalls; i++)
-    pi->syscall_names[i] = NULL;
-
-  /* Read the syscall names in.  */
-  for (i = 0; i < header.pr_nsyscalls; i++)
-    {
-      char namebuf[MAX_SYSCALL_NAME_LENGTH];
-      int nread;
-      int callnum;
-
-      if (syscalls[i].pr_number >= MAX_SYSCALLS
-	  || syscalls[i].pr_number < 0
-	  || syscalls[i].pr_nameoff <= 0
-	  || (lseek (sysent_fd, (off_t) syscalls[i].pr_nameoff, SEEK_SET)
-				       != (off_t) syscalls[i].pr_nameoff))
-	continue;
-
-      nread = read (sysent_fd, namebuf, sizeof namebuf);
-      if (nread <= 0)
-	continue;
-
-      callnum = syscalls[i].pr_number;
-
-      if (pi->syscall_names[callnum] != NULL)
-	{
-	  /* FIXME: Generate warning.  */
-	  continue;
-	}
-
-      namebuf[nread-1] = '\0';
-      size = strlen (namebuf) + 1;
-      pi->syscall_names[callnum] = xmalloc (size);
-      strncpy (pi->syscall_names[callnum], namebuf, size-1);
-      pi->syscall_names[callnum][size-1] = '\0';
-    }
-
-  do_cleanups (cleanups);
-}
-
-/* Free the space allocated for the syscall names from the procinfo
-   structure.  */
-
-static void
-free_syscalls (procinfo *pi)
-{
-  if (pi->syscall_names)
-    {
-      int i;
-
-      for (i = 0; i < pi->num_syscalls; i++)
-	if (pi->syscall_names[i] != NULL)
-	  xfree (pi->syscall_names[i]);
-
-      xfree (pi->syscall_names);
-      pi->syscall_names = 0;
-    }
-}
-
-/* Given a name, look up (and return) the corresponding syscall number.
-   If no match is found, return -1.  */
-
-static int
-find_syscall (procinfo *pi, const char *name)
-{
-  int i;
-
-  for (i = 0; i < pi->num_syscalls; i++)
-    {
-      if (pi->syscall_names[i] && strcmp (name, pi->syscall_names[i]) == 0)
-	return i;
-    }
-  return -1;
-}
-#endif
-
 /* =================== END, STRUCT PROCINFO "MODULE" =================== */
 
 /* ===================  /proc  "MODULE" =================== */
@@ -1010,13 +606,13 @@  find_syscall (procinfo *pi, const char *
    than have a bunch of #ifdefs all thru the gdb target vector
    functions, we do our best to hide them all in here.  */
 
-static long proc_flags (procinfo * pi);
-static int proc_why (procinfo * pi);
-static int proc_what (procinfo * pi);
-static int proc_set_current_signal (procinfo * pi, int signo);
-static int proc_get_current_thread (procinfo * pi);
+static long proc_flags (procinfo *pi);
+static int proc_why (procinfo *pi);
+static int proc_what (procinfo *pi);
+static int proc_set_current_signal (procinfo *pi, int signo);
+static int proc_get_current_thread (procinfo *pi);
 static int proc_iterate_over_threads
-  (procinfo * pi,
+  (procinfo *pi,
    int (*func) (procinfo *, procinfo *, void *),
    void *ptr);
 
@@ -1051,7 +647,6 @@  proc_get_status (procinfo *pi)
       return 0;
     }
 
-#ifdef NEW_PROC_API
   if (lseek (pi->status_fd, 0, SEEK_SET) < 0)
     pi->status_valid = 0;			/* fail */
   else
@@ -1067,42 +662,10 @@  proc_get_status (procinfo *pi)
 	{
 	  pi->status_valid = (read (pi->status_fd,
 				    (char *) &pi->prstatus,
-				    sizeof (gdb_prstatus_t))
-			      == sizeof (gdb_prstatus_t));
+				    sizeof (pstatus_t))
+			      == sizeof (pstatus_t));
 	}
     }
-#else	/* ioctl method */
-#ifdef PIOCTSTATUS	/* osf */
-  if (pi->tid == 0)	/* main process */
-    {
-      /* Just read the danged status.  Now isn't that simple?  */
-      pi->status_valid =
-	(ioctl (pi->status_fd, PIOCSTATUS, &pi->prstatus) >= 0);
-    }
-  else
-    {
-      int win;
-      struct {
-	long pr_count;
-	tid_t pr_error_thread;
-	struct prstatus status;
-      } thread_status;
-
-      thread_status.pr_count = 1;
-      thread_status.status.pr_tid = pi->tid;
-      win = (ioctl (pi->status_fd, PIOCTSTATUS, &thread_status) >= 0);
-      if (win)
-	{
-	  memcpy (&pi->prstatus, &thread_status.status,
-		  sizeof (pi->prstatus));
-	  pi->status_valid = 1;
-	}
-    }
-#else
-  /* Just read the danged status.  Now isn't that simple?  */
-  pi->status_valid = (ioctl (pi->status_fd, PIOCSTATUS, &pi->prstatus) >= 0);
-#endif
-#endif
 
   if (pi->status_valid)
     {
@@ -1114,11 +677,9 @@  proc_get_status (procinfo *pi)
 
   /* The status struct includes general regs, so mark them valid too.  */
   pi->gregs_valid  = pi->status_valid;
-#ifdef NEW_PROC_API
   /* In the read/write multiple-fd model, the status struct includes
      the fp regs too, so mark them valid too.  */
   pi->fpregs_valid = pi->status_valid;
-#endif
   return pi->status_valid;	/* True if success, false if failure.  */
 }
 
@@ -1131,11 +692,7 @@  proc_flags (procinfo *pi)
     if (!proc_get_status (pi))
       return 0;	/* FIXME: not a good failure value (but what is?)  */
 
-#ifdef NEW_PROC_API
   return pi->prstatus.pr_lwp.pr_flags;
-#else
-  return pi->prstatus.pr_flags;
-#endif
 }
 
 /* Returns the pr_why field (why the process stopped).  */
@@ -1147,11 +704,7 @@  proc_why (procinfo *pi)
     if (!proc_get_status (pi))
       return 0;	/* FIXME: not a good failure value (but what is?)  */
 
-#ifdef NEW_PROC_API
   return pi->prstatus.pr_lwp.pr_why;
-#else
-  return pi->prstatus.pr_why;
-#endif
 }
 
 /* Returns the pr_what field (details of why the process stopped).  */
@@ -1163,11 +716,7 @@  proc_what (procinfo *pi)
     if (!proc_get_status (pi))
       return 0;	/* FIXME: not a good failure value (but what is?)  */
 
-#ifdef NEW_PROC_API
   return pi->prstatus.pr_lwp.pr_what;
-#else
-  return pi->prstatus.pr_what;
-#endif
 }
 
 /* This function is only called when PI is stopped by a watchpoint.
@@ -1182,20 +731,12 @@  proc_watchpoint_address (procinfo *pi, C
     if (!proc_get_status (pi))
       return 0;
 
-#ifdef NEW_PROC_API
   *addr = (CORE_ADDR) gdbarch_pointer_to_address (target_gdbarch (),
 	    builtin_type (target_gdbarch ())->builtin_data_ptr,
 	    (gdb_byte *) &pi->prstatus.pr_lwp.pr_info.si_addr);
-#else
-  *addr = (CORE_ADDR) gdbarch_pointer_to_address (target_gdbarch (),
-	    builtin_type (target_gdbarch ())->builtin_data_ptr,
-	    (gdb_byte *) &pi->prstatus.pr_info.si_addr);
-#endif
   return 1;
 }
 
-#ifndef PIOCSSPCACT	/* The following is not supported on OSF.  */
-
 /* Returns the pr_nsysarg field (number of args to the current
    syscall).  */
 
@@ -1206,11 +747,7 @@  proc_nsysarg (procinfo *pi)
     if (!proc_get_status (pi))
       return 0;
 
-#ifdef NEW_PROC_API
   return pi->prstatus.pr_lwp.pr_nsysarg;
-#else
-  return pi->prstatus.pr_nsysarg;
-#endif
 }
 
 /* Returns the pr_sysarg field (pointer to the arguments of current
@@ -1223,53 +760,16 @@  proc_sysargs (procinfo *pi)
     if (!proc_get_status (pi))
       return NULL;
 
-#ifdef NEW_PROC_API
   return (long *) &pi->prstatus.pr_lwp.pr_sysarg;
-#else
-  return (long *) &pi->prstatus.pr_sysarg;
-#endif
 }
-#endif /* PIOCSSPCACT */
-
-#ifdef PROCFS_DONT_PIOCSSIG_CURSIG
-/* Returns the pr_cursig field (current signal).  */
-
-static long
-proc_cursig (struct procinfo *pi)
-{
-  if (!pi->status_valid)
-    if (!proc_get_status (pi))
-      return 0;	/* FIXME: not a good failure value (but what is?)  */
-
-#ifdef NEW_PROC_API
-  return pi->prstatus.pr_lwp.pr_cursig;
-#else
-  return pi->prstatus.pr_cursig;
-#endif
-}
-#endif /* PROCFS_DONT_PIOCSSIG_CURSIG */
-
-/* === I appologize for the messiness of this function.
-   === This is an area where the different versions of
-   === /proc are more inconsistent than usual.
-
-   Set or reset any of the following process flags:
+
+/* Set or reset any of the following process flags:
       PR_FORK	-- forked child will inherit trace flags
       PR_RLC	-- traced process runs when last /proc file closed.
       PR_KLC    -- traced process is killed when last /proc file closed.
       PR_ASYNC	-- LWP's get to run/stop independently.
 
-   There are three methods for doing this function:
-   1) Newest: read/write [PCSET/PCRESET/PCUNSET]
-      [Sol6, Sol7, UW]
-   2) Middle: PIOCSET/PIOCRESET
-      [Irix, Sol5]
-   3) Oldest: PIOCSFORK/PIOCRFORK/PIOCSRLC/PIOCRRLC
-      [OSF, Sol5]
-
-   Note: Irix does not define PR_ASYNC.
-   Note: OSF  does not define PR_KLC.
-   Note: OSF  is the only one that can ONLY use the oldest method.
+   This function is done using read/write [PCSET/PCRESET/PCUNSET].
 
    Arguments:
       pi   -- the procinfo
@@ -1294,70 +794,16 @@  proc_modify_flag (procinfo *pi, long fla
   if (pi->pid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API	/* Newest method: Newer Solarii.  */
-  /* First normalize the PCUNSET/PCRESET command opcode
-     (which for no obvious reason has a different definition
-     from one operating system to the next...)  */
-#ifdef  PCUNSET
-#define GDBRESET PCUNSET
-#else
-#ifdef  PCRESET
-#define GDBRESET PCRESET
-#endif
-#endif
-  {
-    procfs_ctl_t arg[2];
-
-    if (mode == FLAG_SET)	/* Set the flag (RLC, FORK, or ASYNC).  */
-      arg[0] = PCSET;
-    else			/* Reset the flag.  */
-      arg[0] = GDBRESET;
-
-    arg[1] = flag;
-    win = (write (pi->ctl_fd, (void *) &arg, sizeof (arg)) == sizeof (arg));
-  }
-#else
-#ifdef PIOCSET		/* Irix/Sol5 method */
-  if (mode == FLAG_SET)	/* Set the flag (hopefully RLC, FORK, or ASYNC).  */
-    {
-      win = (ioctl (pi->ctl_fd, PIOCSET, &flag)   >= 0);
-    }
+  procfs_ctl_t arg[2];
+
+  if (mode == FLAG_SET)	/* Set the flag (RLC, FORK, or ASYNC).  */
+    arg[0] = PCSET;
   else			/* Reset the flag.  */
-    {
-      win = (ioctl (pi->ctl_fd, PIOCRESET, &flag) >= 0);
-    }
-
-#else
-#ifdef PIOCSRLC		/* Oldest method: OSF */
-  switch (flag) {
-  case PR_RLC:
-    if (mode == FLAG_SET)	/* Set run-on-last-close */
-      {
-	win = (ioctl (pi->ctl_fd, PIOCSRLC, NULL) >= 0);
-      }
-    else			/* Clear run-on-last-close */
-      {
-	win = (ioctl (pi->ctl_fd, PIOCRRLC, NULL) >= 0);
-      }
-    break;
-  case PR_FORK:
-    if (mode == FLAG_SET)	/* Set inherit-on-fork */
-      {
-	win = (ioctl (pi->ctl_fd, PIOCSFORK, NULL) >= 0);
-      }
-    else			/* Clear inherit-on-fork */
-      {
-	win = (ioctl (pi->ctl_fd, PIOCRFORK, NULL) >= 0);
-      }
-    break;
-  default:
-    win = 0;		/* Fail -- unknown flag (can't do PR_ASYNC).  */
-    break;
-  }
-#endif
-#endif
-#endif
-#undef GDBRESET
+    arg[0] = PCUNSET;
+
+  arg[1] = flag;
+  win = (write (pi->ctl_fd, (void *) &arg, sizeof (arg)) == sizeof (arg));
+
   /* The above operation renders the procinfo's cached pstatus
      obsolete.  */
   pi->status_valid = 0;
@@ -1366,12 +812,8 @@  proc_modify_flag (procinfo *pi, long fla
     warning (_("procfs: modify_flag failed to turn %s %s"),
 	     flag == PR_FORK  ? "PR_FORK"  :
 	     flag == PR_RLC   ? "PR_RLC"   :
-#ifdef PR_ASYNC
 	     flag == PR_ASYNC ? "PR_ASYNC" :
-#endif
-#ifdef PR_KLC
 	     flag == PR_KLC   ? "PR_KLC"   :
-#endif
 	     "<unknown flag>",
 	     mode == FLAG_RESET ? "off" : "on");
 
@@ -1409,7 +851,6 @@  proc_unset_inherit_on_fork (procinfo *pi
   return proc_modify_flag (pi, PR_FORK, FLAG_RESET);
 }
 
-#ifdef PR_ASYNC
 /* Set PR_ASYNC flag.  If one LWP stops because of a debug event
    (signal etc.), the remaining LWPs will continue to run.  Returns
    non-zero for success, zero for failure.  */
@@ -1429,7 +870,6 @@  proc_unset_async (procinfo *pi)
 {
   return proc_modify_flag (pi, PR_ASYNC, FLAG_RESET);
 }
-#endif /* PR_ASYNC */
 
 /* Request the process/LWP to stop.  Does not wait.  Returns non-zero
    for success, zero for failure.  */
@@ -1447,22 +887,9 @@  proc_stop_process (procinfo *pi)
     return 0;
   else
     {
-#ifdef NEW_PROC_API
       procfs_ctl_t cmd = PCSTOP;
 
       win = (write (pi->ctl_fd, (char *) &cmd, sizeof (cmd)) == sizeof (cmd));
-#else	/* ioctl method */
-      win = (ioctl (pi->ctl_fd, PIOCSTOP, &pi->prstatus) >= 0);
-      /* Note: the call also reads the prstatus.  */
-      if (win)
-	{
-	  pi->status_valid = 1;
-	  PROC_PRETTYFPRINT_STATUS (proc_flags (pi),
-				    proc_why (pi),
-				    proc_what (pi),
-				    proc_get_current_thread (pi));
-	}
-#endif
     }
 
   return win;
@@ -1484,26 +911,11 @@  proc_wait_for_stop (procinfo *pi)
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
-  {
-    procfs_ctl_t cmd = PCWSTOP;
-
-    win = (write (pi->ctl_fd, (char *) &cmd, sizeof (cmd)) == sizeof (cmd));
-    /* We been runnin' and we stopped -- need to update status.  */
-    pi->status_valid = 0;
-  }
-#else	/* ioctl method */
-  win = (ioctl (pi->ctl_fd, PIOCWSTOP, &pi->prstatus) >= 0);
-  /* Above call also refreshes the prstatus.  */
-  if (win)
-    {
-      pi->status_valid = 1;
-      PROC_PRETTYFPRINT_STATUS (proc_flags (pi),
-				proc_why (pi),
-				proc_what (pi),
-				proc_get_current_thread (pi));
-    }
-#endif
+  procfs_ctl_t cmd = PCWSTOP;
+
+  win = (write (pi->ctl_fd, (char *) &cmd, sizeof (cmd)) == sizeof (cmd));
+  /* We been runnin' and we stopped -- need to update status.  */
+  pi->status_valid = 0;
 
   return win;
 }
@@ -1550,23 +962,11 @@  proc_run_process (procinfo *pi, int step
   else if (signo != -1)		/* -1 means do nothing W.R.T. signals.  */
     proc_set_current_signal (pi, signo);
 
-#ifdef NEW_PROC_API
-  {
-    procfs_ctl_t cmd[2];
-
-    cmd[0]  = PCRUN;
-    cmd[1]  = runflags;
-    win = (write (pi->ctl_fd, (char *) &cmd, sizeof (cmd)) == sizeof (cmd));
-  }
-#else	/* ioctl method */
-  {
-    prrun_t prrun;
-
-    memset (&prrun, 0, sizeof (prrun));
-    prrun.pr_flags  = runflags;
-    win = (ioctl (pi->ctl_fd, PIOCRUN, &prrun) >= 0);
-  }
-#endif
+  procfs_ctl_t cmd[2];
+
+  cmd[0]  = PCRUN;
+  cmd[1]  = runflags;
+  win = (write (pi->ctl_fd, (char *) &cmd, sizeof (cmd)) == sizeof (cmd));
 
   return win;
 }
@@ -1575,7 +975,7 @@  proc_run_process (procinfo *pi, int step
    for success, zero for failure.  */
 
 static int
-proc_set_traced_signals (procinfo *pi, gdb_sigset_t *sigset)
+proc_set_traced_signals (procinfo *pi, sigset_t *sigset)
 {
   int win;
 
@@ -1587,22 +987,17 @@  proc_set_traced_signals (procinfo *pi, g
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
-  {
-    struct {
-      procfs_ctl_t cmd;
-      /* Use char array to avoid alignment issues.  */
-      char sigset[sizeof (gdb_sigset_t)];
-    } arg;
-
-    arg.cmd = PCSTRACE;
-    memcpy (&arg.sigset, sigset, sizeof (gdb_sigset_t));
-
-    win = (write (pi->ctl_fd, (char *) &arg, sizeof (arg)) == sizeof (arg));
-  }
-#else	/* ioctl method */
-  win = (ioctl (pi->ctl_fd, PIOCSTRACE, sigset) >= 0);
-#endif
+  struct {
+    procfs_ctl_t cmd;
+    /* Use char array to avoid alignment issues.  */
+    char sigset[sizeof (sigset_t)];
+  } arg;
+
+  arg.cmd = PCSTRACE;
+  memcpy (&arg.sigset, sigset, sizeof (sigset_t));
+
+  win = (write (pi->ctl_fd, (char *) &arg, sizeof (arg)) == sizeof (arg));
+
   /* The above operation renders the procinfo's cached pstatus obsolete.  */
   pi->status_valid = 0;
 
@@ -1627,22 +1022,17 @@  proc_set_traced_faults (procinfo *pi, fl
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
-  {
-    struct {
-      procfs_ctl_t cmd;
-      /* Use char array to avoid alignment issues.  */
-      char fltset[sizeof (fltset_t)];
-    } arg;
-
-    arg.cmd = PCSFAULT;
-    memcpy (&arg.fltset, fltset, sizeof (fltset_t));
-
-    win = (write (pi->ctl_fd, (char *) &arg, sizeof (arg)) == sizeof (arg));
-  }
-#else	/* ioctl method */
-  win = (ioctl (pi->ctl_fd, PIOCSFAULT, fltset) >= 0);
-#endif
+  struct {
+    procfs_ctl_t cmd;
+    /* Use char array to avoid alignment issues.  */
+    char fltset[sizeof (fltset_t)];
+  } arg;
+
+  arg.cmd = PCSFAULT;
+  memcpy (&arg.fltset, fltset, sizeof (fltset_t));
+
+  win = (write (pi->ctl_fd, (char *) &arg, sizeof (arg)) == sizeof (arg));
+
   /* The above operation renders the procinfo's cached pstatus obsolete.  */
   pi->status_valid = 0;
 
@@ -1665,28 +1055,21 @@  proc_set_traced_sysentry (procinfo *pi, 
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
-  {
-    struct gdb_proc_ctl_pcsentry {
-      procfs_ctl_t cmd;
-      /* Use char array to avoid alignment issues.  */
-      char sysset[sizeof (sysset_t)];
-    } *argp;
-    int argp_size = sizeof (struct gdb_proc_ctl_pcsentry)
-		  - sizeof (sysset_t)
-		  + sysset_t_size (pi);
-
-    argp = (struct gdb_proc_ctl_pcsentry *) xmalloc (argp_size);
-
-    argp->cmd = PCSENTRY;
-    memcpy (&argp->sysset, sysset, sysset_t_size (pi));
-
-    win = (write (pi->ctl_fd, (char *) argp, argp_size) == argp_size);
-    xfree (argp);
-  }
-#else	/* ioctl method */
-  win = (ioctl (pi->ctl_fd, PIOCSENTRY, sysset) >= 0);
-#endif
+  struct gdb_proc_ctl_pcsentry {
+    procfs_ctl_t cmd;
+    /* Use char array to avoid alignment issues.  */
+    char sysset[sizeof (sysset_t)];
+  } *argp;
+  int argp_size = sizeof (struct gdb_proc_ctl_pcsentry);
+
+  argp = (struct gdb_proc_ctl_pcsentry *) xmalloc (argp_size);
+
+  argp->cmd = PCSENTRY;
+  memcpy (&argp->sysset, sysset, sizeof (sysset_t));
+
+  win = (write (pi->ctl_fd, (char *) argp, argp_size) == argp_size);
+  xfree (argp);
+
   /* The above operation renders the procinfo's cached pstatus
      obsolete.  */
   pi->status_valid = 0;
@@ -1710,28 +1093,21 @@  proc_set_traced_sysexit (procinfo *pi, s
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
-  {
-    struct gdb_proc_ctl_pcsexit {
-      procfs_ctl_t cmd;
-      /* Use char array to avoid alignment issues.  */
-      char sysset[sizeof (sysset_t)];
-    } *argp;
-    int argp_size = sizeof (struct gdb_proc_ctl_pcsexit)
-		  - sizeof (sysset_t)
-		  + sysset_t_size (pi);
-
-    argp = (struct gdb_proc_ctl_pcsexit *) xmalloc (argp_size);
-
-    argp->cmd = PCSEXIT;
-    memcpy (&argp->sysset, sysset, sysset_t_size (pi));
-
-    win = (write (pi->ctl_fd, (char *) argp, argp_size) == argp_size);
-    xfree (argp);
-  }
-#else	/* ioctl method */
-  win = (ioctl (pi->ctl_fd, PIOCSEXIT, sysset) >= 0);
-#endif
+  struct gdb_proc_ctl_pcsexit {
+    procfs_ctl_t cmd;
+    /* Use char array to avoid alignment issues.  */
+    char sysset[sizeof (sysset_t)];
+  } *argp;
+  int argp_size = sizeof (struct gdb_proc_ctl_pcsexit);
+
+  argp = (struct gdb_proc_ctl_pcsexit *) xmalloc (argp_size);
+
+  argp->cmd = PCSEXIT;
+  memcpy (&argp->sysset, sysset, sizeof (sysset_t));
+
+  win = (write (pi->ctl_fd, (char *) argp, argp_size) == argp_size);
+  xfree (argp);
+
   /* The above operation renders the procinfo's cached pstatus
      obsolete.  */
   pi->status_valid = 0;
@@ -1743,7 +1119,7 @@  proc_set_traced_sysexit (procinfo *pi, s
    Returns non-zero for success, zero for failure.  */
 
 static int
-proc_set_held_signals (procinfo *pi, gdb_sigset_t *sighold)
+proc_set_held_signals (procinfo *pi, sigset_t *sighold)
 {
   int win;
 
@@ -1755,21 +1131,16 @@  proc_set_held_signals (procinfo *pi, gdb
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
-  {
-    struct {
-      procfs_ctl_t cmd;
-      /* Use char array to avoid alignment issues.  */
-      char hold[sizeof (gdb_sigset_t)];
-    } arg;
-
-    arg.cmd  = PCSHOLD;
-    memcpy (&arg.hold, sighold, sizeof (gdb_sigset_t));
-    win = (write (pi->ctl_fd, (void *) &arg, sizeof (arg)) == sizeof (arg));
-  }
-#else
-  win = (ioctl (pi->ctl_fd, PIOCSHOLD, sighold) >= 0);
-#endif
+  struct {
+    procfs_ctl_t cmd;
+    /* Use char array to avoid alignment issues.  */
+    char hold[sizeof (sigset_t)];
+  } arg;
+
+  arg.cmd  = PCSHOLD;
+  memcpy (&arg.hold, sighold, sizeof (sigset_t));
+  win = (write (pi->ctl_fd, (void *) &arg, sizeof (arg)) == sizeof (arg));
+
   /* The above operation renders the procinfo's cached pstatus
      obsolete.  */
   pi->status_valid = 0;
@@ -1780,10 +1151,10 @@  proc_set_held_signals (procinfo *pi, gdb
 /* Returns the set of signals that are held / blocked.  Will also copy
    the sigset if SAVE is non-zero.  */
 
-static gdb_sigset_t *
-proc_get_held_signals (procinfo *pi, gdb_sigset_t *save)
+static sigset_t *
+proc_get_held_signals (procinfo *pi, sigset_t *save)
 {
-  gdb_sigset_t *ret = NULL;
+  sigset_t *ret = NULL;
 
   /* We should never have to apply this operation to any procinfo
      except the one for the main process.  If that ever changes for
@@ -1793,22 +1164,13 @@  proc_get_held_signals (procinfo *pi, gdb
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
   if (!pi->status_valid)
     if (!proc_get_status (pi))
       return NULL;
 
   ret = &pi->prstatus.pr_lwp.pr_lwphold;
-#else  /* not NEW_PROC_API */
-  {
-    static gdb_sigset_t sigheld;
-
-    if (ioctl (pi->ctl_fd, PIOCGHOLD, &sigheld) >= 0)
-      ret = &sigheld;
-  }
-#endif /* NEW_PROC_API */
   if (save && ret)
-    memcpy (save, ret, sizeof (gdb_sigset_t));
+    memcpy (save, ret, sizeof (sigset_t));
 
   return ret;
 }
@@ -1816,10 +1178,10 @@  proc_get_held_signals (procinfo *pi, gdb
 /* Returns the set of signals that are traced / debugged.  Will also
    copy the sigset if SAVE is non-zero.  */
 
-static gdb_sigset_t *
-proc_get_traced_signals (procinfo *pi, gdb_sigset_t *save)
+static sigset_t *
+proc_get_traced_signals (procinfo *pi, sigset_t *save)
 {
-  gdb_sigset_t *ret = NULL;
+  sigset_t *ret = NULL;
 
   /* We should never have to apply this operation to any procinfo
      except the one for the main process.  If that ever changes for
@@ -1829,22 +1191,13 @@  proc_get_traced_signals (procinfo *pi, g
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
   if (!pi->status_valid)
     if (!proc_get_status (pi))
       return NULL;
 
   ret = &pi->prstatus.pr_sigtrace;
-#else
-  {
-    static gdb_sigset_t sigtrace;
-
-    if (ioctl (pi->ctl_fd, PIOCGTRACE, &sigtrace) >= 0)
-      ret = &sigtrace;
-  }
-#endif
   if (save && ret)
-    memcpy (save, ret, sizeof (gdb_sigset_t));
+    memcpy (save, ret, sizeof (sigset_t));
 
   return ret;
 }
@@ -1865,20 +1218,11 @@  proc_get_traced_faults (procinfo *pi, fl
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
   if (!pi->status_valid)
     if (!proc_get_status (pi))
       return NULL;
 
   ret = &pi->prstatus.pr_flttrace;
-#else
-  {
-    static fltset_t flttrace;
-
-    if (ioctl (pi->ctl_fd, PIOCGFAULT, &flttrace) >= 0)
-      ret = &flttrace;
-  }
-#endif
   if (save && ret)
     memcpy (save, ret, sizeof (fltset_t));
 
@@ -1901,53 +1245,13 @@  proc_get_traced_sysentry (procinfo *pi, 
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
   if (!pi->status_valid)
     if (!proc_get_status (pi))
       return NULL;
 
-#ifndef DYNAMIC_SYSCALLS
   ret = &pi->prstatus.pr_sysentry;
-#else /* DYNAMIC_SYSCALLS */
-  {
-    static sysset_t *sysentry;
-    size_t size;
-
-    if (!sysentry)
-      sysentry = sysset_t_alloc (pi);
-    ret = sysentry;
-    if (pi->status_fd == 0 && open_procinfo_files (pi, FD_STATUS) == 0)
-      return NULL;
-    if (pi->prstatus.pr_sysentry_offset == 0)
-      {
-	gdb_premptysysset (sysentry);
-      }
-    else
-      {
-	int rsize;
-
-	if (lseek (pi->status_fd, (off_t) pi->prstatus.pr_sysentry_offset,
-		   SEEK_SET)
-	    != (off_t) pi->prstatus.pr_sysentry_offset)
-	  return NULL;
-	size = sysset_t_size (pi);
-	gdb_premptysysset (sysentry);
-	rsize = read (pi->status_fd, sysentry, size);
-	if (rsize < 0)
-	  return NULL;
-      }
-  }
-#endif /* DYNAMIC_SYSCALLS */
-#else /* !NEW_PROC_API */
-  {
-    static sysset_t sysentry;
-
-    if (ioctl (pi->ctl_fd, PIOCGENTRY, &sysentry) >= 0)
-      ret = &sysentry;
-  }
-#endif /* NEW_PROC_API */
   if (save && ret)
-    memcpy (save, ret, sysset_t_size (pi));
+    memcpy (save, ret, sizeof (sysset_t));
 
   return ret;
 }
@@ -1958,7 +1262,7 @@  proc_get_traced_sysentry (procinfo *pi, 
 static sysset_t *
 proc_get_traced_sysexit (procinfo *pi, sysset_t *save)
 {
-  sysset_t * ret = NULL;
+  sysset_t *ret = NULL;
 
   /* We should never have to apply this operation to any procinfo
      except the one for the main process.  If that ever changes for
@@ -1968,53 +1272,13 @@  proc_get_traced_sysexit (procinfo *pi, s
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
   if (!pi->status_valid)
     if (!proc_get_status (pi))
       return NULL;
 
-#ifndef DYNAMIC_SYSCALLS
   ret = &pi->prstatus.pr_sysexit;
-#else /* DYNAMIC_SYSCALLS */
-  {
-    static sysset_t *sysexit;
-    size_t size;
-
-    if (!sysexit)
-      sysexit = sysset_t_alloc (pi);
-    ret = sysexit;
-    if (pi->status_fd == 0 && open_procinfo_files (pi, FD_STATUS) == 0)
-      return NULL;
-    if (pi->prstatus.pr_sysexit_offset == 0)
-      {
-	gdb_premptysysset (sysexit);
-      }
-    else
-      {
-	int rsize;
-
-	if (lseek (pi->status_fd, (off_t) pi->prstatus.pr_sysexit_offset,
-		   SEEK_SET)
-	    != (off_t) pi->prstatus.pr_sysexit_offset)
-	  return NULL;
-	size = sysset_t_size (pi);
-	gdb_premptysysset (sysexit);
-	rsize = read (pi->status_fd, sysexit, size);
-	if (rsize < 0)
-	  return NULL;
-      }
-  }
-#endif /* DYNAMIC_SYSCALLS */
-#else
-  {
-    static sysset_t sysexit;
-
-    if (ioctl (pi->ctl_fd, PIOCGEXIT, &sysexit) >= 0)
-      ret = &sysexit;
-  }
-#endif
   if (save && ret)
-    memcpy (save, ret, sysset_t_size (pi));
+    memcpy (save, ret, sizeof (sysset_t));
 
   return ret;
 }
@@ -2036,15 +1300,9 @@  proc_clear_current_fault (procinfo *pi)
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
-  {
-    procfs_ctl_t cmd = PCCFAULT;
-
-    win = (write (pi->ctl_fd, (void *) &cmd, sizeof (cmd)) == sizeof (cmd));
-  }
-#else
-  win = (ioctl (pi->ctl_fd, PIOCCFAULT, 0) >= 0);
-#endif
+  procfs_ctl_t cmd = PCCFAULT;
+
+  win = (write (pi->ctl_fd, (void *) &cmd, sizeof (cmd)) == sizeof (cmd));
 
   return win;
 }
@@ -2064,9 +1322,9 @@  proc_set_current_signal (procinfo *pi, i
   struct {
     procfs_ctl_t cmd;
     /* Use char array to avoid alignment issues.  */
-    char sinfo[sizeof (gdb_siginfo_t)];
+    char sinfo[sizeof (siginfo_t)];
   } arg;
-  gdb_siginfo_t mysinfo;
+  siginfo_t mysinfo;
   ptid_t wait_ptid;
   struct target_waitstatus wait_status;
 
@@ -2078,50 +1336,28 @@  proc_set_current_signal (procinfo *pi, i
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef PROCFS_DONT_PIOCSSIG_CURSIG
-  /* With Alpha OSF/1 procfs, the kernel gets really confused if it
-     receives a PIOCSSIG with a signal identical to the current
-     signal, it messes up the current signal.  Work around the kernel
-     bug.  */
-  if (signo > 0 &&
-      signo == proc_cursig (pi))
-    return 1;           /* I assume this is a success?  */
-#endif
-
   /* The pointer is just a type alias.  */
   get_last_target_status (&wait_ptid, &wait_status);
   if (ptid_equal (wait_ptid, inferior_ptid)
       && wait_status.kind == TARGET_WAITKIND_STOPPED
       && wait_status.value.sig == gdb_signal_from_host (signo)
       && proc_get_status (pi)
-#ifdef NEW_PROC_API
       && pi->prstatus.pr_lwp.pr_info.si_signo == signo
-#else
-      && pi->prstatus.pr_info.si_signo == signo
-#endif
       )
     /* Use the siginfo associated with the signal being
        redelivered.  */
-#ifdef NEW_PROC_API
-    memcpy (arg.sinfo, &pi->prstatus.pr_lwp.pr_info, sizeof (gdb_siginfo_t));
-#else
-    memcpy (arg.sinfo, &pi->prstatus.pr_info, sizeof (gdb_siginfo_t));
-#endif
+    memcpy (arg.sinfo, &pi->prstatus.pr_lwp.pr_info, sizeof (siginfo_t));
   else
     {
       mysinfo.si_signo = signo;
       mysinfo.si_code  = 0;
       mysinfo.si_pid   = getpid ();       /* ?why? */
       mysinfo.si_uid   = getuid ();       /* ?why? */
-      memcpy (arg.sinfo, &mysinfo, sizeof (gdb_siginfo_t));
+      memcpy (arg.sinfo, &mysinfo, sizeof (siginfo_t));
     }
 
-#ifdef NEW_PROC_API
   arg.cmd = PCSSIG;
   win = (write (pi->ctl_fd, (void *) &arg, sizeof (arg))  == sizeof (arg));
-#else
-  win = (ioctl (pi->ctl_fd, PIOCSSIG, (void *) &arg.sinfo) >= 0);
-#endif
 
   return win;
 }
@@ -2143,29 +1379,23 @@  proc_clear_current_signal (procinfo *pi)
   if (pi->tid != 0)
     pi = find_procinfo_or_die (pi->pid, 0);
 
-#ifdef NEW_PROC_API
-  {
-    struct {
-      procfs_ctl_t cmd;
-      /* Use char array to avoid alignment issues.  */
-      char sinfo[sizeof (gdb_siginfo_t)];
-    } arg;
-    gdb_siginfo_t mysinfo;
-
-    arg.cmd = PCSSIG;
-    /* The pointer is just a type alias.  */
-    mysinfo.si_signo = 0;
-    mysinfo.si_code  = 0;
-    mysinfo.si_errno = 0;
-    mysinfo.si_pid   = getpid ();       /* ?why? */
-    mysinfo.si_uid   = getuid ();       /* ?why? */
-    memcpy (arg.sinfo, &mysinfo, sizeof (gdb_siginfo_t));
-
-    win = (write (pi->ctl_fd, (void *) &arg, sizeof (arg)) == sizeof (arg));
-  }
-#else
-  win = (ioctl (pi->ctl_fd, PIOCSSIG, 0) >= 0);
-#endif
+  struct {
+    procfs_ctl_t cmd;
+    /* Use char array to avoid alignment issues.  */
+    char sinfo[sizeof (siginfo_t)];
+  } arg;
+  siginfo_t mysinfo;
+
+  arg.cmd = PCSSIG;
+  /* The pointer is just a type alias.  */
+  mysinfo.si_signo = 0;
+  mysinfo.si_code  = 0;
+  mysinfo.si_errno = 0;
+  mysinfo.si_pid   = getpid ();       /* ?why? */
+  mysinfo.si_uid   = getuid ();       /* ?why? */
+  memcpy (arg.sinfo, &mysinfo, sizeof (siginfo_t));
+
+  win = (write (pi->ctl_fd, (void *) &arg, sizeof (arg)) == sizeof (arg));
 
   return win;
 }
@@ -2180,11 +1410,7 @@  proc_get_gregs (procinfo *pi)
     if (!proc_get_status (pi))
       return NULL;
 
-#ifdef NEW_PROC_API
   return &pi->prstatus.pr_lwp.pr_reg;
-#else
-  return &pi->prstatus.pr_reg;
-#endif
 }
 
 /* Return the general-purpose registers for the process or LWP
@@ -2193,66 +1419,11 @@  proc_get_gregs (procinfo *pi)
 static gdb_fpregset_t *
 proc_get_fpregs (procinfo *pi)
 {
-#ifdef NEW_PROC_API
   if (!pi->status_valid || !pi->fpregs_valid)
     if (!proc_get_status (pi))
       return NULL;
 
   return &pi->prstatus.pr_lwp.pr_fpreg;
-
-#else  /* not NEW_PROC_API */
-  if (pi->fpregs_valid)
-    return &pi->fpregset;	/* Already got 'em.  */
-  else
-    {
-      if (pi->ctl_fd == 0 && open_procinfo_files (pi, FD_CTL) == 0)
-	{
-	  return NULL;
-	}
-      else
-	{
-# ifdef PIOCTGFPREG
-	  struct {
-	    long pr_count;
-	    tid_t pr_error_thread;
-	    tfpregset_t thread_1;
-	  } thread_fpregs;
-
-	  thread_fpregs.pr_count = 1;
-	  thread_fpregs.thread_1.tid = pi->tid;
-
-	  if (pi->tid == 0
-	      && ioctl (pi->ctl_fd, PIOCGFPREG, &pi->fpregset) >= 0)
-	    {
-	      pi->fpregs_valid = 1;
-	      return &pi->fpregset; /* Got 'em now!  */
-	    }
-	  else if (pi->tid != 0
-		   && ioctl (pi->ctl_fd, PIOCTGFPREG, &thread_fpregs) >= 0)
-	    {
-	      memcpy (&pi->fpregset, &thread_fpregs.thread_1.pr_fpregs,
-		      sizeof (pi->fpregset));
-	      pi->fpregs_valid = 1;
-	      return &pi->fpregset; /* Got 'em now!  */
-	    }
-	  else
-	    {
-	      return NULL;
-	    }
-# else
-	  if (ioctl (pi->ctl_fd, PIOCGFPREG, &pi->fpregset) >= 0)
-	    {
-	      pi->fpregs_valid = 1;
-	      return &pi->fpregset; /* Got 'em now!  */
-	    }
-	  else
-	    {
-	      return NULL;
-	    }
-# endif
-	}
-    }
-#endif /* NEW_PROC_API */
 }
 
 /* Write the general-purpose registers back to the process or LWP
@@ -2275,7 +1446,6 @@  proc_set_gregs (procinfo *pi)
     }
   else
     {
-#ifdef NEW_PROC_API
       struct {
 	procfs_ctl_t cmd;
 	/* Use char array to avoid alignment issues.  */
@@ -2285,9 +1455,6 @@  proc_set_gregs (procinfo *pi)
       arg.cmd = PCSREG;
       memcpy (&arg.gregs, gregs, sizeof (arg.gregs));
       win = (write (pi->ctl_fd, (void *) &arg, sizeof (arg)) == sizeof (arg));
-#else
-      win = (ioctl (pi->ctl_fd, PIOCSREG, gregs) >= 0);
-#endif
     }
 
   /* Policy: writing the registers invalidates our cache.  */
@@ -2315,7 +1482,6 @@  proc_set_fpregs (procinfo *pi)
     }
   else
     {
-#ifdef NEW_PROC_API
       struct {
 	procfs_ctl_t cmd;
 	/* Use char array to avoid alignment issues.  */
@@ -2325,28 +1491,6 @@  proc_set_fpregs (procinfo *pi)
       arg.cmd = PCSFPREG;
       memcpy (&arg.fpregs, fpregs, sizeof (arg.fpregs));
       win = (write (pi->ctl_fd, (void *) &arg, sizeof (arg)) == sizeof (arg));
-#else
-# ifdef PIOCTSFPREG
-      if (pi->tid == 0)
-	win = (ioctl (pi->ctl_fd, PIOCSFPREG, fpregs) >= 0);
-      else
-	{
-	  struct {
-	    long pr_count;
-	    tid_t pr_error_thread;
-	    tfpregset_t thread_1;
-	  } thread_fpregs;
-
-	  thread_fpregs.pr_count = 1;
-	  thread_fpregs.thread_1.tid = pi->tid;
-	  memcpy (&thread_fpregs.thread_1.pr_fpregs, fpregs,
-		  sizeof (*fpregs));
-	  win = (ioctl (pi->ctl_fd, PIOCTSFPREG, &thread_fpregs) >= 0);
-	}
-# else
-      win = (ioctl (pi->ctl_fd, PIOCSFPREG, fpregs) >= 0);
-# endif
-#endif /* NEW_PROC_API */
     }
 
   /* Policy: writing the registers invalidates our cache.  */
@@ -2372,17 +1516,11 @@  proc_kill (procinfo *pi, int signo)
     }
   else
     {
-#ifdef NEW_PROC_API
       procfs_ctl_t cmd[2];
 
       cmd[0] = PCKILL;
       cmd[1] = signo;
       win = (write (pi->ctl_fd, (char *) &cmd, sizeof (cmd)) == sizeof (cmd));
-#else   /* ioctl method */
-      /* FIXME: do I need the Alpha OSF fixups present in
-	 procfs.c/unconditionally_kill_inferior?  Perhaps only for SIGKILL?  */
-      win = (ioctl (pi->ctl_fd, PIOCKILL, &signo) >= 0);
-#endif
   }
 
   return win;
@@ -2412,8 +1550,6 @@  proc_parent_pid (procinfo *pi)
 /* Convert a target address (a.k.a. CORE_ADDR) into a host address
    (a.k.a void pointer)!  */
 
-#if (defined (PCWATCH) || defined (PIOCSWATCH)) \
-    && !(defined (PIOCOPENLWP))
 static void *
 procfs_address_to_host_pointer (CORE_ADDR addr)
 {
@@ -2425,21 +1561,10 @@  procfs_address_to_host_pointer (CORE_ADD
 			      (gdb_byte *) &ptr, addr);
   return ptr;
 }
-#endif
 
 static int
 proc_set_watchpoint (procinfo *pi, CORE_ADDR addr, int len, int wflags)
 {
-#if !defined (PCWATCH) && !defined (PIOCSWATCH)
-  /* If neither or these is defined, we can't support watchpoints.
-     This just avoids possibly failing to compile the below on such
-     systems.  */
-  return 0;
-#else
-/* Horrible hack!  Detect Solaris 2.5, because this doesn't work on 2.5.  */
-#if defined (PIOCOPENLWP)	/* Solaris 2.5: bail out.  */
-  return 0;
-#else
   struct {
     procfs_ctl_t cmd;
     char watch[sizeof (prwatch_t)];
@@ -2449,26 +1574,12 @@  proc_set_watchpoint (procinfo *pi, CORE_
   /* NOTE: cagney/2003-02-01: Even more horrible hack.  Need to
      convert a target address into something that can be stored in a
      native data structure.  */
-#ifdef PCAGENT	/* Horrible hack: only defined on Solaris 2.6+ */
   pwatch.pr_vaddr  = (uintptr_t) procfs_address_to_host_pointer (addr);
-#else
-  pwatch.pr_vaddr  = (caddr_t) procfs_address_to_host_pointer (addr);
-#endif
   pwatch.pr_size   = len;
   pwatch.pr_wflags = wflags;
-#if defined(NEW_PROC_API) && defined (PCWATCH)
   arg.cmd = PCWATCH;
   memcpy (arg.watch, &pwatch, sizeof (prwatch_t));
   return (write (pi->ctl_fd, &arg, sizeof (arg)) == sizeof (arg));
-#else
-#if defined (PIOCSWATCH)
-  return (ioctl (pi->ctl_fd, PIOCSWATCH, &pwatch) >= 0);
-#else
-  return 0;	/* Fail */
-#endif
-#endif
-#endif
-#endif
 }
 
 #if (defined(__i386__) || defined(__x86_64__)) && defined (sun)
@@ -2483,7 +1594,6 @@  static struct ssd *
 proc_get_LDT_entry (procinfo *pi, int key)
 {
   static struct ssd *ldt_entry = NULL;
-#ifdef NEW_PROC_API
   char pathname[MAX_PROC_NAME_SIZE];
   struct cleanup *old_chain = NULL;
   int  fd;
@@ -2521,41 +1631,6 @@  proc_get_LDT_entry (procinfo *pi, int ke
   /* Loop ended, match not found.  */
   do_cleanups (old_chain);
   return NULL;
-#else
-  int nldt, i;
-  static int nalloc = 0;
-
-  /* Get the number of LDT entries.  */
-  if (ioctl (pi->ctl_fd, PIOCNLDT, &nldt) < 0)
-    {
-      proc_warn (pi, "proc_get_LDT_entry (PIOCNLDT)", __LINE__);
-      return NULL;
-    }
-
-  /* Allocate space for the number of LDT entries.  */
-  /* This alloc has to persist, 'cause we return a pointer to it.  */
-  if (nldt > nalloc)
-    {
-      ldt_entry = (struct ssd *)
-	xrealloc (ldt_entry, (nldt + 1) * sizeof (struct ssd));
-      nalloc = nldt;
-    }
-
-  /* Read the whole table in one gulp.  */
-  if (ioctl (pi->ctl_fd, PIOCLDT, ldt_entry) < 0)
-    {
-      proc_warn (pi, "proc_get_LDT_entry (PIOCLDT)", __LINE__);
-      return NULL;
-    }
-
-  /* Search the table and return the (first) entry matching 'key'.  */
-  for (i = 0; i < nldt; i++)
-    if (ldt_entry[i].sel == key)
-      return &ldt_entry[i];
-
-  /* Loop ended, match not found.  */
-  return NULL;
-#endif
 }
 
 /* Returns the pointer to the LDT entry of PTID.  */
@@ -2599,22 +1674,6 @@  procfs_find_LDT_entry (ptid_t ptid)
 
 /* Returns the number of threads for the process.  */
 
-#if defined (PIOCNTHR) && defined (PIOCTLIST)
-/* OSF version */
-static int
-proc_get_nthreads (procinfo *pi)
-{
-  int nthreads = 0;
-
-  if (ioctl (pi->ctl_fd, PIOCNTHR, &nthreads) < 0)
-    proc_warn (pi, "procfs: PIOCNTHR failed", __LINE__);
-
-  return nthreads;
-}
-
-#else
-#if defined (SYS_lwpcreate) || defined (SYS_lwp_create) /* FIXME: multiple */
-/* Solaris version */
 static int
 proc_get_nthreads (procinfo *pi)
 {
@@ -2622,25 +1681,13 @@  proc_get_nthreads (procinfo *pi)
     if (!proc_get_status (pi))
       return 0;
 
-  /* NEW_PROC_API: only works for the process procinfo, because the
-     LWP procinfos do not get prstatus filled in.  */
-#ifdef NEW_PROC_API
+  /* Only works for the process procinfo, because the LWP procinfos do not
+     get prstatus filled in.  */
   if (pi->tid != 0)	/* Find the parent process procinfo.  */
     pi = find_procinfo_or_die (pi->pid, 0);
-#endif
   return pi->prstatus.pr_nlwp;
 }
 
-#else
-/* Default version */
-static int
-proc_get_nthreads (procinfo *pi)
-{
-  return 0;
-}
-#endif
-#endif
-
 /* LWP version.
 
    Return the ID of the thread that had an event of interest.
@@ -2648,8 +1695,6 @@  proc_get_nthreads (procinfo *pi)
    other things being equal, this should be the ID of a thread that is
    currently executing.  */
 
-#if defined (SYS_lwpcreate) || defined (SYS_lwp_create) /* FIXME: multiple */
-/* Solaris version */
 static int
 proc_get_current_thread (procinfo *pi)
 {
@@ -2665,37 +1710,9 @@  proc_get_current_thread (procinfo *pi)
     if (!proc_get_status (pi))
       return 0;
 
-#ifdef NEW_PROC_API
   return pi->prstatus.pr_lwp.pr_lwpid;
-#else
-  return pi->prstatus.pr_who;
-#endif
 }
 
-#else
-#if defined (PIOCNTHR) && defined (PIOCTLIST)
-/* OSF version */
-static int
-proc_get_current_thread (procinfo *pi)
-{
-#if 0	/* FIXME: not ready for prime time?  */
-  return pi->prstatus.pr_tid;
-#else
-  return 0;
-#endif
-}
-
-#else
-/* Default version */
-static int
-proc_get_current_thread (procinfo *pi)
-{
-  return 0;
-}
-
-#endif
-#endif
-
 /* Discover the IDs of all the threads within the process, and create
    a procinfo for each of them (chained to the parent).  This
    unfortunately requires a different method on every OS.  Returns
@@ -2713,51 +1730,6 @@  proc_delete_dead_threads (procinfo *pare
   return 0;	/* keep iterating */
 }
 
-#if defined (PIOCLSTATUS)
-/* Solaris 2.5 (ioctl) version */
-static int
-proc_update_threads (procinfo *pi)
-{
-  gdb_prstatus_t *prstatus;
-  struct cleanup *old_chain = NULL;
-  procinfo *thread;
-  int nlwp, i;
-
-  /* We should never have to apply this operation to any procinfo
-     except the one for the main process.  If that ever changes for
-     any reason, then take out the following clause and replace it
-     with one that makes sure the ctl_fd is open.  */
-
-  if (pi->tid != 0)
-    pi = find_procinfo_or_die (pi->pid, 0);
-
-  proc_iterate_over_threads (pi, proc_delete_dead_threads, NULL);
-
-  if ((nlwp = proc_get_nthreads (pi)) <= 1)
-    return 1;	/* Process is not multi-threaded; nothing to do.  */
-
-  prstatus = XNEWVEC (gdb_prstatus_t, nlwp + 1);
-
-  old_chain = make_cleanup (xfree, prstatus);
-  if (ioctl (pi->ctl_fd, PIOCLSTATUS, prstatus) < 0)
-    proc_error (pi, "update_threads (PIOCLSTATUS)", __LINE__);
-
-  /* Skip element zero, which represents the process as a whole.  */
-  for (i = 1; i < nlwp + 1; i++)
-    {
-      if ((thread = create_procinfo (pi->pid, prstatus[i].pr_who)) == NULL)
-	proc_error (pi, "update_threads, create_procinfo", __LINE__);
-
-      memcpy (&thread->prstatus, &prstatus[i], sizeof (*prstatus));
-      thread->status_valid = 1;
-    }
-  pi->threads_valid = 1;
-  do_cleanups (old_chain);
-  return 1;
-}
-#else
-#ifdef NEW_PROC_API
-/* Solaris 6 (and later) version.  */
 static void
 do_closedir_cleanup (void *dir)
 {
@@ -2807,53 +1779,6 @@  proc_update_threads (procinfo *pi)
   do_cleanups (old_chain);
   return 1;
 }
-#else
-#ifdef PIOCTLIST
-/* OSF version */
-static int
-proc_update_threads (procinfo *pi)
-{
-  int nthreads, i;
-  tid_t *threads;
-
-  /* We should never have to apply this operation to any procinfo
-     except the one for the main process.  If that ever changes for
-     any reason, then take out the following clause and replace it
-     with one that makes sure the ctl_fd is open.  */
-
-  if (pi->tid != 0)
-    pi = find_procinfo_or_die (pi->pid, 0);
-
-  proc_iterate_over_threads (pi, proc_delete_dead_threads, NULL);
-
-  nthreads = proc_get_nthreads (pi);
-  if (nthreads < 2)
-    return 0;		/* Nothing to do for 1 or fewer threads.  */
-
-  threads = XNEWVEC (tid_t, nthreads);
-
-  if (ioctl (pi->ctl_fd, PIOCTLIST, threads) < 0)
-    proc_error (pi, "procfs: update_threads (PIOCTLIST)", __LINE__);
-
-  for (i = 0; i < nthreads; i++)
-    {
-      if (!find_procinfo (pi->pid, threads[i]))
-	if (!create_procinfo  (pi->pid, threads[i]))
-	  proc_error (pi, "update_threads, create_procinfo", __LINE__);
-    }
-  pi->threads_valid = 1;
-  return 1;
-}
-#else
-/* Default version */
-static int
-proc_update_threads (procinfo *pi)
-{
-  return 0;
-}
-#endif	/* OSF PIOCTLIST */
-#endif  /* NEW_PROC_API   */
-#endif  /* SOL 2.5 PIOCLSTATUS */
 
 /* Given a pointer to a function, call that function once for each lwp
    in the procinfo list, until the function returns non-zero, in which
@@ -2918,14 +1843,14 @@  static int
 procfs_debug_inferior (procinfo *pi)
 {
   fltset_t traced_faults;
-  gdb_sigset_t traced_signals;
+  sigset_t traced_signals;
   sysset_t *traced_syscall_entries;
   sysset_t *traced_syscall_exits;
   int status;
 
   /* Register to trace hardware faults in the child.  */
   prfillset (&traced_faults);		/* trace all faults...  */
-  gdb_prdelset  (&traced_faults, FLTPAGE);	/* except page fault.  */
+  prdelset  (&traced_faults, FLTPAGE);	/* except page fault.  */
   if (!proc_set_traced_faults  (pi, &traced_faults))
     return __LINE__;
 
@@ -2937,93 +1862,35 @@  procfs_debug_inferior (procinfo *pi)
 
   /* Register to trace the 'exit' system call (on entry).  */
   traced_syscall_entries = sysset_t_alloc (pi);
-  gdb_premptysysset (traced_syscall_entries);
-#ifdef SYS_exit
-  gdb_praddsysset (traced_syscall_entries, SYS_exit);
-#endif
-#ifdef SYS_lwpexit
-  gdb_praddsysset (traced_syscall_entries, SYS_lwpexit);/* And _lwp_exit...  */
-#endif
-#ifdef SYS_lwp_exit
-  gdb_praddsysset (traced_syscall_entries, SYS_lwp_exit);
-#endif
-#ifdef DYNAMIC_SYSCALLS
-  {
-    int callnum = find_syscall (pi, "_exit");
-
-    if (callnum >= 0)
-      gdb_praddsysset (traced_syscall_entries, callnum);
-  }
-#endif
+  premptyset (traced_syscall_entries);
+  praddset (traced_syscall_entries, SYS_exit);
+  praddset (traced_syscall_entries, SYS_lwp_exit);
 
   status = proc_set_traced_sysentry (pi, traced_syscall_entries);
   xfree (traced_syscall_entries);
   if (!status)
     return __LINE__;
 
-#ifdef PRFS_STOPEXEC	/* defined on OSF */
-  /* OSF method for tracing exec syscalls.  Quoting:
-     Under Alpha OSF/1 we have to use a PIOCSSPCACT ioctl to trace
-     exits from exec system calls because of the user level loader.  */
-  /* FIXME: make nice and maybe move into an access function.  */
-  {
-    int prfs_flags;
-
-    if (ioctl (pi->ctl_fd, PIOCGSPCACT, &prfs_flags) < 0)
-      return __LINE__;
-
-    prfs_flags |= PRFS_STOPEXEC;
-
-    if (ioctl (pi->ctl_fd, PIOCSSPCACT, &prfs_flags) < 0)
-      return __LINE__;
-  }
-#else /* not PRFS_STOPEXEC */
-  /* Everyone else's (except OSF) method for tracing exec syscalls.  */
+  /* Method for tracing exec syscalls.  */
   /* GW: Rationale...
      Not all systems with /proc have all the exec* syscalls with the same
      names.  On the SGI, for example, there is no SYS_exec, but there
      *is* a SYS_execv.  So, we try to account for that.  */
 
   traced_syscall_exits = sysset_t_alloc (pi);
-  gdb_premptysysset (traced_syscall_exits);
+  premptyset (traced_syscall_exits);
 #ifdef SYS_exec
-  gdb_praddsysset (traced_syscall_exits, SYS_exec);
+  praddset (traced_syscall_exits, SYS_exec);
 #endif
-#ifdef SYS_execve
-  gdb_praddsysset (traced_syscall_exits, SYS_execve);
-#endif
-#ifdef SYS_execv
-  gdb_praddsysset (traced_syscall_exits, SYS_execv);
-#endif
-
-#ifdef SYS_lwpcreate
-  gdb_praddsysset (traced_syscall_exits, SYS_lwpcreate);
-  gdb_praddsysset (traced_syscall_exits, SYS_lwpexit);
-#endif
-
-#ifdef SYS_lwp_create	/* FIXME: once only, please.  */
-  gdb_praddsysset (traced_syscall_exits, SYS_lwp_create);
-  gdb_praddsysset (traced_syscall_exits, SYS_lwp_exit);
-#endif
-
-#ifdef DYNAMIC_SYSCALLS
-  {
-    int callnum = find_syscall (pi, "execve");
-
-    if (callnum >= 0)
-      gdb_praddsysset (traced_syscall_exits, callnum);
-    callnum = find_syscall (pi, "ra_execve");
-    if (callnum >= 0)
-      gdb_praddsysset (traced_syscall_exits, callnum);
-  }
-#endif
+  praddset (traced_syscall_exits, SYS_execve);
+  praddset (traced_syscall_exits, SYS_lwp_create);
+  praddset (traced_syscall_exits, SYS_lwp_exit);
 
   status = proc_set_traced_sysexit (pi, traced_syscall_exits);
   xfree (traced_syscall_exits);
   if (!status)
     return __LINE__;
 
-#endif /* PRFS_STOPEXEC */
   return 0;
 }
 
@@ -3311,28 +2178,16 @@  procfs_store_registers (struct target_op
 static int
 syscall_is_lwp_exit (procinfo *pi, int scall)
 {
-#ifdef SYS_lwp_exit
   if (scall == SYS_lwp_exit)
     return 1;
-#endif
-#ifdef SYS_lwpexit
-  if (scall == SYS_lwpexit)
-    return 1;
-#endif
   return 0;
 }
 
 static int
 syscall_is_exit (procinfo *pi, int scall)
 {
-#ifdef SYS_exit
   if (scall == SYS_exit)
     return 1;
-#endif
-#ifdef DYNAMIC_SYSCALLS
-  if (find_syscall (pi, "_exit") == scall)
-    return 1;
-#endif
   return 0;
 }
 
@@ -3343,191 +2198,19 @@  syscall_is_exec (procinfo *pi, int scall
   if (scall == SYS_exec)
     return 1;
 #endif
-#ifdef SYS_execv
-  if (scall == SYS_execv)
-    return 1;
-#endif
-#ifdef SYS_execve
   if (scall == SYS_execve)
     return 1;
-#endif
-#ifdef DYNAMIC_SYSCALLS
-  if (find_syscall (pi, "_execve"))
-    return 1;
-  if (find_syscall (pi, "ra_execve"))
-    return 1;
-#endif
   return 0;
 }
 
 static int
 syscall_is_lwp_create (procinfo *pi, int scall)
 {
-#ifdef SYS_lwp_create
   if (scall == SYS_lwp_create)
     return 1;
-#endif
-#ifdef SYS_lwpcreate
-  if (scall == SYS_lwpcreate)
-    return 1;
-#endif
   return 0;
 }
 
-#ifdef SYS_syssgi
-/* Return the address of the __dbx_link() function in the file
-   refernced by ABFD by scanning its symbol table.  Return 0 if
-   the symbol was not found.  */
-
-static CORE_ADDR
-dbx_link_addr (bfd *abfd)
-{
-  long storage_needed;
-  asymbol **symbol_table;
-  long number_of_symbols;
-  long i;
-
-  storage_needed = bfd_get_symtab_upper_bound (abfd);
-  if (storage_needed <= 0)
-    return 0;
-
-  symbol_table = (asymbol **) xmalloc (storage_needed);
-  make_cleanup (xfree, symbol_table);
-
-  number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table);
-
-  for (i = 0; i < number_of_symbols; i++)
-    {
-      asymbol *sym = symbol_table[i];
-
-      if ((sym->flags & BSF_GLOBAL)
-	  && sym->name != NULL && strcmp (sym->name, "__dbx_link") == 0)
-	return (sym->value + sym->section->vma);
-    }
-
-  /* Symbol not found, return NULL.  */
-  return 0;
-}
-
-/* Search the symbol table of the file referenced by FD for a symbol
-   named __dbx_link().  If found, then insert a breakpoint at this location,
-   and return nonzero.  Return zero otherwise.  */
-
-static int
-insert_dbx_link_bpt_in_file (int fd, CORE_ADDR ignored)
-{
-  long storage_needed;
-  CORE_ADDR sym_addr;
-
-  gdb_bfd_ref_ptr abfd (gdb_bfd_fdopenr ("unamed", 0, fd));
-  if (abfd == NULL)
-    {
-      warning (_("Failed to create a bfd: %s."), bfd_errmsg (bfd_get_error ()));
-      return 0;
-    }
-
-  if (!bfd_check_format (abfd.get (), bfd_object))
-    {
-      /* Not the correct format, so we can not possibly find the dbx_link
-	 symbol in it.	*/
-      return 0;
-    }
-
-  sym_addr = dbx_link_addr (abfd.get ());
-  if (sym_addr != 0)
-    {
-      struct breakpoint *dbx_link_bpt;
-
-      /* Insert the breakpoint.  */
-      dbx_link_bpt
-	= create_and_insert_solib_event_breakpoint (target_gdbarch (),
-						    sym_addr);
-      if (dbx_link_bpt == NULL)
-	{
-	  warning (_("Failed to insert dbx_link breakpoint."));
-	  return 0;
-	}
-      return 1;
-    }
-
-  return 0;
-}
-
-/* Calls the supplied callback function once for each mapped address
-   space in the process.  The callback function receives an open file
-   descriptor for the file corresponding to that mapped address space
-   (if there is one), and the base address of the mapped space.  Quit
-   when the callback function returns a nonzero value, or at teh end
-   of the mappings.  Returns the first non-zero return value of the
-   callback function, or zero.  */
-
-static int
-solib_mappings_callback (struct prmap *map, int (*func) (int, CORE_ADDR),
-			 void *data)
-{
-  procinfo *pi = data;
-  int fd;
-
-#ifdef NEW_PROC_API
-  char name[MAX_PROC_NAME_SIZE + sizeof (map->pr_mapname)];
-
-  if (map->pr_vaddr == 0 && map->pr_size == 0)
-    return -1;		/* sanity */
-
-  if (map->pr_mapname[0] == 0)
-    {
-      fd = -1;	/* no map file */
-    }
-  else
-    {
-      sprintf (name, "/proc/%d/object/%s", pi->pid, map->pr_mapname);
-      /* Note: caller's responsibility to close this fd!  */
-      fd = open_with_retry (name, O_RDONLY);
-      /* Note: we don't test the above call for failure;
-	 we just pass the FD on as given.  Sometimes there is
-	 no file, so the open may return failure, but that's
-	 not a problem.  */
-    }
-#else
-  fd = ioctl (pi->ctl_fd, PIOCOPENM, &map->pr_vaddr);
-  /* Note: we don't test the above call for failure;
-     we just pass the FD on as given.  Sometimes there is
-     no file, so the ioctl may return failure, but that's
-     not a problem.  */
-#endif
-  return (*func) (fd, (CORE_ADDR) map->pr_vaddr);
-}
-
-/* If the given memory region MAP contains a symbol named __dbx_link,
-   insert a breakpoint at this location and return nonzero.  Return
-   zero otherwise.  */
-
-static int
-insert_dbx_link_bpt_in_region (struct prmap *map,
-			       find_memory_region_ftype child_func,
-			       void *data)
-{
-  procinfo *pi = (procinfo *) data;
-
-  /* We know the symbol we're looking for is in a text region, so
-     only look for it if the region is a text one.  */
-  if (map->pr_mflags & MA_EXEC)
-    return solib_mappings_callback (map, insert_dbx_link_bpt_in_file, pi);
-
-  return 0;
-}
-
-/* Search all memory regions for a symbol named __dbx_link.  If found,
-   insert a breakpoint at its location, and return nonzero.  Return zero
-   otherwise.  */
-
-static int
-insert_dbx_link_breakpoint (procinfo *pi)
-{
-  return iterate_over_mappings (pi, NULL, pi, insert_dbx_link_bpt_in_region);
-}
-#endif
-
 /* Retrieve the next stop event from the child process.  If child has
    not stopped yet, wait for it to stop.  Translate /proc eventcodes
    (or possibly wait eventcodes) into gdb internal event codes.
@@ -3614,13 +2297,11 @@  wait_again:
 
 	  if (flags & (PR_STOPPED | PR_ISTOP))
 	    {
-#ifdef PR_ASYNC
 	      /* If it's running async (for single_thread control),
 		 set it back to normal again.  */
 	      if (flags & PR_ASYNC)
 		if (!proc_unset_async (pi))
 		  proc_error (pi, "target_wait, unset_async", __LINE__);
-#endif
 
 	      if (info_verbose)
 		proc_prettyprint_why (why, what, 1);
@@ -3692,22 +2373,19 @@  wait_again:
 		    printf_filtered (_("procfs: trapped on entry to "));
 		    proc_prettyprint_syscall (proc_what (pi), 0);
 		    printf_filtered ("\n");
-#ifndef PIOCSSPCACT
-		    {
-		      long i, nsysargs, *sysargs;
-
-		      if ((nsysargs = proc_nsysarg (pi)) > 0 &&
-			  (sysargs  = proc_sysargs (pi)) != NULL)
-			{
-			  printf_filtered (_("%ld syscall arguments:\n"),
-					   nsysargs);
-			  for (i = 0; i < nsysargs; i++)
-			    printf_filtered ("#%ld: 0x%08lx\n",
-					     i, sysargs[i]);
-			}
-
-		    }
-#endif
+
+		    long i, nsysargs, *sysargs;
+
+		    if ((nsysargs = proc_nsysarg (pi)) > 0 &&
+			(sysargs  = proc_sysargs (pi)) != NULL)
+		      {
+			printf_filtered (_("%ld syscall arguments:\n"),
+					 nsysargs);
+			for (i = 0; i < nsysargs; i++)
+			  printf_filtered ("#%ld: 0x%08lx\n",
+					   i, sysargs[i]);
+		      }
+
 		    if (status)
 		      {
 			/* How to exit gracefully, returning "unknown
@@ -3732,22 +2410,6 @@  wait_again:
 		       address.  */
 		    wstat = (SIGTRAP << 8) | 0177;
 		  }
-#ifdef SYS_syssgi
-		else if (what == SYS_syssgi)
-		  {
-		    /* see if we can break on dbx_link().  If yes, then
-		       we no longer need the SYS_syssgi notifications.	*/
-		    if (insert_dbx_link_breakpoint (pi))
-		      proc_trace_syscalls_1 (pi, SYS_syssgi, PR_SYSEXIT,
-					     FLAG_RESET, 0);
-
-		    /* This is an internal event and should be transparent
-		       to wfi, so resume the execution and wait again.	See
-		       comment in procfs_init_inferior() for more details.  */
-		    target_continue_no_signal (ptid);
-		    goto wait_again;
-		  }
-#endif
 		else if (syscall_is_lwp_create (pi, what))
 		  {
 		    /* This syscall is somewhat like fork/exec.  We
@@ -3795,21 +2457,19 @@  wait_again:
 		    printf_filtered (_("procfs: trapped on exit from "));
 		    proc_prettyprint_syscall (proc_what (pi), 0);
 		    printf_filtered ("\n");
-#ifndef PIOCSSPCACT
-		    {
-		      long i, nsysargs, *sysargs;
-
-		      if ((nsysargs = proc_nsysarg (pi)) > 0 &&
-			  (sysargs  = proc_sysargs (pi)) != NULL)
-			{
-			  printf_filtered (_("%ld syscall arguments:\n"),
-					   nsysargs);
-			  for (i = 0; i < nsysargs; i++)
-			    printf_filtered ("#%ld: 0x%08lx\n",
-					     i, sysargs[i]);
-			}
-		    }
-#endif
+
+		    long i, nsysargs, *sysargs;
+
+		    if ((nsysargs = proc_nsysarg (pi)) > 0 &&
+			(sysargs  = proc_sysargs (pi)) != NULL)
+		      {
+			printf_filtered (_("%ld syscall arguments:\n"),
+					 nsysargs);
+			for (i = 0; i < nsysargs; i++)
+			  printf_filtered ("#%ld: 0x%08lx\n",
+					   i, sysargs[i]);
+		      }
+
 		    status->kind = TARGET_WAITKIND_SPURIOUS;
 		    return inferior_ptid;
 		  }
@@ -3847,41 +2507,26 @@  wait_again:
 		break;
 	      case PR_FAULTED:
 		switch (what) {
-#ifdef FLTWATCH
 		case FLTWATCH:
 		  wstat = (SIGTRAP << 8) | 0177;
 		  break;
-#endif
-#ifdef FLTKWATCH
-		case FLTKWATCH:
-		  wstat = (SIGTRAP << 8) | 0177;
-		  break;
-#endif
 		  /* FIXME: use si_signo where possible.  */
 		case FLTPRIV:
-#if (FLTILL != FLTPRIV)		/* Avoid "duplicate case" error.  */
 		case FLTILL:
-#endif
 		  wstat = (SIGILL << 8) | 0177;
 		  break;
 		case FLTBPT:
-#if (FLTTRACE != FLTBPT)	/* Avoid "duplicate case" error.  */
 		case FLTTRACE:
-#endif
 		  wstat = (SIGTRAP << 8) | 0177;
 		  break;
 		case FLTSTACK:
 		case FLTACCESS:
-#if (FLTBOUNDS != FLTSTACK)	/* Avoid "duplicate case" error.  */
 		case FLTBOUNDS:
-#endif
 		  wstat = (SIGSEGV << 8) | 0177;
 		  break;
 		case FLTIOVF:
 		case FLTIZDIV:
-#if (FLTFPE != FLTIOVF)		/* Avoid "duplicate case" error.  */
 		case FLTFPE:
-#endif
 		  wstat = (SIGFPE << 8) | 0177;
 		  break;
 		case FLTPAGE:	/* Recoverable page fault */
@@ -3949,11 +2594,9 @@  procfs_xfer_partial (struct target_ops *
     case TARGET_OBJECT_MEMORY:
       return procfs_xfer_memory (readbuf, writebuf, offset, len, xfered_len);
 
-#ifdef NEW_PROC_API
     case TARGET_OBJECT_AUXV:
       return memory_xfer_auxv (ops, object, annex, readbuf, writebuf,
 			       offset, len, xfered_len);
-#endif
 
     default:
       return ops->beneath->to_xfer_partial (ops->beneath, object, annex,
@@ -4142,10 +2785,8 @@  procfs_resume (struct target_ops *ops,
 	    {
 	      /* We're to resume a specific thread, and not the
 		 others.  Set the child process's PR_ASYNC flag.  */
-#ifdef PR_ASYNC
 	      if (!proc_set_async (pi))
 		proc_error (pi, "target_resume, set_async", __LINE__);
-#endif
 #if 0
 	      proc_iterate_over_threads (pi,
 					 make_signal_thread_runnable,
@@ -4173,7 +2814,7 @@  static void
 procfs_pass_signals (struct target_ops *self,
 		     int numsigs, unsigned char *pass_signals)
 {
-  gdb_sigset_t signals;
+  sigset_t signals;
   procinfo *pi = find_procinfo_or_die (ptid_get_pid (inferior_ptid), 0);
   int signo;
 
@@ -4183,7 +2824,7 @@  procfs_pass_signals (struct target_ops *
     {
       int target_signo = gdb_signal_from_host (signo);
       if (target_signo < numsigs && pass_signals[target_signo])
-	gdb_prdelset (&signals, signo);
+	prdelset (&signals, signo);
     }
 
   if (!proc_set_traced_signals (pi, &signals))
@@ -4223,28 +2864,8 @@  unconditionally_kill_inferior (procinfo 
   int parent_pid;
 
   parent_pid = proc_parent_pid (pi);
-#ifdef PROCFS_NEED_PIOCSSIG_FOR_KILL
-  /* Alpha OSF/1-2.x procfs needs a PIOCSSIG call with a SIGKILL signal
-     to kill the inferior, otherwise it might remain stopped with a
-     pending SIGKILL.
-     We do not check the result of the PIOCSSIG, the inferior might have
-     died already.  */
-  {
-    gdb_siginfo_t newsiginfo;
-
-    memset ((char *) &newsiginfo, 0, sizeof (newsiginfo));
-    newsiginfo.si_signo = SIGKILL;
-    newsiginfo.si_code = 0;
-    newsiginfo.si_errno = 0;
-    newsiginfo.si_pid = getpid ();
-    newsiginfo.si_uid = getuid ();
-    /* FIXME: use proc_set_current_signal.  */
-    ioctl (pi->ctl_fd, PIOCSSIG, &newsiginfo);
-  }
-#else /* PROCFS_NEED_PIOCSSIG_FOR_KILL */
   if (!proc_kill (pi, SIGKILL))
     proc_error (pi, "unconditionally_kill, proc_kill", __LINE__);
-#endif /* PROCFS_NEED_PIOCSSIG_FOR_KILL */
   destroy_procinfo (pi);
 
   /* If pi is GDB's child, wait for it to die.  */
@@ -4308,7 +2929,7 @@  static void
 procfs_init_inferior (struct target_ops *ops, int pid)
 {
   procinfo *pi;
-  gdb_sigset_t signals;
+  sigset_t signals;
   int fail;
   int lwpid;
 
@@ -4379,31 +3000,6 @@  procfs_init_inferior (struct target_ops 
 		      ptid_build (pid, lwpid, 0));
 
   gdb_startup_inferior (pid, START_INFERIOR_TRAPS_EXPECTED);
-
-#ifdef SYS_syssgi
-  /* On mips-irix, we need to stop the inferior early enough during
-     the startup phase in order to be able to load the shared library
-     symbols and insert the breakpoints that are located in these shared
-     libraries.  Stopping at the program entry point is not good enough
-     because the -init code is executed before the execution reaches
-     that point.
-
-     So what we need to do is to insert a breakpoint in the runtime
-     loader (rld), more precisely in __dbx_link().  This procedure is
-     called by rld once all shared libraries have been mapped, but before
-     the -init code is executed.  Unfortuantely, this is not straightforward,
-     as rld is not part of the executable we are running, and thus we need
-     the inferior to run until rld itself has been mapped in memory.
-
-     For this, we trace all syssgi() syscall exit events.  Each time
-     we detect such an event, we iterate over each text memory maps,
-     get its associated fd, and scan the symbol table for __dbx_link().
-     When found, we know that rld has been mapped, and that we can insert
-     the breakpoint at the symbol address.  Once the dbx_link() breakpoint
-     has been inserted, the syssgi() notifications are no longer necessary,
-     so they should be canceled.  */
-  proc_trace_syscalls_1 (pi, SYS_syssgi, PR_SYSEXIT, FLAG_SET, 0);
-#endif
 }
 
 /* When GDB forks to create a new process, this function is called on
@@ -4436,59 +3032,18 @@  procfs_set_exec_trap (void)
       _exit (127);
     }
 
-#ifdef PRFS_STOPEXEC	/* defined on OSF */
-  /* OSF method for tracing exec syscalls.  Quoting:
-     Under Alpha OSF/1 we have to use a PIOCSSPCACT ioctl to trace
-     exits from exec system calls because of the user level loader.  */
-  /* FIXME: make nice and maybe move into an access function.  */
-  {
-    int prfs_flags;
-
-    if (ioctl (pi->ctl_fd, PIOCGSPCACT, &prfs_flags) < 0)
-      {
-	proc_warn (pi, "set_exec_trap (PIOCGSPCACT)", __LINE__);
-	gdb_flush (gdb_stderr);
-	_exit (127);
-      }
-    prfs_flags |= PRFS_STOPEXEC;
-
-    if (ioctl (pi->ctl_fd, PIOCSSPCACT, &prfs_flags) < 0)
-      {
-	proc_warn (pi, "set_exec_trap (PIOCSSPCACT)", __LINE__);
-	gdb_flush (gdb_stderr);
-	_exit (127);
-      }
-  }
-#else /* not PRFS_STOPEXEC */
-  /* Everyone else's (except OSF) method for tracing exec syscalls.  */
+  /* Method for tracing exec syscalls.  */
   /* GW: Rationale...
      Not all systems with /proc have all the exec* syscalls with the same
      names.  On the SGI, for example, there is no SYS_exec, but there
      *is* a SYS_execv.  So, we try to account for that.  */
 
   exitset = sysset_t_alloc (pi);
-  gdb_premptysysset (exitset);
+  premptyset (exitset);
 #ifdef SYS_exec
-  gdb_praddsysset (exitset, SYS_exec);
+  praddset (exitset, SYS_exec);
 #endif
-#ifdef SYS_execve
-  gdb_praddsysset (exitset, SYS_execve);
-#endif
-#ifdef SYS_execv
-  gdb_praddsysset (exitset, SYS_execv);
-#endif
-#ifdef DYNAMIC_SYSCALLS
-  {
-    int callnum = find_syscall (pi, "execve");
-
-    if (callnum >= 0)
-      gdb_praddsysset (exitset, callnum);
-
-    callnum = find_syscall (pi, "ra_execve");
-    if (callnum >= 0)
-      gdb_praddsysset (exitset, callnum);
-  }
-#endif /* DYNAMIC_SYSCALLS */
+  praddset (exitset, SYS_execve);
 
   if (!proc_set_traced_sysexit (pi, exitset))
     {
@@ -4496,7 +3051,6 @@  procfs_set_exec_trap (void)
       gdb_flush (gdb_stderr);
       _exit (127);
     }
-#endif /* PRFS_STOPEXEC */
 
   /* FIXME: should this be done in the parent instead?  */
   /* Turn off inherit on fork flag so that all grand-children
@@ -4618,23 +3172,6 @@  procfs_create_inferior (struct target_op
 static void
 procfs_inferior_created (struct target_ops *ops, int from_tty)
 {
-#ifdef SYS_syssgi
-  /* Make sure to cancel the syssgi() syscall-exit notifications.
-     They should normally have been removed by now, but they may still
-     be activated if the inferior doesn't use shared libraries, or if
-     we didn't locate __dbx_link, or if we never stopped in __dbx_link.
-     See procfs_init_inferior() for more details.
-
-     Since these notifications are only ever enabled when we spawned
-     the inferior ourselves, there is nothing to do when the inferior
-     was created by attaching to an already running process, or when
-     debugging a core file.  */
-  if (current_inferior ()->attach_flag || !target_can_run (&current_target))
-    return;
-
-  proc_trace_syscalls_1 (find_procinfo_or_die (ptid_get_pid (inferior_ptid),
-			 0), SYS_syssgi, PR_SYSEXIT, FLAG_RESET, 0);
-#endif
 }
 
 /* Callback for update_thread_list.  Calls "add_thread".  */
@@ -4716,7 +3253,6 @@  static int
 procfs_set_watchpoint (ptid_t ptid, CORE_ADDR addr, int len, int rwflag,
 		       int after)
 {
-#ifndef AIX5
   int       pflags = 0;
   procinfo *pi;
 
@@ -4757,7 +3293,6 @@  procfs_set_watchpoint (ptid_t ptid, CORE
 	return 0;		/* ignore */
       proc_error (pi, "set_watchpoint", __LINE__);
     }
-#endif /* AIX5 */
   return 0;
 }
 
@@ -4807,14 +3342,8 @@  procfs_stopped_by_watchpoint (struct tar
     {
       if (proc_why (pi) == PR_FAULTED)
 	{
-#ifdef FLTWATCH
 	  if (proc_what (pi) == FLTWATCH)
 	    return 1;
-#endif
-#ifdef FLTKWATCH
-	  if (proc_what (pi) == FLTKWATCH)
-	    return 1;
-#endif
 	}
     }
   return 0;
@@ -4919,13 +3448,10 @@  iterate_over_mappings (procinfo *pi, fin
   int map_fd;
   int nmap;
   struct cleanup *cleanups = make_cleanup (null_cleanup, NULL);
-#ifdef NEW_PROC_API
   struct stat sbuf;
-#endif
 
   /* Get the number of mappings, allocate space,
      and read the mappings into prmaps.  */
-#ifdef NEW_PROC_API
   /* Open map fd.  */
   sprintf (pathname, "/proc/%d/map", pi->pid);
   if ((map_fd = open (pathname, O_RDONLY)) < 0)
@@ -4944,15 +3470,6 @@  iterate_over_mappings (procinfo *pi, fin
   if (read (map_fd, (char *) prmaps, nmap * sizeof (*prmaps))
       != (nmap * sizeof (*prmaps)))
     proc_error (pi, "iterate_over_mappings (read)", __LINE__);
-#else
-  /* Use ioctl command PIOCNMAP to get number of mappings.  */
-  if (ioctl (pi->ctl_fd, PIOCNMAP, &nmap) != 0)
-    proc_error (pi, "iterate_over_mappings (PIOCNMAP)", __LINE__);
-
-  prmaps = (struct prmap *) alloca ((nmap + 1) * sizeof (*prmaps));
-  if (ioctl (pi->ctl_fd, PIOCMAP, prmaps) != 0)
-    proc_error (pi, "iterate_over_mappings (PIOCMAP)", __LINE__);
-#endif
 
   for (prmap = prmaps; nmap > 0; prmap++, nmap--)
     if ((funcstat = (*func) (prmap, child_func, data)) != 0)
@@ -5012,10 +3529,6 @@  mappingflags (long flags)
   static char asciiflags[8];
 
   strcpy (asciiflags, "-------");
-#if defined (MA_PHYS)
-  if (flags & MA_PHYS)
-    asciiflags[0] = 'd';
-#endif
   if (flags & MA_STACK)
     asciiflags[1] = 's';
   if (flags & MA_BREAK)
@@ -5040,11 +3553,7 @@  info_mappings_callback (struct prmap *ma
 {
   unsigned int pr_off;
 
-#ifdef PCAGENT	/* Horrible hack: only defined on Solaris 2.6+ */
   pr_off = (unsigned int) map->pr_offset;
-#else
-  pr_off = map->pr_off;
-#endif
 
   if (gdbarch_addr_bit (target_gdbarch ()) == 32)
     printf_filtered ("\t%#10lx %#10lx %#10lx %#10x %7s\n",
@@ -5207,9 +3716,9 @@  proc_trace_syscalls_1 (procinfo *pi, int
     proc_error (pi, "proc-trace, get_traced_sysset", __LINE__);
 
   if (mode == FLAG_SET)
-    gdb_praddsysset (sysset, syscallnum);
+    praddset (sysset, syscallnum);
   else
-    gdb_prdelsysset (sysset, syscallnum);
+    prdelset (sysset, syscallnum);
 
   if (entry_or_exit == PR_SYSENTRY)
     {
@@ -5301,8 +3810,6 @@  procfs_first_available (void)
 }
 
 /* ===================  GCORE .NOTE "MODULE" =================== */
-#if defined (PIOCOPENLWP) || defined (PCAGENT)
-/* gcore only implemented on solaris (so far) */
 
 static char *
 procfs_do_thread_registers (bfd *obfd, ptid_t ptid,
@@ -5326,21 +3833,12 @@  procfs_do_thread_registers (bfd *obfd, p
   target_fetch_registers (regcache, -1);
 
   fill_gregset (regcache, &gregs, -1);
-#if defined (NEW_PROC_API)
   note_data = (char *) elfcore_write_lwpstatus (obfd,
 						note_data,
 						note_size,
 						merged_pid,
 						stop_signal,
 						&gregs);
-#else
-  note_data = (char *) elfcore_write_prstatus (obfd,
-					       note_data,
-					       note_size,
-					       merged_pid,
-					       stop_signal,
-					       &gregs);
-#endif
   fill_fpregset (regcache, &fpregs, -1);
   note_data = (char *) elfcore_write_prfpreg (obfd,
 					      note_data,
@@ -5440,12 +3938,10 @@  procfs_make_note_section (struct target_
 
   stop_signal = find_stop_signal ();
 
-#ifdef NEW_PROC_API
   fill_gregset (get_current_regcache (), &gregs, -1);
   note_data = elfcore_write_pstatus (obfd, note_data, note_size,
 				     ptid_get_pid (inferior_ptid),
 				     stop_signal, &gregs);
-#endif
 
   thread_args.obfd = obfd;
   thread_args.note_data = note_data;
@@ -5466,12 +3962,4 @@  procfs_make_note_section (struct target_
 
   return note_data;
 }
-#else /* !Solaris */
-static char *
-procfs_make_note_section (struct target_ops *self, bfd *obfd, int *note_size)
-{
-  error (_("gcore not implemented for this host."));
-  return NULL;	/* lint */
-}
-#endif /* Solaris */
 /* ===================  END GCORE .NOTE "MODULE" =================== */
diff --git a/gdb/sparc-sol2-nat.c b/gdb/sparc-sol2-nat.c
--- a/gdb/sparc-sol2-nat.c
+++ b/gdb/sparc-sol2-nat.c
@@ -104,8 +104,6 @@  void
   struct target_ops *t;
 
   t = procfs_target ();
-#ifdef NEW_PROC_API	/* Solaris 6 and above can do HW watchpoints.  */
   procfs_use_watchpoints (t);
-#endif
   add_target (t);
 }