This is the mail archive of the gdb-cvs@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] Remove ioctl-based procfs support on Solaris


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=44122162aefcbabb2fbe5b531412d157da5e59fc

commit 44122162aefcbabb2fbe5b531412d157da5e59fc
Author: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date:   Thu Nov 30 16:05:30 2017 +0100

    Remove ioctl-based procfs support on Solaris
    
    This is the previously mentioned patch to get rid of
    unstructured/ioctl-based procfs support in procfs.c.  Given that support
    for structured procfs was introduced in Solaris 2.6 back in 1997 and
    we're just removing support for Solaris < 10, there's no point in
    carrying that baggage (and tons of support for IRIX and OSF/1 as well)
    around any longer.
    
    Most of the patch should be straightforward (removing support for
    !NEW_PROC_API, non-Solaris OSes and pre-Solaris 10 quirks).
    
    Only a few points need explanations:
    
    * <sys/syscall.h> was already included unconditionally in most places,
      so there's no need to have guards in a few remaining ones.
    
    * configure.host already obsoletes i?86-*-sysv4.2, i?86-*-sysv5, so
      NEW_PROC_API detection for those in configure.ac can go.
    
    * I'm still including <sys/procfs.h> with #define _STRUCTURED_PROC 1.
      Theoretically, it would be better to include <procfs.h> on Solaris
      (which includes that define), but that breaks the build over
      <procfs.h> vs. gdb's "procfs.h", and doesn't exist on Linux.
    
    * I've regenerated syscall_table[] in proc-events.c with a small script
      from Solaris 10, 11.3, 11.4 <sys/syscall.h>, so there should be no
      traces of older Solaris versions and other OSes left.
    
    * prsysent_t and DYNAMIC_SYSCALLS was only used for AIX 5, but AIX
      doesn't use procfs.c any longer, so all related code can go.
    
    The patch was generated with diff -w so one can easier see changes
    without being distracted by simple reindentations.
    
    So far, it has only been compiled and smoke-tested on
    amd64-pc-solaris2.1[01], sparcv9-sun-solaris2.1[01], and
    x86_64-pc-linux-gnu.  Certainly needs more testing (Solaris 11.3
    vs. 11.4, 32-bit gdb, testsuite once I've figured out what's wrong on
    Solaris 10 etc.), but it's enough to get a first impression how much
    cleanup is possible here.
    
    	* configure.ac Don't check for sys/fault.h, sys/syscall.h,
    	sys/proc.h.
    	(NEW_PROC_API): Remove.
    	(prsysent_t, pr_sigset_t, pr_sigaction64_t, pr_siginfo64_t):
    	Likewise.
    	* common/common.m4 (GDB_AC_COMMON): Don't check for sys/syscall.h.
    	* configure: Regenerate.
    	* config.in: Regenerate.
    	* gdbserver/configure: Regenerate.
    	* gdbserver/config.in: Regenerate.
    
    	* i386-sol2-nat.c (_initialize_amd64_sol2_nat): Remove
    	NEW_PROC_API test.
    	* sparc-sol2-nat.c (_initialize_sparc_sol2_nat): Likewise.
    
    	* linux-btrace.c: Remove HAVE_SYS_SYSCALL_H test.
    
    	* proc-api.c: Remove !NEW_PROC_API support.
    	Remove HAVE_SYS_PROC_H and HAVE_SYS_USER_H tests.
    	Remove tests for macros always defined on Solaris.
    	* proc-events.c: Remove !NEW_PROC_API support.
    	Remove Remove HAVE_SYS_SYSCALL_H, HAVE_SYS_PROC_H and
    	HAVE_SYS_USER_H tests.
    	(init_syscall_table): Remove non-Solaris syscalls.
    	Remove tests for syscalls present on all Solaris versions.
    	Add missing Solaris 10+ syscalls.
    	(signal_table): Remove non-Solaris signals.
    	Remove tests for signals present on all Solaris versions.
    	(fault_table): Remove non-Solaris faults.
    	Remove tests for faults present on all Solaris versions.
    	* proc-flags.c: Remove !NEW_PROC_API support.
    	(pr_flag_table): Remove non-Solaris and pre-Solaris 7 comments.
    	Remove non-Solaris flags.
    	* proc-why.c: Remove !NEW_PROC_API support.
    	(pr_why_table): Remove meaningless comments.
    	Remove tests for reasons present on all Solaris versions.
    	Remove OSF/1 cases.
    	(proc_prettyfprint_why): Likewise.
    
    	* procfs.c: Remove !NEW_PROC_API and DYNAMIC_SYSCALLS support.
    	Remove HAVE_SYS_FAULT_H and HAVE_SYS_SYSCALL_H tests.
    	Remove WA_READ test, IRIX watchpoint support.
    	(gdb_sigset_t, gdb_sigaction_t, gdb_siginfo_t): Replace by base
    	types.  Change users.
    	(gdb_praddset, gdb_prdelset, gdb_premptysysset, gdb_praddsysset)
    	(gdb_prdelset, gdb_pr_issyssetmember): Replace by base macros.
    	Change callers.
    	Remove CTL_PROC_NAME_FMT tests.
    	(gdb_prstatus_t, gdb_lwpstatus_t): Replace by base types.  Change
    	users.
    	(sysset_t_size): Remove.  Use sizeof (sysset_t) in callers.
    	Remove PROCFS_DONT_PIOCSSIG_CURSIG support.
    	(proc_modify_flag): Replace GDBRESET by PCUNSET.
    	Remove PR_ASYNC, PR_KLC tests.
    	(proc_unset_inherit_on_fork): Remove PR_ASYNC test.
    	(proc_parent_pid): Remove PCWATCH etc. tests.
    	(proc_set_watchpoint): Remove !PCWATCH && !PIOCSWATCH support.
    	Remove PCAGENT test.
    	(proc_get_nthreads) [PIOCNTHR && PIOCTLIST]: Remove.
    	Remove SYS_lwpcreate || SYS_lwp_create test.
    	(proc_get_current_thread): Likewise.
    	[PIOCNTHR && PIOCTLIST]: Remove.
    	[PIOCLSTATUS]: Remove.
    	(procfs_debug_inferior): Remove non-Solaris cases, conditionals.
    	[PRFS_STOPEXEC]: Remove.
    	(syscall_is_lwp_exit): Remove non-Solaris cases, conditionals.
    	(syscall_is_exit): Likewise.
    	(syscall_is_exec): Likewise.
    	(syscall_is_lwp_create): Likewise.
    	Remove SYS_syssgi support.
    	(procfs_wait): Remove PR_ASYNC, !PIOCSSPCACT tests.
    	[SYS_syssgi]: Remove.
    	Remove non-Solaris cases, conditionals.
    	(unconditionally_kill_inferior) [PROCFS_NEED_PIOCSSIG_FOR_KILL]:
    	Remove.
    	(procfs_init_inferior) [SYS_syssgi]: Remove.
    	(procfs_set_exec_trap) [PRFS_STOPEXEC]: Remove.
    	(procfs_inferior_created) [SYS_syssgi]: Remove.
    	(procfs_set_watchpoint): Remove !AIX5 test.
    	(procfs_stopped_by_watchpoint): Remove FLTWATCH test, FLTKWATCH
    	case.
    	(mappingflags) [MA_PHYS]: Remove.
    	(info_mappings_callback): Remove PCAGENT test.
    	Remove PIOCOPENLWP || PCAGENT test.

Diff:
---
 gdb/ChangeLog           |   87 +++
 gdb/aclocal.m4          |   30 +-
 gdb/common/common.m4    |    2 +-
 gdb/config.in           |   24 -
 gdb/configure           |  187 +----
 gdb/configure.ac        |   28 +-
 gdb/gdbserver/config.in |    3 -
 gdb/gdbserver/configure |    2 +-
 gdb/i386-sol2-nat.c     |    2 -
 gdb/nat/linux-btrace.c  |    2 -
 gdb/proc-api.c          |  356 +--------
 gdb/proc-events.c       | 1205 +++---------------------------
 gdb/proc-flags.c        |  218 +-----
 gdb/proc-why.c          |   61 +-
 gdb/procfs.c            | 1902 +++++------------------------------------------
 gdb/sparc-sol2-nat.c    |    2 -
 16 files changed, 452 insertions(+), 3659 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 73685e6..10dc10e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,92 @@
 2017-11-30  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
+	* configure.ac Don't check for sys/fault.h, sys/syscall.h,
+	sys/proc.h.
+	(NEW_PROC_API): Remove.
+	(prsysent_t, pr_sigset_t, pr_sigaction64_t, pr_siginfo64_t):
+	Likewise.
+	* common/common.m4 (GDB_AC_COMMON): Don't check for sys/syscall.h.
+	* configure: Regenerate.
+	* config.in: Regenerate.
+	* gdbserver/configure: Regenerate.
+	* gdbserver/config.in: Regenerate.
+
+	* i386-sol2-nat.c (_initialize_amd64_sol2_nat): Remove
+	NEW_PROC_API test.
+	* sparc-sol2-nat.c (_initialize_sparc_sol2_nat): Likewise.
+
+	* linux-btrace.c: Remove HAVE_SYS_SYSCALL_H test.
+
+	* proc-api.c: Remove !NEW_PROC_API support.
+	Remove HAVE_SYS_PROC_H and HAVE_SYS_USER_H tests.
+	Remove tests for macros always defined on Solaris.
+	* proc-events.c: Remove !NEW_PROC_API support.
+	Remove Remove HAVE_SYS_SYSCALL_H, HAVE_SYS_PROC_H and
+	HAVE_SYS_USER_H tests.
+	(init_syscall_table): Remove non-Solaris syscalls.
+	Remove tests for syscalls present on all Solaris versions.
+	Add missing Solaris 10+ syscalls.
+	(signal_table): Remove non-Solaris signals.
+	Remove tests for signals present on all Solaris versions.
+	(fault_table): Remove non-Solaris faults.
+	Remove tests for faults present on all Solaris versions.
+	* proc-flags.c: Remove !NEW_PROC_API support.
+	(pr_flag_table): Remove non-Solaris and pre-Solaris 7 comments.
+	Remove non-Solaris flags.
+	* proc-why.c: Remove !NEW_PROC_API support.
+	(pr_why_table): Remove meaningless comments.
+	Remove tests for reasons present on all Solaris versions.
+	Remove OSF/1 cases.
+	(proc_prettyfprint_why): Likewise.
+
+	* procfs.c: Remove !NEW_PROC_API and DYNAMIC_SYSCALLS support.
+	Remove HAVE_SYS_FAULT_H and HAVE_SYS_SYSCALL_H tests.
+	Remove WA_READ test, IRIX watchpoint support.
+	(gdb_sigset_t, gdb_sigaction_t, gdb_siginfo_t): Replace by base
+	types.  Change users.
+	(gdb_praddset, gdb_prdelset, gdb_premptysysset, gdb_praddsysset)
+	(gdb_prdelset, gdb_pr_issyssetmember): Replace by base macros.
+	Change callers.
+	Remove CTL_PROC_NAME_FMT tests.
+	(gdb_prstatus_t, gdb_lwpstatus_t): Replace by base types.  Change
+	users.
+	(sysset_t_size): Remove.  Use sizeof (sysset_t) in callers.
+	Remove PROCFS_DONT_PIOCSSIG_CURSIG support.
+	(proc_modify_flag): Replace GDBRESET by PCUNSET.
+	Remove PR_ASYNC, PR_KLC tests.
+	(proc_unset_inherit_on_fork): Remove PR_ASYNC test.
+	(proc_parent_pid): Remove PCWATCH etc. tests.
+	(proc_set_watchpoint): Remove !PCWATCH && !PIOCSWATCH support.
+	Remove PCAGENT test.
+	(proc_get_nthreads) [PIOCNTHR && PIOCTLIST]: Remove.
+	Remove SYS_lwpcreate || SYS_lwp_create test.
+	(proc_get_current_thread): Likewise.
+	[PIOCNTHR && PIOCTLIST]: Remove.
+	[PIOCLSTATUS]: Remove.
+	(procfs_debug_inferior): Remove non-Solaris cases, conditionals.
+	[PRFS_STOPEXEC]: Remove.
+	(syscall_is_lwp_exit): Remove non-Solaris cases, conditionals.
+	(syscall_is_exit): Likewise.
+	(syscall_is_exec): Likewise.
+	(syscall_is_lwp_create): Likewise.
+	Remove SYS_syssgi support.
+	(procfs_wait): Remove PR_ASYNC, !PIOCSSPCACT tests.
+	[SYS_syssgi]: Remove.
+	Remove non-Solaris cases, conditionals.
+	(unconditionally_kill_inferior) [PROCFS_NEED_PIOCSSIG_FOR_KILL]:
+	Remove.
+	(procfs_init_inferior) [SYS_syssgi]: Remove.
+	(procfs_set_exec_trap) [PRFS_STOPEXEC]: Remove.
+	(procfs_inferior_created) [SYS_syssgi]: Remove.
+	(procfs_set_watchpoint): Remove !AIX5 test.
+	(procfs_stopped_by_watchpoint): Remove FLTWATCH test, FLTKWATCH
+	case.
+	(mappingflags) [MA_PHYS]: Remove.
+	(info_mappings_callback): Remove PCAGENT test.
+	Remove PIOCOPENLWP || PCAGENT test.
+
+2017-11-30  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
 	* sol-thread.c (info_solthreads): Constify args.
 	Cast args to void *.
 
diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
index 68a98d1..e0d38ea 100644
--- a/gdb/aclocal.m4
+++ b/gdb/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,12 +14,14 @@
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -100,12 +103,15 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -124,8 +130,8 @@ AC_SUBST(install_sh)])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -145,7 +151,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
        [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
 [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
@@ -161,12 +167,14 @@ AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of
 
 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -189,13 +197,13 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -204,7 +212,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
diff --git a/gdb/common/common.m4 b/gdb/common/common.m4
index 7e701b6..27634fc 100644
--- 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/config.in b/gdb/config.in
index 60cdc77..1d11a97 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -348,18 +348,6 @@
 /* Define to 1 if you have the <proc_service.h> header file. */
 #undef HAVE_PROC_SERVICE_H
 
-/* Define if <sys/procfs.h> has prsysent_t. */
-#undef HAVE_PRSYSENT_T
-
-/* Define if <sys/procfs.h> has pr_sigaction64_t. */
-#undef HAVE_PR_SIGACTION64_T
-
-/* Define if <sys/procfs.h> has pr_siginfo64_t. */
-#undef HAVE_PR_SIGINFO64_T
-
-/* Define if <sys/procfs.h> has pr_sigset_t. */
-#undef HAVE_PR_SIGSET_T
-
 /* Define if <sys/procfs.h> has psaddr_t. */
 #undef HAVE_PSADDR_T
 
@@ -495,9 +483,6 @@
 /* Define to 1 if you have the <sys/debugreg.h> header file. */
 #undef HAVE_SYS_DEBUGREG_H
 
-/* Define to 1 if you have the <sys/fault.h> header file. */
-#undef HAVE_SYS_FAULT_H
-
 /* Define to 1 if you have the <sys/file.h> header file. */
 #undef HAVE_SYS_FILE_H
 
@@ -516,9 +501,6 @@
 /* Define to 1 if you have the <sys/procfs.h> header file. */
 #undef HAVE_SYS_PROCFS_H
 
-/* Define to 1 if you have the <sys/proc.h> header file. */
-#undef HAVE_SYS_PROC_H
-
 /* Define to 1 if you have the <sys/ptrace.h> header file. */
 #undef HAVE_SYS_PTRACE_H
 
@@ -537,9 +519,6 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
-/* Define to 1 if you have the <sys/syscall.h> header file. */
-#undef HAVE_SYS_SYSCALL_H
-
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
@@ -619,9 +598,6 @@
    moved. */
 #undef JIT_READER_DIR_RELOCATABLE
 
-/* Define if you want to use new multi-fd /proc interface. */
-#undef NEW_PROC_API
-
 /* Name of this package. */
 #undef PACKAGE
 
diff --git a/gdb/configure b/gdb/configure
index 3c64bb1..7b25007 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -12041,10 +12041,9 @@ fi
 # elf_hp.h is for HP/UX 64-bit shared library support.
 for ac_header in 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
 do :
@@ -12060,22 +12059,6 @@ fi
 
 done
 
-for ac_header in sys/proc.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "sys/proc.h" "ac_cv_header_sys_proc_h" "#if HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_proc_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_PROC_H 1
-_ACEOF
-
-fi
-
-done
-
 for ac_header in sys/user.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "sys/user.h" "ac_cv_header_sys_user_h" "#if HAVE_SYS_PARAM_H
@@ -13559,7 +13542,7 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
   fi
 
 
-  for ac_header in linux/perf_event.h locale.h memory.h signal.h 		   sys/resource.h sys/socket.h sys/syscall.h 		   sys/un.h sys/wait.h 		   thread_db.h wait.h 		   termios.h
+  for ac_header in linux/perf_event.h locale.h memory.h signal.h 		   sys/resource.h sys/socket.h 		   sys/un.h sys/wait.h 		   thread_db.h wait.h 		   termios.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -14275,23 +14258,6 @@ _ACEOF
 fi
 
 
-# Detect which type of /proc is in use, such as for Solaris.
-
-if test "${target}" = "${host}"; then
-  case "${host}" in
-  *-*-sysv4.2* | *-*-sysv5* )
-
-$as_echo "#define NEW_PROC_API 1" >>confdefs.h
-
-      ;;
-  *-*-solaris2.[6789] | *-*-solaris2.1[0-9]*)
-
-$as_echo "#define NEW_PROC_API 1" >>confdefs.h
-
-      ;;
-  esac
-fi
-
 if test "$ac_cv_header_sys_procfs_h" = yes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gregset_t in sys/procfs.h" >&5
 $as_echo_n "checking for gregset_t in sys/procfs.h... " >&6; }
@@ -14552,155 +14518,6 @@ $as_echo "#define HAVE_PSADDR_T 1" >>confdefs.h
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_psaddr_t" >&5
 $as_echo "$bfd_cv_have_sys_procfs_type_psaddr_t" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prsysent_t in sys/procfs.h" >&5
-$as_echo_n "checking for prsysent_t in sys/procfs.h... " >&6; }
- if test "${bfd_cv_have_sys_procfs_type_prsysent_t+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#define _SYSCALL32
-/* Needed for new procfs interface on sparc-solaris.  */
-#define _STRUCTURED_PROC 1
-#include <sys/procfs.h>
-int
-main ()
-{
-prsysent_t avar
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  bfd_cv_have_sys_procfs_type_prsysent_t=yes
-else
-  bfd_cv_have_sys_procfs_type_prsysent_t=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
- if test $bfd_cv_have_sys_procfs_type_prsysent_t = yes; then
-
-$as_echo "#define HAVE_PRSYSENT_T 1" >>confdefs.h
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_prsysent_t" >&5
-$as_echo "$bfd_cv_have_sys_procfs_type_prsysent_t" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pr_sigset_t in sys/procfs.h" >&5
-$as_echo_n "checking for pr_sigset_t in sys/procfs.h... " >&6; }
- if test "${bfd_cv_have_sys_procfs_type_pr_sigset_t+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#define _SYSCALL32
-/* Needed for new procfs interface on sparc-solaris.  */
-#define _STRUCTURED_PROC 1
-#include <sys/procfs.h>
-int
-main ()
-{
-pr_sigset_t avar
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  bfd_cv_have_sys_procfs_type_pr_sigset_t=yes
-else
-  bfd_cv_have_sys_procfs_type_pr_sigset_t=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
- if test $bfd_cv_have_sys_procfs_type_pr_sigset_t = yes; then
-
-$as_echo "#define HAVE_PR_SIGSET_T 1" >>confdefs.h
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_pr_sigset_t" >&5
-$as_echo "$bfd_cv_have_sys_procfs_type_pr_sigset_t" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pr_sigaction64_t in sys/procfs.h" >&5
-$as_echo_n "checking for pr_sigaction64_t in sys/procfs.h... " >&6; }
- if test "${bfd_cv_have_sys_procfs_type_pr_sigaction64_t+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#define _SYSCALL32
-/* Needed for new procfs interface on sparc-solaris.  */
-#define _STRUCTURED_PROC 1
-#include <sys/procfs.h>
-int
-main ()
-{
-pr_sigaction64_t avar
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  bfd_cv_have_sys_procfs_type_pr_sigaction64_t=yes
-else
-  bfd_cv_have_sys_procfs_type_pr_sigaction64_t=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
- if test $bfd_cv_have_sys_procfs_type_pr_sigaction64_t = yes; then
-
-$as_echo "#define HAVE_PR_SIGACTION64_T 1" >>confdefs.h
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_pr_sigaction64_t" >&5
-$as_echo "$bfd_cv_have_sys_procfs_type_pr_sigaction64_t" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pr_siginfo64_t in sys/procfs.h" >&5
-$as_echo_n "checking for pr_siginfo64_t in sys/procfs.h... " >&6; }
- if test "${bfd_cv_have_sys_procfs_type_pr_siginfo64_t+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#define _SYSCALL32
-/* Needed for new procfs interface on sparc-solaris.  */
-#define _STRUCTURED_PROC 1
-#include <sys/procfs.h>
-int
-main ()
-{
-pr_siginfo64_t avar
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  bfd_cv_have_sys_procfs_type_pr_siginfo64_t=yes
-else
-  bfd_cv_have_sys_procfs_type_pr_siginfo64_t=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
- if test $bfd_cv_have_sys_procfs_type_pr_siginfo64_t = yes; then
-
-$as_echo "#define HAVE_PR_SIGINFO64_T 1" >>confdefs.h
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_pr_siginfo64_t" >&5
-$as_echo "$bfd_cv_have_sys_procfs_type_pr_siginfo64_t" >&6; }
-
-
 
 
 
diff --git a/gdb/configure.ac b/gdb/configure.ac
index de24cfa..8e706b6 100644
--- 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.pl_tdname], [], [],
 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" = yes; then
   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/gdbserver/config.in b/gdb/gdbserver/config.in
index 4a2e778..dda7c1f 100644
--- a/gdb/gdbserver/config.in
+++ b/gdb/gdbserver/config.in
@@ -271,9 +271,6 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
-/* Define to 1 if you have the <sys/syscall.h> header file. */
-#undef HAVE_SYS_SYSCALL_H
-
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index ec032bc..835dcca 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -6769,7 +6769,7 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
   fi
 
 
-  for ac_header in linux/perf_event.h locale.h memory.h signal.h 		   sys/resource.h sys/socket.h sys/syscall.h 		   sys/un.h sys/wait.h 		   thread_db.h wait.h 		   termios.h
+  for ac_header in linux/perf_event.h locale.h memory.h signal.h 		   sys/resource.h sys/socket.h 		   sys/un.h sys/wait.h 		   thread_db.h wait.h 		   termios.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/gdb/i386-sol2-nat.c b/gdb/i386-sol2-nat.c
index 0c5d03f..e05180e 100644
--- a/gdb/i386-sol2-nat.c
+++ b/gdb/i386-sol2-nat.c
@@ -138,9 +138,7 @@ _initialize_amd64_sol2_nat (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
index 1a383b7..4d4168a 100644
--- 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
index a03caa1..25c0686 100644
--- 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, size_t len, char *file, int line)
 		 "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, size_t len, char *file, int line)
 	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, size_t len, char *file, int line)
 	  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, int whence, char *file, int line)
   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
index 9d3233e..b3cf8d1 100644
--- 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_SYSCALLS];
 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";
-#endif
-#ifdef SYS_acl
+  syscall_table[SYS_acctctl] = "acctctl";
   syscall_table[SYS_acl] = "acl";
+#ifdef SYS_adi
+  syscall_table[SYS_adi] = "adi";
 #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";
-#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";
+#ifdef SYS_faccessat
+  syscall_table[SYS_faccessat] = "faccessat";
 #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
-  syscall_table[SYS_fchroot] = "fchroot";
+#ifdef SYS_fchownat
+  syscall_table[SYS_fchownat] = "fchownat";
 #endif
-#ifdef SYS_fcntl
+  syscall_table[SYS_fchroot] = "fchroot";
   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
-  syscall_table[SYS_fstatfs] = "fstatfs";
+#ifdef SYS_fstatat
+  syscall_table[SYS_fstatat] = "fstatat";
 #endif
-#ifdef SYS_fstatvfs
-  syscall_table[SYS_fstatvfs] = "fstatvfs";
+#ifdef SYS_fstatat64
+  syscall_table[SYS_fstatat64] = "fstatat64";
 #endif
-#ifdef SYS_fstatvfs64
+  syscall_table[SYS_fstatfs] = "fstatfs";
+  syscall_table[SYS_fstatvfs] = "fstatvfs";
   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";
-#endif
-#ifdef SYS_getaddressconf
-  syscall_table[SYS_getaddressconf] = "getaddressconf";
-#endif
-#ifdef SYS_getcontext
-  syscall_table[SYS_getcontext] = "getcontext";
-#endif
-#ifdef SYS_getdents
+  syscall_table[SYS_getcwd] = "getcwd";
   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_getloadavg] = "getloadavg";
   syscall_table[SYS_getmsg] = "getmsg";
-#endif
-#ifdef SYS_getpagesize
-  syscall_table[SYS_getpagesize] = "getpagesize";
-#endif
-#ifdef SYS_getpeername
+  syscall_table[SYS_getpagesizes] = "getpagesizes";
   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";
+#ifdef SYS_getrandom
+  syscall_table[SYS_getrandom] = "getrandom";
 #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";
+#ifdef SYS_issetugid
+  syscall_table[SYS_issetugid] = "issetugid";
 #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
-  syscall_table[SYS_listen] = "listen";
+#ifdef SYS_linkat
+  syscall_table[SYS_linkat] = "linkat";
 #endif
-#ifdef SYS_llseek
+  syscall_table[SYS_listen] = "listen";
   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";
-#endif
-#ifdef SYS_lwp_mutex_unlock
   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_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";
-#endif
-#ifdef SYS_lwp_sigredirect
-  syscall_table[SYS_lwp_sigredirect] = "lwp_sigredirect";
+  syscall_table[SYS_lwp_sigmask] = "lwp_sigmask";
+#ifdef SYS_lwp_sigqueue
+  syscall_table[SYS_lwp_sigqueue] = "lwp_sigqueue";
 #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";
-#endif
-#ifdef SYS_memcntl
   syscall_table[SYS_memcntl] = "memcntl";
+#ifdef SYS_memsys
+  syscall_table[SYS_memsys] = "memsys";
 #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";
-#endif
-#ifdef SYS_mmap64
   syscall_table[SYS_mmap64] = "mmap64";
+#ifdef SYS_mmapobj
+  syscall_table[SYS_mmapobj] = "mmapobj";
 #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
-  syscall_table[SYS_p_online] = "p_online";
-#endif
-#ifdef SYS_pagelock
-  syscall_table[SYS_pagelock] = "pagelock";
+#ifdef SYS_openat64
+  syscall_table[SYS_openat64] = "openat64";
 #endif
-#ifdef SYS_pathconf
+  syscall_table[SYS_p_online] = "p_online";
   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
-  syscall_table[SYS_readv] = "readv";
-#endif
-#ifdef SYS_reboot
-  syscall_table[SYS_reboot] = "reboot";
+#ifdef SYS_readlinkat
+  syscall_table[SYS_readlinkat] = "readlinkat";
 #endif
-#ifdef SYS_recv
+  syscall_table[SYS_readv] = "readv";
   syscall_table[SYS_recv] = "recv";
-#endif
-#ifdef SYS_recvfrom
   syscall_table[SYS_recvfrom] = "recvfrom";
+#ifdef SYS_recvmmsg
+  syscall_table[SYS_recvmmsg] = "recvmmsg";
 #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
-  syscall_table[SYS_resolvepath] = "resolvepath";
-#endif
-#ifdef SYS_revoke
-  syscall_table[SYS_revoke] = "revoke";
-#endif
-#ifdef SYS_rfsys
-  syscall_table[SYS_rfsys] = "rfsys";
+#ifdef SYS_renameat
+  syscall_table[SYS_renameat] = "renameat";
 #endif
+  syscall_table[SYS_resolvepath] = "resolvepath";
 #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";
-#endif
-#ifdef SYS_select
-  syscall_table[SYS_select] = "select";
-#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";
+  syscall_table[SYS_sendfilev] = "sendfilev";
+#ifdef SYS_sendmmsg
+  syscall_table[SYS_sendmmsg] = "sendmmsg";
 #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_sharefs] = "sharefs";
   syscall_table[SYS_shmsys] = "shmsys";
-#endif
-#ifdef SYS_shutdown
   syscall_table[SYS_shutdown] = "shutdown";
+#ifdef SYS_sidsys
+  syscall_table[SYS_sidsys] = "sidsys";
 #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";
-#endif
-#ifdef SYS_signotifywait
-  syscall_table[SYS_signotifywait] = "signotifywait";
-#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";
+#ifdef SYS_sigresend
+  syscall_table[SYS_sigresend] = "sigresend";
 #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_sigtimedwait] = "sigtimedwait";
   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";
+#ifdef SYS_sparc_fixalign
+  syscall_table[SYS_sparc_fixalign] = "sparc_fixalign";
 #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
-  syscall_table[SYS_sync] = "sync";
-#endif
-#ifdef SYS_sys3b
-  syscall_table[SYS_sys3b] = "sys3b";
+#ifdef SYS_symlinkat
+  syscall_table[SYS_symlinkat] = "symlinkat";
 #endif
-#ifdef SYS_syscall
+  syscall_table[SYS_sync] = "sync";
   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
-  syscall_table[SYS_systeminfo] = "systeminfo";
+#ifdef SYS_system_stats
+  syscall_table[SYS_system_stats] = "system_stats";
 #endif
-#ifdef SYS_table
-  syscall_table[SYS_table] = "table";
-#endif
-#ifdef SYS_time
+  syscall_table[SYS_systeminfo] = "systeminfo";
+  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 *sigset, int verbose)
 
 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
index 29b5f2a..306b019 100644
--- 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
index 9c60635..c867c69 100644
--- 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, unsigned long why, unsigned long what,
 	  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
index 333a825..888dc69 100644
--- 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.  */
+   This module supports only the Solaris version of the read/write
+   interface.  */
 
-/* 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
 #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 (struct target_ops *, ptid_t);
 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"
+#[...]

[diff truncated at 100000 bytes]


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]