Update to strace v4.6.

This change also fixes the system call numbers for ARM.
Previously, the ARM port had been hacked to use the system call numbers
for SH, which were only partially correct and often wildly inaccurate.

Refer to Android.patch for the Android-specific changes.

Change-Id: I5bba77591ef40f78a1b146c8831c05f1d7a3df94
diff --git a/Android.mk b/Android.mk
index 8ab0021..112891c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,40 +4,126 @@
 include $(CLEAR_VARS)
 
 # From autoconf-generated Makefile
-strace_SOURCES = strace.c syscall.c util.c desc.c file.c \
-                 io.c ioctl.c mem.c net.c process.c bjm.c \
+strace_SOURCES = strace.c syscall.c count.c util.c desc.c file.c ipc.c \
+                 io.c ioctl.c mem.c net.c process.c bjm.c quota.c \
                  resource.c signal.c sock.c system.c term.c time.c \
-                 proc.c stream.c
+                 proc.c stream.c block.c
 
-#excluded_sources = ipc.c
+#excluded_sources = scsi.c
+
+strace_VERSION = 4.6
 
 LOCAL_SRC_FILES:= $(strace_SOURCES)
 
 LOCAL_SHARED_LIBRARIES :=
 
-# Hack for ARM devices. This version of strace does not support ARM, and the
-# patch that was used to add ARM support actually adds the ARM syscalls to
-# linux/sh/ (Sega Megadrive/Dreamcast/...) instead of linux/arm/ . The proper
-# way to fix this would be to upgrade to a version of strace that does support
-# ARM (e.g. 4.5.1.8), but that would mean having to reapply all Android-specific
-# changes. Sigh.
+LOCAL_CFLAGS := -DLINUX=1 \
+	-DGETGROUPS_T=gid_t \
+	-DHAVE_ASM_SIGCONTEXT_H=1 \
+	-DHAVE_DECL_SYS_ERRLIST=1 \
+	-DHAVE_DECL_SYS_SIGLIST=1 \
+	-DHAVE_DECL_____PTRACE_EVENT_CLONE=1 \
+	-DHAVE_DECL_____PTRACE_EVENT_FORK=1 \
+	-DHAVE_DECL_____PTRACE_EVENT_VFORK=1 \
+	-DHAVE_DECL_____PTRACE_GETEVENTMSG=1 \
+	-DHAVE_DECL_____PTRACE_GETSIGINFO=1 \
+	-DHAVE_DECL_____PTRACE_O_TRACECLONE=1 \
+	-DHAVE_DECL_____PTRACE_O_TRACEFORK=1 \
+	-DHAVE_DECL_____PTRACE_O_TRACEVFORK=1 \
+	-DHAVE_DECL_____PTRACE_SETOPTIONS=1 \
+	-DHAVE_DECL_____PTRACE_EVENT_CLONE=1 \
+	-DHAVE_DECL_____PTRACE_EVENT_CLONE=1 \
+	-DHAVE_DIRENT_H=1 \
+	-DHAVE_FORK=1 \
+	-DHAVE_GETDENTS=1 \
+	-DHAVE_IF_INDEXTONAME=1 \
+	-DHAVE_INET_NTOP=1 \
+	-DHAVE_INTTYPES_H=1 \
+	-DHAVE_LINUX_CAPABILITY_H=1 \
+	-DHAVE_LINUX_ICMP_H=1 \
+	-DHAVE_LINUX_IF_PACKET_H=1 \
+	-DHAVE_LINUX_IN6_H=1 \
+	-DHAVE_LINUX_NETLINK_H=1 \
+	-DHAVE_LINUX_UTSNAME_H=1 \
+	-DHAVE_LONG_LONG=1 \
+	-DHAVE_LONG_LONG_RLIM_T=1 \
+	-DHAVE_MEMORY_H=1 \
+	-DHAVE_NETINET_TCP_H=1 \
+	-DHAVE_NETINET_UDP_H=1 \
+	-DHAVE_POLL_H=1 \
+	-DHAVE_PRCTL=1 \
+	-DHAVE_PREAD=1 \
+	-DHAVE_SENDMSG=1 \
+	-DHAVE_SIGACTION=1 \
+	-DHAVE_SIGINFO_T=1 \
+	-DHAVE_SIG_ATOMIC_T=1 \
+	-DHAVE_STAT64=1 \
+	-DHAVE_STATFS64=1 \
+	-DHAVE_STDBOOL_H=1 \
+	-DHAVE_STDINT_H=1 \
+	-DHAVE_STDLIB_H=1 \
+	-DHAVE_STRERROR=1 \
+	-DHAVE_STRINGS_H=1 \
+	-DHAVE_STRING_H=1 \
+	-DHAVE_STRSIGNAL=1 \
+	-DHAVE_STRUCT_MSGHDR_MSG_CONTROL=1 \
+	-DHAVE_STRUCT_SIGCONTEXT \
+	-DHAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID=1 \
+	-DHAVE_STRUCT_STAT_ST_BLKSIZE=1 \
+	-DHAVE_STRUCT_STAT_ST_BLOCKS=1 \
+	-DHAVE_STRUCT_STAT_ST_RDEV=1 \
+	-DHAVE_STRUCT_USER_DESC=1 \
+	-DHAVE_STRUCT___OLD_KERNEL_STAT=1 \
+	-DHAVE_SYS_EPOLL_H=1 \
+	-DHAVE_SYS_IOCTL_H=1 \
+	-DHAVE_SYS_POLL_H=1 \
+	-DHAVE_SYS_PTRACE_H=1 \
+	-DHAVE_SYS_SIGLIST=1 \
+	-DHAVE_SYS_STAT_H=1 \
+	-DHAVE_SYS_TYPES_H=1 \
+	-DHAVE_SYS_VFS_H=1 \
+	-DHAVE_UNISTD_H=1 \
+	-DLINUX=1 \
+	-DMAJOR_IN_SYSMACROS \
+	-DPACKAGE=strace \
+	-DPACKAGE_BUGREPORT= \
+	-DPACKAGE_NAME='"strace"' \
+	-DPACKAGE_STRING='"strace $(strace_VERSION)"' \
+	-DPACKAGE_TARNAME='"strace"' \
+	-DPACKAGE_VERSION='"$(strace_VERSION)"' \
+	-DRETSIGTYPE=void \
+	-DSTDC_HEADER=1 \
+	-DVERSION='"$(strace_VERSION)"' \
+	-D_GNU_SOURCE=1 \
+	-D_POSIX_SOURCE=1 \
+	-Dfopen64=fopen \
+	-Dd_fileno=d_ino \
+	-D_LFS64_LARGEFILE=1 \
+	-D__KERNEL__=1
+
+#These are defined in AndroidConfig.h so we omit them above.
+#	-DHAVE_SYS_UIO_H=1 \
+#	-DHAVE_TERMIO_H=1 \
+
+
+arch := $(TARGET_ARCH)
 ifeq ($(TARGET_ARCH),arm)
-	STRACE_ARCH_HEADERS := $(LOCAL_PATH)/strace/linux/sh
-else
-	STRACE_ARCH_HEADERS := $(LOCAL_PATH)/strace/linux/$(TARGET_ARCH)
+	LOCAL_CFLAGS += -DARM=1 -DHAVE_LITTLE_ENDIAN_LONG_LONG=1
+else ifeq ($(TARGET_ARCH),x86)
+	LOCAL_CFLAGS += -DI386=1 -DHAVE_LITTLE_ENDIAN_LONG_LONG=1
+	arch := i386
+else ifeq ($(TARGET_ARCH),sh)
+	LOCAL_CFLAGS += -DSH=1 -DHAVE_LITTLE_ENDIAN_LONG_LONG=1
+else ifeq ($(TARGET_ARCH),mips)
+	LOCAL_CFLAGS += -DMIPS=1 -DHAVE_LITTLE_ENDIAN_LONG_LONG=1
 endif
 
+LOCAL_CFLAGS += -Wno-missing-field-initializers
+
 LOCAL_C_INCLUDES := \
-	$(STRACE_ARCH_HEADERS) \
 	$(KERNEL_HEADERS) \
 	$(LOCAL_PATH)/linux \
-	$(LOCAL_PATH)/android/arch/$(TARGET_ARCH)
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H -Dd_fileno=d_ino -D_LFS64_LARGEFILE=1
-
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_CFLAGS += -Ulinux
-endif
+	$(LOCAL_PATH)/linux/$(arch)
 
 LOCAL_MODULE := strace
 
diff --git a/Android.patch b/Android.patch
new file mode 100644
index 0000000..c7f36d8
--- /dev/null
+++ b/Android.patch
@@ -0,0 +1,252 @@
+diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/bjm.c ./bjm.c
+--- /Users/jeffbrown/Downloads/strace-4.6/bjm.c	2009-11-06 09:27:46.000000000 -0800
++++ ./bjm.c	2012-03-02 15:17:11.000000000 -0800
+@@ -39,7 +39,9 @@
+ #include <sys/wait.h>
+ #include <sys/resource.h>
+ #include <sys/utsname.h>
++#ifndef HAVE_ANDROID_OS
+ #include <sys/user.h>
++#endif
+ #include <sys/syscall.h>
+ #include <signal.h>
+ 
+diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/file.c ./file.c
+--- /Users/jeffbrown/Downloads/strace-4.6/file.c	2011-03-03 18:08:02.000000000 -0800
++++ ./file.c	2012-03-02 15:11:14.000000000 -0800
+@@ -45,6 +45,41 @@
+ # define kernel_dirent dirent
+ #endif
+ 
++#ifdef HAVE_ANDROID_OS
++#include <linux/fadvise.h>
++
++// ANDROID: From linux/dirent.h
++
++struct dirent64 {
++ __u64 d_ino;
++ __s64 d_off;
++ unsigned short d_reclen;
++ unsigned char d_type;
++ char d_name[256];
++};
++
++// ANDROID: From kernel_headers/asm/statfs.h
++
++/*
++ * With EABI there is 4 bytes of padding added to this structure.
++ * Let's pack it so the padding goes away to simplify dual ABI support.
++ * Note that user space does NOT have to pack this structure.
++ */
++struct statfs64 {
++        __u32 f_type;
++        __u32 f_bsize;
++        __u64 f_blocks;
++        __u64 f_bfree;
++        __u64 f_bavail;
++        __u64 f_files;
++        __u64 f_ffree;
++        __kernel_fsid_t f_fsid;
++        __u32 f_namelen;
++        __u32 f_frsize;
++        __u32 f_spare[5];
++} __attribute__ ((packed,aligned(4)));
++#endif /* HAVE_ANDROID_OS */
++
+ #ifdef LINUX
+ #  ifdef LINUXSPARC
+ struct stat {
+diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/ioctl.c ./ioctl.c
+--- /Users/jeffbrown/Downloads/strace-4.6/ioctl.c	2011-01-15 12:15:31.000000000 -0800
++++ ./ioctl.c	2012-03-02 15:53:36.000000000 -0800
+@@ -155,9 +155,11 @@
+ 	case 0x03:
+ 	case 0x12:
+ 		return block_ioctl(tcp, code, arg);
++#ifndef HAVE_ANDROID_OS
+ 	case 0x22:
+ 		return scsi_ioctl(tcp, code, arg);
+ #endif
++#endif
+ 	default:
+ 		break;
+ 	}
+diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/ipc.c ./ipc.c
+--- /Users/jeffbrown/Downloads/strace-4.6/ipc.c	2010-03-31 15:22:01.000000000 -0700
++++ ./ipc.c	2012-03-02 16:12:52.000000000 -0800
+@@ -40,9 +40,15 @@
+ 
+ #include <fcntl.h>
+ #include <sys/ipc.h>
++#ifdef HAVE_ANDROID_OS
++#include <linux/sem.h>
++#include <linux/msg.h>
++#include <linux/shm.h>
++#else
+ #include <sys/sem.h>
+ #include <sys/msg.h>
+ #include <sys/shm.h>
++#endif
+ 
+ #ifndef MSG_STAT
+ #define MSG_STAT 11
+diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/process.c ./process.c
+--- /Users/jeffbrown/Downloads/strace-4.6/process.c	2011-03-14 14:58:59.000000000 -0700
++++ ./process.c	2012-03-02 15:16:28.000000000 -0800
+@@ -45,7 +45,11 @@
+ #include <sys/wait.h>
+ #include <sys/resource.h>
+ #include <sys/utsname.h>
++#ifdef HAVE_ANDROID_OS
++#include <asm/user.h>
++#else
+ #include <sys/user.h>
++#endif
+ #include <sys/syscall.h>
+ #include <signal.h>
+ #ifdef SUNOS4
+@@ -114,6 +118,10 @@
+ #define GETGROUPS32_T __kernel_gid32_t
+ #endif /* LINUX */
+ 
++#ifdef HAVE_ANDROID_OS
++#define __sched_priority sched_priority
++#endif
++
+ #if defined(LINUX) && defined(IA64)
+ # include <asm/ptrace_offsets.h>
+ # include <asm/rse.h>
+diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/signal.c ./signal.c
+--- /Users/jeffbrown/Downloads/strace-4.6/signal.c	2011-03-10 15:14:47.000000000 -0800
++++ ./signal.c	2012-03-02 15:22:07.000000000 -0800
+@@ -37,9 +37,17 @@
+ 
+ #include <stdint.h>
+ #include <signal.h>
++#ifndef HAVE_ANDROID_OS
+ #include <sys/user.h>
++#endif
+ #include <fcntl.h>
+ 
++#ifdef HAVE_ANDROID_OS
++//FIXME use "sigprocmask" or something
++#define sigmask(sig)    (1UL << ((sig) - 1))
++#define sigcontext_struct sigcontext
++#endif
++
+ #ifdef SVR4
+ #include <sys/ucontext.h>
+ #endif /* SVR4 */
+@@ -455,7 +463,7 @@
+ 
+ #endif /* LINUX */
+ 
+-#if __GLIBC_MINOR__ < 1
++#if __GLIBC_MINOR__ < 1 && !defined(HAVE_ANDROID_OS)
+ /* Type for data associated with a signal.  */
+ typedef union sigval
+ {
+diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/strace.c ./strace.c
+--- /Users/jeffbrown/Downloads/strace-4.6/strace.c	2011-03-10 14:25:03.000000000 -0800
++++ ./strace.c	2012-03-02 16:55:15.000000000 -0800
+@@ -38,7 +38,10 @@
+ #include <sys/param.h>
+ #include <fcntl.h>
+ #include <sys/resource.h>
++#ifdef HAVE_ANDROID_OS
++#define wait4 __wait4
+ #include <sys/wait.h>
++#endif
+ #include <sys/stat.h>
+ #include <pwd.h>
+ #include <grp.h>
+diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/syscall.c ./syscall.c
+--- /Users/jeffbrown/Downloads/strace-4.6/syscall.c	2011-02-18 16:02:27.000000000 -0800
++++ ./syscall.c	2012-03-02 15:00:35.000000000 -0800
+@@ -38,10 +38,16 @@
+ #include <signal.h>
+ #include <time.h>
+ #include <errno.h>
++#ifndef HAVE_ANDROID_OS
+ #include <sys/user.h>
++#endif
+ #include <sys/syscall.h>
+ #include <sys/param.h>
+ 
++#ifdef HAVE_ANDROID_OS
++#include "syscall-android.h"
++#endif
++
+ #ifdef HAVE_SYS_REG_H
+ #include <sys/reg.h>
+ #ifndef PTRACE_PEEKUSR
+@@ -2600,6 +2606,7 @@
+ 	}
+ 
+ 	switch (known_scno(tcp)) {
++#ifndef __ARM_EABI__
+ #ifdef SYS_socket_subcall
+ 	case SYS_socketcall:
+ 		decode_subcall(tcp, SYS_socket_subcall,
+@@ -2612,6 +2619,7 @@
+ 			SYS_ipc_nsubcalls, shift_style);
+ 		break;
+ #endif
++#endif
+ #ifdef SVR4
+ #ifdef SYS_pgrpsys_subcall
+ 	case SYS_pgrpsys:
+diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/system.c ./system.c
+--- /Users/jeffbrown/Downloads/strace-4.6/system.c	2011-02-22 02:22:13.000000000 -0800
++++ ./system.c	2012-03-02 15:50:24.000000000 -0800
+@@ -32,6 +32,11 @@
+ 
+ #include "defs.h"
+ 
++#ifdef HAVE_ANDROID_OS
++#undef __unused
++#include <linux/socket.h>
++#endif
++
+ #ifdef LINUX
+ #define _LINUX_SOCKET_H
+ #define _LINUX_FS_H
+diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/time.c ./time.c
+--- /Users/jeffbrown/Downloads/strace-4.6/time.c	2011-03-03 18:08:02.000000000 -0800
++++ ./time.c	2012-03-02 15:23:05.000000000 -0800
+@@ -33,7 +33,11 @@
+ 
+ #ifdef LINUX
+ #include <linux/version.h>
++#ifdef HAVE_ANDROID_OS
++#include <linux/timex.h>
++#else
+ #include <sys/timex.h>
++#endif
+ #include <linux/ioctl.h>
+ #include <linux/rtc.h>
+ 
+diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/util.c ./util.c
+--- /Users/jeffbrown/Downloads/strace-4.6/util.c	2011-03-03 18:08:02.000000000 -0800
++++ ./util.c	2012-03-02 15:01:45.000000000 -0800
+@@ -37,7 +37,9 @@
+ 
+ #include <signal.h>
+ #include <sys/syscall.h>
++#ifndef HAVE_ANDROID_OS
+ #include <sys/user.h>
++#endif
+ #include <sys/param.h>
+ #include <fcntl.h>
+ #if HAVE_SYS_UIO_H
+@@ -49,6 +51,10 @@
+ #include <link.h>
+ #endif /* SUNOS4 */
+ 
++#ifdef HAVE_ANDROID_OS
++#include "syscall-android.h"
++#endif
++
+ #if defined(linux) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1))
+ #include <linux/ptrace.h>
+ #endif
diff --git a/COPYRIGHT b/COPYRIGHT
index f76bac7..faaa2d8 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -28,4 +28,4 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-$Id: COPYRIGHT,v 1.3 2002/03/31 18:43:00 wichert Exp $
+$Id$
diff --git a/CREDITS b/CREDITS
index c2b3c5f..488c606 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,49 +1,115 @@
-The primary authors of strace are:
+The primary authors of strace were:
 
 	Paul Kranenburg <pk@cs.few.eur.nl>
 	Branko Lankester <branko@hacktic.nl>
 	Rick Sladkey <jrs@world.std.com>
 
-Thanks to the follow people for contributing to strace by reporting
-bugs, providing fixes, providing information, providing resources or
-porting to new systems:
+These people have contributed to strace.  Some have reported problems, others
+have contributed improvements to the documentation, actual code, provided
+information, provided resources, or helped to port strace to new systems.
+Those contributions are described in the version control logs and ChangeLog-CVS
+file.  If your name has been left out, if you'd rather not be listed, or if
+you'd prefer a different address be used, please send a note to the
+strace-devel@lists.sourceforge.net mailing list.
 
-	Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-	Arkadiusz Miskiewicz <misiek@pld.org.pl>
-	Marty Leisner <leisner@sdsp.mc.xerox.com>
-	Lupe Christoph <lupe@alanya.isar.muc.de>
-	Thanh Ma <tma@encore.com>
-	Keith Thompson <kst@alsys.com>
-	Roland Borde <bo@uebemc.siemens.de>
-	Matt Day <mday@artisoft.com>
-	Joe Ilacqua <spike@world.std.com>
-	Ju"rgen Fluk <louis@marco.de>
-	Bo Kullmar <bk@kullmar.se>
-	Leonard N. Zubkoff <lnz@dandelion.com>
-	Reuben Sumner <rasumner@undergrad.math.uwaterloo.ca>
-	Juergen Weigert <jnweiger@immd4.informatik.uni-erlangen.de>
-	Linus Torvalds <Linus.Torvalds@cs.Helsinki.FI>
-	Michael E Chastain <mec@duracef.shout.net>
-	Aaron Ucko <UCKO@VAX1.ROCKHURST.EDU>
-	David S. Miller <davem@caip.rutgers.edu>
-	Matthias Pfaller <leo@dachau.marco.de>
-	Thomas Bogendoerfer <tsbogend@bigbug.franken.de>
-	Richard Henderson <richard@twiddle.tamu.edu>
-	Tom Dyas <tdyas@eden.rutgers.edu>
-	Henrik Storner <storner@osiris.ping.dk>
-	David Mosberger-Tang <davidm@hpl.hp.com>
-	Ulrich Drepper <drepper@cygnus.com>
-	Nate Eldredge <nate@cartsys.com>
-	Jakub Jelinek <jj@ultra.linux.cz>
-	John Hughes <john@Calva.COM>
-	Richard Braakman <dark@xs4all.nl>
-	Florian Lohoff <flo@rfc822.org>
-	D.J. Barrow <djbarrow@de.ibm.com>
-	Topi Miettinen <Topi.Miettinen@nic.fi>
-	Gaël Roualland <gael.roualland@iname.com>
-	Richard Hirst <rhirst@linuxcare.com>
-	Ganesan Rajagopal <rganesan@myrealbox.com>
-	Greg Banks <gbanks@pocketpenguins.com>
+	Aaron Ucko <ucko@vax1.rockhurst.edu>
+	Adrien Kunysz <adrien@kunysz.be>
 	Andi Kleen <ak@suse.de>
-	Michal Ludvig <mludvig@suse.cz>
+	Andreas Schwab <schwab@linux-m68k.org>
+	Anton Blanchard <anton@samba.org>
+	Arkadiusz Miskiewicz <misiek@pld.org.pl>
+	Bai Weidong <baiwd@cn.fujitsu.com>
+	Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+	Bo Kullmar <bk@kullmar.se>
+	Cai Fei <caifei@cn.fujitsu.com>
+	Carlos O'Donell <carlos@systemhalted.org>
+	Carmelo AMOROSO <carmelo.amoroso@st.com>
+	Chris Metcalf <cmetcalf@tilera.com>
+	D.J. Barrow <djbarrow@de.ibm.com>
+	David Daney <ddaney@caviumnetworks.com>
+	David Mosberger-Tang <davidm@hpl.hp.com>
+	David S. Miller <davem@caip.rutgers.edu>
+	David Wilder <wilder@us.ibm.com>
+	David Woodhouse <dwmw2@redhat.com>
+	Denys Vlasenko <dvlasenk@redhat.com>
+	Dmitry V. Levin <ldv@altlinux.org>
+	Douglas Mencken <dougmencken@gmail.com>
+	Edgar E. Iglesias <edgar.iglesias@gmail.com>
+	Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
+	Florian Lohoff <flo@rfc822.org>
+	Frederik Schüler <fs@debian.org>
+	Gabor Gombas <gombasg@sztaki.hu>
+	Ganesan Rajagopal <rganesan@myrealbox.com>
+	Gaël Roualland <gael.roualland@iname.com>
+	Greg Banks <gbanks@pocketpenguins.com>
 	Heiko Carstens <heiko.carstens@de.ibm.com>
+	Henrik Storner <storner@osiris.ping.dk>
+	Holger Hans Peter Freyther <holger@freyther.de>
+	Jakub Bogusz <qboosh@pld-linux.org>
+	Jakub Jelinek <jj@ultra.linux.cz>
+	Jan Kratochvil <jan.kratochvil@redhat.com>
+	Jeff Mahoney <jeffm@suse.com>
+	Joe Ilacqua <spike@world.std.com>
+	Johannes Stezenbach <js@sig21.net>
+	John Hughes <john@Calva.COM>
+	Ju"rgen Fluk <louis@marco.de>
+	Juergen Weigert <jnweiger@immd4.informatik.uni-erlangen.de>
+	Keith Thompson <kst@alsys.com>
+	Kirill A. Shutemov <kirill@shutemov.name>
+	Kyle McMartin <kyle@mcmartin.ca>
+	Lai JiangShan <laijs@cn.fujitsu.com>
+	Leonard N. Zubkoff <lnz@dandelion.com>
+	Linus Torvalds <Linus.Torvalds@cs.helsinki.fi>
+	Lupe Christoph <lupe@alanya.isar.muc.de>
+	Mark Wielaard <mjw@redhat.com>
+	Marty Leisner <leisner@sdsp.mc.xerox.com>
+	Matt Day <mday@artisoft.com>
+	Matthias Pfaller <leo@dachau.marco.de>
+	Maxim Shchetynin <maxim@de.ibm.com>
+	Michael E Chastain <mec@duracef.shout.net>
+	Michael Holzheu <holzheu@de.ibm.com>
+	Michail Litvak <mci@owl.openwall.com>
+	Michal Ludvig <mludvig@suse.cz>
+	Mike Frysinger <vapier@gentoo.org>
+	Mike Stroyan <mike.stroyan@hp.com>
+	Muttley Meen <muttley.meen@gmail.com>
+	Nate Eldredge <nate@cartsys.com>
+	Nate Sammons <nate@users.sourceforge.net>
+	Neil Campbell <lists@thebatcave.org.uk>
+	Paolo Bonzini <pbonzini@redhat.com>
+	Paul Mundt <lethal@linux-sh.org>
+	Pavel Machek <pavel@ucw.cz>
+	Peter Jones <pjones@redhat.com>
+	Pádraig Brady <P@draigBrady.com>
+	Rajeev V. Pillai <rajeevvp@gmail.com>
+	Ralf Baechle <ralf@linux-mips.org>
+	Randolph Chung <tausq@debian.org>
+	Reuben Sumner <rasumner@undergrad.math.uwaterloo.ca>
+	Richard Braakman <dark@xs4all.nl>
+	Richard Henderson <richard@twiddle.tamu.edu>
+	Richard Hirst <rhirst@linuxcare.com>
+	Roland Borde <bo@uebemc.siemens.de>
+	Roland McGrath <roland@redhat.com>
+	Sami Farin <safari@u.safari.iki.fi>
+	Scott Tsai <scottt958@yahoo.com.tw>
+	Sebastian Pipping <sebastian@pipping.org>
+	Simon Murray <simon@transitive.com>
+	Solar Designer <solar@openwall.com>
+	Srinivasa Ds <srinivasa@in.ibm.com>
+	Steve Bennett <steveb@workware.net.au>
+	Thanh Ma <tma@encore.com>
+	Thiemo Seufer <ths@networkno.de>
+	Thomas Bogendoerfer <tsbogend@bigbug.franken.de>
+	Tim Yamin <plasmaroo@gentoo.org>
+	Timo Lindfors <timo.lindfors@iki.fi>
+	Tom Dyas <tdyas@eden.rutgers.edu>
+	Tommi Rantala <ext-tommi.1.rantala@nokia.com>
+	Topi Miettinen <Topi.Miettinen@nic.fi>
+	Ulrich Drepper <drepper@redhat.com>
+	Wang Chao <wang.chao@cn.fujitsu.com>
+	Wichert Akkerman <wichert@deephackmode.org>
+	Xiaoning Ding <dingxn@gmail.com>
+	Yang Zhiguo <yzgcsu@cn.fujitsu.com>
+	Zach Brown <zach.brown@oracle.com>
+	Zhang Le <zhilg@users.sourceforge.net>
+	Марк Коренберг <socketpair@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index fb5b95f..7a79abb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3613 +1,1438 @@
-2005-06-09  Roland McGrath  <roland@redhat.com>
+2011-03-15  Dmitry V. Levin  <ldv@altlinux.org>
 
-	* configure.ac, NEWS: Version 4.5.12.
-	* debian/changelog, strace.spec: 4.5.12-1.
+	Ensure that PTRACE_GETSIGINFO et al are always defined on Linux
+	* configure.ac (AC_CHECK_DECLS): Add PTRACE_* constants.
+	* defs.h [LINUX]: Define those PTRACE_* constants that are not provided
+	by <sys/ptrace.h>.
 
-2005-06-08  Dmitry V. Levin  <ldv@altlinux.org>
+	* CREDITS.in: Fix typo.
 
-	Minor namespace cleanup.
-	* defs.h (string_quote): Remove declaration.
-	* file.c (openmodessol) [LINUXSPARC]: Make static.
-	(fileflags): Likewise.
-	(aclcmds, aclipc) [HAVE_SYS_ACL_H]: Likewise.
-	(direnttypes) [FREEBSD || LINUX]: Likewise.
-	(xattrflags): Likewise.
-	* process.c (unalignctl_string): Make static.
-	(setarg): Disable.
-	* syscall.c (subcalls_table): Make static.
-	(socket_map) [!(LINUX && (ALPHA || MIPS))]: Likewise.
-	(sparc_socket_decode): Make static, define for [SPARC || SPARC64] only.
-	(decode_subcall): Make static.
-	(syscall_fixup): Likewise.
-	(get_error): Likewise.
-	(syscall_enter): Likewise.
-	* util.c (tv_tv): Disable.
-	(getpc): Likewise.
-	(string_quote): Make static.
-	Fixes RH#159688.
+2011-03-14  Dmitry V. Levin  <ldv@altlinux.org>
 
-2005-05-12  Philippe De Muyter  <phdm@macqel.be>
+	Update PTRACE_* constants
+	* process.c (ptrace_cmds): Add PTRACE_GETREGSET and PTRACE_SETREGSET.
 
-	* util.c (getpc, printcall): Check #if defined(M68K), not M68k.
-	Enables `-i' on m68k machines.
+	Prepare for 4.6 release
+	* NEWS: Update for 4.6 release.
+	* configure.ac: Version 4.6.
+	* debian/changelog: 4.6-1.
+	* strace.spec: 4.6-1.
 
-2005-06-06  Roland McGrath  <roland@redhat.com>
+2011-03-14  Mike Frysinger  <vapier@gentoo.org>
 
-	* process.c (struct_user_offsets) [X86_64]: Reorder elements so
-	matching works right.
-	Fixes RH#159787.
+	linux/ioctlent: unify them all
+	This unifies all the ioctlent.h's in the linux subdir while still
+	allowing each arch to maintain its own minor list.
 
-	* linux/syscall.h (SYS_socket, SYS_bind, SYS_connect, SYS_listen)
-	(SYS_accept, SYS_getsockname, SYS_getpeername, SYS_socketpair)
-	(SYS_send, SYS_recv, SYS_sendto, SYS_recvfrom, SYS_shutdown)
-	(SYS_setsockopt, SYS_getsockopt, SYS_sendmsg, SYS_recvmsg)
-	(SYS_getsockname, SYS_semop, SYS_semgsub_et, SYS_semget, SYS_semctl)
-	(SYS_semtimedop, SYS_msgsnd, SYS_msgrcv, SYS_msgget)
-	(SYS_msgctl, SYS_shmat, SYS_shmdt, SYS_shmget)
-	(SYS_shmctl): Macros renamed to SYS_sub_*.
-	* syscall.c (dumpio): Match SYS_sub_* if defined instead of SYS_*.
+	The basic method is:
+	- each arch has linux/<arch>/ioctlent.h.in which defines only the
+	arch-specific ioctls;
+	- linux/ioctlent.h.in which defines only the common ioctls;
+	- at build time, these two headers are combined and sorted to produce
+	the linux/ioctlent.h file.
 
-	* linux/syscall.h (SYS_waitid): Define if not defined.
+	This also requires a little tweaking of the include files since the
+	common ioctlent.h is a built file.
 
-	* linux/syscallent.h: Fix pread/pwrite names to pread64/pwrite64.
+	* linux/ioctlent.h: Split into linux/ioctlent.h.in and
+	linux/i386/ioctlent.h.in, remove asm entries from the former, remove
+	non-asm entries from the latter.
+	* linux/alpha/ioctlent.h: Rename to linux/alpha/ioctlent.h.in, remove
+	non-asm entries.
+	* linux/bfin/ioctlent.h: Rename to linux/bfin/ioctlent.h.in, remove
+	non-asm entries.
+	* linux/hppa/ioctlent.h: Rename to linux/hppa/ioctlent.h.in, remove
+	non-asm entries.
+	* linux/ia64/ioctlent.h: Rename to linux/ia64/ioctlent.h.in, remove
+	non-asm entries.
+	* linux/mips/ioctlent.h: Rename to linux/mips/ioctlent.h.in, remove
+	non-asm entries.
+	* linux/powerpc/ioctlent.h: Rename to linux/powerpc/ioctlent.h.in,
+	remove non-asm entries.
+	* linux/s390/ioctlent.h: Rename to linux/s390/ioctlent.h.in, remove
+	non-asm entries.
+	* linux/sh/ioctlent.h: Rename to linux/sh/ioctlent.h.in, remove
+	non-asm entries.
+	* linux/sparc/ioctlent.h: Rename to linux/sparc/ioctlent.h.in, remove
+	non-asm entries.
+	* linux/arm/ioctlent.h.in: New file.
+	* linux/avr32/ioctlent.h.in: Likewise.
+	* linux/i386/ioctlent.h.in: Likewise.
+	* linux/m68k/ioctlent.h.in: Likewise.
+	* linux/microblaze/ioctlent.h.in: Likewise.
+	* linux/tile/ioctlent.h.in: Likewise.
+	* linux/x86_64/ioctlent.h.in: Likewise.
+	* linux/s390x/ioctlent.h.in: Include ioctlent.h.in instead of
+	ioctlent.h.
+	* linux/sh64/ioctlent.h.in: Likewise.
+	* linux/sparc64/ioctlent.h.in: Likewise.
+	* linux/arm/ioctlent1.h: Update ioctlent.h include.
+	* linux/powerpc/ioctlent1.h: Likewise.
+	* linux/sparc/ioctlent1.h: Likewise.
+	* linux/sparc64/ioctlent1.h: Likewise.
+	* linux/x86_64/ioctlent1.h: Likewise.
+	* Makefile.am (AM_CPPFLAGS): Add -I$(builddir)/$(OS).
+	(EXTRA_DIST): Update.
+	[MAINTAINER_MODE && LINUX]: Convert from ioctlent_h to ioctlent_h_in.
+	[LINUX]: Add $(builddir)/$(OS)/ioctlent.h generation rules.
+	* .gitignore: Add linux/ioctlent.h.
 
-	* defs.h (struct sysent): New member `native_scno'.
-	(known_scno): Declare new function.
-	* linux/syscallent.h: Add new final field to interesting syscalls.
-	* syscall.c (known_scno): New function.
-	(dumpio, internal_syscall, syscall_fixup, trace_syscall): Use it.
-	* process.c (internal_fork, internal_exit): Likewise.
-	[IA64] (ARG_STACKSIZE, ARG_PTID, ARG_CTID, ARG_TLS): Likewise.
-	* strace.c (proc_open): Likewise.
-	* util.c [LINUX] (setbpt): Likewise.
-	* linux/syscall.h: Remove [!defined(X86_64)] from conditional
-	for defining SYS_socket_subcall et al.
-	* linux/syscallent.h: Likewise for #error check.
-	* syscall.c (trace_syscall): Likewise for SYS_{socketcall,ipc} cases.
-	Fixes RH#158934.
+2011-03-10  Dmitry V. Levin  <ldv@altlinux.org>
 
-2005-06-02  Roland McGrath  <roland@redhat.com>
+	Show more details about signals received by traced processess
+	* strace.c [!USE_PROCFS] (trace): Differentiate output format depending
+	on PTRACE_GETSIGINFO success or failure.  In the former case, use
+	printsiginfo() to show more details about received signal.
 
-	* file.c (printstatfs64): Cast values to unsigned long long and use
-	%llu formats.
-	Fixes RH#158243.
+	Get rid of PT_GETSIGINFO
+	* strace.c [!USE_PROCFS] (trace): Assume that PTRACE_GETSIGINFO is
+	available.  Replace PT_GETSIGINFO with PTRACE_GETSIGINFO.  Use
+	PTRACE_GETSIGINFO for all signals.
 
-2005-05-31  Dmitry V. Levin  <ldv@altlinux.org>
+	Enhance decoding of kernel-generated signals
+	* signal.c (printsiginfo) [LINUX]: Do not print uninteresting
+	zero-initialized fields.
 
-	Deal with memory management issues.
-	* defs.h (tprint_iov): Update prototype.
-	* desc.c (sys_epoll_wait) [HAVE_SYS_EPOLL_H]: Do not allocate
-	epoll_event array of arbitrary size on the stack, to avoid
-	stack overflow.
-	* file.c (print_xattr_val): Check for integer overflow during
-	malloc size calculation, to avoid heap corruption.
-	* io.c (tprint_iov) [HAVE_SYS_UIO_H]: Check for integer overflow
-	during malloc size calculation, to avoid heap corruption.
-	Change iovec array handling to avoid heap memory allocation.
-	* mem.c (get_nodes) [LINUX]: Check for integer overflow during
-	size calculation and do not allocate array of arbitrary size on
-	the stack, to avoid stack overflow.
-	* net.c (printcmsghdr) [HAVE_SENDMSG]: Do not allocate array of
-	arbitrary size on the stack, to avoid stack overflow.  Do not
-	trust cmsg.cmsg_len to avoid read beyond the end of allocated
-	object.
-	(printmsghdr) [HAVE_SENDMSG]: Update tprint_iov() usage.
-	* process.c (sys_setgroups): Check for integer overflow during
-	malloc size calculation, to avoid heap corruption.  Change gid_t
-	array handling to avoid heap memory allocation.
-	(sys_getgroups): Likewise.
-	(sys_setgroups32) [LINUX]: Likewise.
-	(sys_getgroups32) [LINUX]: Likewise.
-	* stream.c (sys_poll) [HAVE_SYS_POLL_H]: Check for integer
-	overflow during malloc size calculation, to avoid heap corruption.
-	Change pollfd array handling to avoid heap memory allocation.
-	* system.c (sys_sysctl) [LINUX]: Check for integer overflow
-	during malloc size calculation, to avoid heap corruption.
-	* util.c (dumpiov) [HAVE_SYS_UIO_H]: Check for integer overflow
-	during malloc size calculation, to avoid heap corruption.
-	Fixes RH#159196.
+	Fix decoding of user-generated signals
+	* signal.c [LINUX] (SI_FROMUSER): Define.
+	[LINUX || SVR4] (printsiginfo) [SI_FROMUSER]: Enhance decoding.
 
-	* util.c (printxval): Change third argument from "char *" to
-	"const char *".
-	(printflags): Add third argument, "const char *", with similar
-	meaning to the third argument of printxval().
-	* defs.h (printxval): Change third argument from "char *" to
-	"const char *".
-	(printflags): Add third argument.
-	* bjm.c (sys_query_module) [LINUX]: Pass third argument to
-	printflags().
-	* desc.c (sys_fcntl): Likewise.
-	(sys_flock) [LOCK_SH]: Likewise.
-	(print_epoll_event) [HAVE_SYS_EPOLL_H]: Likewise.
-	* file.c (sys_open): Likewise.
-	(solaris_open) [LINUXSPARC]: Likewise.
-	(sys_access): Likewise.
-	(sys_chflags, sys_fchflags) [FREEBSD]: Likewise.
-	(realprintstat) [HAVE_LONG_LONG_OFF_T &&
-	HAVE_STRUCT_STAT_ST_FLAGS]: Likewise.
-	(printstat64) [HAVE_STAT64 &&
-	HAVE_STRUCT_STAT_ST_FLAGS]: Likewise.
-	(sys_setxattr, sys_fsetxattr): Likewise.
-	* ipc.c (sys_msgget, sys_msgsnd, sys_msgrcv, sys_semget,
-	sys_shmget, sys_shmat) [LINUX || SUNOS4 || FREEBSD]: Likewise.
-	(sys_mq_open) [LINUX]: Likewise.
-	(printmqattr) [HAVE_MQUEUE_H]: Likewise.
-	* mem.c (print_mmap) [!HAVE_LONG_LONG_OFF_T]: Likewise.
-	(sys_mmap64) [_LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T]: Likewise.
-	(sys_mprotect): Likewise.
-	(sys_mremap, sys_madvise, sys_mlockall) [LINUX]: Likewise.
-	(sys_msync) [MS_ASYNC]: Likewise.
-	(sys_mctl) [MC_SYNC]: Likewise.
-	(sys_remap_file_pages, sys_mbind, sys_get_mempolicy) [LINUX]:
-	Likewise.
-	* net.c (printmsghdr) [HAVE_STRUCT_MSGHDR_MSG_CONTROL]: Likewise.
-	(sys_send, sys_sendto): Likewise.
-	(sys_sendmsg) [HAVE_SENDMSG]: Likewise.
-	(sys_recv, sys_recvfrom): Likewise.
-	(sys_recvmsg) [HAVE_SENDMSG]: Likewise.
-	(printicmpfilter) [ICMP_FILTER]: Likewise.
-	* proc.c (proc_ioctl) [SVR4 && !HAVE_MP_PROCFS || FREEBSD]: Likewise.
-	* process.c (sys_clone) [LINUX]: Likewise.
-	(printwaitn): Likewise.
-	(sys_waitid) [SVR4 || LINUX]: Likewise.
-	* signal.c (sys_sigvec) [SUNOS4 || FREEBSD]: Likewise.
-	(sys_sigaction): Likewise.
-	(printcontext) [SVR4]: Likewise.
-	(print_stack_t) [LINUX) || FREEBSD]: Likewise.
-	(sys_rt_sigaction) [LINUX]: Likewise.
-	* sock.c (sock_ioctl) [LINUX]: Likewise.
-	* stream.c (sys_putmsg, sys_getmsg): Likewise.
-	(sys_putpmsg) [SYS_putpmsg]: Likewise.
-	(sys_getpmsg) [SYS_getpmsg]: Likewise.
-	(sys_poll): Likewise.
-	(print_transport_message) [TI_BIND]: Likewise.
-	(stream_ioctl): Likewise.
-	* system.c (sys_mount, sys_reboot): Likewise.
-	(sys_cacheflush) [LINUX && M68K]: Likewise.
-	(sys_capget, sys_capset) [SYS_capget]: Likewise.
-	* term.c (term_ioctl) [TIOCMGET]: Likewise.
-	* time.c (sys_clock_nanosleep, sys_timer_settime) [LINUX]:
-	Likewise.
-	Fixes RH#159310.
+	Recognize SI_KERNEL and SI_ASYNCNL
+	* signal.c [LINUX] (SI_KERNEL, SI_ASYNCNL): Define.
+	[LINUX || SVR4] (siginfo_codes): Add entries for SI_KERNEL and
+	SI_ASYNCNL, reorder entries.
 
-	* bjm.c (sys_query_module) [LINUX]: Unitize "out of memory"
-	errors reporting style.
-	* strace.c (rebuild_pollv) [USE_PROCFS]: Likewise.
-	* system.c (sys_capget, sys_capset) [SYS_capget]: Likewise.
-	* util.c (printstr): Likewise.
-	(dumpiov) [HAVE_SYS_UIO_H]: Likewise.
-	(fixvfork) [SUNOS4]: Likewise.
-	* desc.c (decode_select): Continue to decode syscall arguments
-	in case of OOM condition.
-	* file.c (sys_getdents): Likewise.
-	(sys_getdents64) [_LFS64_LARGEFILE]: Likewise.
-	(sys_getdirentries) [FREEBSD]: Likewise.
-	* mem.c (sys_mincore): Changed type of variables which deal with
-	malloc size from int to unsigned long.
-	Fixes RH#159308.
+2011-03-05  Sebastian Pipping  <sebastian@pipping.org>
 
-2005-05-22  Dmitry V. Levin  <ldv@altlinux.org>
+	Take all git branches into account for generation of CREDITS file
+	* Makefile.am: Make CREDITS target depend on all git branches.
 
-	* bjm.c [LINUX]: Do not include <linux/linkage.h>.  It is not
-	safe to include kernel headers, and this one is not used anyway.
-	Fixes RH#158488.
+2011-03-04  Dmitry V. Levin  <ldv@altlinux.org>
 
-2005-05-26  Roland McGrath  <roland@redhat.com>
+	Fix decoding of file descriptors
+	* defs.h (printfd): New function prototype.
+	* util.c (printfd): New function.
+	* file.c (print_dirfd): Update prototype to use printfd().
+	(sys_openat, sys_faccessat, sys_newfstatat, sys_mkdirat, sys_linkat,
+	sys_unlinkat, sys_readlinkat, sys_renameat, sys_fchownat, sys_fchmodat,
+	sys_futimesat, sys_utimensat, sys_mknodat): Update use of print_dirfd().
+	(sys_lseek, sys_llseek, sys_readahead, sys_ftruncate, sys_ftruncate64,
+	sys_fstat, sys_fstat64, sys_oldfstat, sys_fstatfs, sys_fstatfs64,
+	sys_fchdir, sys_fchroot, sys_linkat, sys_fchown, sys_fchmod, sys_fsync,
+	sys_readdir, sys_getdents, sys_getdirentries, sys_fsetxattr,
+	sys_fgetxattr, sys_flistxattr, sys_fremovexattr, sys_fadvise64,
+	sys_fadvise64_64, sys_inotify_add_watch, sys_inotify_rm_watch,
+	sys_fallocate): Use printfd() for decoding of file descriptors.
+	* desc.c (sys_fcntl, sys_flock, sys_close, sys_dup, do_dup2,
+	decode_select, sys_epoll_ctl, epoll_wait_common): Use printfd() for
+	decoding of file descriptors.
+	* io.c (sys_read, sys_write, sys_readv, sys_writev, sys_pread,
+	sys_pwrite, sys_sendfile, sys_sendfile64, sys_pread64, sys_pwrite64,
+	sys_ioctl): Likewise.
+	* mem.c (print_mmap, sys_mmap64): Likewise.
+	* signal.c (do_signalfd): Likewise.
+	* stream.c (decode_poll): Likewise.
+	* time.c (sys_timerfd_settime, sys_timerfd_gettime): Likewise.
+	Based on patch from Grant Edwards <grant.b.edwards@gmail.com>.
 
-	* system.c (sys_sysctl): Check for errors accessing user pointers.
-	Use malloc instead of alloca in case size is insane.
+2011-03-03  Sebastian Pipping  <sebastian@pipping.org>
 
-2005-05-09  Roland McGrath  <roland@redhat.com>
+	Print shutdown(2) modes as SHUT_* constants
+	* net.c (shutdown_modes): New xlat structure.
+	(sys_shutdown): Use shutdown_modes to decode 2nd syscall argument.
 
-	* configure.ac: Check for libaio.h.
-	* desc.c (sys_io_setup, sys_io_submit, sys_io_cancel,
-	sys_io_getevents, sys_io_destroy): New functions.
-	* linux/syscall.h: Declare them.
-	* linux/syscallent.h: Use those for io_* syscalls.
-	* linux/alpha/syscallent.h: Likewise.
-	* linux/hppa/syscallent.h: Likewise.
-	* linux/ia64/syscallent.h: Likewise.
-	* linux/mips/syscallent.h: Likewise.
-	* linux/powerpc/syscallent.h: Likewise.
-	* linux/s390/syscallent.h: Likewise.
-	* linux/s390x/syscallent.h: Likewise.
-	* linux/x86_64/syscallent.h: Likewise.
-	From Zach Brown <zach.brown@oracle.com>.
-	Fixes RH#155065.
+	Fix decoding of inotify_init1() flags
+	* file.c (inotify_init_flags): New xlat structure.
+	(sys_inotify_init1): Use it instead of open_mode_flags.
 
-	* debian/control (Architecture): Add ppc64.
-	Fixes Debian bug #301089.
+2011-03-03  Dmitry V. Levin  <ldv@altlinux.org>
 
-2005-05-05  Anton Blanchard  <anton@samba.org>
+	Fix struct xlat initialization bugs
+	* file.c (inotify_modes): Terminate with NULL entry.
+	* net.c (sock_type_flags): Make this array static.
+	(socketlayers): Add a comment that this array should remain not
+	NULL-terminated.
 
-	* process.c (ptrace_cmds): Add PTRACE_GETVRREGS and PTRACE_SETVRREGS
-	if defined.
+	tests: avoid SIGPIPE
+	* tests/ptrace_setoptions: Replace "grep -q" with "grep > /dev/null".
+	The former may result to strace being killed by SIGPIPE, which in
+	certain configuratons may lead to generation of a core file.
+	Suggested by Mike Frysinger.
 
-2005-05-09  Roland McGrath  <roland@redhat.com>
+2011-03-01  Mike Frysinger  <vapier@gentoo.org>
 
-	* strace.c (main): Refuse negative -s argument value.
-	Fixes Debian bug #303256.
-
-2005-04-25  Anton Blanchard  <anton@samba.org>
-
-	* file.c (openmodes): Add O_NOATIME flag if defined.
-
-2005-04-05  Anton Blanchard  <anton@samba.org>
-
-	* linux/powerpc/ioctlent.h: Regenerated.
-
-	* signal.c (signame): Don't try and dereference negative index.
-
-	* linux/powerpc/syscallent.h: Add debug_setcontext, vserver,
-	mbind, *_mempolicy, mq_*, sys_kexec_load, add_key, request_key,
-	keyctl, waitid, sys_semtimedop.  Fix various other syscalls.
-
-	* ipc.c (shm_resource_flags): New variable, table has SHM_HUGETLB
-	but not IPC_NOWAIT, which have the same value.
-	(sys_shmget): Use that instead of resource_flags.
-
-2005-03-22  Roland McGrath  <roland@redhat.com>
-
-	* desc.c (decode_select): Increase local buffer size.
-	Fixes RH#151570.
-
-	* configure.ac, NEWS: Version 4.5.11.
-	* debian/changelog, strace.spec: 4.5.11-1.
-
-	* linux/arm/syscallent.h: Fix 113 entry (syscall, not vm86old).
-
-2005-03-14  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.5.10.
-	* debian/changelog, strace.spec: 4.5.10-1.
-
-2005-02-26  GOTO Masanori  <gotom@debian.or.jp>
-
-	* linux/alpha/syscallent.h: Fix the reversed order of lstat64 and
-	fstat64.  Clean up osf_nrecvmsg and osf_ngetsockname.
-
-2005-02-28  Andreas Schwab  <schwab@suse.de>
-
-	* syscall.c (getrval2): Move #ifdef IA64 inside #ifdef LINUX.
-
-2005-03-14  Roland McGrath  <roland@redhat.com>
-
-	* linux/mips/syscallent.h: Update various calls.
-	From Thiemo Seufer <ths@networkno.de>.
-	Fixes Debian bug #256684.
-
-	* debian/control (Architecture): Add s390.
-	Fixes Debian bug #294172.
-
-2005-03-06  Roland McGrath  <roland@redhat.com>
-
-	* strace.c (trace) [PTRACE_GETSIGINFO]: Fetch siginfo_t for SIGSEGV
-	and SIGBUS signals, use si_addr in output.
-
-2005-03-01  Roland McGrath  <roland@redhat.com>
-
-	* file.c (print_xattr_val): Add a cast.
-
-2005-02-05  Roland McGrath  <roland@redhat.com>
-
-	* desc.c (decode_select): Calculate size of passed fd_set vectors and
-	copy in the user's size rather than the standard sizeof(fd_set).
-	Fixes Debian bug #65654, #284290.
-
-	* util.c (printpath, printpathn): Print NULL and don't try any fetch
-	when ADDR is zero.
-	Fixes Debian bug #63093.
-
-	* debian/control (Build-Depends): Fix for s390 and sparc.
-	From Bastian Blank <waldi@debian.org>.
-	Fixes Debian bug #293564.
-
-2004-12-19  Dmitry V. Levin  <ldv@altlinux.org>
-
-	* strace.c (main) [!USE_PROCFS]: In child process, raise SIGSTOP
-	right before execv() call.  Remove fake_execve() call.
-	* defs.h (fake_execve): Remove unused declaration.
-	* process.c (fake_execve): Remove unused function.
-	Fixes RH#143365.
-
-2005-02-04  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.5.9.
-	* debian/changelog, strace.spec: 4.5.9-2.
-
-	* file.c (O_LARGEFILE): Omit when #undef'd because it was zero.
-
-2005-02-02  Roland McGrath  <roland@redhat.com>
-
-	* debian/control: Add strace-udeb package for installer debugging.
-	* debian/rules (binary-arch): Build it.
-	From Joshua Kwan <joshk@triplehelix.org>.
-	Fixes Debian bug #268294.
-
-	* file.c (openmodes) [O_LARGEFILE] [O_LARGEFILE == 0]: Redefine to
-	known values for Linux.
-
-	* util.c (printcall): Print 16 ?s when long is 8 bytes.
-	Fixes RH#146932.
-
-	* linux/sparc/syscall.h: Declare sys_epoll_create, sys_epoll_ctl,
-	sys_epoll_wait.
-	* linux/sparc64/syscall.h: Just #include "../sparc/syscall.h" here.
-	* ioctl.c (nioctlents2): Add const to type.
-	Fixes Debian bug #278449.
-
-	* sock.c (iffflags): New variable, table of IFF_* values.
-	(print_addr): New function.
-	(sock_ioctl): Handle SIOCGIFADDR, SIOCGIFDSTADDR, SIOCGIFBRDADDR,
-	SIOCGIFNETMASK, SIOCGIFFLAGS, SIOCGIFMETRIC, SIOCGIFMTU, SIOCGIFSLAVE,
-	SIOCGIFHWADDR.	Use print_addr for SIOCGIFCONF, SIOCGIFNAME, and
-	SIOCGIFINDEX, and fix their output.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#138223.
-	Fixes Debian bug #192164.
-
-2004-12-20  Dmitry V. Levin  <ldv@altlinux.org>
-
-	* configure.ac: Use AC_GNU_SOURCE macro instead of changing CFLAGS.
-	* defs.h [HAVE_CONFIG_H]: Include config.h first.
-	* strace.c: Include "defs.h" first.
-	Fixes RH#143370.
-
-	* syscall.c (call_summary): Fix potential NULL dereference.
-	Fixes RH#143369.
-
-2004-12-19  Dmitry V. Levin  <ldv@altlinux.org>
-
-	* syscall.c (qual_signal): Check bounds for numeric signal names.
-	Fix parser of symbolic signal names.
-	Fix return code, as required by qualify() function.
-	* syscall.c (qual_desc): Check bounds for descriptor number.
-	* syscall.c (qual_syscall): Correct return code, to be consistent
-	with qualify() and other qual_* functions.
-	Fixes RH#143362.
-
-2005-02-01  Roland McGrath  <roland@redhat.com>
-
-	* system.c [LINUX] (MS_MANDLOCK, MS_NOATIME, MS_NODIRATIME, MS_BIND,
-	MS_MOVE, MS_REC, MS_VERBOSE, MS_POSIXACL, MS_ACTIVE, MS_NOUSER):
-	New macros.
-	[LINUX] (mount_flags): Add them.
-	[LINUX] (sys_mount): If any of (MS_BIND|MS_MOVE|MS_REMOUNT) bits are
-	set in the flags argument, don't try to fetch the filesystem string.
-	Fixes RH#141932.
-
-	* config.guess: Update from canonical version, timestamp 2004-11-12.
-	* config.sub: Likewise, timestamp 2004-11-30.
-
-	* process.c [LINUX] [X86_64] (sys_arch_prctl): New function.
-	* linux/syscall.h: Declare it.
-	* linux/x86_64/syscallent.h: Use it.
-	Part of RH#142667.
-
-	* process.c (sys_sched_setscheduler): Use %#lx format for bad pointer.
-	(sys_sched_getparam, sys_sched_setparam): Likewise.
-	Part of RH#142667.
-
-	* signal.c [HAVE_SIGACTION] [LINUX && X86_64] (SA_RESTORER): Define
-	here too.
-	Part of RH#142667.
-
-	* linux/syscallent.h: Use sys_mincore instead of printargs.
-	* linux/x86_64/syscallent.h: Likewise.  Also use sys_getrlimit,
-	sys_semtimedop, sys_umount2.
-	Part of RH#142667.
-
-	* syscall.c (qual_signal): Fix inverted return value and bogus
-	argument to qualify_one in the named case.
-
-	* file.c (print_xattr_val): Don't use auto array sized by syscall
-	argument.  Use malloc instead, so it can fail for insane values.
-	Fixes Debian bug #283704.
-
-	* net.c (sys_getsockopt): Fix a format %ld -> %d.
-
-	* linux/syscall.h [IA64] (SYS_semtimedop): #undef it.
-
-	* syscall.c (syscall_enter) [X86_64]: Fix 32-bit argument register map
-	not to double the middle entry!
-	Fixes RH#146093.
-
-	* linux/x86_64/syscallent.h: Fix exit_group entry.
-
-	* util.c (getpc) [S390 || S390X]: Implement it.
-	Patch by David Wilder <wilder@us.ibm.com>.
-
-	* linux/ia64/syscallent.h: Add fadvise64, fstatfs64, statfs64, mbind,
-	[gs]et_mempolicy, mq_*, sys_kexec_load, vserver, and waitid.
-	Fixes RH#146245.
-
-2005-01-22  Andreas Schwab  <schwab@suse.de>
-
-	* net.c (sys_getsockopt): Change type of len to int.
-
-2004-10-19  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.5.8.
-	* debian/changelog, strace.spec: 4.5.8-1.
-
-	* file.c (sys_fadvise64): Conditionalize just on [LINUX].
-
-	* configure.ac: Check for sys/epoll.h.
-	* desc.c: Protect #include <sys/epoll.h> with [HAVE_SYS_EPOLL_H].
-	(epollctls, epollevents): Protect each entry with #ifdef on its macro.
-
-	* strace.c (handle_group_exit): Don't detach leader that wasn't
-	TCB_ATTACHED.  Instead mark it with TCB_GROUP_EXITING.
-	Remove droptcb loop at end, no longer required since 2.6 reports each
-	thread death.
-	Fixes RH#135254.
-
-	* strace.c (trace): Use handle_group_exit for non-TCB_ATTACHED child
-	taking signal when it has nclone_threads > 0.
+	tests: do not make missing /usr/bin/time a failure
+	* tests/init.sh (framework_skip_): New function.
+	(check_prog): Use it instead of framework_failure_.
 
-	* strace.c (handle_group_exit, trace): Mark leader with
-	TCB_GROUP_EXITING and don't be surprised at child deaths when their
-	leader has it set.
-	Fixes RH#132150.
+2011-02-27  Dmitry V. Levin  <ldv@altlinux.org>
 
-	* process.c (WCOREFLAG): Define if not defined.
-	(W_STOPCODE, W_EXITCODE): Likewise.
-	Reported by Marty Leisner <mleisner@eng.mc.xerox.com>.
+	Generate an xz tar archive of the distribution
+	* configure.ac (AM_INIT_AUTOMAKE): Replace dist-bzip2 with dist-xz.
+	* Makefile.am: Update srpm target.
+	* make-dist: Update for dist-xz.
+	* strace.spec: Update Source tag.
+	* debian/watch: Update regexp.
+	* .gitignore: Add strace-*.tar.xz.
 
-	* sock.c [! LINUX]: Include <sys/socket.h> before <sys/sockio.h>.
-	Reported by Marty Leisner <mleisner@eng.mc.xerox.com>.
+	Use "make check" in debian/rules and strace.spec
+	* debian/control: Update Build-Depends.
+	* debian/rules: Run "make check".
+	* strace.spec: Update BuildRequires. Run "make check" in %check section.
 
-	* debian/rules: Make strace64.1.gz symlink to strace.1.gz instead of
-	strace64.1 to strace.1, which doesn't exist.
-	Fixes Debian bug #269220.
+	Implement two basic "strace -f" tests
+	* Makefile.am (SUBDIRS): Add tests.
+	* configure.ac (AC_CONFIG_FILES): Add tests/Makefile.
+	* tests/.gitignore: New file.
+	* tests/Makefile.am: Likewise.
+	* tests/init.sh: Likewise.
+	* tests/ptrace_setoptions: Likewise.
+	* tests/strace-f: Likewise.
 
-2004-09-05  Phil Blundell  <pb@nexus.co.uk>
+2011-02-26  Dmitry V. Levin  <ldv@altlinux.org>
 
-	* linux/arm/syscallent.h: New file.
+	ppc, s390, sparc: regenerate ioctlent.h files
+	* linux/powerpc/ioctlent.h: Regenerated using Fedora 15 kernel headers.
+	* linux/s390/ioctlent.h: Likewise.
+	* linux/sparc/ioctlent.h: Likewise.
 
-2004-10-19  Roland McGrath  <roland@redhat.com>
+	Remove redundant ioctlent.h files
+	* linux/s390x/ioctlent.h: Replace old contents with include of
+	s390/ioctlent.h file.
+	* linux/sparc64/ioctlent.h: Replace old contents with include of
+	sparc/ioctlent.h file.
 
-	* debian/rules (DEB_BUILD_GNU_TYPE, CONFIG_OPTS): New variables.
-	[$(DEB_HOST_GNU_TYPE) == s390-linux] (build64, HOST64, CC64): Set them.
-	(build/Makefile): Use $(CONFIG_OPTS).
-	(build64/Makefile): Pass --host as well as --build.
-	From Bastian Blank <waldi@debian.org>.
-	Fixes Debian bug #271500.
+2011-02-25  Dmitry V. Levin  <ldv@altlinux.org>
 
-	* linux/hppa/syscallent.h: Update for 2.6.9 syscalls.
-	From Randolph Chung <tausq@debian.org>
-	Fixes Debian bug #273887.
+	ioctlsort: sync with ioctl_lookup()
+	* linux/ioctlsort.c (main): Use NR and TYPE bits only, to sync with
+	ioctl_lookup() which looks at these bits only.
 
-	* file.c (sys_llseek): Revert last change.
+	Remove obsolete .cvsignore files
+	* test/.cvsignore: Rename to test/.gitignore.
+	* */.cvsignore, */*/.cvsignore: Removed.
 
-2004-09-14  Richard Henderson  <rth@twiddle.net>
+	Ignore generated intermediate header files
+	* .gitignore: Add ioctls.h and ioctldefs.h.
 
-	* linux/alpha/syscallent.h: Add tgkill, *stat64, vserver, mbind,
-	[gs]et_mempolicy, mq_*, waitid.
+2011-02-24  Dmitry V. Levin  <ldv@altlinux.org>
 
-2004-10-07  Roland McGrath  <roland@redhat.com>
+	Generate much of the CREDITS file from git log
+	* CREDITS.in: New file, derived from CREDITS, without names of
+	those who are listed as git log 'Author:'s.
+	* CREDITS: Remove file.
+	* Makefile.am [MAINTAINER_MODE] (CREDITS): New rule.
+	* .gitignore: Add CREDITS.
+	* .mailmap: New file, required to map git author names and email
+	addresses to canonical/preferred form.
 
-	* file.c (sys_llssek, sys_readahead, sys_fadvise64, sys_fadvise64_64):
-	Use LONG_LONG macro.
-	* io.c (sys_pread, sys_pwrite, sys_sendfile): Likewise.
+2011-02-23  Dmitry V. Levin  <ldv@altlinux.org>
 
-	* linux/x86_64/syscallent.h: Fix botched table entries.
-	From Ulrich Drepper <drepper@redhat.com>.
+	sparc: fix compilation warning
+	* file.c [!HAVE_LONG_LONG_OFF_T] (realprintstat): Cast st_size
+	to unsigned long.
 
-	* mem.c [LINUX] (sys_mbind, sys_set_mempolicy, sys_get_mempolicy):
-	New functions.
-	* linux/syscall.h: Declare them.
-	* linux/x86_64/syscallent.h: Likewise.
-	From Ulrich Drepper <drepper@redhat.com>.
+	Update the list of files that must be distributed
+	* Makefile.am (EXTRA_DIST): Add debian/source/format, debian/watch,
+	linux/ia64/signalent.h, linux/powerpc/ioctlent1.h,
+	linux/powerpc/syscallent1.h, linux/powerpc/errnoent1.h,
+	linux/powerpc/signalent1.h.
 
-	* linux/syscallent.h: Handle mbind, set_mempolicy, get_mempolicy.
-	From Ulrich Drepper <drepper@redhat.com>.
+	Fix compilation warning reported by gcc -Wunused-but-set-variable
+	* process.c (printwaitn) [!SUNOS4]: Do not define "exited" variable.
 
-	* file.c [LINUX && (I386 || X86_64)] (sys_fadvise64, sys_fadvise64_64):
-	New functions.
-	* linux/syscall.h: Declare them.
-	* linux/syscallent.h: Handle fadvise64 and fadvise64_64 using those.
-	* linux/x86_64/syscallent.h: Likewise.
-	From Ulrich Drepper <drepper@redhat.com>.
+2011-02-22  Mike Frysinger  <vapier@gentoo.org>
 
-2004-09-13  Dmitry V. Levin  <ldv@altlinux.org>
+	ioctlsort: zero pad ioctl codes to 4 places
+	Zero padding the ioctl number will allow simple sorting via shell scripts.
 
-	* linux/ioctlsort.c (main): Omit duplicate lines
-	(with same name and code) from output.
-	* linux/ioctlent.sh: Build the list of ioctls defined in
-	scsi/sg.h (0x22..), scsi/scsi.h and scsi/scsi_ioctl.h (0x53..),
-	as suggested by Peter Jones <pjones@redhat.com>
+	* linux/ioctlsort.c (main): Output ioctl codes zero padded.
 	* linux/ioctlent.h: Regenerated.
-	Fixes RH#129808.
 
-2004-09-13  Ulrich Drepper <drepper@redhat.com>
-	    Dmitry V. Levin <ldv@altlinux.org>
+	Update mount flags to latest linux
+	* system.c (MS_RELATIME, MS_KERNMOUNT, MS_I_VERSION,
+	MS_STRICTATIME, MS_BORN): Define.
+	(mount_flags): Add MS_RELATIME, MS_KERNMOUNT, MS_I_VERSION,
+	MS_STRICTATIME, MS_BORN.
 
-	* time.c [LINUX] (print_rtc): New function, for printing rtc_time
-	structure.
-	[LINUX] (rtc_ioctl): New function, for parsing RTC_* ioctls.
-	* ioctl.c [LINUX] (ioctl_decode): Call rtc_ioctl.
-	* defs.h [LINUX]: Declare rtc_ioctl.
-	Fixes RH#58606.
+2011-02-22  Dmitry V. Levin  <ldv@altlinux.org>
 
-2004-10-06  Roland McGrath  <roland@redhat.com>
+	Sync debian/changelog and strace.spec with packages
+	* debian/changelog: Sync with 4.5.20-2.
+	* strace.spec: Likewise.
 
-	* desc.c [LINUX] (sys_epoll_create, sys_epoll_ctl, sys_epoll_wait):
-	New functions.
-	* linux/syscall.h: Declare them.
-	* linux/syscallent.h: Use those for epoll_* syscalls.
-	* linux/alpha/syscallent.h: Likewise.
-	* linux/hppa/syscallent.h: Likewise.
+2011-02-20  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Add TRACE_DESC|TRACE_FILE flags to fanotify_* sysentries
+	* linux/*/syscallent.h: Add TD flag to fanotify_init.  Add TD|TF flags
+	to fanotify_mark.
+
+	Fix flags of fallocate sysentries
+	* linux/*/syscallent.h: Fix sys_fallocate flags.
+
+	Add TRACE_DESC flag to epoll_create* sysentries
+	* linux/*/syscallent.h: Add TD flag to sys_epoll_create and
+	sys_epoll_create1.
+
+	Add TRACE_DESC flag to fgetxattr, flistxattr, and fremovexattr sysentries
+	* linux/*/syscallent.h: Add TD flag to sys_fgetxattr, sys_flistxattr,
+	and fremovexattr.
+
+	Add TRACE_FILE flag to swapoff sysentries
+	* linux/*/syscallent.h: Add TF flag to sys_swapoff.
+
+	Add TRACE_DESC flag to fadvise64* sysentries
+	* linux/*/syscallent.h: Add TD flag to sys_fadvise64 and
+	sys_fadvise64_64.
+
+	Add TRACE_DESC flag to mmap, mmap2, and old_mmap sysentries
+	* linux/*/syscallent.h: Add TD flag to sys_mmap and sys_old_mmap.
+
+	Do not initialize native_scno on platforms with only one personality
+	* linux/bfin/syscallent.h: Remove redundant native_scno initialization.
+	* linux/m68k/syscallent.h: Likewise.
+	* linux/microblaze/syscallent.h: Likewise.
+
+	Add LOOP_* ioctls defined in linux/loop.h
+	* linux/ioctlent.sh: Add LOOP_* ioctls (0x4C..) defined in linux/loop.h
+	header file.
+	* linux/ioctlent.h: Regenerated.
+	Reported by Mike Frysinger.
+
+2011-02-19  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Fix PTRACE_GETEVENTMSG usage and enhance test_ptrace_setoptions()
+	* strace.c (handle_ptrace_event): Fix PTRACE_GETEVENTMSG usage.
+	(test_ptrace_setoptions): Test that PTRACE_GETEVENTMSG works properly.
+
+2011-02-19  Mike Frysinger  <vapier@gentoo.org>
+
+	linux/sparc: move to common syscall.h
+	Rather than constantly deal with the sparc/syscall.h going stale, merge
+	the few sparc-specific pieces into the linux/syscall.h header.
+
+	* linux/syscall.h: Add sparc-specific pieces from sparc/syscall.h.
+	* Makefile.am (EXTRA_DIST): Remove linux/sparc/syscall.h and
+	linux/sparc64/syscall.h.
+	* linux/sparc/syscall.h, linux/sparc64/syscall.h: Deleted.
+
+	sparc: add new funcs to syscall.h
+	Sync missing defs from the common syscall.h here.
+
+	* linux/sparc/syscall.h: Add sys_setfsuid, sys_pread64, and
+	sys_pwrite64 prototypes.
+
+	sparc: punt unused syscall.h.2
+	I can't find any mention of this header actually being used.
+	Seems to be a really old copy of the common syscall.h.
+
+	* Makefile.am (EXTRA_DIST): Remove linux/sparc/syscall.h.2.
+	* linux/sparc/syscall.h.2: Deleted.
+
+2011-02-19  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Fix raw exit_group(2) decoding
+	* syscall.c (trace_syscall_entering): Check for sys_exit instead of
+	SYS_exit to handle exit_group(2) as well as _exit(2).
+
+2011-02-18  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Optimize known_scno()
+	* syscall.c (known_scno): Do not check for native_scno field on
+	platforms that support only one personality.
+
+	* process.c (internal_exit) [IA64]: Remove redundant check.
+
+2011-02-09  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Fix biarch support in IO dumping
+	* syscall.c (dumpio): Switch on tcp->sys_func instead of tcp->scno
+	for more reliable results.
+
+	Simplify tprintf() declaration
+	* defs.h (tprintf): Simplify declaration.
+
+2011-02-05  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* defs.h (SYSCALL_NEVER_FAILS): Fix typo.
+
+2011-01-19  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Fix decoding of get[ug]id, gete[ug]id and setfs[ug]id return values
+	* defs.h (SYSCALL_NEVER_FAILS): New syscall flag.
+	* linux/dummy.h: Change redirection for sys_get[ug]id, sys_gete[ug]id
+	and setfs[ug]id.
+	* linux/*/syscallent.h: Set SYSCALL_NEVER_FAILS flag for get[ug]id,
+	gete[ug]id and setfs[ug]id syscalls.
+	* process.c [LINUX] (sys_getuid, sys_setfsuid): New functions.
+	* syscall.c (NF): New shorthand macro for use in syscallent.h files.
+	(get_error): Check SYSCALL_NEVER_FAILS flag.
+	Reported by Марк Коренберг <socketpair@gmail.com>.
+
+	* linux/*/syscallent.h: Fix typo in sys_newfstatat syscall flags.
+
+2011-01-18  Mike Frysinger  <vapier@gentoo.org>
+
+	Blackfin: update ioctl list
+	* linux/bfin/ioctlent.h: Sync with latest kernel sources.
+
+2011-01-17  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Fix stat64 decoding on mips
+	* linux/mips/syscallent.h: Use sys_stat64() to decode stat64 syscall.
+	This fixes Debian bug #599028.
+
+	Update linux/*/syscallent.h files to match Linux kernel v2.6.37
+	* linux/alpha/syscallent.h: Add hooks for fanotify_init, fanotify_mark,
+	and prlimit64.
+	* linux/i386/syscallent.h: Likewise.
 	* linux/ia64/syscallent.h: Likewise.
-	* linux/powerpc/syscallent.h: Likewise.
-	* linux/s390/syscallent.h: Likewise.
-	* linux/s390x/syscallent.h: Likewise.
-	* linux/sparc/syscallent.h: Likewise.
-	* linux/sparc64/syscallent.h: Likewise.
-	* linux/sparc64/syscallent2.h: Likewise.
-	* linux/x86_64/syscallent.h: Likewise.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#134463.
-
-	* resource.c (resources): Add RLIMIT_LOCKS, RLIMIT_SIGPENDING,
-	and RLIMIT_MSGQUEUE, if defined.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#133594.
-
-	* net.c [HAVE_SENDMSG] (printcmsghdr): New function.
-	(printmsghdr): Use it.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#131689.
-
-	* file.c (sprintmode): Add const to return type.
-	(sprintfstype): Likewise.
-	* signal.c (printsiginfo): Add a const.
-
-2004-09-15  Roland McGrath  <roland@redhat.com>
-
-	* linux/x86_64/syscallent.h: Use sys_waitid.
-
-	* linux/syscallent.h: waitid takes 5 arguments, and is in TP category.
-	* process.c (sys_waitid): Handle fifth argument (struct rusage *).
-
-2004-09-11  Roland McGrath  <roland@redhat.com>
-
-	* time.c (sys_clock_nanosleep): Print zero flags arg correctly.
-	(sys_timer_settime): Likewise.
-	(printsigevent): Print signals by name for SIGEV_SIGNAL.
-	(sys_timer_create): Print clock ID symbolically.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#131420.
-
-2004-09-07  Michal Ludvig  <mludvig@suse.cz>
-
-	* defs.h (nioctlents1, nsignals2): Fix typos in decls.
-
-2004-09-03  Roland McGrath  <roland@redhat.com>
-
-	* syscall.c (qual_options): Add const to defn.
-	Update all uses.
-	(call_count, error_count, tv_count): Variables removed.
-	(struct call_counts, counts): New type and variable.
-	Update all users of the old three to use the new array of structs.
-	(trace_syscall): Allocate counts on first use.
-	(sorted_count): Variable removed.
-	(call_summary): Allocate locally.
-
-	* syscall.c (sysent0, sysent1, sysent2, sysent): Add const to defn.
-	(nsyscalls0, nsyscalls1, nsyscalls2): Likewise.
-	(errnoent0, errnoent1, errnoent2, errnoent): Likewise.
-	(nerrnos0, nerrnos1, nerrnos2): Likewise.
-	* signal.c (signalent0, signalent1, signalent2): Likewise.
-	(nsignals0, nsignals1, nsignals2): Likewise.
-	(signame): LIkewise.
-	* ioctl.c (ioctlent0, ioctlent1, ioctlent2): Likewise.
-	(nioctlents0, nioctlents1, nioctlents2): Likewise.
-	(ioctl_lookup, ioctl_next_match): Likewise.
-	* defs.h: Update decls.
-	* io.c (sys_ioctl): Update users.
-
-	* util.c (xlookup, printxval, addflags, printflags): Use const for
-	struct xlat * argument.
-	* defs.h (xlookup, printxval, addflags, printflags): Update decls.
-	* bjm.c: Add const to all struct xlat defns.
-	* desc.c: Likewise.
-	* file.c: Likewise.
-	* ipc.c: Likewise.
-	* mem.c: Likewise.
-	* net.c: Likewise.
-	* proc.c: Likewise.
-	* process.c: Likewise.
-	* resource.c: Likewise.
-	* signal.c: Likewise.
-	* sock.c: Likewise.
-	* stream.c: Likewise.
-	* system.c: Likewise.
-	* term.c: Likewise.
-	* time.c: Likewise.
-	* util.c: Likewise.
-
-2004-09-01  Roland McGrath  <roland@redhat.com>
-
-	* linux/x86_64/syscallent.h: Add new entries for timer_*, clock_*, and
-	mq_* syscalls, and names only for new calls up to 252.
-	* linux/syscallent.h: Add waitid.
-	* linux/x86_64/syscallent.h: Likewise.
-	* linux/syscall.h: Declare sys_waitid.
-
-	* process.c (internal_wait): Take second arg giving index of flags
-	argument.
-	* defs.h: Update prototype.
-	* syscall.c (internal_syscall): Update caller.
-	Also use internal_wait for SYS_waitid.
-	* process.c (sys_waitid): Define for [LINUX] as well.
-	Don't tweak TCB_SUSPENDED--internal_wait does that.
-	(waitid_types): Conditionalize use of nonstandard P_* macros.
-
-2004-08-31  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.5.7.
-	* debian/changelog: 4.5.7-1.
-	* strace.spec: 4.5.7-2.
-
-	* debian/rules: Rewrite sparc64 change of 2004-07-12.
-	Always do each build in a separate build directory.
-	Fixes Debian bug #254728.
-
-	* time.c (clocknames): Use #ifdef around CLOCK_* uses.
-
-	* strace.1: Say that -c shows system CPU time, not real time.
-	Fixes Debian bug #254438.
-
-	* syscall.c (dumpio): Match pread and pwrite system calls too.
-	Fixes Debian bug #239947.
-
-	* net.c (sockoptions): Add all SO_* macros known in Linux 2.6.9.
-	Fixes Debian bug #171653.
-
-2004-07-12  Dmitry V. Levin  <ldv@altlinux.org>
-
-	* signal.c [LINUX] (parse_sigset_t): Fix hex strings parser.
-	Fixes RH#128091.
-
-2004-08-30  Roland McGrath  <roland@redhat.com>
-
-	* strace.c (main): Don't call fake_execve under -c.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#129166.
-
-	* net.c (sockipoptions): Add some options.
-	[SOL_IPV6] (sockipv6options): New variable.
-	(sys_getsockopt, printsockopt): Use it for SOL_IPV6 level.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#128391.
-
-	* time.c (clocknames): New variable, symbolic names for clock_t.
-	(sys_clock_settime, sys_clock_gettime, sys_clock_nanosleep): Use it.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#129378.
-
-	* system.c (personality_options): Hard-code values here.
-	Don't #include <linux/personality.h> at all.
-	Fixes RH#130965 and Debian bug #40588.
-
-	* file.c (print_xattr_val): New function to show attribute values.
-	(sys_setxattr, sys_fsetxattr, sys_getxattr, sys_fgetxattr): Use it.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#131177.
-
-2004-07-12  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.5.6.
-	* strace.spec, debian/changelog: 4.5.6-1.
-
-	* Makefile.am (EXTRA_DIST): Add linux/sparc64 files.
-
-	* debian/rules: On sparc-linux, build strace64 as well.
-	From Ben Collins <bcollins@debian.org>.
-	Fixes Debian bug #254728.
-
-2004-07-07  David S. Miller  <davem@nuts.davemloft.net>
-
-	* linux/sparc/syscallent.h: Sync with reality.
-	* linux/sparc/syscall.h (sys_sendfile64, sys_futex, sys_gettid,
-	sys_sched_setaffinity, sys_sched_getaffinity, sys_setxattr,
-	sys_lsetxattr, sys_fsetxattr, sys_getxattr, sys_lgetxattr,
-	sys_fgetxattr, sys_listxattr, sys_llistxattr, sys_flistxattr,
-	sys_removexattr, sys_lremovexattr, sys_fremovexattr,
-	sys_remap_file_pages, sys_readahead, sys_tgkill, sys_statfs64,
-	sys_fstatfs64, sys_clock_settime, sys_clock_gettime,
-	sys_clock_getres, sys_clock_nanosleep, sys_timer_create,
-	sys_timer_settime, sys_timer_gettime): New declarations.
-	* linux/sparc64/dummy2.h, linux/sparc64/syscallent2.h,
-	linux/sparc64/syscall.h, linux/sparc64/errnoent.h,
-	linux/sparc64/errnoent1.h, linux/sparc64/errnoent2.h,
-	linux/sparc64/ioctlent.h, linux/sparc64/ioctlent1.h,
-	linux/sparc64/ioctlent2.h, linux/sparc64/signalent.h,
-	linux/sparc64/signalent.h, linux/sparc64/signalent.h,
-	linux/sparc64/signalent1.h, linux/sparc64/signalent2.h,
-	linux/sparc64/syscall1.h, linux/sparc64/syscallent.h,
-	linux/sparc64/syscallent1.h: New files.
-	* defs.h (LINUXSPARC): Define also when SPARC64.
-	(LINUX && SPARC64): Set SUPPORTED_PERSONALITIES to 3.
-	Ignore SIGTRAP after execve by defining TCB_WAITEXECVE.
-	Define possibly missing __NR_exit_group.  Declare getrval2.
-	* configure.ac (sparc64): New architecture case.
-	* file.c (stat_sparc64): New structure.
-	(printstat_sparc64): New output routine for that.
-	(printstat): Call it, if personality is 2.
-	(printstat64): Likewise.
-	* util.c: Conditionalize ptrace defines on LINUXSPARC
-	not LINUX && SPARC.
-	(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
-	to PTRACE_FOOREGS64 so that more sparc code can be shared
-	between 64-bit and 32-bit.
-	(_hack_syscall5): Correct trap number when SPARC64.
-	(PTRACE_WRITE{TEXT,DATA}): Add SPARC64 to ifdef guard.
-	(getpc): Handle SPARC64 && LINUX.
-	(printcall): Likewise.
-	(arg fetching/setting): Use same code for SPARC64 LINUX
-	as for SPARC.
-	(setbpt): Handle SPARC64 && LINUX.
-	(clearbpt): Likewise.
-	* signal.c: Conditionalize ptrace defines on SPARC and
-	SPARC64.
-	(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
-	to PTRACE_FOOREGS64 so that more sparc code can be shared
-	between 64-bit and 32-bit.
-	(m_siginfo): Use same definition on SPARC64 as SPARC.
-	(sys_sigreturn): Handle LINUX && SPARC64.
-	* syscall.c: Conditionalize ptrace defines on SPARC and
-	SPARC64.
-	(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
-	to PTRACE_FOOREGS64 so that more sparc code can be shared
-	between 64-bit and 32-bit.
-	(getscno): Use same static state on SPARC64 as SPARC,
-	and add SPARC64 handling.
-	(get_error): Handle LINUX && SPARC64.
-	(force_result): Likewise.
-	(syscall_enter): Likewise.
-	(trace_syscall): Handle sys_socketcall and sys_ipc on SPARC64
-	just like SPARC.
-	(getrval2): Handle LINUX && SPARC64.
-	* process.c: Conditionalize ptrace defines on SPARC and
-	SPARC64.
-	(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
-	to PTRACE_FOOREGS64 so that more sparc code can be shared
-	between 64-bit and 32-bit.
-	(change_syscall): Handle LINUX && SPARC64.
-	(struct_user_offsets): Ifdef out those which do not exist
-	on SPARC64.
-	* net.c (sys_pipe): Handle LINUX && SPARC64.
-	* ioctl.c: Fix initializer typo for nioctlents2, was
-	nioctlents1 by accident.
-
-2004-06-28  Andreas Schwab  <schwab@suse.de>
-
-	* process.c (internal_exec): Move TCB_WAITEXECVE handling here.
-	(sys_execve): Remove it here.
-
-2004-07-12  Roland McGrath  <roland@redhat.com>
-
-	* Makefile.am (EXTRA_DIST): Add linux/sh64/syscallent.h.
-
-	* debian/control (Section): Move to utils, matching Debian override.
-
-	* net.c (addrfams): Make variable global.
-	* sock.c (sock_ioctl): Decode the arguments for SIOCGIFNAME,
-	SIOCGIFINDEX, and SIOCGIFCONF.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#126917.
-
-	* linux/ioctlsort.c: Add some #includes.
-	[POWERPC]: Kludge out high bits.
-	* linux/ia64/ioctlent.h: Regenerated using RHEL3 headers.
-	* linux/powerpc/ioctlent.h: Likewise.
-
-2004-07-11  Roland McGrath  <roland@redhat.com>
-
-	* linux/ioctlent.sh: Replace asm with $asm in all places.
-
-	* configure.ac: Add I386 as AM_CONDITIONAL.
-	* Makefile.am [LINUX]: Add maintainer-mode rules to regenerate
-	the ioctlent.h file.
-
-2004-07-08  Roland McGrath  <roland@redhat.com>
-
-	* resource.c (sys_quotactl): Truncate first argument to 32 bits, since
-	that's what the kernel will do.
-
-2004-07-07  Roland McGrath  <roland@redhat.com>
-
-	* linux/ioctlent.sh: Take optional second argument to use as directory
-	name in place of `asm'.
-
-2004-06-27  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.5.5.
-	* strace.spec, debian/changelog: 4.5.5-1.
-
-2004-06-22  Roland McGrath  <roland@redhat.com>
-
-	* syscall.c (syscall_fixup) [LINUX && X86_64]: For 32-bit process,
-	sign extend the low 32 bits of RAX to 64 bits.
-	Fixes RH#126547.
-
-	* syscall.c (force_result): [LINUX && X86_64]: Fix RAX*4 -> RAX*8.
-
-2004-06-03  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.5.4.
-	* strace.spec, debian/changelog: 4.5.4-1.
-
-	* net.c (domains): Add many PF_* values #ifdef PF_*.
-	(addrfams): Add many AF_* values #ifdef AF_*.
-	Fixes Debian bug #250506.
-
-2004-05-02  Dmitry V. Levin  <ldv@altlinux.org>
-
-	* linux/ioctlsort.c (compare): When ioctl codes equal, compare
-	names.
-	(main): Print a note that program output is generated by
-	ioctlsort.
-	* linux/ioctlent.sh: Build the list of ioctls defined in
-	linux/fb.h (0x46..), linux/kd.h (0x4B..), linux/cdrom.h (0x53..),
-	asm/ioctls.h (0x54..), linux/vt.h (0x56..), linux/videotext.h
-	(0x71..), linux/videotext.h (0x72..), asm/sockios.h (0x89..),
-	linux/sockios.h (0x89..), linux/wireless.h (0x8B..).
-	* linux/ioctlent.h: Regenerated from linux-2.6.5.
-	Fixes RH#122257.
-
-2004-06-03  Roland McGrath  <roland@redhat.com>
-
-	* debian/control (Architecture): Add amd64.
-	Fixes Debian bug #246568.
-
-	* strace.c (main) [LINUX]: Expand TCBTAB as necessary for threads
-	attached.  Attach threads only under -f.  Set TCB_FOLLOWFORK in them.
-	(expand_tcbtab): New function, broken out of ...
-	* process.c (fork_tcb): ... here, call that.
-	* defs.h: Declare expand_tcbtab.
-
-2004-04-19  Roland McGrath  <roland@redhat.com>
-
-	* process.c (printstatus): Add a space before | in output.
-
-2004-04-16  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac: Version 4.5.3.
-	* strace.spec, debian/changelog: 4.5.3-1.
-
-2004-03-18  Dmitry V. Levin  <ldv@altlinux.org>
-
-	* resource.c (sys_quotactl) [LINUX]: Cast arithmetic shift operand
-	from long to unsigned long, to fix output of the quotactl command
-	parser.
-	Fixes RH#118694.
-
-2004-04-16  Roland McGrath  <roland@redhat.com>
-
-	* linux/s390/ioctlent.h, linux/s390x/ioctlent.h: Update DASD ioctls.
-	From Maxim Shchetynin <maxim@de.ibm.com>.
-
-	* configure.ac: Check for <mqueue.h>.
-	* ipc.c (sys_mq_open, printmqattr) [! HAVE_MQUEUE_H]: Don't try to
-	decode struct mq_attr.
-	* NEWS: Mention mq support.
-
-	* linux/syscall.h: Support new mq_* syscalls on Linux.
-	* linux/syscallent.h: Likewise.
-	* linux/dummy.h: Likewise.
-	* ipc.c: Likewise.
-	* time.c (printsigevent): Handle SIGEV_THREAD.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#120701.
-
-2004-04-13  Roland McGrath  <roland@redhat.com>
-
-	* net.c (msg_flags): Grok MSG_FIX, MSG_SYN, MSG_RST, MSG_NOSIGNAL,
-	MSG_MORE.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#120541.
-
-	* process.c (printstatus): Mask out bits presented symbolically, and
-	print "| 0xnnn" if the remaining bits are not all zero.
-	Fixes Debian bug #240062.
-
-	* process.c (print_affinitylist): Rewritten to handle indirect values.
-	(sys_sched_setaffinity, sys_sched_getaffinity): Update callers.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#118685.
-
-	* acinclude.m4: Quote first argument to AC_DEFUN in all cases.
-
-2004-04-08  Roland McGrath  <roland@redhat.com>
-
-	* strace.c (main) [LINUX]: When attaching for -p, look in
-	/proc/PID/task for all threads and attach them as presumed
-	CLONE_THREAD children.
-	* NEWS: Mention the feature.
-	Fixes RH#120462.
-
-2004-03-02  Roland McGrath  <roland@redhat.com>
-
-	* util.c (setbpt): Fix one missed spot to use new arg0_index macro.
-	From Michael Holzheu <HOLZHEU@de.ibm.com>.
-
-	* debian/control (Standards-Version): Update to 3.6.1.
-
-2004-03-01  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.5.2.
-	* strace.spec, debian/changelog: 4.5.2-1.
-
-	* strace.c (main): Avoid potential buffer overruns from ludicrous
-	arguments or PATH values.
-	* syscall.c (qual_signal): Bail out for too-long string.
-
-	* mem.c [LINUX]: <asm/mman.h> -> <linux/mman.h>
-	Fixes Debian bug #223207.
-
-	* linux/sparc/syscall.h: Copy linux/syscall.h decls of sys_sched_*.
-
-	* configure.ac: Check for `struct user_desc' in <asm/ldt.h>.
-	* process.c [HAVE_STRUCT_USER_DESC]: Use struct user_desc in place of
-	struct modify_ldt_ldt_s.
-	* mem.c [HAVE_STRUCT_USER_DESC]: Likewise.
-
-	* system.c (sysctl_vm): Conditionalize VM_* macro uses, add some more.
-	From Tim Yamin <plasmaroo@gentoo.org>.
-
-	* process.c (sys_execve): Clear instead of set TCB_WAITEXECVE on
-	erring syscall.
-
-	* configure.ac: Check for `struct pt_all_user_regs'
-	and `struct ia64_fpreg' in <sys/ptrace.h>.
-	* util.c, process.c, syscall.c, signal.c: Work around conflicts between
-	<sys/ptrace.h> and <linux/ptrace.h> for defining those types.
-
-	* process.c (struct_user_offsets) [LINUX && IA64]: Conditionalize
-	PT_AR_CSD and PT_AR_SSD uses in case of older kernel headers.
-
-	* util.c [LINUX] (arg0_index, arg1_index): New macros.
-	[S390 || S390X]: Define them with inverted values.
-	(setbpt): Use them for u_arg indices.
-
-2004-02-26  Andreas Schwab  <schwab@suse.de>
-
-	* defs.h [LINUX && IA64]: Declare getrval2 also on IA64.
-	* net.c (sys_pipe) [LINUX && IA64]: For IA64 use the two return values.
-	* syscall.c (getrval2) [LINUX && IA64]: Implement for IA64.
-
-2004-03-01  Roland McGrath  <roland@redhat.com>
-
-	* linux/dummy.h (sys_sched_getscheduler, sys_sched_setparam,
-	sys_sched_getparam, sys_sched_setscheduler, sys_sched_getscheduler,
-	sys_sched_get_priority_max, sys_sched_get_priority_min): Remove macros.
-	* process.c [LINUX] (sys_sched_getscheduler, sys_sched_setparam,
-	sys_sched_getparam, sys_sched_setscheduler, sys_sched_getscheduler,
-	sys_sched_get_priority_min): New functions.
-	From Ulrich Drepper <drepper@redhat.com>.
-	Fixes RH#116990.
-
-2004-02-20  Roland McGrath  <roland@redhat.com>
-
-	* linux/hppa/syscallent.h: Update some syscalls.
-	From Randolph Chung <tausq@debian.org>.
-	Fixes Debian bug #231632.
-
-2003-12-31  David Mosberger  <davidm@hpl.hp.com>
-
-	* process.c (internal_exit): For ia64, also recognize IA-32 252
-	as exit_group().
-	(change_syscall): For IA64, also support changing IA-32 syscalls.
-	* syscall.c (internal_syscall): For IA64, also recognize IA-32
-        syscall 252 (exit_group) as an internal_exit() syscall.
-	* util.c (SYS_fork): For IA64, define them to the IA-32 syscall
-	number.
-	(SYS_vfork): Likewise.
-	(arg_setup): For IA64 version, also support IA-32 syscalls.
-	(get_arg0): Likewise.
-	(get_arg1): Likewise.
-	(set_arg0): Likewise.
-	(set_arg1): Likewise.
-
-2004-02-15  Anton Blanchard  <anton@samba.org>
-
-	* linux/powerpc/syscallent.h: Add rtas call.
-	Shift multiplexed syscalls to start at 300, we are already about
-	to hit 256 real syscalls.
-	* linux/syscall.h: SYS_socket_subcall is now 300 for [POWERPC].
-
-2004-02-19  Roland McGrath  <roland@redhat.com>
-
-	* strace.c (main): Use TCP->pid, not PID, in -p message.
-	Fixes Debian bug #229802.
-
-2004-01-13  Roland McGrath  <roland@redhat.com>
-
-	* syscall.c (force_result) [LINUX] [S390 || S390X]: Remove bogus upeek
-	call.
-
-	* stream.c (internal_stream_ioctl): Fix typo strict -> struct.
-	Reported by Petter Reinholdtsen <pere@hungry.com>.
-
-2003-12-31  David Mosberger  <davidm@hpl.hp.com>
-
-	* process.c (struct_user_offsets) [IA64]: Fix up register name list.
-
-2003-12-14  Anton Blanchard  <anton@samba.org>
-
-	* file.c (sys_getdents64): Don't cast d_ino and d_off to unsigned long.
-	Use %llu formats for them.
-
-	* file.c [LINUX] (fsmagic): Add SYSFS_MAGIC.
-
-	* linux/powerpc/syscallent.h: Update to include recently added
-	syscalls.
-
-	* syscall.c (get_error) [POWERPC]: Cast result to unsigned long for
-	ppc64, we were misreporting syscalls that really succeeded as having
-	failed.
-
-2004-01-13  Roland McGrath  <roland@redhat.com>
-
-	* strace.1: Remove comment about vfork on Linux.
-	Fixes Debian bug #223390.
-
-	* file.c (direnttypes): Define under [LINUX] as well.  Add DT_UNKNOWN.
-	(sys_getdents64) [LINUX]: Print d_type field.
-
-2003-12-15  Dmitry V. Levin  <ldv@altlinux.org>
-
-	* strace.c (trace) [WCOREDUMP]: Show coredump status of the
-	killed process if available.  Fixes RH#112117.
-
-2003-11-13  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.5.1.
-	* strace.spec, debian/changelog: 4.5.1-1.
-
-2003-09-06  Dmitry V. Levin  <ldv@altlinux.org>
-
-	* defs.h (ioctl_lookup): Prototype change.
-	* ioctl.c (ioctl_next_match): New function.
-	* defs.h: Declare it.
-	* io.c (sys_ioctl): Use it, to display all possible ioctl names
-	when there's more than one match.
-	* ioctl.c (ioctl_lookup): Likewise.
-	* stream.c (internal_stream_ioctl): Likewise.
-	Patch from Solar Designer <solar@openwall.com>.
-
-2003-11-13  Roland McGrath  <roland@redhat.com>
-
-	* linux/sh/syscallent.h: Use sys_setgroups32, sys_getgroups32.
-	* linux/sh64/syscallent.h: Likewise.
-
-2003-09-06  Dmitry V. Levin  <ldv@altlinux.org>
-
-	Fixes for RH#105359.
-	* util.c (printuid): New function.
-	* defs.h: Declare it.
-	* file.c (sys_chown): Use it.
-	* file.c (sys_fchown): Likewise.
-	* process.c (sys_setreuid, sys_setregid, sys_setresuid,
-	sys_setresgid): Likewise.
-	* linux/syscallent.h: Better handle getgid32, geteuid32, getegid32,
-	setreuid32, setregid32, getgroups32, setgroups32, fchown32,
-	setresuid32, getresuid32, setresgid32, getresgid32, chown32,
-	setuid32, setgid32, setfsuid32, setfsgid32.
-	* process.c [LINUX]: Define GETGROUPS32_T.
-	* process.c [LINUX] (sys_setgroups32, sys_getgroups32):
-	New functions.
-	* linux/syscall.h (sys_setgroups32, sys_getgroups32):
-	Declare them.
-
-2003-11-11  Roland McGrath  <roland@redhat.com>
-
-	* strace.c (main): Bail with usage error for missing command before we
-	open the -o file or fiddle uids.
-
-2003-11-06  Roland McGrath  <roland@redhat.com>
-
-	* strace.c (main): Treat piped output more like file output.
-	Disallow -ff with piped output.  Fixes RH#105366.
-	Reported by Dmitry V. Levin <ldv@altlinux.org>
-
-	* strace.c (tprintf): Check result of vfprintf and use perror when it
-	fails while not writing to stderr itself.  Fixes Debian bug #218762.
-
-	* net.c (printsock): Fix typo in #ifdef AF_NETLINK.
-	From Ulrich Drepper <drepper@redhat.com>.
-
-2003-11-01  Roland McGrath  <roland@redhat.com>
-
-	* syscall.c (trace_syscall) [LINUX]: Calculate ONE_TICK once using
-	setitimer rather than hard-coding a value based on HZ.
-	Fixes RH#108012, reported by Florian La Roche <laroche@redhat.com>.
-
-2003-10-21  Roland McGrath  <roland@redhat.com>
-
-	* strace.1: Fixed a few spelling errors.
-	Fixes Debian bug #217008.
-
-	* syscall.c: Revert last change, was broken.
-
-2003-10-01  Roland McGrath  <roland@redhat.com>
-
-	* process.c (internal_clone): Don't suspend parent when call requested
-	a specific PID that is not a traced child.
-
-	* signal.c [LINUX] (parse_sigset_t): Rewrite to process hex strings
-	from right to left so we don't have to presume the size.
-	Reported by David Woodhouse <dwmw2@redhat.com>.
-
-2003-09-25  Roland McGrath  <roland@redhat.com>
-
-	* mem.c (mmap_prot) [PROT_SEM, PROT_GROWSDOWN, PROT_GROWSUP]: Include
-	these in the table if they are defined.
-
-2003-09-24  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.5.
-	* strace.spec, debian/changelog: 4.5-1.
-
-	* syscall.c (get_scno) [LINUX] [S390 || S390X]: Bail out of
-	instruction decoding branch if TCB_INSYSCALL is clear.
-	Reported by <jochen@penguin-breeder.org>.
-
-	* linux/ioctlent.h: Swap order of overloaded TC* and SNDCTL_* values.
-
-2003-09-23  Roland McGrath  <roland@redhat.com>
-
-	* strace.spec: On ppc64 (maybe others later), create an strace64
-	package as well containing just /usr/bin/strace64.
-
-	* signal.c (sprintsigmask): Print RT_%u for __SIGRTMIN..__SIGRTMAX.
-	Fixes RH#104365.
-
-2003-08-21  Roland McGrath  <roland@redhat.com>
-
-	* linux/syscallent.h: Fix mlock argument count.  Fixes RH#101499.
-	* linux/x86_64/syscallent.h: Likewise.
-	* linux/s390/syscallent.h: Likewise.
-	* linux/s390x/syscallent.h: Likewise.
-
-2003-07-28  Daniel Jacobowitz  <drow@mvista.com>
-
-	* defs.h (ALIGN64): Define for MIPS.
-	* io.c (PREAD_OFFSET_ARG): Define.
-	(sys_pread, sys_pwrite): Use it.
-	* process.c (struct_user_offsets) [SH]: Check whether REG_XDREG0
-	is defined.
-	* linux/sh/syscallent.h (pread, pwrite): Take six arguments.
-	(truncate64, ftruncate64): Pretty-print.
-	* linux/mips/syscallent.h (pread, pwrite): Take six arguments.
-	(truncate64, ftruncate64): Take four arguments.
-
-2003-07-17  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.4.99.
-	* strace.spec, debian/changelog: 4.4.99-1.
-
-2003-07-15  Anton Blanchard  <anton@samba.org>
-
-	* ipc.c: Add SHM_HUGETLB field.
-	Mask out permission bits in msgget, semget and shmget before
-		printing resource_flags.
-	Mask execute permission bits (even though we dont currently
-		use them).
-
-2003-07-17  Roland McGrath  <roland@redhat.com>
-
-	* linux/powerpc/syscallent.h (tgkill): New at 250.
-
-	* linux/syscallent.h: truncate64/ftruncate64 need 3 args.
-	From Ulrich Drepper <drepper@redhat.com>.
-
-	* linux/syscallent.h: Handle statfs64, fstatfs64, utimes.
-	* file.c (printstatfs): Print f_fsid and f_frsize.
-	[LINUX] (printstatfs64, sys_statfs64, sys_fstatfs64): New functions.
-	* linux/syscall.h: Add decls.
-	From Ulrich Drepper <drepper@redhat.com>.
-
-2003-07-09  Roland McGrath  <roland@redhat.com>
-
-	* linux/ia64/syscallent.h (tgkill): New at 1235.
-
-2003-07-05  Richard Henderson  <rth@twiddle.net>
-
-	* process.c (sys_clone): Order arguments for alpha the same as x86_64.
-	* syscall.c (ERESTART_RESTARTBLOCK): New.
-	(trace_syscall): Print it.
-	* linux/alpha/syscallent.h (osf_syscall): Name properly.
-	(osf_set_program_attributes): Fix typo.
-	(osf_nfssvc): Likewise.
-	(osf_sigsendset): Likewise.
-	(getdents64, gettid, readahead, tkill, setxattr, lsetxattr, fsetxattr,
-	getxattr, lgetxattr, fgetxattr, listxattr, llistxattr, flistxattr,
-	removexattr, lremovexattr, fremovexattr, futex, sched_setaffinity,
-	sched_getaffinity, tuxcall, io_setup, io_destroy, io_getevents,
-	io_submit, io_cancel, exit_group, lookup_dcookie, epoll_create,
-	epoll_ctl, epoll_wait, remap_file_pages, set_tid_address,
-	restart_syscall, fadvise, timer_create, timer_settime, timer_gettime,
-	timer_getoverrun, timer_delete, clock_settime, clock_gettime,
-	clock_getres, clock_nanosleep, semtimedop): New.
-
-2003-07-08  Roland McGrath  <roland@redhat.com>
-
-	* signal.c (sys_tgkill): New function.
-	* linux/syscall.h: Declare it.
-	* linux/syscallent.h: Add tgkill.
-
-2003-06-27  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac: Check for type `struct __old_kernel_stat'.
-	* file.c (convertoldstat, printoldstat): Define under
-	[LINUX && HAVE_STRUCT___OLD_KERNEL_STAT] rather than a list of archs.
-	(sys_oldstat, sys_oldfstat, sys_oldlstat): Likewise.
-	* linux/dummy.h [! HAVE_STRUCT___OLD_KERNEL_STAT]
-	(sys_oldstat, sys_oldfstat, sys_oldlstat): #define to printargs.
-
-2003-06-26  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac: SHMEDIA -> SH64
-	* defs.h: Likewise.
-	* mem.c: Likewise.
-	* process.c: Likewise.
-	* sock.c: Likewise.
-	* syscall.c: Likewise.
-	* util.c: Likewise.
-	* linux/shmedia/syscallent.h: Moved to ...
-	* linux/sh64/syscallent.h: ... here.
-
-	* config.guess: Update from canonical version, timestamp 2003-06-17.
-	* config.sub: Likewise.
-
-	* syscall.c (force_result) [LINUX] [ARM]: Fix variable usage.
-	From: Joshua Neal <tinara@netpipeline.net>.
-
-	* process.c [LINUX] (sys_futex): Grok FUTEX_REQUEUE and print 5th arg.
-	* linux/syscallent.h: sys_futex argument count is now 5, not 4.
-	* linux/ia64/syscallent.h: Likewise.
-	* linux/powerpc/syscallent.h: Likewise.
-	* linux/s390/syscallent.h: Likewise.
-	* linux/s390x/syscallent.h: Likewise.
-	* linux/x86_64/syscallent.h: Likewise.
-	From Jakub Jelinek <jakub@redhat.com>.
-
-	* syscall.c (get_scno) [S390 || S390X]: Fix old vs new mode detection.
-	From Michael Holzheu <HOLZHEU@de.ibm.com>.
-
-2003-06-23  Roland McGrath  <roland@redhat.com>
-
-	* net.c (sys_socket): Decode protocol for PF_INET6 same as PF_INET.
-	From Ulrich Drepper <drepper@redhat.com>.
-
-2003-06-10  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.4.98.
-	* strace.spec, debian/changelog: 4.4.98-1.
-
-2003-06-09  Roland McGrath  <roland@redhat.com>
-
-	* linux/s390x/syscallent.h: Update many syscalls.
-	* linux/syscall.h (SYS_socket_subcall): Update [S390X] value.
-
-	* linux/s390/syscallent.h: Update many syscalls.
-	* linux/syscall.h (SYS_socket_subcall): Update [S390] value.
-
-	* linux/shmedia/syscallent.h: New file.
-	From Stephen Thomas <stephen.thomas@superh.com>.
-
-	* strace.c (trace): Print a message and newline for a WIFEXITED report
-	from the process we just printed an unterminated syscall line for.
-
-2003-06-03  Roland McGrath  <roland@redhat.com>
-
-	* util.c (printcall) [LINUX]: Fix typo [IA62] -> [IA64].
-
-	Linux/ARM improvements from Russell King <rmk@arm.linux.org.uk>:
-	* defs.h [LINUX] (TCB_WAITEXECVE): Define for [ARM] too.
-	* process.c (struct_user_offsets) [LINUX] [ARM]: Add ARM registers.
-	* signal.c [LINUX] (sys_sigreturn) [ARM]: New case.
-	* syscall.c (get_scno, syscall_fixup) [LINUX] [ARM]: Case rewritten.
-	(get_error) [LINUX] [ARM]: Update.
-	(syscall_enter) [LINUX] [ARM]: New case.
-	* util.c (printcall) [LINUX] [ARM]: New case.
-
-	* debian/control (Standards-Version): Update to 3.5.10.
-
-	* strace.c (main): In PATH search, accept only a regular file with
-	execute bits set.  Fixes Debian bug #137103.
-
-2003-06-02  Roland McGrath  <roland@redhat.com>
-
-	* strace.c (main): Set -q when given -o and not -p, and not when not
-	given -o, to match what the man page always said.
-	Fixes Debian bug #47113, #153678.
-
-	* configure.ac, NEWS: Version 4.4.97.
-	* strace.spec, debian/changelog: 4.4.97-1.
-
-	* configure.ac, defs.h, mem.c, process.c, sock.c, syscall.c, util.c:
-	Merged in SHmedia port from Stephen Thomas <stephen.thomas@superh.com>.
-
-	* config.guess: Update from ftp://ftp.gnu.org/pub/gnu/config/,
-	timestamp 2003-05-22.
-	* config.sub: Likewise, timestamp 2003-05-24.
-
-2003-05-22  Roland McGrath  <roland@redhat.com>
-
-	* defs.h (struct tcb): New member `nzombies'.
-	* strace.c (alloctcb): Initialize it.
-	(droptcb): Increment our parent's zombie count.
-	* process.c (internal_wait): Don't go into TCB_SUSPENDED if the
-	process has zombies it can reap.  On the way out, if we reaped
-	an untraced process, decrement the zombie count.
-
-	* process.c (sys_clone): Mask CSIGNAL out of flags and print that
-	separately using signame.
-
-	* process.c (internal_clone) [TCB_CLONE_THREAD]: Use ARG_FLAGS instead
-	of literal 0 for index.  Consult the right flags without clobbering
-	anything when we reparent the new child to the caller's parent thread.
-
-	* linux/s390/syscallent.h: Fix sys_clone argument count.
-	* linux/s390x/syscallent.h: Likewise.
+	* linux/m68k/syscallent.h: Likewise.
+	* linux/microblaze/syscallent.h: Likewise.
 	* linux/mips/syscallent.h: Likewise.
-	* linux/alpha/syscallent.h: Likewise.
 	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
 	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
 	* linux/sparc/syscallent.h: Likewise.
-	* linux/hppa/syscallent.h: Likewise.
+	* linux/x86_64/syscallent.h: Likewise.
+	* linux/arm/syscallent.h: Add hooks for accept4, fanotify_init,
+	fanotify_mark, and prlimit64.
+	* linux/hppa/syscallent.h: Add hook for prlimit64.
 
-	* process.c [LINUX] [S390 || S390X] (ARG_CTID, ARG_TLS): Fix swapped
-	indices.  Reported by Jakub Jelinek <jakub@redhat.com>.
+2011-01-16  Dmitry V. Levin  <ldv@altlinux.org>
 
-	* signal.c [LINUX] (SI_SIGIO, SI_TKILL): New macros.
-	[LINUX || SVR4] (siginfo_codes): Add strings for them.
+	block.c: cleanup
+	* block.c: Include <inttypes.h>.
+	(print_blkpg_req): Always decode struct blkpg_ioctl_arg.
+	Robustify decoding of strings.
+	(block_ioctl): Do not decode return values passed by pointers on exit
+	from failed syscalls.
+	Use format macros from inttypes.h to print values of type uint64_t.
 
-	* process.c (print_affinitylist): Fix loop condition.
-	Reported by Ian Wienand <ianw@gelato.unsw.edu.au>.
+2011-01-15  Dmitry V. Levin  <ldv@altlinux.org>
 
-2003-04-10  Roland McGrath  <roland@redhat.com>
+	Add block ioctl support
+	* block.c: New file.
+	* Makefile.am (strace_SOURCES): Add it.
+	* defs.h [LINUX] (block_ioctl): New function.
+	* ioctl.c (ioctl_decode) [LINUX]: Use it to decode HDIO_* and BLK*
+	ioctls.
+	Patch by Jeff Mahoney <jeffm@suse.com>
 
-	* syscall.c (qual_desc): Return zero after parsing number.
-	From Rob Leslie <rob@mars.org>, fixes Debian bug #188379.
+2011-01-14  Holger Hans Peter Freyther  <zecke@selfish.org>
 
-2003-04-07  Roland McGrath  <roland@redhat.com>
+	Parse SOL_SCTP socket options
+	* configure.ac (AC_CHECK_HEADERS): Add netinet/sctp.h.
+	* net.c [HAVE_NETINET_SCTP_H]: Include <netinet/sctp.h>.
+	[SOL_SCTP] (socksctpoptions): New xlat structure.
+	(sys_getsockopt, printsockopt): Parse SOL_SCTP options.
 
-	* linux/syscallent.h: Handle semtimedop subcall of ipc syscall.
-	* linux/syscall.h: Likewise.
-	* ipc.c [LINUX] (sys_semtimedop): New function.
-	From Ulrich Drepper <drepper@redhat.com>.
+	* net.c (socketlayers): Add more SOL_* constants from linux/socket.h
 
-	* ipc.c (sys_semget): Mask off permission bits for resource_flags.
-	From Ulrich Drepper <drepper@redhat.com>.
+2011-01-14  Dmitry V. Levin  <ldv@altlinux.org>
 
-2003-04-01  Philippe De Muyter  <phdm@macqel.be>
+	strace.1: fix misleading italics
+	* strace.1: Use bold instead of italics for "-e trace=" keywords.
+	This fixes Debian bug #589323.
 
-	* sock.c, stream.c: Check #ifdef LINUX, not linux.
-	* file.c: Always provide sys_*attr, regardless of #ifdef XATTR_CREATE.
+	Update linux/ioctlent.h
+	* linux/ioctlent.h: Regenerate using linux v2.6.37 headers.
 
-2003-03-30  Roland McGrath  <roland@redhat.com>
+	Add HDIO_* ioctls defined in linux/hdreg.h
+	* linux/ioctlent.sh: Add HDIO_* ioctls (0x03..) defined in
+	linux/hdreg.h header file.
+	This fixes Debian bug #450953.
 
-	* configure.ac, NEWS: Version 4.4.96.
-	* strace.spec, debian/changelog: 4.4.96-1.
+2011-01-13  Dmitry V. Levin  <ldv@altlinux.org>
 
-2003-02-26  Stuart Menefy <stuart.menefy@st.com>
+	Test PTRACE_O_TRACECLONE and PTRACE_O_TRACEVFORK along with PTRACE_O_TRACEFORK
+	* strace.c (test_ptrace_setoptions): Add PTRACE_O_TRACECLONE and
+	PTRACE_O_TRACEVFORK to PTRACE_SETOPTIONS call, to test exactly
+	the same set of options that is going to be used later in trace().
 
-	Various fixes for SuperH [SH]:
-	* mem.c (sys_old_mmap): mmap() parameters passed in registers
-	* net.c (sys_pipe), syscall.c (getrval2): pipe() results returned
-	in registers
-	* process.c (change_syscall): Fixed register which holds system
-	call number
-	* util.c (arg0_offset, arg1_offset): provide definition
-	* Makefile.am: Added new files in linux/sh
-	* linux/sh/syscallent.h: New file.
-	* linux/sh/errnoent.h: New file.
-	* linux/sh/ioctlent.h: New file.
-	* linux/sh/signalent.h: New file.
+2011-01-10  Dmitry V. Levin  <ldv@altlinux.org>
 
-	* linux/ioctlent.sh: Take an arg for location of header files
-	* syscallent.sh: Replaced lost $
+	* net.c (protocols): Add more IPPROTO_* constants defined in netinet/in.h
 
-2003-03-30  Roland McGrath  <roland@redhat.com>
+2011-01-10  Holger Hans Peter Freyther  <holger@freyther.de>
 
-	* time.c [LINUX]: Handle new Linux 2.5 clock/timer syscalls.
-	* linux/syscall.h, linux/syscallent.h, linux/dummy.h: Likewise.
-	From Ulrich Drepper <drepper@redhat.com>.
+	* net.c (protocols): Add IPPROTO_GRE, IPPROTO_SCTP and IPPROTO_UDPLITE.
 
-	* linux/syscallent.h: Use sys_getrlimit for 191.
-	Use name "old_getrlimit" for 76.
-	Reported by Ulrich Drepper <drepper@redhat.com>.
+2011-01-10  Carmelo AMOROSO  <carmelo.amoroso@st.com>
+
+	sh: Add entry for not-multiplexed accept4
+	* linux/sh/syscallent.h: Add specific entry for not-multiplexed accept4
+	available in kernel mainline since v2.6.37-rc6, see
+	http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=21b6e4c7106b2d68a6710506d8706608272fd78b
+
+2010-12-14  Carmelo AMOROSO  <carmelo.amoroso@st.com>
+
+	sh: Add entries for not-multiplexed socket calls
+	* linux/sh/syscallent.h: Add specific entries for not-multiplexed
+	socket calls (available in kernel mainline since v2.6.37-rc1)
+
+	sh: Fix compilation warning in do_pipe due to missing prototype
+	* defs.h [SH]: Make getrval2 prototype visible to do_pipe
+	and fix the following compiler warning:
+	.../net.c: In function 'do_pipe':
+	.../net.c:1632: warning: implicit declaration of function 'getrval2'
+	.../net.c:1632: warning: format '%lu' expects type 'long unsigned int',
+	but argument 3 has type 'int'
+
+2010-12-14  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Fix build on uClibc
+	* defs.h [LINUX]: Define PTRACE_GETEVENTMSG macro.
+	Patch by Douglas Mencken <dougmencken@gmail.com>.
+
+2010-12-07  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Fix strace -f -o '|command' hangup
+	* strace.c (main): Call test_ptrace_setoptions() before parsing
+	-o option, otherwise a forked command will cause a hangup inside
+	test_ptrace_setoptions().
+
+2010-12-03  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Output diagnostics to stderr
+	* syscall.c (get_scno): Output information about changes in
+	personality mode to stderr.  Reported by Pádraig Brady.
+
+	Recognize more clone flags
+	* process.c (CLONE_*): Define more flags from linux v2.6.25.
+	(clone_flags): Add entries for them.
+	Proposed by <zhangyanfei@cn.fujitsu.com>.
+
+	Decode struct ucred for getsockopt SO_PEERCRED
+	* net.c (sys_getsockopt): Decode SO_PEERCRED.
+	Proposed by Arkadiusz Miśkiewicz <arekm@maven.pl>.
+
+2010-12-03  Carmelo AMOROSO  <carmelo.amoroso@st.com>
+
+	sh: Add support for tracing sys_cacheflush system call
+	* linux/sh/syscallent.h: Update sys_cacheflush entry.
+	* linux/syscall.h [SH] (sys_cacheflush): New function declaration.
+	* system.c [SH] (cacheflush_flags): New xlat structure.
+	[SH] (sys_cacheflush): New function.
+
+	Reviewed-by: Angelo Castello <angelo.castello@st.com>
+
+2010-11-30  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Cleanup test_ptrace_setoptions()
+	* strace.c (test_ptrace_setoptions): Cleanup.
+	(main): Fix test_ptrace_setoptions() error diagnostics message.
+	Print ptrace_setoptions value in debug mode.
+
+2010-11-30  Wang Chao  <wang.chao@cn.fujitsu.com>
+
+	Handle followfork using ptrace_setoptions if available
+	If PTRACE_O_TRACECLONE et al options are supported by kernel,
+	use them to do followfork rather than the original setbpt
+	method that changes registers ourselves.
+
+	* defs.h [LINUX] (handle_new_child): New function prototype.
+	* process.c [LINUX] (handle_new_child): New function based on the
+	code from internal_fork(), with a trivial change: do reparent only
+	for sys_clone.
+	[LINUX] (internal_fork): Use handle_new_child().  Do nothing if
+	ptrace_setoptions is in effect.
+	* strace.c [LINUX] (handle_ptrace_event): New function.
+	[LINUX] (trace): If ptrace_setoptions is in effect, then
+	call the new function to handle PTRACE_EVENT_* status, and
+	set PTRACE_SETOPTIONS when we see the initial stop of tracee.
+
+	Test how PTRACE_SETOPTIONS support works
+	Currently test fork related options only.  Fork a child that uses
+	PTRACE_TRACEME at startup and then does a fork so strace can test
+	how the PTRACE_SETOPTIONS support works before it handles any real
+	tracee.  Since PTRACE_O_TRACECLONE/*FORK were introduced to kernel
+	at the same time, this test seems to be enough for these 3 options.
+
+	* defs.h [LINUX]: Define PTRACE_O_TRACECLONE et al macros here.
+	(ptrace_setoptions): New variable declaration.
+	* strace.c [LINUX] (test_ptrace_setoptions): New function, tests
+	whether kernel supports PTRACE_O_CLONE/*FORK, the result is stored
+	in the new variable ptrace_setoptions for later use.
+	(main): Call test_ptrace_setoptions() if followfork option is set.
+
+2010-09-17  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Enable support for less verbose build rules
+	* configure.ac (AM_INIT_AUTOMAKE): Add silent-rules.
+
+2010-09-17  Wang Chao  <wang.chao@cn.fujitsu.com>
+
+	Do not trace children cloned with CLONE_UNTRACED flag
+	If clone is called with flag CLONE_UNTRACED, to be consistent with
+	option PTRACE_O_TRACECLONE, we should not set CLONE_PTRACE flag on
+	its arguments.
+
+	* process.c [LINUX] (internal_fork): Check the syscall and arguments.
+
+2010-09-17  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Update the list of CLOCK_* constants to match Linux kernel v2.6.32+
+	* time.c (struct xlat clocknames[]): Add more RT clock IDs.
+	Reported by Tommi Rantala.
+
+2010-09-16  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Update linux/hppa/syscallent.h to match Linux kernel v2.6.35
+	* linux/hppa/syscallent.h: Add hooks for recvmmsg and accept4.
+
+2010-09-15  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Pass less information to qualify_one and qual_*
+	* syscall.c (qualify_one, qual_syscall, qual_signal, qual_fault,
+	qual_desc): Take just a bitflag argument instead of pointer to the whole
+	qual_options structure.
+	(struct qual_options): Update prototype of "qualify" field.
+	(qualify): Update use of qualify_one and qual_options->qualify.
+
+2010-09-15  Wang Chao  <wang.chao@cn.fujitsu.com>
+
+	Fix -e option with only one value in qualifier statement
+	Fix regression introduced by commit v4.5.20-19-g30145dd:
+	if -e option is used with only one value in qualifier statement,
+	e.g. 'strace -e trace=open ls', syscall information would not be
+	printed properly.
+
+	* syscall.c (qualify): Remove faulty optimization.
+
+2010-09-15  Mike Frysinger  <vapier@gentoo.org>
+
+	Fix off_t/rlim_t size checks when cross-compiling
+	The current off_t/rlim_t size checks (wrt size of long long) use AC_RUN
+	which obviously doesn't work when cross-compiling.  While we don't hit
+	any configure errors, the fall back code is pretty dumb (which is to say
+	there isn't any).  Considering the code in question though, we can use
+	some fun compiler tricks with sizeof and array lengths to turn it into
+	a pure build test and avoid the RUN issue completely.
+
+	* m4/long_long.m4 (AC_OFF_T_IS_LONG_LONG, AC_RLIM_T_IS_LONG_LONG):
+	Convert from AC_RUN_IFELSE to AC_COMPILE_IFELSE.
+
+	Fix long long little endian detection when cross-compiling
+	The long long endian detection code does an AC_TRY_RUN() and since that
+	doesn't work when cross-compiling, it sets a fallback value.  However,
+	rather than do any sort of default endian detection, the code simply
+	sets it to "no".  This probably breaks most little endian systems out
+	there when cross-compiling for them.  It certainly breaks Blackfin
+	systems.  So use the common endian detection code provided by autoconf
+	and key off of that when cross-compiling.
+
+	* configure.ac: Call AC_C_BIGENDIAN.
+	* m4/long_long.m4 (AC_LITTLE_ENDIAN_LONG_LONG): Set cross-compiling
+	logic based on ac_cv_c_bigendian.
+
+	Blackfin: decode new syscalls
+	* linux/bfin/syscallent.h: Add fanotify/prlimit/cacheflush syscalls.
+	* linux/syscall.h: Add sys_cacheflush() decl.
+	* system.c: Decode Blackfin's cacheflush syscall.
+
+	* linux/ioctlent.sh: Search a few non-exported paths.
+
+2010-09-15  Roland McGrath  <roland@redhat.com>
+
+	Clean up pid2tcb usage
+	* strace.c (pid2tcb): Always match pid.  Fail for argument <= 0.
+	[USE_PROCFS] (first_used_tcb): New function.
+	[USE_PROCFS] (trace): Use that instead of pid2tcb(0).
+
+2010-09-09  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Turn on more compiler warnings
+	* configure.ac: Enable gcc -Wwrite-strings.
+
+	Import warnings.m4 from gnulib
+	* m4/warnings.m4: Replace with warnings.m4 from gnulib.
+	* configure.ac: Use gl_WARN_ADD from new warnings.m4.
+	* Makefile.am (AM_CFLAGS): Update for new warnings.m4.
+
+	Split acinclude.m4
+	* Makefile.am (ACLOCAL_AMFLAGS): Add "-I m4".
+	* acinclude.m4: Remove.
+	* m4/includedir.m4: New file, with definition of AC_INCLUDEDIR from
+	acinclude.m4.
+	* m4/long_long.m4: New file, with definitions of AC_OFF_T_IS_LONG_LONG,
+	AC_RLIM_T_IS_LONG_LONG and AC_LITTLE_ENDIAN_LONG_LONG from acinclude.m4.
+	* m4/procfs.m4: New file, with definitions of AC_MP_PROCFS,
+	AC_POLLABLE_PROCFS and AC_STRUCT_PR_SYSCALL from acinclude.m4.
+	* m4/stat.m4: New file, with definition of AC_STAT64 from acinclude.m4.
+	* m4/statfs.m4: New file, with definition of AC_STATFS64 from
+	acinclude.m4.
+	* m4/warnings.m4: New file, with definition of AC_WARNFLAGS from
+	acinclude.m4.
 
-2003-03-18  Roland McGrath  <roland@redhat.com>
+	* process.c (sys_waitid): Remove unused variable.
 
-	* process.c [LINUX] (sys_clone): Don't dereference parent_tid argument.
+2010-09-07  Dmitry V. Levin  <ldv@altlinux.org>
 
-2003-03-17  Roland McGrath  <roland@redhat.com>
+	Fix const-correctness issues uncovered by gcc -Wwrite-strings
+	* defs.h (struct xlat): Add const qualifier to the field of
+	type "char *".
+	(set_sortby, qualify, printnum, printnum_int): Add const qualifier to
+	arguments of type "char *".
+	* count.c (set_sortby): Add const qualifier to the argument and
+	automatic variable of type "char *".
+	* desc.c (decode_select): Add const qualifier to automatic variables of
+	type "char *".
+	* ioctlsort.c (struct ioctlent): Add const qualifier to fields of
+	type "char *".
+	(main):  Add const qualifier to argv.
+	* process.c (printargv): Add const qualifier to the argument and
+	automatic variable of type "char *".
+	(printargc) Add const qualifier to argument of type "char *".
+	* signal.c (sprintsigmask, parse_sigset_t): Add const qualifier to
+	arguments of type "char *".
+	* strace.c (progname): Add const qualifier.
+	(detach): Add const qualifier to automatic variable of type "char *".
+	* stream.c (struct strbuf): Add const qualifier to the field of
+	type "char *".
+	* syscall.c (struct qual_options): Add const qualifier to fields of
+	type "char *".
+	(qual_syscall, qual_fault, qual_desc, lookup_class): Add const qualifier
+	to arguments of type "char *".
+	(qual_signal): Add const qualifier to the argument of type "char *",
+	avoid modification of constant argument.
+	(qualify): Likewise.
+	* util.c (printflags): Add const qualifier to automatic variable of
+	type "char *".
+	(printnum, printnum_int): Add const qualifier to arguments of
+	type "char *".
 
-	* linux/x86_64/syscallent.h: clone takes 5 args.
-	* process.c [LINUX] (sys_clone) [X86_64]: Fix argument order.
+2010-09-04  Wang Chao  <wang.chao@cn.fujitsu.com>
 
-2003-03-15  Roland McGrath  <roland@redhat.com>
+	Fix printing clone flags
+	When we trace clone() syscall with only exit signal as clone
+	flags, strace would print an unnecessary OR operator.
 
-	* linux/x86_64/syscallent.h: Add exit_group syscall at 231.
+	* process.c (sys_clone): Fix this.
 
-2003-03-14  Roland McGrath  <roland@redhat.com>
+2010-08-28  Wang Chao  <wang.chao@cn.fujitsu.com>
 
-	* linux/x86_64/syscallent.h: Update and add many 2.5 syscalls.
+	Drop nclone_detached and related flags
+	Remove nclone_detached since CLONE_DETACHED flag was no-op for a very
+	long time in kernel.
 
-	* linux/ia64/syscallent.h: clone takes 5 arguments.
-	* process.c [LINUX && IA64] (ARG_*): Update for 2.5 clone calls.
+	* defs.h (struct tcb): Remove nclone_detached field.
+	Remove TCB_CLONE_DETACHED flag.
+	* process.c: Remove CLONE_DETACHED flag.
+	(clone_flags): Remove CLONE_DETACHED entry.
+	(internal_fork, internal_wait): Remove code dealing with CLONE_DETACHED
+	flag and nclone_detached.
+	* strace.c (startup_attach, alloc_tcb, droptcb, handle_group_exit):
+	Likewise.
 
-2003-03-12  Roland McGrath  <roland@redhat.com>
+2010-08-09  Neil Campbell  <lists@thebatcave.org.uk>
 
-	* linux/ia64/syscallent.h: Fix arg counts for clone and clone2.
-	Use sys_clone for clone2.
-	* linux/syscall.h: Don't declare sys_clone2.
-	* process.c (sys_clone): Rewritten to handle both flavors,
-	print all extra args depending on flag bits.
-	(sys_clone2): Function removed.
+	Correct get/set_robust_list syscall numbers for powerpc
+	* linux/powerpc/syscallent.h: Swap positions of get_ and set_robust_list.
 
-	* linux/ia64/syscallent.h: Add a bunch of 2.5 syscalls.
+2010-08-09  Wang Chao  <wang.chao@cn.fujitsu.com>
 
-2003-03-04  Roland McGrath  <roland@redhat.com>
+	Handle CLONE_PARENT flag
+	* process.c (internal_fork): The parent of new cloned process is the
+	same of the calling process when CLONE_PARENT is set.
 
-	* syscall.c (get_scno) [IA64]: Do TCB_WAITEXECVE check only when
-	TCB_INSYSCALL is clear, like other platforms do.
+	Fix error when judging if process has children
+	* process.c (internal_wait): Processes counted in tcp->nclone_threads
+	are tcp's threads, rather than tcp's children.
 
-2003-03-04  Ulrich Drepper  <drepper@redhat.com>
+	Forbid using mutually exclusive options -D and -p together
+	If we use -D and -p option together to trace a multi-thread program, in
+	addition to the main thread, other threads could not be traced even if we
+	present -f option. Moreover, when executing 'strace -D -p <non-exist pid>',
+	strace could not terminate normally.
 
-	* mem.c [LINUX] (sys_remap_file_pages): New function.
-	* linux/syscall.h: Declare it.
-	* linux/syscallent.h: Use it.
-	* linux/powerpc/syscallent.h: Likewise.
+	* strace.c (main): Check it.
 
-	* process.c [LINUX] (sys_futex): Omit final if op is not FUTEX_WAIT.
+2010-08-05  David Daney  <ddaney@caviumnetworks.com>
 
-2003-02-26  Roland McGrath  <roland@redhat.com>
+	Update Linux MIPS syscalls to match 2.6.35-rc6+
+	* linux/mips/syscallent.h: Add and update 405 hooks.
 
-	* configure.ac: Fix typo in netinet/in.h check.
-	Also include <sys/types.h> and <sys/socket.h> before <netinet/in.h>.
-	Reported by Alex Semenyaka <alexs@snark.rinet.ru>.
+2010-08-05  Edgar E. Iglesias  <edgar.iglesias@gmail.com>
 
-2003-02-24  Roland McGrath  <roland@redhat.com>
+	Add support for the MicroBlaze architecture
+	* configure.ac: Recognize MicroBlaze.
+	* linux/microblaze/syscallent.h: New file.
+	* Makefile.am (EXTRA_DIST): Add linux/microblaze/syscallent.h
+	* process.c (change_syscall, struct_user_offsets): Add MicroBlaze
+	support.
+	* signal.c (sys_sigreturn): Likewise.
+	* syscall.c (internal_syscall, get_scno, syscall_fixup, get_error,
+	syscall_enter): Likewise.
 
-	* configure.ac, NEWS: Version 4.4.95.
-	* strace.spec, debian/changelog: 4.4.95-1.
+2010-08-05  Frederik Schüler  <fs@debian.org>
 
-	* process.c (sys_getresgid): Fix typos in argument access.
+	linux/sparc: add missing syscall declarations
+	* linux/sparc/syscall.h: Sync with linux/syscall.h
 
-2003-02-23  Roland McGrath  <roland@redhat.com>
+2010-07-17  Andreas Schwab  <schwab@linux-m68k.org>
 
-	* process.c (sys_getresuid): Fix typos in argument access.
-	Reported by Anton Blanchard <anton@samba.org>.
+	Handle biarch get/setrlimit
+	* resource.c (print_rlimit32) [POWERPC64 || X86_64]: Define.
+	(sys_getrlimit, sys_setrlimit) [POWERPC64 || X86_64]: Use it.
 
-2003-02-19  Roland McGrath  <roland@redhat.com>
+2010-07-13  Andreas Schwab  <schwab@linux-m68k.org>
 
-	* configure.ac, NEWS: Version 4.4.94.
-	* strace.spec, debian/changelog: 4.4.94-1.
+	Add biarch support for powerpc64
+	* acinclude.m4 (AC_LITTLE_ENDIAN_LONG_LONG): Use int instead of
+	long.
+	* configure.ac [$host_cpu = powerpc*]: Also define POWERPC64 if
+	$host_cpu = powerpc64.
+	* defs.h (SUPPORTED_PERSONALITIES, PERSONALITY0_WORDSIZE)
+	(PERSONALITY1_WORDSIZE) [POWERPC64]: Define.
+	* file.c: (struct stat_powerpc32, printstat_powerpc32) [POWERPC64]:
+	Define.
+	(printstat) [LINUX && POWERPC64]: Use printstat_powerpc32 in
+	32-bit personality.
+	(sys_newfstatat) [POWERPC64]: Handle personalities.
+	* signal.c (sys_sigreturn) [POWERPC64]: Likewise.
+	* util.c (printllval) [POWERPC64]: Likewise.
+	(printcall) [POWERPC64]: Use wider format for IP prefix.
+	* syscall.c (get_scno) [POWERPC64]: Check for 64/32 bit mode.
+	* linux/powerpc/errnoent1.h: New file.
+	* linux/powerpc/ioctlent1.h: New file.
+	* linux/powerpc/signalent1.h: New file.
+	* linux/powerpc/syscallent1.h: New file.
 
-	* version.c: Removed.
-	* Makefile.am (strace_SOURCES): Remove it.
-	* strace.c: Use PACKAGE_NAME and VERSION macros instead of version var.
+2010-07-09  Andreas Schwab  <schwab@redhat.com>
 
-	FreeBSD rfork support changes from Russ Cox <rsc@plan9.bell-labs.com>:
-	* syscall.c (internal_syscall): Handle SYS_rfork with internal_fork.
-	* process.c (internal_fork) [SYS_rfork]: Bail if RFPROC flag not set.
+	Balance braces
+	* strace.c (proc_open): Avoid unbalanced braces.
+	(trace): Likewise.
 
-2003-01-23  Roland McGrath  <roland@redhat.com>
+2010-07-06  Andreas Schwab  <schwab@linux-m68k.org>
 
-	* signal.c: Reorder #ifdefs so HAVE_ASM_SIGCONTEXT_H doesn't matter on
-	SPARC, which doesn't use the header regardless.
+	Remove extern declaration at file scope
+	* defs.h (force_result): Declare.
+	* process.c (internal_wait): Don't declare force_result.
 
-	* util.c [LINUX && SPARC]: Do renaming kludges around <asm/reg.h>
-	like signal.c does.
+2010-06-24  Andreas Schwab  <schwab@redhat.com>
 
-	* linux/sparc/syscall.h: Declare sys_getdents64, sys_llseek.
+	Document -C/-D
+	* strace.c (usage): Document -C.
+	* strace.1: Document -D.
 
-	* linux/dummy.h [! SYS_getpmsg] (sys_getpmsg): #define to printargs.
-	[! SYS_putpmsg] (sys_putpmsg): Likewise.
+2010-06-13  Roland McGrath  <roland@redhat.com>
 
-	* process.c: Reorder includes to put sys/reg.h before linux/ptrace.h,
-	since they can conflict.
+	Fix sourceforge download URL.
 
-2003-01-21  Roland McGrath  <roland@redhat.com>
+2010-06-05  Andreas Schwab  <schwab@linux-m68k.org>
 
-	* strace.c (usage): Omit -z, since it has never worked properly.
-	* NEWS: Likewise.
+	M68K: Fix fetching syscall arguments
+	* syscall.c (syscall_enter) [M68K]: Properly handle more than five
+	syscall arguments.
 
-	* strace.c (main): Grok new option `-E var=val' or `-E var' to put
-	var=val in environ or to remove var, respectively.
-	(usage): Mention it.
-	* strace.1, NEWS: Document it.
+2010-05-28  Andreas Schwab  <schwab@linux-m68k.org>
 
-	* configure.ac, NEWS: Version 4.4.93.
-	* strace.spec, debian/changelog: 4.4.93-1.
-	* strace.spec (Source0): Use strace-VERSION.tar.bz2 now.
+	Decode TLS syscalls on m68k
+	* linux/m68k/syscallent.h: Add entries for get_thread_area,
+	set_thread_area, atomic_comxchg_32, atomic_barrier.
+	* linux/dummy.h (sys_get_thread_area, sys_set_thread_area) [M68K]:
+	Don't redefine.
+	* mem.c (sys_get_thread_area, sys_set_thread_area) [LINUX && M68K]: New.
 
-2003-01-20  Roland McGrath  <roland@redhat.com>
+	Fix warning when compiling for m68k
+	* syscall.c (d0): Define as long.
 
-	* defs.h [LINUX] [S390 || S390X] (TCB_WAITEXECVE): Define it.
-	* syscall.c (get_scno, syscall_fixup) [LINUX] [S390 || S390X]: Handle
-	TCB_WAITEXECVE state with special kludges.
+2010-04-13  Dmitry V. Levin  <ldv@altlinux.org>
 
-	* process.c [LINUX] (sys_clone) [S390 || S390X]: Argument order is
-	reversed from other architectures.
+	Prepare for 4.5.20 release
+	* NEWS: Update for 4.5.20 release.
+	* configure.ac: Version 4.5.20.
+	* debian/changelog: 4.5.20-1.
+	* strace.spec: 4.5.20-1.
 
-	* process.c (sys_execve) [LINUX]: Make setting TCB_WAITEXECVE flag
-	conditional on [TCB_WAITEXECVE] instead of list of processors.
+2010-04-13  Frederik Schüler  <fs@debian.org>
 
-	* util.c (restore_arg0): Evaluate args in no-op defns.
+	Update debian/* files for the upcoming release
+	* debian/control: update standards-version to 3.8.4.
+	* debian/rules: allow parallel building.
+	* debian/rules: comment out verbose build, only needed for debugging.
+	* debian/rules: clean up clean: target, dh_clean does most of the work
+	  already.
+	* debian/rules: use *-stamp instead of stamp-*, so dh_clean can tidy
+	  up for us.
 
-	* util.c [S390 || S390X] (arg0_offset, arg1_offset): Fix definitions
-	for clone call on S390.  From Michael Holzheu <holzheu@de.ibm.com>.
+2010-04-13  Heiko Carstens  <heiko.carstens@de.ibm.com>
 
-2003-01-17  Anton Blanchard <anton@samba.org>
+	Fix s390 system call table list
+	* linux/s390/syscallent.h: Add the missing entries for preadv and
+	pwritev to the system call table list.
+	* linux/s390x/syscallent.h: Likewise.
 
-	* util.c [LINUX] (setbpt): Handle SYS_vfork like SYS_fork.
+2010-04-07  Dmitry V. Levin  <ldv@altlinux.org>
 
-	* linux/syscall.h (SYS_socket_subcall): 256 also for POWERPC.
+	Update linux/ioctlent.h
+	* linux/ioctlent.sh: Search in asm-generic directory as well.
+	* linux/ioctlent.h: Regenerated.
 
-2003-01-14  Roland McGrath  <roland@redhat.com>
+	Update linux/*/syscallent.h files to match Linux kernel v2.6.33
+	* linux/alpha/syscallent.h: Add 47 hooks.
+	* linux/arm/syscallent.h: Update hooks for pselect6, ppoll,
+	epoll_pwait.  Add 11 hooks.
+	* linux/bfin/syscallent.h: Update hooks for prctl, fallocate,
+	signalfd4, eventfd2, epoll_create1, dup3, pipe2, perf_event_open.
+	Hook up recvmmsg.
+	* linux/hppa/syscallent.h: Update hooks for signalfd4, eventfd2,
+	epoll_create1, dup3, pipe2, perf_event_open.
+	* linux/i386/syscallent.h: Fix syscall name for the kexec_load hook.
+	Add 5 hooks.
+	* linux/ia64/syscallent.h: Fix syscall name for the kexec_load hook.
+	Add 4 hooks.
+	* linux/m68k/syscallent.h: Add 50 hooks.
+	* linux/powerpc/syscallent.h: Fix hook for timerfd_create.  Fix
+	6 syscall names to match the kernel.  Use sys_semop to parse semop.
+	Add 14 hooks.
+	* linux/s390/syscallent.h: Fix syscall name for the kexec_load hook.
+	Add 14 hooks.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Add 13 hooks.
+	* linux/sh64/syscallent.h: Add 15 hooks.
+	* linux/sparc/syscallent.h: Add 22 hooks.
+	* linux/x86_64/syscallent.h: Add 5 hooks.
 
-	* linux/powerpc/errnoent.h: Add missing errnos.
-	* linux/powerpc/ioctlent.h: Update ioctl values.
-	From Anton Blanchard <anton@samba.org>.
+	Enhance recvmmsg parser
+	* net.c (sys_recvmmsg): Decode mmsghdr structure on exit from the
+	syscall.  Decode timespec structure both on entrance and on exit.
 
-	* io.c [LINUX] (sys_pread, sys_pwrite): Fix last change.
-	From Anton Blanchard <anton@samba.org>.
+2010-04-07  Andreas Schwab  <schwab@linux-m68k.org>
 
-	* linux/hppa/syscallent.h: Use sys_getdents64, sys_truncate64,
-	sys_ftruncate64, instead of printargs, for those syscalls.
-	* linux/mips/syscallent.h: Likewise.
+	Decode recvmmsg syscall
+	* net.c (do_msghr): New function to print struct msghdr.
+	(printmsghdr): Use it.
+	(printmmsghdr, sys_recvmmsg): New.
+	* linux/syscall.h: Declare sys_recvmmsg.
+	(SYS_sub_recvmmsg): Define.
+	(SYS_socket_nsubcalls): Bump.
+	* linux/sparc/syscall.h: Likewise.
+	* linux/arm/syscallent.h: Add sys_recvmmsg.
+	* linux/bfin/syscallent.h: Likewise.
+	* linux/i386/syscallent.h: Likewise.
+	* linux/m68k/syscallent.h: Likewise.
 	* linux/powerpc/syscallent.h: Likewise.
 	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
 	* linux/sparc/syscallent.h: Likewise.
+	* linux/ia64/syscallent.h: Adjust.
 
-	* linux/syscall.h (SYS_socket_subcall): Only 256 for S390, S390X.
-	All others at the moment use linux/syscallent.h, where it's 300.
+2010-04-07  Dmitry V. Levin  <ldv@altlinux.org>
 
-	* strace.1: Update bug reporting info.
+	* strace.1: Fix quoting of hyphens and formatting of strace options.
 
-	* resource.c [LINUX] (quotacmds): Grok new command encodings.
-	From Nathan Scott <nathans@debian.org>.
+	Split trace_syscall() for better readability
+	* syscall.c (trace_syscall): Split into trace_syscall_exiting() and
+	trace_syscall_entering().
 
-	* configure.ac, NEWS: Version 4.4.92.
-	* strace.spec, debian/changelog: 4.4.92-1.
+	Implement -C option to combine regular and -c output
+	* defs.h (cflag_t): New enum.
+	* strace.1: Document -C option.
+	* strace.c (cflag): Update type.
+	(main): Handle -C option.
+	(trace): Update use of cflag.
+	* count.c (count_syscall): Move clearing of TCB_INSYSCALL to ...
+	* syscall.c (trace_syscall): ... here.  Update use of cflag.
+	Based on patch by Adrien Kunysz.
 
-	* configure.ac: Match powerpc* (includes powerpc64), and don't match
-	ppc (never comes out of config.sub).
+	Fix "make dist" regression introduced by commit v4.5.19-12-g5078770
+	* Makefile.am (EXTRA_DIST): Rename linux/syscallent.h to linux/i386/syscallent.h
 
-	* process.c (sys_ptrace): Use #lx format for address argument.
-	[POWERPC]: Use sizeof(unsigned long) in place of 4 for multipliers.
-	* process.c [POWERPC]: Likewise.
-	* signal.c (sys_sigreturn) [POWERPC]: Likewise.
-	* syscall.c (get_scno) [POWERPC]: Likewise.
-	* util.c [POWERPC]: Likewise.
-	(printnum): Use long for NUM.
-	From Anton Blanchard <anton@samba.org>.
+	* desc.c (sys_epoll_pwait): Fix output formatting bug.
 
-	* defs.h (ALIGN64): Fix defn for PPC, same as FreeBSD one.
+	* desc.c (decode_select): Fix potential stack buffer overflow.
 
-	* util.c [LINUX] (restore_arg0, restore_arg1): New macros, defined
-	appropriately via set_arg0 or no-ops for each architecture.
-	(clearbpt): Use those instead of set_arg0 and set_arg1.
+2010-03-31  Dmitry V. Levin  <ldv@altlinux.org>
 
-	* defs.h [_LARGEFILE64_SOURCE] (_LFS64_LARGEFILE): Define it.
-	* linux/syscallent.h: Use sys_getdents64, sys_truncate64,
-	sys_ftruncate64, instead of printargs, for those syscalls.
+	Fix msgsnd indirect ipccall decoding
+	This regression was introduced by commit v4.5.18-136-g783f5bc.
+	* ipc.c (tprint_msgsnd): Add and use "flags" argument.
+	(sys_msgsnd): Pass "flags" argument to tprint_msgsnd().
+	Patch by Anton Blanchard.
 
-	* process.c: Use <linux/ptrace.h> regardless of <sys/reg.h>.
-	(sys_ptrace): Use printxval.
-	(ptrace_cmds): Make PTRACE_GETREGS et al conditional on #ifdef PTRACE_*
-	instead of only #ifdef SUNOS4.  Add PTRACE_[GS]ETFPXREGS.
+2010-03-23  Mark Wielaard  <mjw@redhat.com>
 
-	* ipc.c (PRINTCTL): New macro.  #ifdef IPC_64, factor out the flag and
-	print it before using printxval.
-	(sys_msgctl, sys_semctl, sys_shmctl): Use it.
-
-2003-01-13  Roland McGrath  <roland@redhat.com>
-
-	* config.guess: Update from ftp://ftp.gnu.org/pub/gnu/config/,
-	timestamp 2003-01-10.
-	* config.sub: Likewise, timestamp 2003-01-03.
-	* install-sh: Update from Automake 1.7.2.
-
-	* linux/powerpc/signalent.h: Add SIGRTMIN.
-	From Anton Blanchard <anton@samba.org>.
-
-	* linux/powerpc/syscallent.h: Add missing system calls.
-	Decode more system calls, we were just printargs for many things.
-	Remove some x86-specific system calls.
-	Remove two syscalls between the socket and ipc syscalls,
-	it was resulting in all IPC syscalls being off by two.
-
-	* ioctl.c (ioctl_decode) [POWERPC]: Decode term ioctls like Alpha.
-	From Anton Blanchard <anton@samba.org>.
-
-	* defs.h [POWERPC] (UESP, EIP, EAX, ORIG_EAX): Remove this cruft.
-	[LINUX && POWERPC && !__powerpc64__] (ALIGN64): New macro.
-	* io.c (sys_pread, sys_pwrite): Use ALIGN64.
-	From Anton Blanchard <anton@samba.org>.
-
-	* term.c [LINUX]: Get kernel definition of struct termios.
-	From Anton Blanchard <anton@samba.org>.
-
-	* linux/ioctlent.sh: Look in sound/ directory too.
-	From Anton Blanchard <anton@samba.org>.
-
-	* desc.c (printflock64): Fix ADDR argument type.
-	From Anton Blanchard <anton@samba.org>.
-
-	* strace.c [! HAVE_STRSIGNAL]: Clean up #ifdefs on decls for
-	sys_siglist and _sys_siglist.
-	Reported by John Hughes <john@Calva.COM>.
-
-	* net.c: HAVE_OPTHDR -> HAVE_STRUCT_OPTHDR
-	Reported by John Hughes <john@Calva.COM>.
-
-	* linux/syscall.h [ARM] (SYS_socket_subcall): Set to 300.
-
-2003-01-10  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, NEWS: Version 4.4.91.
-	* strace.spec, debian/changelog: 4.4.91-1
-
-	* util.c [LINUX && X86_64] (arg0_offset, arg1_offset): Use correct
-	values for x86-64, conditional on current_personality.
-
-	* strace.c (droptcb): Clear flags word before calling rebuild_pollv.
-
-	* configure.ac: Check struct T_conn_res for QUEUE_ptr or ACCEPTOR_id.
-	* stream.c (print_transport_message): Use #ifdefs for those members.
-
-	* strace.c (rebuild_pollv): Fix typo: struct poll -> struct pollfd.
-
-	* configure.ac: Fix siginfo_t/sig_atomic_t checks.
-	Use prerequisite #include <netinet/in.h> for netinet/*.h checks.
-
-	* strace.c (pfd2tcb): Fix for new tcbtab type.
-	(rebuild_pollv): Likewise.
-	(detach): Put variables used under [LINUX] inside #ifdef.
-
-	* process.c (change_syscall) [POWERPC]: Add missing return.
-	* util.c [POWERPC] (arg0_offset): Set to 4*PT_R3, not 4*PT_ORIG_R3.
-
-	* strace.spec: New file.
-	* debian/changelog: 4.4.90-1
-	* debian/rules (binary-arch): Depend on build.
-	(clean): Don't try to run Makefile.in.
-	* debian/control (Standards-Version): Now 3.5.8.
-
-	* configure.ac: Diddle CFLAGS after AC_PROG_CC, not before.
-
-2003-01-09  Roland McGrath  <roland@redhat.com>
-
-	* syscall.c (force_result) [S390 || S390X]: Fix typo.
-
-	* debian/control: Update Maintainer: field.
-
-2003-01-08  Roland McGrath  <roland@redhat.com>
-
-	* NEWS: Update for 4.4.90 test release.
-
-	Support for new Linux 2.5 thread features.
-	* defs.h [LINUX]: Define __NR_exit_group if not defined.
-	(struct tcb): New members nclone_threads, nclone_detached,
-	and nclone_waiting.
-	(TCB_CLONE_DETACHED, TCB_CLONE_THREAD, TCB_GROUP_EXITING): New macros.
-	(waiting_parent): Macro removed.
-	(pid2tcb): Declare it.
-	* process.c (internal_clone) [TCB_CLONE_THREAD]: Reparent the new
-	child to our parent if we are a CLONE_THREAD child ourselves.
-	Maintain TCB_CLONE_THREAD and TCB_CLONE_DETACHED flags and counts.
-	(internal_wait) [TCB_CLONE_THREAD]: Factor out detached children when
-	determining if we have any.  If TCB_CLONE_THREAD is set, check
-	parent's children instead of our own, and bump nclone_waiting count.
-	(internal_exit) [__NR_exit_group]: Set the TCB_GROUP_EXITING flag if
-	the syscall was exit_group.
-	* syscall.c (internal_syscall): Use internal_exit for exit_group.
-	* strace.c (pid2tcb): No longer static.
-	(alloctcb) [TCB_CLONE_THREAD]: Initialize new fields.
-	(droptcb) [TCB_CLONE_THREAD]: Maintain new fields.
-	If we have thread children, set TCB_EXITING and don't clear the TCB.
-	(resume) [TCB_CLONE_THREAD]: Decrement parent's nclone_waiting.
-	(detach) [TCB_CLONE_THREAD]: When calling resume, check all thread
-	children of our parent that might be waiting for us too.
-	[TCB_GROUP_EXITING] (handle_group_exit): New function.
-	(trace) [TCB_GROUP_EXITING]: Use that in place of detach or droptcb.
-
-	Revamp -f support for Linux.
-	* util.c [LINUX] (setbpt, clearbpt): New implementations that tweak
-	the system call to be clone with CLONE_PTRACE set.  Various new static
-	helper functions.
-	* process.c (internal_clone): Define also #ifdef SYS_clone2.
-	Initialize TCPCHILD->parent field.
-	[CLONE_PTRACE]: Don't do PTRACE_ATTACH here, because it's preattached.
-	Check in case the new child is in the tcb already.
-	(internal_fork) [LINUX]: Just call internal_clone.
-	* strace.c (trace) [LINUX]: Under -f/-F, grok an unknown pid
-	reporting to wait, put it in the TCB with TCB_ATTACHED|TCB_SUSPENDED.
-
-	* linux/x86_64/syscallent1.h (sys_oldlstat): #define as printargs.
-
-	* file.c [LINUX]: #undef st_[amc]time in case they are macros.
-
-	* Makefile.am (AM_CFLAGS): New variable, define to $(WARNFLAGS).
-
-	* Makefile.am (EXTRA_DIST): Remove debian/postinst and debian/prerm.
-
-2003-01-09  Wichert Akkerman  <wichert@deephackmode.org>
-
-	* debian/postinst, debian/prerm: removed, /usr/doc symlink is no
-	longer used
-	* debian/rules: no longer install postinst and prerm
-	* debian/control: do not end summary with full stop (lintian)
-
-2002-12-30  Roland McGrath  <roland@redhat.com>
-
-	* Makefile.am (bin_SCRIPTS): New variable, list strace-graph.
-	(EXTRA_DIST): Add missing files.
-
-	* configure.ac: Fix asm/sigcontext.h check to include prerequisite.
-
-	* syscall.c (qualify_one): New function.
-	(qual_options): Replace lookup field with qualify, update initializer.
-	(qualify): Update caller.
-	(qual_signal, qual_fault, qual_desc): Rewritten from lookup_*.
-	(qual_syscall): Rewritten lookup_syscall, match name more than once.
-	Fixes RH#70579, bites IA64 -efoo when foo exists on IA32.
-
-	* version.c (version): Make const, bump to 4.4.90.
-	* strace.c: Update decl.
-
-	* Makefile.am [LINUX && X86_64]: Remove cruft.
-	* linux/x86_64/errnoent1.h: New file.
-	* linux/x86_64/ioctlent1.h: New file.
-	* linux/x86_64/signalent1.h: New file.
-	* linux/x86_64/syscallent1.h: New file.
-	* linux/x86_64/i386-headers.diff: File removed.
-	* linux/x86_64/makeheaders.sh: File removed.
-	* linux/x86_64/Makefile.in: File removed.
-
-	* linux/syscallent.h [X86_64]: Disable sanity checks, subcall stuff is
-	already broken for 32-bit personality on x86-64.
-
-2002-12-29  Roland McGrath  <roland@redhat.com>
-
-	* configure.ac, Makefile.am: Punt subdirs, handle everything here.
-	* linux/Makefile.am: File removed.
-	* freebsd/Makefile.am: File removed.
-	* sunos4/Makefile.in: File removed.
-	* svr4/Makefile.in: File removed.
-
-	* linux/alpha/Makefile.in: File removed.
-	* linux/hppa/Makefile.in: File removed.
-	* linux/ia64/Makefile.in: File removed.
-	* linux/powerpc/Makefile.in: File removed.
-	* linux/s390/Makefile.in: File removed.
-	* linux/s390x/Makefile.in: File removed.
-
-2002-12-26  Roland McGrath  <roland@redhat.com>
-
-	* syscallent.sh: Grok three flavors of #define line, uniquify.
-	* linux/hppa/syscallent.sh: File removed.
-	* linux/powerpc/syscallent.sh: File removed.
-
-	* linux/Makefile.am: New file.
-	* linux/Makefile.in: File removed.
-	* freebsd/Makefile.am: New file.
-	* freebsd/i386/Makefile.am: New file.
-	* freebsd/i386/Makefile.in: File removed.
-
-2002-12-22  Roland McGrath  <roland@redhat.com>
-
-	Update to Autoconf 2.57, and Automakify with version 1.7.
-	* Makefile.am: New file.
-	* Makefile.in: File removed.
-	* configure.in: Moved to ...
-	* configure.ac: ... here.  Update for Autoconf 2.5x and Automake.
-	* aclocal.m4: Moved to ...
-	* acinclude.m4: ... here.  Update for Autoconf 2.5x.
-	* acconfig.h: File removed.
-	* AUTHORS: New file, makes automake happy.
-	* autogen.sh: File removed.
-	* README-CVS: Update to recommend autoreconf instead.
-	* file.c: HAVE_ST_* -> HAVE_STRUCT_STAT_ST_*.
-	* net.c: HAVE_SIN6_SCOPE_ID -> HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID,
-	HAVE_MSG_CONTROL -> HAVE_STRUCT_MSGHDR_MSG_CONTROL.
-	* strace.c: *_DECLARED -> HAVE_DECL_*
-	* stream.c: HAVE_* -> HAVE_STRUCT_*
-
-	* linux/Makefile.in (ioctldefs.h ioctls.h): Use $(SHELL) instead of
-	sh, and use $(srcdir) to find the script.
-	* linux/powerpc/Makefile.in (ioctlent.raw): Find ioctlent.sh in ../.
-	(ioctlsort.o): Use ../ioctlsort.c, not ../../ioctlsort.c.
-	* linux/x86_64/Makefile.in (headers): Renamed to all.
-	* linux/alpha/Makefile.in: Add empty install target.
-	* linux/x86_64/Makefile.in: Likewise.
-	* linux/powerpc/Makefile.in: Likewise.
-	* linux/Makefile.in: Likewise.
-
-2002-12-26  Roland McGrath  <roland@redhat.com>
-
-	* defs.h [LINUX && MIPS] (MAX_QUALS): Set to 5000, not 4999.
-	From Daniel Jacobowitz <drow@false.org>.
-
-2002-12-21  Roland McGrath  <roland@redhat.com>
-
-	* linux/syscallent.h: Add some new 2.5 syscall names.
-	Now clone takes 5 args.
-	* process.c [LINUX] (clone_flags): Update with 2.5 flag bits.
-	[LINUX] (sys_clone): Print new args.
-	* mem.c (print_ldt_entry): Make global.
-
-	* linux/syscall.h [I386 || IA64] (SYS_socket_subcall): Bump to 300 for
-	safety, since up to 260 are already used in 2.5 kernels.
-	* linux/syscallent.h: Update the table.
-	* linux/ia64/syscallent.h: Likewise.
-
-	* syscall.c (force_result): New function.
-	* process.c (internal_wait): Handle ECHILD exit from wait call with
-	WNOHANG flag set; force the return value to 0 in the inferior when it
-	has live children we are tracing.
-	* NEWS: Mention the bug fix.
-
-2002-12-17  Roland McGrath  <roland@redhat.com>
-
-	* linux/ia64/syscallent.h: Remove placeholders 275-298 to catch up
-	with linux/syscallent.h additions.
-
-	* strace.c (tcbtab): Make this a pointer to pointers, not an array.
-	(tcbtabsize): New variable.
-	(main): Initialize them using dynamic allocation.
-	(alloctcb, main): Use tcbtabsize in place of MAX_PROCS; indirect.
-	(pid2tcb, cleanup): Likewise.
-	[USE_PROCFS] (pollv): Make this a pointer, not an array; make static.
-	(rebuild_pollv): Dynamically allocate the vector.
-	* defs.h (tcbtab): Update decls.
-	(MAX_PROCS): Macro removed, no more static limit on this.
-	* process.c (fork_tcb): New function.
-	(internal_clone, internal_fork): Use it instead of checking nprocs.
-
-	* strace.c (detach) [LINUX]: Use __WALL (or a second try with __WCLONE)
-	in wait after sending SIGSTOP.
-
-2002-12-16  Roland McGrath  <roland@redhat.com>
-
-	* signal.c (sprintsigmask): Increase static buffer size to account for
-	worst possible case.  Reported by Daniel Jacobowitz <drow@false.org>.
-
-	* process.c [LINUX] (wait4_options): Fix __WCLONE value.  Add
-	__WNOTHREAD and __WALL.
-
-	* strace.c (trace) [LINUX]: Only check errno if wait4 actually fails,
-	so we don't repeat a wait and thus drop a status.  Fixes RH#62591.
-
-2002-12-15  Roland McGrath  <roland@redhat.com>
-
-	* process.c (setarg) [POWERPC]: Support it.
-
-	* util.c [POWERPC] (LOOP): Fix value, now 0x48000000 (0: b 0b).
-	Old value was bogus, not even a proper instruction.
-	From Guy M. Streeter <streeter@redhat.com>.
-
-	* strace.c (main) [! USE_PROCFS]: Always reset SIGCHLD to SIG_DFL.
-
-	* configure.in: Don't check for putpmsg.
-	* stream.c (sys_getpmsg, sys_putpmsg): Make these conditional on
-	#ifdef SYS_*, rather than on HAVE_PUTPMSG.
-
-	* aclocal.m4 (AC_STAT64): Include <linux/types.h> before <asm/stat.h>
-	in test.  Test our own #ifdef LINUX rather than predefined `linux'.
-
-	* linux/powerpc/syscallent.h: Use sys_llseek for _llseek.
-	* linux/sparc/syscallent.h: Likewise.
+	Hook up inotify_init1 open mode flags printer
+	* file.c [LINUX] (sys_inotify_init1): New function.
+	* linux/syscall.h: Declare new sys_inotify_init1 handler.
+	* linux/bfin/syscallent.h: Hook up new handler.
 	* linux/hppa/syscallent.h: Likewise.
+	* linux/i386/syscallent.h: Likewise.
+	* linux/x86_64/syscallent.h: Likewise.
 
-	* syscall.c (syscall_enter) [LINUX && POWERPC]: Define PT_ORIG_R3 if
-	not defined, since <asm/ptrace.h> defines it only #ifdef __KERNEL__.
-	* process.c: Likewise.
+2010-03-09  Andreas Schwab  <schwab@redhat.com>
 
-	* desc.c (sys_osf_select): Add missing return type.
+	Avoid spurious error when checking for linux/netlink.h
+	* configure.ac: Include <asm/types.h> when checking for
+	linux/netlink.h.
 
-	* syscall.c (trace_syscall): Use strerror, not sys_errlist/sys_nerr.
+2010-02-23  Andreas Schwab  <schwab@linux-m68k.org>
 
-	* linux/ia64/syscallent.h: Remove macros for sys_delete_module,
-	sys_nanosleep, both already in linux/dummy.h.
+	Fix reporting signal mask by sigreturn on powerpc
+	* signal.c (sys_sigreturn) [POWERPC]: Skip dummy stack frame when
+	locating signal context.
 
-	* syscall.c (get_scno): Move static `currpers' inside #ifdef X86_64.
-	(trace_syscall): Fix return without value.
+2010-02-09  David Daney  <ddaney@caviumnetworks.com>
 
-	* linux/syscallent.h: Update table with names of new syscalls
-	io_setup, io_destroy, io_getvents, io_submit, io_cancel.
-	* linux/ia64/syscallent.h: Likewise.
+	Fix MIPS N32/N64 compile error
+	* syscall.c [LINUX_MIPSN32 || LINUX_MIPSN64] (syscall_enter): Pass
+	tcp->pid to ptrace().
+
+2010-02-05  Chris Metcalf  <cmetcalf@tilera.com>
+
+	Add support for the TILE architecture
+	* configure.ac: Add TILE to the list of supported architectures.
+	* defs.h: Define TCB_WAITEXECVE for TILE.
+	* linux/tile/syscallent.h: New file.
+	* Makefile.am (EXTRA_DIST): Add linux/tile/syscallent.h
+	* process.c (change_syscall, struct_user_offsets): Add TILE support.
+	* syscall.c (get_scno, get_error, syscall_enter): Likewise.
+	* mem.c (mmap_flags, print_mmap): Add MAP_CACHE_xxx TILE extensions
+	support.
+	* signal.c (sigact_flags): Add SA_NOPTRACE.
+	(sys_sigreturn): Add TILE support.
+
+2010-02-04  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Remove dead code
+	* defs.h (tv_tv): Remove.
+	* net.c (sys_xsetsockaddr): Remove commented out dead code.
+	* process.c (setarg, sys_execv, sys_execve, struct_user_offsets):
+	Likewise.
+	* signal.c (sys_sigsuspend): Likewise.
+	* strace.c (reaper, trace): Likewise.
+	* stream.c (internal_stream_ioctl): Likewise.
+	* syscall.c (trace_syscall): Likewise.
+	* term.c (term_ioctl): Likewise.
+	* util.c (tv_tv, umoven, uload, getpc, fixvfork, setbpt, clearbpt):
+	Likewise.
+
+	Merge Linux internal_clone() into internal_fork()
+	* defs.h (internal_clone): Remove.
+	* process.c (internal_clone): Merge into internal_fork().
+	(internal_fork) [!LINUX]: Remove dead code.
+	* syscall.c (internal_syscall): Replace internal_clone() with
+	internal_fork().
+
+	* Makefile.am (INCLUDES): Remove redundant search directories.
+
+2010-02-04  Frederik Schüler  <fs@debian.org>
+
+	Update debian/* files
+	* debian/control: add sparc64 to the architectures list.
+	This closes Debian bug #560062
+	* Backport commit f0df31e71a58c6e79ba77c1a9d84b2f38d44bec7 to fix FTBFS.
+	This closes Debian bug #560516
+	* debian/control: Update standards-version to 3.8.3.
+	* debian/control: Lower package priority to optional, matching
+	the archive override.
+	* debian/control: add ${misc:Depends} to Depends: lines where
+	appropriate.
+	* debian/watch: new file, allows automatic tracking of new
+	upstream versions.
+	* debian/source/format: new file, adapt to debian source format "quilt"
+	* debian/rules: indentation cleanups; use dh_testroot and dh_prep
+	in clean target.
+
+2010-01-25  Andreas Schwab  <schwab@redhat.com>
+
+	Fix spurious failure of AC_STAT64 test
+	* acinclude.m4 (AC_STAT64): Include <sys/types.h> first.
+
+2010-01-12  Andreas Schwab  <schwab@redhat.com>
+
+	Don't kill the process when detaching
+	* strace.c (detach): Call clearbpt when TCB_BPTSET is set.
+
+2009-12-25  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Decode fifth argument of mremap syscall
+	* mem.c (sys_mremap): Decode fifth argument.
+	* linux/*/syscallent.h: Update the number of mremap syscall arguments.
+
+2009-12-24  Chris Metcalf  <cmetcalf@tilera.com>
+
+	* mem.c (sys_mbind): Display first argument in hex
+
+	* mem.c (mremap_flags): Add MREMAP_FIXED
+
+2009-11-16  Mike Frysinger  <vapier@gentoo.org>
+
+	Move i386-specific files out of common linux dir
+	* linux/syscallent.h: Moved to ...
+	* linux/i386/syscallent.h: ... here.
+	* linux/ia64/syscallent.h: Update i386 syscallent.h include.
+	* linux/sparc/gen.pl: Likewise.
+	* linux/x86_64/syscallent1.h: Likewise.
+
+2009-11-16  Andreas Schwab  <schwab@redhat.com>
+
+	Remove support for pre-C89
+	* defs.h: Remove references to __STDC__ and P macros.
+	* strace.c: Likewise.
+
+2009-11-13  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Decode more SOL_PACKET socket options
+	* net.c (sockpacketoptions): Add more PACKET_* entries.
+	(sys_getsockopt): Decode PACKET_STATISTICS.
+	(printsockopt): Decode PACKET_RX_RING and PACKET_TX_RING.
+	Patch by Gabor Gombas.
+
+2009-11-11  Andreas Schwab  <schwab@redhat.com>
+
+	Ignore errors if a thread is killed
+	* util.c (clearbpt): Ignore ESRCH error.
+
+2009-11-06  Bernhard Reutner-Fischer  <rep.dot.nop@gmail.com>
+
+	Fix handling of Linux systems without struct statfs64
+	* acinclude.m4 (AC_STATFS64): New macro to check for struct statfs64.
+	* configure.ac: Call AC_STATFS64.
+	* file.c (printstatfs64, sys_statfs64, sys_fstatfs64): Compile only
+	  if struct statfs64 is available.
+
+2009-11-06  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Fix getsockopt decoding on architectures where sizeof(long) > sizeof(int)
+	* net.c (sys_getsockopt): Optimize output a bit.
+	Decode integer argument using printnum_int(), patch by Gabor Gombas.
+
+	Check umove() return code
+	* bjm.c (sys_query_module): Print input parameters when entering
+	syscall.  Fix handling of syscall error.  Handle unlikely umove()
+	failures.
+	* ipc.c (tprint_msgrcv): New function.  Move part of msgrcv parser code
+	here, add check umove() return code.
+	(sys_msgsnd): Print msqid parameter as int instead of long.
+	(sys_msgrcv): Likewise.  Use tprint_msgrcv().
+	* process.c (print_affinitylist): Check umove() return code.
+	* sock.c (sock_ioctl): Handle unlikely umove() failure in the
+	SIOCGIFCONF parser.
+
+	Fix check for linux/netlink.h on Linux 2.6.32-rc5+
+	* configure.ac (AC_CHECK_HEADERS): In check for linux/netlink.h, include
+	sys/socket.h instead of linux/socket.h beforehand.
+
+2009-11-04  Andreas Schwab  <schwab@redhat.com>
+
+	Decode fallocate on PowerPC
+	* linux/powerpc/syscallent.h: Decode fallocate.
+
+	Factor out printing of 64bit syscall argument
+	* defs.h (ALIGN64): Remove.
+	(printllval): Declare.
+	* util.c (printllval): Define.
+	* file.c (sys_readahead): Use printllval.
+	(sys_lseek64): Likewise.
+	(sys_truncate64): Likewise.
+	(sys_ftruncate64): Likewise.
+	(sys_fadvise64): Likewise.
+	(sys_fadvise64_64): Likewise.
+	(sys_fallocate): Likewise.
+	* io.c (sys_pread): Likewise.
+	(sys_pwrite): Likewise.
+	(sys_pread64): Likewise.
+	(sys_pwrite64): Likewise.
+	* mem.c (sys_mmap64): Likewise.
+
+2009-11-03  Andreas Schwab  <schwab@redhat.com>
+
+	Correct decoding of readahead and fadvice64(_64) on PowerPC
+	* file.c (sys_readahead): Align 64bit argument.  Handle PowerPC64
+	like other 64bit architectures.
+	(sys_fadvise64): Likewise.
+	(sys_fadvise64_64): Handle PowerPC like ARM.
+	* linux/powerpc/syscallent.h (sys_readahead): Account for 64bit
+	argument alignment on PowerPC32.
+
+2009-10-27  Andreas Schwab  <schwab@redhat.com>
+
+	Maintain separate print column for each process
+	* defs.h (struct tcp): Add curcol.
+	* strace.c: (alloc_tcb): Initialize it.
+	(trace): Use curcol from current process and save it before
+	continuing.
+	(tprintf): Don't modify curcol on output error.
+
+2009-10-21  Roland McGrath  <roland@redhat.com>
+
+	* strace.spec: 4.5.19-1 release.
+
+2009-10-21  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* file.c (printstat64): Cleanup trailing whitespace.
+
+2009-10-16  Andreas Schwab  <schwab@redhat.com>
+
+	Fix decoding of newfstatat syscall on x86-64
+	* file.c (printstat64) [LINUX && X68_64]: If tracing a 64-bit
+	process redirect to printstat.
+	Fixes RH#529316 "Field values shown for "newfstatat" system
+	call are incorrect"
+
+2009-10-12  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* configure.ac (AC_CHECK_HEADERS): Remove asm/reg.h.
+
+2009-10-12  Mike Frysinger  <vapier@gentoo.org>
+
+	sparc/linux: Rewrite to use asm/ptrace.h
+	The current sparc/linux code uses asm/reg.h, but recent Linux kernels
+	dropped that header completely.  So switch over to the ptrace headers
+	as those should stick around indefinitely as part of the ABI.
+
+	* defs.h [LINUXSPARC] (U_REG_G1, U_REG_O0, U_REG_O1): Define.
+	* process.c: Drop asm/regs.h include.
+	[SPARC || SPARC64] (change_syscall): Change struct regs to struct pt_regs.
+	* signal.c: Drop asm/regs.h include.
+	(m_siginfo_t): Unify [SPARC || SPARC64] and [MIPS].
+	[SPARC || SPARC64] (sys_sigreturn): Change struct regs to struct pt_regs.
+	* syscall.c: Drop asm/regs.h include.
+	[SPARC || SPARC64] (internal_syscall, get_scno, get_error, force_result,
+	syscall_enter): Change struct regs to struct pt_regs.
+	* util.c: Drop asm/regs.h include.
+	(_hack_syscall5, _ptrace): Delete.
+	[SPARC || SPARC64] (getpc, printcall, arg_setup_state): Change
+	struct regs to struct pt_regs.
+
+2009-10-11  Roland McGrath  <roland@redhat.com>
+
+	* make-dist: Clean up.
+
+	* configure.ac: Use AC_CONFIG_AUX_DIR([.]).
+
+2009-10-09  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* make-dist: New script for preparing release tarballs.
+
+	* git-set-file-times: Import from rsync.
+
+	* Makefile.am [MAINTAINER_MODE]: Define and export TAR_OPTIONS.
+
+2009-10-08  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Enhance msgsnd() parser
+	* ipc.c (tprint_msgsnd): New function.  Move msgsnd parser code here,
+	add check for umove() return code.
+	(sys_msgsnd): Use tprint_msgsnd().
+
+	* NEWS: Update for 4.5.19 release.
+
+	Enhance semop()/semtimedop() sembuf parser
+	* ipc.c (tprint_sembuf): New function. Move sembuf parser code here,
+	add abbrev() support.
+	(sys_semop, sys_semtimedop): Use tprint_sembuf().
+
+2009-10-08  Jakub Bogusz  <qboosh@pld-linux.org>
+
+	Add pretty printing of sembuf argument to semop() and semtimedop()
+	* ipc.c (semop_flags): New xlat structure.
+	(sys_semop, sys_semtimedop): Add pretty printing of sembuf argument.
+
+2009-10-08  Mike Frysinger  <vapier@gentoo.org>
+
+	Add support for Linux/no-mmu with vfork
+	* configure.ac (AC_CHECK_FUNCS): Add fork.
+	* strace.c (strace_vforked): Define.
+	(startup_child): Do not raise SIGSTOP if vforked.
+	(trace): Skip first exec when starting up after vforked.
+	* syscall.c [BFIN] (get_scno): Drop waitexec checks.
+
+	Avoid malloc(0) in getdents parsers
+	On end of directory, getdents returns 0.  This return value is used to
+	then try and do malloc(0), but on some systems this will always return
+	NULL.  Since the code won't read the pointer in question if len is 0,
+	then don't bother calling malloc(0) and set the pointer to NULL ourself.
+	* file.c (sys_getdents, sys_getdents64): Avoid malloc(0) call.
+
+2009-10-07  Mike Frysinger  <vapier@gentoo.org>
+
+	Add sys_nanosleep() prototype for sparc
+	* linux/sparc/syscall.h (sys_nanosleep): New prototype.
+	Reported by Frederik Schüler.
+
+	Silence compiler warnings about implicit cast from pointer to integer
+	* util.c (do_ptrace): Cast ptrace() 4th arg to long.
+	(ptrace_restart): Drop void* cast on ptrace() 4th arg.
+
+	Ignore .gdb files from FLAT toolchains
+	* .gitignore: Add /*.gdb.
+
+	* configure.ac (AC_CHECK_FUNCS): Sort and expand.
+
+	Blackfin: Update ioctl/syscall lists
+	* linux/bfin/ioctlent.h: Sync list with latest kernel sources.
+	* linux/bfin/syscallent.h: Likewise.
+
+	ioctlsort: Check ppc hosts too
+	* linux/ioctlsort.c: Check for __powerpc__.
+
+2009-10-07  Andreas Schwab  <schwab@redhat.com>
+
+	Fix build on ia64
+	* linux/ia64/syscallent.h: Update for addition of accept4 syscall
+	in ../syscallent.h.
+
+2009-10-07  Roland McGrath  <roland@redhat.com>
+
+	* strace.spec (%doc): Add ChangeLog-CVS.
+
+	* Makefile.am (srpm): New phony target.
+
+	* Makefile.am (EXTRA_DIST): Add ChangeLog.
+	($(srcdir)/ChangeLog): New target, replaces gen-changelog phony target.
+	Put it inside [MAINTAINER_MODE].
+
+2009-10-06  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* NEWS: Update for 4.5.19 release.
+
+2009-10-05  Frederik Schüler  <fs@debian.org>
+
+	Prepare debian/* files for release
+	* debian/rules: Do not ship ChangeLog anymore.
+	* debian/control: Update to Debian standards version 3.8.1, and remove
+	Roland from the Maintainers list.  This closes Debian bug #521458.
+	* debian/changelog: Document changes and prepare for release.
+
+2009-10-05  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* defs.h [HPPA]: Lower MAX_ARGS from 32 to 6.
+
+	* ipc.c [LINUX] (sys_shmat): HPPA does not use an IPC multiplexer.
+	Based on patch from Carlos O'Donell.
+
+2009-10-05  Carlos O'Donell  <carlos@systemhalted.org>
+
+	* linux/hppa/syscallent.h: Update syscalls.
+	Based on work by Kyle McMartin and Helge Deller.
+
+	Fix SA_HANDLER function pointer comparisons for hppa
+	* signal.c (sys_sigaction): Cast SA_HANDLER function pointers to long.
+	(sys_rt_sigaction): Likewise.
+
+2009-10-05  Edgar E. Iglesias  <edgar.iglesias@gmail.com>
+
+	CRIS: Correct first argument to upeek()
+	This complements commit ea0e6e80260d2b1b7ad40282012b0e47869bcddf.
+	* syscall.c [CRISV10 || CRISV32] (syscall_fixup, syscall_enter): Pass
+	tcp pointer instead of pid to upeek().
+	* util.c [CRISV10 || CRISV32] (printcall): Likewise.
+
+2009-10-05  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* signal.c (do_signalfd): Fix typo in output format.
+
+2009-09-21  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* Makefile.am (gen_changelog_start_date): Fix date.
+
+2009-09-19  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Prepare for 4.5.19 release
+	* NEWS: Update for 4.5.19 release.
+	* configure.ac: Version 4.5.19.
+	* debian/changelog: 4.5.19-1.
+	* strace.spec: 4.5.19-1.
+
+	Update debian/* to 4.5.18-1
+	* debian/changelog: Update to 4.5.18-1.
+	* debian/compat: Set compatibility level to 7.
+	* debian/control (Build-Depends): Update debhelper requirement.
+	(strace, strace64): Add Section and Priority tags.
+
+2009-09-19  Kirill A. Shutemov  <kirill@shutemov.name>
+
+	Fix fadvise64 decoding on ARM
+	* file.c (sys_fadvise64_64) [ARM]: Fix argument ordering.
+
+2009-09-18  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Fix follow fork/vfork on Linux ARM OABI
+	__NR_SYSCALL_BASE eis 0 for EABI and is 0x900000 for OABI.
+	* process (change_syscall) [LINUX && ARM]: Mask off the high order bits
+	when changing syscall.
+
+	Reviewed-by: Kirill A. Shutemov <kirill@shutemov.name>
+
+2009-09-18  Mike Frysinger  <vapier@gentoo.org>
+
+	Mark shell scripts as executable
+
+	Ignore ioctlsort helper program
+	* .gitignore: Add ioctlsort.
+
+	linux/errno: Add ERFKILL
+	* linux/errnoent.h: Change ERRNO_132 to ERFKILL according to errno 132
+	definition introduced in Linux 2.6.31.
+
+2009-09-01  Paolo Bonzini  <pbonzini@redhat.com>
+
+	Add accept4 socketcall
+	This second patch in the series adds support for accept4 as a socketcall
+	sub-call.  Besides the need to renumber all system calls, this poses
+	no problem.
+	Tested on i686.
+
+	* linux/arm/syscallent.h: Add accept4 socketcall.
+	* linux/m68k/syscallent.h: Likewise.
 	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/syscallent.h: Likewise.
 
-	* signal.c [LINUX && I386]: Provide SA_RESTORER constant if not
-	defined.  If the bit is set, print the sa_restorer field of sigaction.
+	* linux/sparc/syscall.h (SYS_sub_accept4): Declare.
+	(SYS_socket_nsubcalls): Update.
+	* linux/syscall.h: Likewise.
 
-	* mem.c: Add sys_{get,set}_thread_area.
-	* linux/syscall.h: Declare them.
-	* linux/syscallent.h: Update the table for these.
-	* linux/dummy.h (sys_modify_ldt): Define only #ifndef I386.
-	(sys_get_thread_area, sys_set_thread_area): New macros #ifndef I386.
+	Replace x86-64 paccept with accept4
+	This patch changes the paccept syscall to accept4 for x86-64, since
+	the former was dropped in Linux kernel commit v2.6.27-rc7-14-g2d4c826.
+	At the same time, it adds support for pretty printing its arguments.
 
-	* configure.in: Check for linux/xattr.h and linux/futex.h headers.
-	* linux/syscall.h: Add sys_* decls for new syscalls getpmsg, putpmsg,
-	readahead, sendfile64, setxattr, fsetxattr, getxattr, fgetxattr, int
-	listxattr, flistxattr, removexattr, fremovexattr, sched_setaffinity,
-	sched_getaffinity, futex.
-	* linux/syscallent.h: Update the table.
-	* io.c: Add sys_sendfile64.
-	* file.c: Add sys_readahead, sys_*xattr.
-	* process.c: Add sys_futex, sys_*affinity.
+	* linux/x86_64/syscallent.h: Replace paccept with accept4,
+	hook in sys_accept4.
+	* net.c (sys_accept): Leave a small stub calling the new...
+	(do_accept): ... function, which also adds a flags_arg argument.
+	(sys_accept4): New.
 
-	* linux/syscall.h (SYS_socket_subcall): Define to 256 on all machines.
-	(SYS_ipc_subcall): Always SYS_socket_subcall + SYS_socket_nsubcalls.
-	* linux/syscallent.h: Update the table for socket and ipc subcalls.
+2009-08-28  Andreas Schwab  <schwab@redhat.com>
 
-2002-11-09  Heiko Carstens <heiko.carstens@de.ibm.com>
+	Zero-extend 32-bit addresses when printing argv array.
+	(printargv): Zero-extend 32-bit addresses.
+	Fixes RH#519480 "64-bit strace is lazy on execve of 32-bit
+	process".
 
-	Bugfix for s390/s390x:
-	* syscall.c: Fixed scno derivation for s390/s390x.
+2009-08-12  Andreas Schwab  <schwab@redhat.com>
 
-2002-11-06  Michal Ludvig  <mludvig@suse.cz>
+	Add more futex decoding.
+	* process.c (FUTEX_WAIT_REQUEUE_PI, FUTEX_CMP_REQUEUE_PI)
+	(FUTEX_PRIVATE_FLAG, FUTEX_CLOCK_REALTIME): Define.
+	(futexops): Add entries for them.
+	(sys_futex): Decode FUTEX_CMP_REQUEUE_PI and
+	FUTEX_WAIT_REQUEUE_PI.
 
-	Merged patch from Steven J. Hill <sjhill@realitydiluted.com>
-	to allow the compilation of a native MIPS strace.
+2009-07-08  Dmitry V. Levin  <ldv@altlinux.org>
 
-2002-11-06  Michal Ludvig  <mludvig@suse.cz>
+	Generate ChangeLog from git log
+	* .gitignore: Add ChangeLog
+	* ChangeLog: Rename to ChangeLog-CVS.
+	* Makefile.am (gen-changelog): New rule.
+	(dist-hook): Depend on it.
+	(EXTRA_DIST): Add ChangeLog-CVS.
+	* README-hacking: Describe changes.
+	* gitlog-to-changelog: Import from gnulib.
 
-	From Marty Leisner <leisner@rochester.rr.com>,
-	rewritten by mludvig:
-	* strace.c (not_failing_only): New.
-	(usage): Added -z switch description.
-	(main): Added -z switch parsing to not_failing_only variable.
-	* syscall.c (trace_syscall): Added not_failing_only handling.
 
-2002-10-08  Heiko Carstens <heiko.carstens@de.ibm.com>
-
-	Missing complete changelog for 2002-10-07 commit:
-	* Makefile.in: Added linux/s390, linux/s390x to ALL_SUBDIRS.
-	* acconfig.h: New define for s390x.
-	* config.sub: Added missing define for s390 and new one for s390x.
-	* configure.in: Added new define for s390x.
-	* file.c: Added missing #undef dirent64 and new defines for s390x.
-	* linux/s390: New directory.
-	* linux/s390/Makefile.in: New file.
-	* linux/s390/errnoent.h: New file.
-	* linux/s390/ioctlent.h: New file.
-	* linux/s390/signalent.h: New file.
-	* linux/s390/syscallent.h: New file.
-	* linux/s390x: New directoy.
-	* linux/s390x/Makefile.in: New file.
-	* linux/s390x/errnoent.h: New file.
-	* linux/s390x/ioctlent.h: New file.
-	* linux/s390x/signalent.h: New file.
-	* linux/s390x/syscallent.h: New file.
-	* linux/syscall.h: Added sys_mincore() prototype and added new
-	s390x defines.
-	* process.c: Added s390x defines.
-	(change_syscall): Changed handling for s390.
-	(setarg): Added missing s390/s390x code in setarg().
-	* signal.c: Added s390x define.
-	(sys_sigreturn): Bugfix in s390/s390x code (wrong number of
-	arguments to sprintsigmask()).
-	* stream.c (internal_stream_ioctl): Changed int cast to long cast,
-	since printstr() expects a long.
-	* syscall.c (decode_subcall): Changed several variables to be long
-	instead of int to match 64 bit requirements. Added s390x defines.
-	(syscall_enter): Changed upeek() call to match s390 and s390x
-	requirements.
-	* util.c: Added s390x defines.
-
-2002-10-07  Michal Ludvig  <mludvig@suse.cz>
-
-	Merged s390x port by Heiko Carstens <Heiko.Carstens@de.ibm.com>
-	and bugfixes to s390 by D.J. Barrow.
-
-2002-09-23  Michal Ludvig  <mludvig@suse.cz>
-
-	Merged x86-64 port by Andi Kleen <ak@suse.de>
-	and Michal Ludvig <mludvig@suse.cz>
-	* Makefile.in: New target 'headers'. Failure ignored.
-	* acconfig.h: New defines for x86-64.
-	* configure.in: Ditto.
-	* defs.h: Ditto.
-	* file.c: Ditto.
-	* signal.c: Ditto.
-	* process.c: Added support for x86-64.
-	* util.c: Ditto.
-	* syscall.c: Ditto + added automatic personality switching.
-	* linux/syscall.h: Ditto.
-	* linux/x86_64: New directory.
-	* linux/x86_64/Makefile.in: New file.
-	* linux/x86_64/gentab.pl: Ditto.
-	* linux/x86_64/i386-headers.diff: Ditto.
-	* linux/x86_64/makeheaders.sh: Ditto.
-	* linux/x86_64/syscallent.h: Ditto.
-	* mem.c (print_mmap): Always print arg[4] as int.
-
-2002-09-23  Michal Ludvig  <mludvig@suse.cz>
-
-	* configure.in: Fix regular expressions.
-	* linux/syscall.h: Added missing braces in prototype of
-	sys_getdents64().
-	* file.c: Use '#ifdef LINUX' instead of '#ifdef linux'.
-	(struct fileflags): Made extern to inhibit compiation warnings.
-	(sys_getdents64): Merged LINUX and SVR4 part.
-	* syscall.c (get_scno): Split multiline string into two distinct
-	strings.
-
-2002-05-24  John Hughes <john@calva.com>
-
-	* stream.h, net.h: Avoid possible infinite loop caused by
-	unsigned arithmetic in preceeding change.
-
-2002-05-23  John Hughes <john@calva.com>
-
-	* acconfig.h: Add HAVE_OPTHDR and HAVE_T_OPTHDR defines.
-
-	* aclocal.m4: Add tests for struct opthdr in sys/socket.h and
-	struct t_opthdr in sys/tiuser.h, define HAVE_OPTHDR and HAVE_T_OPTHDR
-	if found.
-
-	* configure.in: use tests for struct opthdr and struct t_opthdr.
-
-	* defs.h: add new function print_sock_optmgmt.
-
-	* io.c: add hack that lets ioctl decode functions set auxilliary
-	string return.
-
-	* stream.c: better decoding for timod ioctls.
-
-	* net.c: add function print_sock_optmgmt, used by timod ioctl
-	decoding functions in stream.c.
-
-2002-05-23  John Hughes <john@calva.com>
-
-	* acconfig.h: Make autoheader happy about Linux/SuperH
-
-2002-05-23  John Hughes <john@calva.com>
-
-	* strace.c: Get rid of warning if not using POLL_HACK
-
-2002-05-22  John Hughes <john@calva.com>
-
-	* net.c: Simplify {get,set}sockopt, decode SO_LINGER, cope with
-	options that are not just ints, cope with systems that don't
-	#define SOL_TCP and so on.
-
-2002-05-21  John Hughes <john@calva.com>
-
-	* strace.c: Fix warning if POLL_HACK is used.
-
-2002-05-17  John Hughes <john@calva.com>
-
-	* svr4/ioctlent.sh: Some defines on UW come with too many spaces.
-
-2002-05-17  John Hughes <john@calva.com>
-
-	* svr4/ioctlent.sh: Cope with #defines wrapped in #ifdefs.
-
-2002-05-17  John Hughes <john@calva.com>
-
-	* stream.c: tidy up output a little.
-
-2002-05-17  John Hughes <john@calva.com>
-
-	* process.c, svr4/dummy.h, svr4/syscall.h: decode arguments
-	to procpriv syscall.
-
-2002-05-01  Wichert Akkerman <wichert@deephackmode.org>
-
-	* configure.in, defs.h, process.c, sock.c, syscall.c, util.c: merge
-	  patch from Greg Banks <gbanks@pocketpenguins.com> for Linux/SuperH
-	  support
-
-2002-04-01  Wichert Akkerman <wichert@deephackmode.org>
-
-	* strace.c: close tcp->outf in droptcb()
-
-2002-04-01  Wichert Akkerman <wichert@deephackmode.org>
-
-	* net.c: decode packet options
-
-2002-03-31  Wichert Akkerman <wichert@deephackmode.org>
-
-	* linux/{alpha,hppa,ia64,mips,powerpc,sparc}/syscallent.h: regenerated
-
-2002-03-31  Wichert Akkerman <wichert@deephackmode.org>
-
-	* debian/*: added
-	* linux/syscallent.h: fix typo and add the reserved stream syscalls
-	* defs.h, file.c, io.c: fix signed/unsigned issues
-	* syscall.c: check for negative u_errors
-	* cvsbuild: renamed to autogen.sh
-
-2001-12-17  Wichert Akkerman <wakkerma@debian.org>
-
-	* net.c: add new TCP socket options
-
-2001-10-26  John Hughes <john@calva.com>
-
-	* svr4/ioctlent.sh: Cope with #define lines containing
-	comments that terminate on subsequent lines.  Used to
-	comment out subsequent ioctls!
-
-2001-10-25  Wichert Akkerman <wakkerma@debian.org>
-
-	* linux/ioctlent.h: regenerated using current scripts so
-	  term ioctls are included
-
-2001-10-19  John Hughes  <john@Calva.COM>
-
-	* strace.c(proc_open): On SVR4 only trace the syscalls,
-	signals and faults we care about.
-
-2001-10-18  John Hughes  <john@Calva.COM>
-
-	* acconfig.h: Add HAS_SIGINFO_T.
-	* aclocal.m4: add check for siginfo_t in signal.h.
-	* configure.in: use check for siginfo_t.
-	* defs.h: if HAVE_SIGINFO_T the declare printsiginfo.  On SVR4
-	  allow access to siginfo when signal recieved.
-	* process.c: Remove SVR4 only version of printsiginfo.
-	* signal.c: merge SVR4 and LINUX versions of printsiginfo.
-	* strace.c: on SVR4 print siginfo when signal recieved.
-
-2001-10-18  John Hughes  <john@Calva.COM>
-
-	* system.c(sys_ssisys): handle return values for ssisys
-
-2001-10-18  John Hughes  <john@Calva.COM>
-
-	* signal.c: handle sigwait
-	* svr4/dummy.c: Move sigwait to done
-	* svr4/syscall.h: handle sigwait
-
-2001-10-16  John Hughes  <john@Calva.COM>
-
-	* system.c(sys_ssisys): decode some args for ssisys.
-
-2001-10-16  John Hughes  <john@Calva.COM>
-
-	* mem.c: MS_SYNC is zero, so must be first in xlat list.
-
-	* svr4/dummy.h: memcntl is much like mctl.
-
-2001-10-16  John Hughes  <john@Calva.COM>
-
-	* util.c (umovestr): UnixWare (svr4?) returns 0 when trying
-	to read unmapped page.  Make it possible to strace ksh.
-
-2001-10-03  David Mosberger  <davidm@hpl.hp.com>
-
-	* process.c (internal_clone): Avoid race condition by clearing
-	breakpoint after attaching to child.
-
-2001-10-02  David Mosberger  <davidm@hpl.hp.com>
-
-	* linux/ia64/syscallent.h: Define ia32 syscall numbers (originally
-	by Don Dugger, with my refinements).
-
-	* linux/ia64/ioctlent.h: Regenerate and manually merge conflicting
-	ioctls (TCGETS & SNDCTL_TMR_TIMEBASE, etc.).
-
-	* linux/ia64/Makefile.in (ioctldefs.h ioctls.h): Update for
-	new ioctlent.h generation scheme.
-
-	* linux/syscall.h (sys_clone2): Declare.
-	[IA64] Define ia32 socket, ipc, and extra syscall numbers.
-
-	* linux/ioctlent.sh (regexp): Also handle <asm/ioctls.h> so we
-	don't miss the tty ioctls (unfortunately, some of the sound timer
-	ioctls are in conflict with them!).
-
-	* util.c (setbpt) [IA64]: Add ia32 support (by Don Dugger).
-	(clrbpt) [IA64]: Ditto.
-
-	* syscall.c (internal_syscall): Handle SYS_clone2, SYS32_wait4,
-	and SYS32_exit.
-	(get_scno): Get ia32 syscall number from r1 (orig eax) instead of
-	r8 (eax).  Handle TCB_WAITEXECVE.
-	(syscall_fixup): Handle ia64.
-	(syscall_enter): Fix argument fetching for ia64.
-
-	* strace.c [IA64 && LINUX]: Include <asm/ptrace_offsets.h>.
-	(trace) [PT_GETSIGINFO]: Print signal address and pc if possible.
-
-	* process.c (tcp): New function.
-	(change_syscall): Add support for ia64 linux.
-	(sys_execve): Turn on TCB_WAITEXECVE for ia64 linux.
-
-	* desc.c (getlk): Cast l_len to "long long" to avoid warnings when
-	type is narrower.
-	* resource.c (sprintrlim64): Ditto.
-
-	* defs.h (TCB_WAITEXECVE) [IA64]: Define.
-	[IA64]: Declare "ia32" variable.
-
-	* bjm.c: Do not include <linux/module.h>.  It's not safe to include
-	kernel headers.  Declare the necessary constants and structures
-	directly instead.
-
-2001-10-01  David Mosberger  <davidm@hpl.hp.com>
-
-	* signal.c (parse_sigset_t): New function.
-	(sigishandled): Fix off-by-one bug by using parse_sigset_t() and
-	avoiding relying on internal layout of sigset_t datastructure.
-
-2001-04-26  David Mosberger  <davidm@hpl.hp.com>
-
-	* linux/ia64/syscallent.h: Add getunwind().
-
-2001-04-11  David Mosberger  <davidm@hpl.hp.com>
-
-	* syscall.c (syscall_enter): Use PT_RBS_END instead of deprecated
-	PT_AR_BSP.  Pick up arguments starting with out0, which is not
-	always the same as r32 (e.g., consider inlined syscalls).
-
-2001-09-28   John Hughes <john@Calva.COM>
-
-  * process.c: FreeBSD-CURRENT no longer has PT_READ_U, and anyway we
-    were showing it as PT_WRITE_U!  Fix from Maxime Henrion.
-
-2001-09-18   John Hughes <john@Calva.COM>
-
-  * net.c: fix display of sockaddr structures, sometimes too many "}",
-    sometimes too few.  Fix suggested by Richard Kettlewell.
-
-2001-08-19   Wichert Akkerman <wakkerma@debian.org>
-
-  * signal.c: do not include asm/sigcontext.h on IA64 since it gets
-    the struct from bits/sigcontext.h already which signal.h includes.
-
-2001-08-03   Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/ioctlent.sh: change regexps so we catch sound ioctls as well in
-    Linux
-  * linux/Makefile.in: fix a few things so the ioctl list is generated
-    properly
-  * ioctl.c: remember to shift ioctl masks as well
-
-2001-08-03   Wichert Akkerman <wakkerma@debian.org>
-
-  * Linux/**/syscallent.h: synchronize section for fcntl and use sys_fcntl
-    for sys_fcntl as well
-
-2001-08-03   Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/hppa/syscallent.h: updated from Matthew Wilcox
-
-2001-08-03   Wichert Akkerman <wakkerma@debian.org>
-
-  * process.c: seems Linux/IA64 changed register names on us, switch to
-    using new names.
-
-2001-08-03   Wichert Akkerman <wakkerma@debian.org>
-
-  * strace.c: set CLOEXEC  flag for outputfile
-
-2001-08-03   Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/sparc/syscall.h, linux/sparc/syscallent.h: add some LFS calls
-
-2001-07-23  Wichert Akkerman <wakkerma@debian.org>
-
-  * configure.in: Support cross-compiling between architectures
-
-2001-07-13  Wichert Akkerman <wakkerma@debian.org>
-
-  * configure.in: add S390 to architecture list
-
-2001-07-10  John Hughes <john@Calva.COM>
-
-  * TODO, defs.h, io.h, net.c, strace.c, syscall.c, util.c: Merge fixes
-    from Richard Kettlewell <rkettlewell@zeus.com> which add I/O dumping
-    of args to readv/writev.  Also gets rid of redundant printiovec
-    routine from net.c (duplicate of tprint_iov in util.c).
-
-2001-07-02  Wichert Akkerman <wakkerma@debian.org>
-
-  * config.{guess,sub}: updated
-
-2001-05-15  John Hughes <john@Calva.COM>
-
-  * signal.c: pass a pointer to sigmask to printsigmask from printcontext,
-    it was just passing the sigmask (ucp->uc_sigmask).
-
-2001-05-15  John Hughes <john@Calva.COM>
-
-  * util.c: Don't run off the end of valid memory in umovestr when
-    USE_PROCFS.  Important for FREEBSD systems (which seem to have an
-    unmapped page just after the args/env area).
-
-2001-04-18  John Hughes <john@Calva.COM>
-
-  * configure.in: test for sys/nscsys.h, the non-stop clusters includes.
-  * process.c: handle rfork{1,all} and rexecve calls on non-stop clusters.
-  * syscall.c: treat rfork{1,all} and fork{1,all} as fork like calls.
-    Treat rexecve as an exec.
-  * system.c: decode arguments to ssisys call on nsc systems.
-  * svr4/dummy.h, svr4/syscall.h: now we handle rfork{1,all}, ssisys and
-    rexecve calls.
-
-2001-04-12  Wichert Akkerman <wakkerma@debian.org>
-
-  * process.c: fix cast for powerpc code
-  * linux/powerpc/syscallent.h: update syscall list
-  * README: fix address for the strace mailinglist
-  * signal.c: switch to using /proc/<pid>/status on Linux so we can get
-    the realtime signals as well
-
-2001-04-10  Wichert Akkerman <wakkerma@debian.org>
-
-  * Merge patches from Maciej W. Rozycki:
-    + util.c: add code to print PC for MIPS
-    + linux/mips/syscallent.h: updated
-    + system.c: formating fixes for sys_sysmips
-    + configure.in: test for yet more headers
-    + stream.c: use configure-headertests instead of relying on OS hints
-
-2001-04-07  Wichert Akkerman <wakkerma@debian.org>
-
-  * NEWS: start 4.3.1 items
-  * version.c: updated to say 4.3.1 (was still 4.2, oops!)
-
-2001-04-07  Wichert Akkerman <wakkerma@debian.org>
-
-  * configure.in: test for asm/sysmips.h and linux/utsname.h
-  * linux/syscall.h: fix a typo for sys_sysmips
-  * system.c: include asm/sysmips.h and linux/utsname.h if they exist,
-    fix typo
-
-2001-03-31  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/mips/ioctlent.h: updated using new Linux ioctl setup
-
-2001-03-31  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/ia64/ioctlent.h: regenerated
-
-2001-03-31  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/{alpha,ia64,powerpc}/ioctlent.sh: removed, all archs use the
-    general Linux ioctlent.sh
-
-2001-03-31  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/ioctlent.sh: add dir variable for location of kernel headers
-
-2001-03-29  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/ia64/ioctlent.h: updated using new Linux ioctl setup
-
-2001-03-29  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/powerpc/ioctlent.h: updated using new Linux ioctl setup
-
-2001-03-29  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/hppa/ioctlent.h: updated using new Linux ioctl setup
-
-2001-03-29  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/alpha/ioctlent.h: updated using new Linux ioctl setup
-
-2001-03-28  Wichert Akkerman <wakkerma@debian.org>
-
-  * configure.in: use sparc* so we can compile on sparc64 as well
-  * process.c, syscall.c: work around double define of fpq, fq and fpu
-    structs on Linux/sparc, and use regs instead of pt_regs
-  * don't use asm/sigcontext.h on Linux/sparc
-
-2001-03-28  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/sparc/ioctlent.h: updated using new Linux ioctl setup
-
-2001-03-28  Wichert Akkerman <wakkerma@debian.org>
-
-  * strace.c: use __WALL as wait4 flag if it exists so we can properly
-    trace threaded programs
-
-2001-03-27  John Hughes <john@Calva.COM>
-
-  * aclocal.m4: add check for endianness of long long.
-  * acconfig.h: add #define for LITTLE_ENDIAN_LONG_LONG.
-  * configure.in: check for endianness of long long.
-  * defs.h: change LONG_LONG macro to work with either endianness of
-    long long.
-
-2001-03-27  John Hughes <john@Calva.COM>
-
-  * net.c: Make compilable by SCO UDK compiler (doesn't like empty
-    initialisation list for array).
-
-2001-03-27  John Hughes <john@Calva.COM>
-
-  * svr4/syscallent.h: ntp_adjtime entry was duplicated on Solaris
-    systems - bad merge of Harald Boehme's patch by me.
-
-2001-03-27  Wichert Akkerman <wakkerma@debian.org>
-
-  * lots of files: add Linux/hppa support
-
-2001-03-19  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/mips/syscallent.h: we can't have -1 nargs, change to 0
-  * linux/syscallent.h: not that syscalls 220 and 221 are used now
-  * config.guess: updated
-
-2001-03-17  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/ioclsort.c: new file
-  * linux/ioctlent.sh: complete rewrite to use a more sane approach to get
-    the ioctl list that doesn't involve attempting to #include all kernel
-    headers
-  * linux/.cvsignore: added ioctdefs.h and ioctls.h which are generated
-    by the new ioctlent.sh
-  * ioctl.c: only look at the number and type bits for linux, since
-    ioctlent.sh no longer supplies the others
-
-2001-03-08  John Hughes <john@Calva.COM>
-
-  * freebsd/syscalls.pl: On FreeBSD we must cope with COMPATibility syscalls,
-    pretend they have names ending with "?" so that -e trace=stat (for
-    example) will work.
-  * freebsd/i386/syscallent.h: add ? to compatability syscalls.
-  * freebsd/i386/syscall.h: consistency.
-
-2001-03-08  John Hughes <john@Calva.COM>
-
-  * acconfig.h: add new ST_xxx defines.
-  * aclocal.m4: macros to check for more fields in struct stat.
-  * configure.in: use new macros to check for fields in struct stat.
-  * file.c: use new defines to replace #ifdef FREEBSD by #if HAVE_ST_xxx.
-
-2001-03-08  John Hughes <john@Calva.COM>
-
-  * defs.h: rename wimpy get64 as powerful new LONG_LONG
-  * file.c: use LONG_LONG
-  * io.c: use LONG_LONG
-  * mem.c use LONG_LONG
-
-2001-03-08  John Hughes <john@Calva.COM>
-
-  * acconfig.h: new #defines HAVE_LONG_LONG_OFF_T and HAVE_LONG_LONG_RLIM_T.
-  * aclocal.m4: routines to check for long long off_t and rlim_t.
-  * configure.in: check for long long off_t and rlim_t.
-  * desc.c: if HAVE_LONG_LONG_OFF_T treat flock as flock64
-  * file.c: if HAVE_LONG_LONG_OFF_T treat stat,lstat,fstat and lseek as 64
-    bit versions.
-  * io.c: if HAVE_LONG_LONG_OFF_T use 64 bit versions of pread and pwrite.
-  * mem.c: if HAVE_LONG_LONG_OFF_T use 64 bit version of mmap
-  * resource.c: if HAVE_LONG_LONG_OFF_T use 64 bit versions of getrlimit
-    and setrlimit.
-  * freebsd/syscalls.print: don't explicitly use 64 bit versions of calls,
-    now done automaticaly for us.
-  * freebsd/i386/syscall.h: ditto.
-  * freebsd/i386/syscallent.h ditto.
-
-2001-03-07  John Hughes <john@Calva.COM>
-
-  * desc.c: On FreeBSD flock structure uses 64 bit offsets.
-  * file.c: On FreeBSD use stat64 and pals instead of stat.
-  * freebsd/syscalls.print: use stat64, lstat64 and fstat64.
-  * freebsd/i386/syscall.h: ditto.
-  * freebsd/i386/syscallent.h: ditto.
-
-2001-03-07  John Hughes <john@Calva.COM>
-
-  * file.c: merge missing part of Harald Böhme's solaris patches,
-    was only declaring sys_{stat64,lstat64,fstat64} on linux!
-
-2001-03-07  John Hughes <john@Calva.COM>
-
-  * svr4/dummy.h: fix multiple define warning on non LFS64 systems.
-  * svr4/syscallent.h: pread/pwrite are TF calls.
-
-2001-03-07  John Hughes <john@Calva.COM>
-
-  * defs.h: add ALIGN64 macro to cope with FreeBSD's strange insistence
-    on alignment for off_t (64 bit) arguments.  Also simplify get64 so
-    we don't need to know endianness of long long.
-  * file.c: FreeBSD now uses 64 bit versions of lseek, truncate,
-    ftruncate, allows reduction in numvber of horrid #if's
-  * io.c: FreeBSD now uses 64 bit versions of pread, pwrite.
-  * mem.c: FreeBSD now uses 64 bit version of mmap.
-  * freebsd/syscalls.print: use 64 bit versions of various syscalls.
-  * freebsd/i386/syscall.h: use 64 bit versions of various syscalls.
-  * freebsd/i386/syscallent.h: use 64 bit versions of various syscalls.
-
-2001-03-06  John Hughes <john@Calva.COM>
-
-  * file.c: Implement truncate64 and ftruncate64
-  * svr4/dummy.h: add dummies for truncate64 and ftruncate64 for non
-    LFS64 systems.
-  * svr4/syscall.h: add declarations for truncate64 and ftruncate64.
-
-2001-03-06  John Hughes <john@Calva.COM>
-
-  * freebsd/syscalls.pl: fix for FreeBSD 4.1 (new optional field in
-    syscall master file).
-
-2001-03-06  John Hughes <john@Calva.COM>
-
-  * syscall.c: fix for FreeBSD 4.1 (SYS_semconfig has disappeared).  Also
-    zap incorrect syscall subarg range check.
-
-2001-03-06  John Hughes <john@Calva.COM>
-
-  * configure.in, defs.h, desc.c, file.c, io.c, mem.c, net.c, resource.c,
-    signal.c, syscall.c, svr4/dummy.h, svr4/syscall.h, svr4/syscallent.h:
-    merge Harald Böhme's solaris patches (_LFS64_LARGEFILE and kernel aio
-    mostly).
-
-2001-03-06  John Hughes <john@Calva.COM>
-
-  * dummy.h: add unimplemented UW sycalls
-  * syscall.h: we can do settimeofday for UW, whopee!
-  * syscallent.h: fix unimplemented UW syscalls
-
-2001-03-06  John Hughes <john@Calva.COM>
-
-  * aclocal.m4: look for pr_syscall in pr_lwp if we HAVE_MP_PROCFS
-  * defs.h: add PR_SYSCALL to allow use of pr_lwp.pr_syscall if it exists.
-  * syscall.c: use PR_SYSCALL instead of pr_syscall, fix up UnixWare code
-    so it doesn't try to use pr_sysarg.
-
-2001-03-06  John Hughes <john@Calva.COM>
-
-  * aclocal.m4: on systems other than linux look for stat64 in sys/stat.h
-  * file.c: handle xstat version _STAT64_VER, aka stat64.
-
-2001-03-06  John Hughes <john@Calva.COM>
-
-  * net.c: make sure SOL_ options are defined before using.
-  * signal.c: declare sigset variable, only used on linux, inside #ifdef.
-
-2001-02-21  Wichert Akkerman <wakkerma@debian.org>
-
-  * net.c: fix format for printing Unix domain sockets
-
-2001-02-19  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/mips/syscallent.h: use new sys_sysmips
-  * system.c: add sys_sysmips decoding
-
-2001-02-16  Wichert Akkerman <wakkerma@debian.org>
-
-  * CREDITS: add Arkadiusz Miskiewicz <misiek@pld.org.pl> who
-    submitted the IP6 scope ID updates
-  * acconfig.h: add HAVE_SIN6_SCOPE_ID and HAVE_SIN6_SCOPE_ID_LINUX
-  * aclocal.m4: add AC_SIN6_SCOPE_ID to check if sin6_scope_id is
-    available
-  * configure.in: check for if_indextoname function and sin6_scope_id
-  * net.c: teach printsock about IP6 scope ids
-
-2001-02-16  Wichert Akkerman <wakkerma@debian.org>
-
-  * configure.in: test for netinet/tcp.h and netinet/udp.h existance
-  * net.c: include netinet/tcp.h and netinet/udp.h if they exist
-  * Makefile.in: use @mandir@ and @bindir@
-
-2000-11-26  Wichert Akkerman <wakkerma@debian.org>
-
-  *  net.c: fix formating error in sys_setsockopt
-  *  net.c: add list of socketlayers and use that for [gs]etsockopt
-
-2000-10-12  Wichert Akkerman <wakkerma@debian.org>
-
-  * time.c: use sys/timex.h so things compile with 2.2 kernels
-  * stream.c: test if MSG_* constants are #defined
-
-2000-09-03  Wichert Akkerman <wakkerma@debian.org>
-
-  * process.c: perform bpt trick for clone as well so we can get the
-    pid of the child before it starts doing something
-  * file.c: rename dirent64 struct to kernel_dirent64 so things compile
-    again with newer libcs
-  * test/clone.c: improve our testcase a bit
-  * Merge another patch from Gäel Roualland with FreeBSD updates
-
-2000-09-01  Wichert Akkerman <wakkerma@debian.org>
-
-  * lots of files: merge patch from Gaël Roualland to add
-    support for FreeBSD.
-
-2000-08-09  Wichert Akkerman <wakkerma@debian.org>
-
-  * file.c: update to reflect that st_ino suddenly became a long long
-    in the in Linux 2.4.0-test6
-
-2000-08-09  Wichert Akkerman <wakkerma@debian.org>
-
-  * test/clone.c: minor fixup
-  * Another bunch of patches from John Hughes merged:
-  * signal.c:
-    + SVR4 printcontext(): sigset_t != sigset_t*
-    + getcontext returns a value, so print on exit of syscall
-    + add UC_FP to ucontext_flags for OS writers that can't spell
-    + sys_signal(): special case SIG_{ERR,DFL,IGN}
-    + decode_subcall(): only do subcall range checking when needed
-  * bunch of UnixWare updates
-  * aclocal.m4, acconfig.h, configure.in: add test for long long type
-
-2000-07-04  Wichert Akkerman <wakkerma@debian.org>
-
-  * net.c: add SOL_PACKET and SOL_RAW socket options, update
-    SOL_IP and SOL_TCP
-
-2000-06-23  Wichert Akkerman <wakkerma@debian.org>
-
-  * strace.c: close outf before we exec a child process
-
-2000-06-09  Ulrich Drepper  <drepper@redhat.com>
-
-  * configure.in: Don't link against libnsl on Linux, it's unnecessary.
-  * defs.h (struct tcb): Make auxstr member const.
-  * file.c (fsmagic): And many more magic numbers.
-  * util.c: Don't include <linux/ptrace.h> for glibc 2.1 and up.
-
-2000-04-26  Wichert Akkerman <wakkerma@debian.org>
-
-  * defs.h: balance #if/#endif again
-  * system.c: fix return statements in sys_capget()
-  * Merge updates from Topi Miettinen <Topi.Miettinen@nic.fi>:
-    + file.c: add F_[SG]ETSIG to fcntl flags
-    + strace.c: don't setre[gu]id if not needed
-    + system.c: handle sys_reboot for Linux
-    + term.c: add baudrate constants up to B4000000
-    + linux/**/syscallent.h: note that munlockall has no arguments
-
-2000-04-25  David Mosberger  <davidm@hpl.hp.com>
-
-  * CREDITS: fix email address
-  * process.c: handle PR_[GS]ET_UNALIGN and PR_[GS]ET_KEEPCAPS
-  * signal.c: honour offset of sigconfig in sigframe structure for
-    Linux/ia64
-  * linux/ia64/syscallent.h: Add perfmonctl, pivotroot, mincore, and
-    madvise syscalls.
-  * syscall.c (syscall_enter): With Kevin's latest ptrace patches,
-    AR_BSP points to the _end_ of the active register frame, so we need
-    to adjust bsp by moving it back by the size of the active frame
-    before using it.
-
-2000-04-24  Wichert Akkerman <wakkerma@debian.org>
-
-  * process.c: add sparc support to change_syscall
-
-2000-04-22  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/mips/syscallent.h: fix some typos
-
-2000-04-14  Wichert Akkerman <wakkerma@debian.org>
-
-  * linux/mips/syscallent.h: added names for SVR4, SYSV, BSD4.3 and POSIX
-    syscalls
-
-2000-04-13  Wichert Akkerman <wakkerma@debian.org>
-
-  * defs.h: Linux/MIPS uses syscalls up to >4k, so set MAX_QUALS to
-    4999
-
-2000-04-09  Wichert Akkerman <wakkerma@debian.org>
-
-  * README-linux: updated to note that strace might not compile
-    with development kernels
-  * bjm.c: sys_query_module: check if malloc succeeds
-  * system.c: sys_cap[gs]et(): check if malloc succeeds, only malloc once
-  * linux/syscallent.h: updated for 2.3.99pre3
-  * linux/alpha/syscallent.h: updated for 2.3.99pre3, add all osf syscalls
-    even though Linux doesn't implement them
-  * syscall.c: add global variables for MIPS registers as well
-  * syscall.c: move global variables to before get_scno since that uses them
-  * util.c: oops, misspelled defined
-  * process.c: fix ptrace calls in change_syscall
-  * mem.c: decode sys_madvise
-  * Merge patch from Topi Miettinen <Topi.Miettinen@nic.fi>
-    + add support for quotactl, fdatasync, mlock, mlockall, munlockall & acct
-    + small fix for RLIMIT_* and RUSAGE_BOTH
-    + enhace support for capget and capset
-
-2000-02-19 Wichert Akkerman <wakkerma@debian.org>
-
-  * test/vfork.c: new file to test vfork traces
-  * test/.cvsignore: new file
-  * defs.h: Up maximum number of traced processed to 64
-  * strace.c: Disable some debugging code from davidm
-  * implement setarg for more architectures
-  * implement change_syscall
-
-1999-12-27  Morten Welinder  <terra@diku.dk>
-
-	* syscall.c (lookup_signal, lookup_desc): isdigit requires an
- 	_unsigned_ char parameter.
-
-2000-02-14 Wichert Akkerman <wakkerma@debian.org>
-
-  * S390 updates
-
-2000-02-03 Wichert Akkerman <wakkerma@debian.org>
-
-  * Merge Linux/ia64 patches
-
-2000-01-02 Pavel Machek	     <pavel@ucw.cz>
-
-  * probe if sys/poll.h exists in configure + minor cleanups
-
-  * syscall.c: split trace_syscall into few pieces to make code readable
-
-2000-01-21 Wichert Akkerman  <wakkerma@debian.org>
-
-  * Release version 4.2 to get the current updates out and so
-    we can concentrate in finishing the clone support.
-
-2000-01-11 Wichert Akkerman  <wakkerma@debian.org>
-
-  * Add 1900 to tm_year in sprinttime
-
-1999-12-24  Wichert Akkerman  <wakkerma@debian.org>
-
- * file.c: protect printstat64 with STAT64 instead of linux so we can
-   compile on Linux architectures that don't have it
- * util.c: fix LOOP for ARM
-
-Fri Dec 24 18:05:00 EST 1999
-
-1999-12-23  Ulrich Drepper  <drepper@cygnus.com>
-
- * file.c: Use ugly libc_stat trick also for stat64.
-   Implement sys_stat64, sys_fstat64, sys_lstat64, and printstat64.
- * process.c (internal_clone): Fix a few typos and add definitions to make
-   it at least compile.
- * linux/syscall.h: Declare sys_stat64, sys_lstat64, and sys_fstat64.
- * linux/syscallent.h: Define table entries for sys_stat64, sys_lstat64,
-   and sys_fstat64.
- * aclocal.m4: Define AC_STAT64.
- * acconfig.h: Define HAVE_STAT64.
- * configure.in: Add AC_STAT64.
-
-Thu Dec 23 15:01:37 CET 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Merge patch from ftp://oss.software.ibm.com/linux390/ to add
-    support for Linux on the IBM S/390 architecture
-  * process.c: add internal_clone(), currently only shows the options
-  * syscall.c: use internal_clone to handle SYS_clone
-
-Mon Dec 20 00:27:50 CET 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Rewrite mmap-handling to support mmap2 on Linux
-
-Tue Dec 14 11:35:16 CET 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Note that Linux can handle sys_semop() as well
-
-Tue Nov 30 11:05:26 CET 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Include linux/in6.h for glibc2.0 and older
-
-Mon Nov 29 16:33:04 CET 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Merge patches from John Hughes to make configure support UnixWare
-
-Sat Nov 27 21:38:17 CET 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Enhance sys_query_module
-
-Fri Nov 26 10:51:55 CET 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Patches from John Hughes:
-    + cosmectic fix in sys_getpmsg
-    + allow net.c to compile on systems without AF_INET6
-    + Only use long_to_sigset on Linux systems
-    + UnixWare treats sigmask_t and sigmask_t* as the same thing
-    + Add pollhack
-    + Parse mount arguments for UnixWare
-    + ACL fixes for UnixWare
-
-Fri Nov 26 01:28:09 CET 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Release 4.1 to get all the changes made out there
-
-Thu Nov 18 18:04:04 CET 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Merge stracefork from Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
-    + Socket calls parsed better
-	+ bunch of alpha OSF syscalls added
-	+ Fix alpha 32/64 bit issues
-
-Mon Nov  1 20:52:08 CET 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Move Linux kernelmodule-functions from system.c to bjm.c and
-    remove duplicate for sys_create_module
-  * Linux MIPS updates:
-    + Play with #ifdef's in net.c to get IPv6 right
-    + Use printargs for vm86-syscall
-
-Sun Oct 31 22:03:00 CET 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Merge Linux mips patch from Florian Lohoff <flo@rfc822.org>
-
-Mon Oct 11 00:36:25 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Merge patch from Keith Owens <kaos@ocs.com.au> to sys_query_module
-    and sys_delete_module correctly
-
-Wed Oct  6 02:00:33 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Update cvsbuild to give a better error if autoconf isn't installed
-  * Add test for linux/ptrace.h to configure
-  * Since we define GNU_SOURCE in the Makefile we don't need to define
-    USE_GNU in file.c anymore
-
-Fri Sep 10 04:35:16 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * #define USE_GNU before including file.c so we get some extra O_* flags
-
-Tue Aug 31 16:27:21 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Add missing } in IPv6 output
-
-Tue Aug 31 01:23:08 CEST 1999  Wichert Akkerman <wakkerma@debian.org>
-
-  * Update copyright for strace-graph to BSD to be consistent with
-    the rest of strace
-
-Mon Aug 30 00:53:57 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Merge patch from Daniel Jacobowitz: KERN_JAVA_* and KERN_SECURELVL aren't
-    defined for all kernelversions
-  * Add strace-graph, written by Richard Braakman <dark@xs4all.nl>
-
-Thu Aug 19 13:10:15 CEST 1999 Jakub Jelinek <jj@ultra.linux.cz>
-
-  * linux/sparc/syscall.h: Declare create_module/init_module.
-  * configure.in: Allow compilation in a different directory
-    than the source one.
-  * signal.c: Use asm/reg.h and struct regs instead of pt_regs
-    so that we don't depend on asm/ptrace.h which clashes with
-    glibc sys/ptrace.h.
-  * util.c: Likewise.
-  * syscall.c: Likewise.
-
-Wed Aug  4 18:01:50 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Syscall 94 on Linux alpha is sys_poll
-
-Sun Jul 25 14:38:33 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Merge in UnixWare patches from John Hughes <john@Calva.COM>
-
-Thu Jul 15 23:00:32 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Merge patch from Maciej W. Rozycki <macro@ds2.pg.gda.pl>:
-    + Correctly implement fix sys_createmodule (Linux)
-    + Add limited handlig of sys_initmodule (Linux)
-
-Tue Jul 13 17:07:50 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Add configure-test for sys/reg.h and use that
-  * Use sys/reg.h instead of asm/ptrace.h
-
-Sat Jul 10 01:46:10 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Remove hack in signal.c for arm architecture
-  * Add hack so we compile correctly on powerpc
-
-Fri Jul  9 02:28:16 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Add a corrected patch from Daniel Jacobowitz
-
-Thu Jul  8 16:00:04 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Merge patch from Daniel Jacobowitz to allow us to use the kernel types
-    for the stat structure
-
-Thu Jun 24 15:54:18 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Fix test for sys/reg include
-
-Tue Jun 22 17:26:33 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Fixed some Linux/powerpc sillyness, thanks to Daniel Jacobowitz
-  * Fixed some SunOS compile problems earlier that I forgot to include
-    here
-
-Mon Jun 14 12:44:25 CEST 1999
-
-  * Avoid leakint fd into child when forking, patch from
-    John Hughes <john@Calva.COM>
-
-Fri Jun 11 14:54:47 CEST 1999
-
-  * Applied IRIX64 patch from Thomas E. Dickey <dickey@clark.net>
-  * Applied Solaris and manpage updates from Guy Harris <guy@netapp.com>
-
-Wed Jun  9 14:48:49 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Brought syscall list for alpha up to date
-
-Wed Jun  2 18:30:12 CEST 1999 Jakub Jelinek <jj@ultra.linux.cz>
-
-  * system.c: sys_umount2 syscall support.
-  * linux/sparc/errnoent.h: Update sparc-linux errnos.
-  * linux/sparc/syscall.h: Update used sparc-linux syscalls.
-  * linux/sparc/syscallent.h: Match 2.2.9 system calls.
-  * file.c: sparc-linux asm/stat.h uses dev_t etc. types,
-    so it needs strace's own copy of the stat structure.
-  * util.c: Make it compile on sparc-linux.
-  * strace.c: Fix strace -f and -ff operation on sparc-linux.
-  * signal.c: rt_sigaction has different arguments on sparc*-linux
-    and alpha-linux.
-  * syscall.c: Recognize sparc64-linux binaries.
-
-Fri May 28 21:09:00 PST Ulrich Drepper <drepper@cygnus.com>
-
-  * configure.in: Fix typo (CFLAG -> CFLAGS).
-
-  * syscall.c: Don't include linux/ptrace.h explicitly for glibc.
-
-Thu May 27 13:59:27 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Add some sysctl support, patch from Ulrich Drepper
-
-Wed May 26 01:04:34 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Use kernel dirent structure for Linux
-
-Sun May  9 02:18:30 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Merge in patches from Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
-    + some layout and other minor fixes
-    + add some m68k-specific things to linux/syscallent.h. Note that m68k
-      is similar enough to i386 to not need it's own subdirectory
-    + add support for sendfile and mremap syscalls for Linux
-  * Merge in patches from Sascha Schumann <sascha@schumann.2ns.de>
-    + ioctls.h vs sys/ioctl.h on Alpha platform
-    + pointer was casted to an int in stream.c
-    + strsignal() needs -D_GNU_SOURCE in CFLAGS
-    + several other casts changed
-    + correct ARM/POWERPC architecture defines in acconfig.h
-  * Merge in patches from Morten Welinder <terra@diku.dk>
-    + add some autoconf-tests for includefiles
-    + handle solaris version of sigcontext struct (actually I hacked this
-      up again, but the idea is his :)
-
-Sun Apr 18 22:32:42 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Update syscalls for linux alpha, patch from Bart Warmerdam
-    <bartw@debian.org>
-  * Update sparc code so it actually compiles
-
-Fri Apr 16 02:18:05 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Add support for old_*stat functions for Linux. Please note you need
-    to use reasonably recent kernel headers to compile strace now.
-  * Change references to LINUX into linux in file.c
-  * Fix include for LDT in mem.c
-
-Thu Apr 15 22:28:15 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
-
-  * Change in strace maintainership, jrs passed the torch to me.
-  * Use autoconf 2.13
-  * Incorporate all changes already made in the Debian strace package:
-    + compiles with more Linux kernels
-    + added support for more Linux architectures
-    + add support for a lot of extra syscalls
-    + fix some problems with hanging children
-    + check stray syscall after execv
-    + decode capget and capset arguments
-    + add more constants to net.c
-    + detect ROSE networking
-    + add more protocol families to domains
-    + add IPIP protocol
-    + added MSG_PROXY and MSG_CTRUNC to msg_flags
-    + added SO_BSDCOMPAT and SO_REUSEPORT to sockoptions
-    + added IP, IPX and TCP-options
-    + added IP, IPX and TCP support to get-/setsockopt()
-    + added IPX support
-    + updated handling of signals
-
-Sun Oct 27 22:28:00 1996  J. Richard Sladkey  <jrs@world.std.com>
-
-	* util.c (umovestr) [LINUX]: Handle Linux like SunOS4
-	instead of SVR4.  That is, read a few bytes at a time
-	to avoid overrunning the end of the stack.
-
-Fri May 31 01:48:49 1996  J. Richard Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.1 is released.
-
-Thu May 23 01:04:43 1996  J. Richard Sladkey  <jrs@world.std.com>
-
-	* aclocal.m4 (AC_DECL_SYS_ERRLIST): Try looking in stdio.h
-	as well since that's where glibc declares it.  Go figure.
-	* signal.c (sys_sigreturn) [ALPHA]: Use sigcontext
-	instead of sigcontext_struct since glibc v5+ apparently
-	plays games with the native OS namespace.
-	From David Mosberger-Tang <davidm@AZStarNet.com>.
-
-Mon May 20 23:17:14 1996  J. Richard Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.14 is released.
-
-	* aclocal.m4 (AC_STRUCT_MSG_CONTROL): New macro.
-	* configure.in: Add call to AC_STRUCT_MSG_CONTROL.
-	* net.c (printmsghdr): Handle BSD 4.3 and 4.4 msghdr members
- 	differently.
-	Reported by Henrik Storner <storner@osiris.ping.dk>.
-
-	* configure.in: (AC_CHECK_{HEADERS,FUNCS}): Add checks for
- 	sys/filio.h and sys/stream.h and remove check for poll.
-	* desc.c (decode_select, sys_select, sys_oldselect) [LINUX]:
- 	Handle old and new styles of argument passing for select on Linux.
-	* ioctl.c, stream.c: Conditionalize stream code on presence of
-	sys/stream.h instead of poll because glibc implements poll but
-	not the rest of the stream interface.
-	* signal.c [LINUX]: Standardize on the name sigcontext_struct.
-	(sys_sigprocmask) [ALPHA]: Handle OSF flavor which is more like
-	sigsetmask.
-	* term.c (term_ioctl): Use _VMIN, if present, for TC{G,S}ETA*.
-	* util.c (umoven, umovestr): Move data in long-sized chunks
-	at a time, instead of hard coding it to be 4.
-	From David Mosberger-Tang <davidm@AZStarNet.com>.
-
-Mon May 20 01:19:36 1996  J. Richard Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.13 is released.
-
-	* configure.in (AC_CHECK_HEADERS): Add check for asm/sigcontext.h.
-	* signal.c [HAVE_ASM_SIGCONTEXT_H]: Conditionally include
-	asm/sigcontext.h to define sigcontext_struct and don't define it
-	locally if the header is present.
-
-	* syscall.c (nerrnos{0,2}): Correct size computation.
-
-	* Makefile.in: Remove dependencies and rules relating to files
- 	normally found in the os directory.  Because of the new scheme we
- 	don't know precisely where they come from.  Sigh.
-	* signalent.sh: Make it work for sunos4, linux, and svr4.
-	* {sunos4,linux{,/alpha},svr4}/Makefile.in: Make rules correspond
- 	to traditional make syntax.  Add signalent.h to files which can
- 	unconditionally be rebuilt.  Prevent signalent.h from being
- 	unconditionally being rebuilt since it's customized.
-	* {sunos4,linux{,/alpha},svr4}/{ioctlent,errnoent,signalent}.h:
- 	Use versions built by {ioctlent,errnoent,signaltent}.sh.
-  	* sunos4/ioctlent.sh: Work around sprintf troubles with SunOS
- 	4.1.4 and gcc 2.7.2.
-
-Sun May 19 17:14:09 1996  J. Richard Sladkey  <jrs@world.std.com>
-
-	* configure.in, Makefile.in: Add OSARCH concept to finish
-	build support for the alpha.
-	* Makefile.in, linux/Makefile.in: Rewrite clean, distclean,
-	and maintainer-clean rules.
-	* defs.h, ioctlsort.c: Make ioctl code member unsigned.
-	* ioctl.c, ioctlsort.c (compare): Perform explicit checking
-	for less, greater, and equal since subtraction on two's
-	complement numbers isn't an order relation (it isn't transitive)!
-	* linux/Makefile.in: Add rules for the signalent.h file.
-	* linux/alpha/Makefile.in: New file.
-
-Sun May 19 01:12:28 1996  J. Richard Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.12 is released.
-
-	* linux{,alpha}/ioctlent.sh: Tweak for recent kernels.
-	From Michael E Chastain <mec@duracef.shout.net>.
-
-	* defs.h (SUPPORTED_PERSONALITES, DEFAULT_PERSONALITY): New.
-	* syscall.c (set_personality): New.
-	* strace.c (main): Call set_personality.
- 	* defs.h, syscall.c, ioctl.c, signal.c: Make sysent, errnoent,
- 	ioctlent, and signalent indirect pointers and redirect them
-	based on personality.
-	* {sunos4,svr4,linux{,/alpha}}/signalent.h: New files.
-	Suggested by Tom Dyas <tdyas@eden.rutgers.edu>.
-
-	* util.c (upeek): Handle case where ptrace returns a long
-	and sizeof(long) != sizeof(int).
-	From Richard Henderson <richard@twiddle.tamu.edu>
-
-Fri May 17 21:03:36 1996  J. Richard Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.11 is released.
-
-	* many files: Fix more printf warnings for other platforms.
-
-	* ipc.c (sys_msgrcv) [LINUX]: Conditionalize definition of ipc_wrapper.
-
-	* linux/dummy.h: Handle missing library support for {send,recv}msg.
-	Reported by Thomas Bogendoerfer <tsbogend@bigbug.franken.de>.
-
-	* linux/syscall.h (sys_utimes): Fix a typo in the declaration.
-	From Thomas Bogendoerfer <tsbogend@bigbug.franken.de>.
-
-Fri May 17 00:50:06 1996  J. Richard Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.10 is released.
-
-	* Makfile.in: Add os/arch to includes so that a given arch
-	(like alpha) can override the native arch (like i386).
-	* configure.in: Check for sendmsg.
-
-	* net.c: Make sendmsg and recvmsg dependent on an autoconf
-	test.  Reported by Michael E Chastain <mec@duracef.shout.net>.
-
-	* acconfig.h, configure.in: Detect the alpha.
-	* ioctl.c: Handle the alpha.
-	* defs.h: Make some members long for the alpha.  Define
-	some register nicknames.  Add support for WAITEXECVE.
-	* file.c [ALPHA]: Support the alpha for statfs.  Add
-	osf_statfs and osf_fstatfs for the alpha.  Make damn sure
-	major and minor results are suitable for passing to printf.
-	* signal.c, syscall.c: Support the alpha.
-	* process.c: Add alpha user offsets.
-	* most files: Use %l? for printf arguments since
-	most are now longs for the alpha.
-	* linux/alpha/{errnoent.h,ioctlent.{h,sh},syscallent.h}:
-	New for the alpha.
-	From Thomas Bogendoerfer <tsbogend@bigbug.franken.de>.
-
-Wed May 15 00:29:37 1996  J. Richard Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.9 is released.
-
-	* config.in, config.sub, install-sh: Upgrade to autoconf 2.10.
-
-	* linux/dummy.h, linux/syscallent.h, linux/syscall.h: Add recent
-	Linux kernel version system calls.
-
-Wed Mar 13 01:03:38 1996  J. Richard Sladkey  <jrs@world.std.com>
-
-	* ipc.c [SUNOS4]: Add SunOS support for decoding IPC calls.
-	* syscall.c [SUNOS4]: Compile decode_subcall on SunOS and
-	decode IPC calls using it.
-	* sunos4/dummy.h: Alias sys_semop to printargs.
-	* sunos4/syscall.h: Add new pseudo syscalls for IPC.
-	* sunos4/syscallent.h: Include new subcalls for IPC.
-	From Matthias Pfaller <leo@dachau.marco.de>.
-
-Tue Feb 13 22:08:25 1996  J. Richard Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.8 is released.
-
-	* time.c [LINUX]: Explicitly include linux/version.h.
-
-	* strace.c (main): Don't let them even *try* to
-	get strace to attach to itself since some systems
-	don't handle this case very gracefully.
-	Reported by David S. Miller <davem@caip.rutgers.edu>.
-
-	* Makefile.in (distclean): Fix it for subdirectories.
-
-	* sunos4/syscallent.h, svr4/syscallent.h: Fill in the new
-	sys_flags member for each defined system call.
-
-Fri Dec  8 01:17:28 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* defs.h (TRACE_*): New flags to describe what class
-	of system call each system call is.
-	(sysent): Add sys_flags member.
-	* syscall.c (sysent): Define (and later undef) abbreviations
-	for the system call class flags.
-	(lookup_class): New function to translate strings to
-	system call class flags.
-	(qualify): Handle new system call class mechanism.
-	* linux/syscallent.h: Fill in the new sys_flags member
-	for each defined system call.
-
-	* defs.h (print_sock): Remove redundant and non-K&R C
-	compatible prototype.  From Juergen Weigert
-	<jnweiger@immd4.informatik.uni-erlangen.de>.
-
-Thu Dec  7 01:17:40 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* linux/ioctlent.sh: Tweak to improve ioctl accuracy.
-	From Michael E Chastain <mec@duracef.shout.net>.
-
-	* system.c (includes) [LINUX]: Add linux/nfs.h for recent
-	kernels.  From Michael E Chastain <mec@duracef.shout.net>.
-
-Wed Dec  6 21:52:28 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* file.c (sprintfstype): Enclose string result in double
-	quotes.
-
-	* time.c (sys_adjtimex) [LINUX]: Conditionalize
-	constantly evolving timex structure.
-	From Aaron Ucko <UCKO@VAX1.ROCKHURST.EDU>.
-
-	* defs.h, syscall.c, strace.c: Rename syscall to
-	trace_syscall and change prototype and all callers
-	because of broken Linux shared libraries.
-	From Aaron Ucko <UCKO@VAX1.ROCKHURST.EDU>.
-
-	* Makefile.in (clean): Check for a file with test -f not
-	test -d.  From Aaron Ucko <UCKO@VAX1.ROCKHURST.EDU>.
-
-Tue Sep 26 02:32:31 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.7 is released.
-
-	* util.c (string_quote): Fix thinko which caused core
-	dumps for strings with quotes in them.
-	Reported by Marty Leisner <leisner@sdsp.mc.xerox.com>.
-
-	* linux/Makefile.in (errnoent.h rule): Grab all errno.h
-	files from /usr/include, not just the linux one.
-	From Michael E Chastain <mec@duracef.shout.net>.
-
-	* linux/errnoent.sh: Total rewrite to handle more ioctls with
-	fewer false positives on more kernel flavors.
-	From Michael E Chastain <mec@duracef.shout.net>.
-
-Mon Sep  4 01:29:22 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.6 is released.
-
-	* linux/dummy.h, linux/syscall.h, linux/syscallent.h: Add
-	sys_msync.
-	* mem.c (mctl_funcs, mctl_lockas, sys_mctl): Conditionalize
-	on MC_SYNC instead of HAVE_MCTL.
-	(mctl_sync): Conditionalize on MS_ASYNC instead of HAVE_MCTL.
-	(sys_msync): New function.
-
-Sat Sep  2 12:06:04 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* linux/dummy.h, linux/syscall.h, linux/syscallent.h: Add
-	sys_flock and sys_getdents.
-	* desc.c (flockcmds, sys_flock): Conditionalize on LOCK_SH
-	not SUNOS4.
-	* file.c (sys_getdents): Define unconditionally and handle
-	LINUX case.
-	* strace.c (main): Disallow username option unless both real
-	and effective uids are root.
-
-Wed Aug 30 01:29:58 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* strace.c (main): Ensure that run_uid and run_gid are
-	always set to something meaningful.
-	(main, newoutf) [!SVR4]: Swap real and effective uids while
-	opening any output files.
-	(main) [!SVR4]: Treat effective uid of root as a request
-	to handle suid binaries correctly using the real uid of
-	the invoking user.
-
-Sat Aug 19 00:06:08 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* Makefile.in: Add `|| true' to clean rule because
-	although GNU make 3.74 uses `sh -c' to invoke commands
-	every other make in the world uses `sh -ec'.
-
-	* syscall.c (syscall) [SVR4, MIPS]: The fifth and subsequent
-	arguments appear to be stored on the stack, not in the
-	registers following A3 (empirical result).
-
-	* defs.h: Add prototype for printsock.
-	* svr4/dummy.h: Remove generic handling of sys_mount.
-	* system.c [SVR4, MIPS]: Include several system headers to cleanly
-	get access to SGI mount information.
-	(mount_flags, nfs_flags) [SVR4, MIPS]: New objects.
-	(sys_mount) [SVR4, MIPS]: New function.
-	(sys_mount) [SVR4, !MIPS]: New function.
-
-Tue Jul  4 00:30:34 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.5 is released.
-
-	* desc.c, resource.c, strace.c, syscall.c, time.c: Cast tv_sec and
- 	tv_usec members to long when using printf.
-
-	* ipc.c: Omit define of __KERNEL__.
-	({MSG,SEM,SHM}_{STAT,INFO}): Explicitly define those things we
- 	want which __KERNEL__ used to provide.
-	(sys_msgrcv): Change reference to ipc_kludge structure to
-	look-alike ipc_wrapper to avoid dependence on __KERNEL__.
-
-	mem.c (mmap_flags) [MAP_{GROWSDOWN,DENYWRITE,EXECUTABLE}]: Add
- 	Linux specific options.
-
-	syscall.c: Use SYS_ERRLIST_DECLARED instead of guessing.
-  	[E{RESTART{SYS,NO{INTR,HAND}},NOIOCTLCMD}]: Explicitly define
- 	instead of depending of __KERNEL__.
-
-	term.c: Cast c_{i,o,c,l}flag to long when using printf.
-
-Tue Jun  6 00:27:48 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* aclocal.m4 (AC_DECL_SYS_ERRLIST, AC_DECL__SYS_SIGLIST): New.
-	* configure.in: Call AC_DECL_SYS_ERRLIST, AC_DECL_SYS_SIGLIST,
-	and AC_DECL__SYS_SIGLIST.
-	* acconfig.h (SYS_ERRLIST_DECLARED): New.
-	* strace.c (strerror): Use SYS_ERRLIST_DECLARED.
-	(strsignal): Use SYS_SIGLIST_DECLARED.
-
-	net.c (sys_socket): Omit inadvertent surplus comma when
-	protocol family isn't PF_INET.
-
-	util.c (dumpstr): Fix incorrect printing of one too many
-	characters when the length is not an even multiple of 16 bytes.
-	Reported by Juergen Weigert
-	<jnweiger@immd4.informatik.uni-erlangen.de>.
-
-Thu May  4 23:37:47 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* ioctl.c (compare): Change prototype to match POSIX qsort.
-	* signal.c (sigishandled) [SVR4]: Omit everything after return.
-	* strace.c (trace) [SVR4]: Break out of for loop instead of
-	returning when finished so final return statement is executed.
-	* syscall.c (internal_syscall): Add more SYS_wait* variations.
-	(syscall) [LINUX]: Correct typo which commented out the M68K
-	argument to ifdef.
-	* util.c (printstr): Cast unsigned char pointer argument
-	to char pointer in umovestr call.
-	(dumpstr): Likewise for umoven.
-
-Wed May  3 01:10:56 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.4 is released.
-
-	* signal.c (sys_sigblock): Move after the definition of
-	sys_sigsetmask that it calls to avoid an implicit declaration.
-	* stream.c (transport_user_options, transport_server_options):
-	Only needed if TI_BIND is defined.
-	* configure.in: Add -Wno-implicit to WARNFLAGS on SunOS 4.x.
-
-	* process.c (internal_fork) [SVR4]: Fix a typo that omitted
-	the tcp arguement from the call to exiting.  Add getrval2
-	check so no fork processing is done in the child.
-	(printwaitn): Initialize exited so that its value is defined
-	for all flows of execution.
-
-Tue May  2 22:39:42 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* linux/dummy.h: Add aliases for sysfs, personality, afs_syscall,
-	setfsuid, setfsgid, and _llseek syscalls.
-	* linux/syscall.h: Add prototypes for them.
-	* linux/syscallent.h: Add them to the syscall entries table.
-	* system.c (headers) [LINUX]: Include linux/unistd.h to get __NR_*
-	defines and conditionally include linux/personality.h if
-	__NR_personality is defined.
-	(personality_options) [LINUX]: New table.
-	(sys_personality) [LINUX]: New function.
-
-Tue May  2 00:20:39 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* strace.c (trace) [!SVR4]: Change forever loop to one predicated
-	on the number of traced processes so that we can have untraced
-	children (e.g. via popen).
-
-	* strace (main) [!SVR4]: Call fake_execve to get the actual
-	exec and its arguments into the trace.
-	(environ): Declare it.
-	* process.c (fake_execve): New function.
-	(headers): Include sys/syscall.h to get SYS_* defines.
-
-	* process.c (sys_execv, sys_execve): Surround argument annotations
-	with C comment delimiters.
-	(printargv, printargc): The arg vector is an array of char pointers
-	not ints.
-
-	* strace.c (printleader): Also check for multiple -p arguments
-	when deciding whether to print the pid field.
-
-	* strace.c (strerror) [!HAVE_STRERROR]: New function.
-	* defs.h (strerror, strsignal): Add these prototypes if we provide
-	the functions.
-	* configure.in (AC_CHECK_FUNCS): Add strerror.
-
-	* strace.c (main, proc_poller): Add SIGPIPE to the list of caught
-	and blocked signals.
-
-	* strace.c (main): Add username option.  Verify they are root before
-	letting them use it.  Look up the ids in the password file.  Set
-	them just before executing the program.
-	From Reuben Sumner <rasumner@undergrad.math.uwaterloo.ca>.
-
-Sat Apr 29 00:09:56 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.3 is released.
-
-	* system.c (mount_flags) [LINUX]: Omit duplicated MS_NOSUID entry.
-	From Reuben Sumner <rasumner@undergrad.math.uwaterloo.ca>.
-
-	* strace.c (outfname): Initialize to NULL.
-	(main): Defer output file processing until after arguments.
-	Allow either a pipe or a bang for command arguments.
-	Check if outfname is NULL instead of checking outf for stderr.
-	Reinitialize each startup TCB's outf to fix -p/-o ordering bug.
-	(droptcb): Reset close TCB's outf to NULL instead of stderr.
-	(tprintf): Avoid calling vfprintf if outf is NULL.
-
-	* strace.c (main): Use popen if -o argument begins with a pipe.
-	From Marty Leisner <leisner@sdsp.mc.xerox.com>.
-
-	* process.c (printstatus): Fix a typo where WIFSIGNALED was meant
-	but WIFSTOPPED was used.
-
-	* Makefile.in: Add an EXTRA_DEFS variable and use it in the .c.o
-	rule to prevent the comment from being untrue.
-
-Fri Apr 28 22:01:56 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* strace.c (sys_exit): Move follow fork code to internal_exit.
-	(sys_fork): Move follow fork code to internal_fork.
-	(sys_execv, sys_execve): Move follow fork code to internal_exec.
-	(sys_waitpid, sys_wait4): Move follow fork code to internal_wait.
-	(vforking): Remove this static variable and check scno in
-	internal_fork instead.
-	(internal_exit, internal_fork, internal_exec, internal_wait): New
-	functions.
-	* defs.h: Add prototypes for the new internal_* functions.
-	* syscall.c (syscall): Move syscall entering trace qualifier check
-	and reprint checking after context decoding and precede them with
-	a call to internal_syscall.  Precede syscall exiting trace
-	qualifier check with a call to internal_syscall.
-	(internal_syscall): New function.
-
-	* defs.h (struct tcb): Make scno signed.
-	* strace.c (syscall) Make u_error signed.
-	[LINUX, I386]: Avoid unsigned cast in eax check.
-	* syscall.c (sys_indir): Make i, scno, and nargs signed.
-	* desc.c (sys_select): Make cumlen unsigned
-
-Mon Apr 24 23:52:47 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* net.c (socktypes): Add SOCK_PACKET.
-
-Sun Apr  2 23:50:39 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* Makefile (clean): Check explicitly for a Makefile in subdirs
-	before running make in them.
-
-Sun Mar 26 12:37:21 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* strace.c [MIPS] (proc_open): Conditionalize run on MIPS.
-	[MIPS] (detach): Initialize error for MIPS case.
-	(trace): Initialize ioctl_result and ioctl_errno for overly helpful
-	compilers.
-	* syscall.c (decode_subcall): Move variable i into conditionals
-	that use use it.
-	* system.c (syssgi_options): Conditionalize SGI_RECVLMSG and
-	SGI_SET_FPDEBUG that SGI decided to drop.  I don't have the stomach
-	to change them all.
-	* term.c (term_ioctl): Force [c_[iocl]flags members to long before
-	printing since we don't know what the size of their type is.
-	* util.c [SVR4, MIPS] (umoven): Prevent MIPS from using pread even
-	if autoconf detects it since it seems to either not work or do
-	something else entirely on Irix 5.3.
-
-Sun Mar 26 00:01:11 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.2 is released.
-	* linux/dummy.h: Make sys_fchdir like sys_close instead of printargs
-	so that the file descriptor arg is decimal.
-
-Sat Mar 25 22:50:13 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* net.c [LINUX] (protocols): Explicitly define all IPPROTO_* entries
-	because on Linux they are enumerators.
-
-	* system.c [LINUX] (mount_flags): Handle renaming of MS_SYNC to
-	MS_SYNCHRONOUS.
-
-	* util.c (printxval): When there is no translation, print the actual
-	number first and the the default value as a C comment.
-
-	* net.c (sys_send, sys_sendto, sys_sendmsg, sys_getsockopt,
-	sys_setsockopt): Change first argument from unsigned to signed to
-	cater to the frequent practice of calling system calls with a file
-	descriptor of -1.
-	* mem.c (sys_mmap): Likewise.
-
-Sun Mar 19 13:53:52 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* signal.c [LINUX] (signalent): Handle old and new values of SIGIO.
-
-Sun Dec 11 22:51:51 1994  Rick Sladkey  <jrs@world.std.com>
-
-	* version.c: Version 3.0.1 is released.
-	* Makefile.in, configure.in, aclocal.m4: Changes for autoconf 2.0.
-	* config.guess, config.guess: Update from the FSF.
-	* install-sh: New from the FSF.
-
-Mon Dec  5 20:51:29 1994  Rick Sladkey  <jrs@world.std.com>
-
-	* Makefile.in: Add m68k arch.
-	* acconfig.h (M68K): Add m68k define.
-	* configure.in: Add detection of arch m68k.
-	* process.c [M68K] (struct_user_offsets): Support m68k registers and
-	offsets.
-	* signal.c [M68K] (sigcontext_struct): Support m68k sigcontext
-	structure.
-	[M68K] (sys_sigreturn): Support m68k sigreturn handling.
-	* syscall.c [M68K] (syscall): Support m68k syscall number register
-	and errno in d0 instead of eax.
-	* util.c [M68K] (getpc, printcall, setbpt, clearbpt): Support m68k
-	program counter in PT_PC instead of EIP.
-	[M68K] (LOOP): Support m68k loop instruction.
-	From Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
-
-	* mem.c [MAP_ANONYMOUS] (mmap_flags): Correct inadvertent reference
-	to MAP_FIXED instead of MAP_ANONYMOUS.
-	From Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
-
-	* signal.c [LINUX] (signalent): Signal 30 is now SIGPWR.
-	From Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
-
-Mon Dec  5 01:05:46 1994  Rick Sladkey  <jrs@world.std.com>
-
-	* defs.h (tprintf): Fix typo in non-gcc ansi prototype for tprintf.
-	Reported by Thanh Ma <tma@encore.com>.
-
-	* strace.c (cleanup): Send SIGCONT before SIGTERM because Linux
-	1.1.62 doesn't continue a traced child when the parent exits.
-	Reported by Matt Day <mday@artisoft.com>.
-
-	* system.c [LINUX]: Include netinet/in.h before arpa/inet.h.
-
-	* util.c (printstr): Fix longstanding bug in notating string
-	continuation.
-
-	* strace.c [SVR4] (proc_open): Specifically wait for the child the
-	child to go into the execve syscall to avoid spurious traces.
-	[LINUX] (detach): Conditionalize the status variable.
-
-Sun Dec  4 23:21:42 1994  Rick Sladkey  <jrs@world.std.com>
-
-	* Makefile.in: Add mips arch.
-	* acconfig.h (MIPS): Add mips define.
-	* configure.in: Add detection of opsys irix5 and arch mips.  Check
-	for prctl function.
-	Check for sys/sysconfig.h header.
-	* defs.h (MAX_ARGS): Bump maximum syscall arguments from 8 to 32.
-	* file.c [SVR4]: Include sys/cred.h.
-	(access_flags): Update access flags for SGI.
-	(sprinttime): Change type of sprinttime argument from unsigned
-	long to time_t.
-	* process.c [HAVE_PRCTL]: Include sys/prctl.h.
-	[HAVE_PRCTL] (prctl_options, sys_prctl): New for SGI.
-	(printsiginfo): Conditionally compile SI_TIMER and SI_MESGQ.
-	Cast si_band member to long before printing.
-	* signal.c (sigact_flags): Add _SA_BSDCALL for SGI.
-	(sigprocmaskcmds): Add SIG_SETMASK32 for SGI.
-	* strace.c [SVR4] [MIPS]:
-	(foobar): New dummy signal handler.
-	(main): Install a dummy signal handler in the child before pausing
-	to work around an SGI bug in PRSABORT.
-	(proc_open): Send a interrupt to the child instead of aborting the
-	syscall which doesn't work on Irix5.2.
-	* svr4/dummy.h: Add new unfinished SGI syscalls
-	(e.g. sys_sysmp, sys_sginap, etc.).  Handle some SGI syscalls like
-	existing calls (e.g. sys_ksigaction like sys_sigaction).
-	Printargs does the print thing for sys_sethostid.
-	* svr4/syscall.h: Declare all new SGI syscalls.
-	(SGI_KLUDGE): Define syscall table starting index to be 1 for SGI
-	and add it to all subcall entry points.
-	(SYS_pgrpsys_subcall, SYS_sigcall_subcall, SYS_context): Don't
-	decode as subcalls on MIPS. Instead, use the normal syscalls.
-	* svr4/syscallent.h [MIPS]: Lead syscall table with a dummy entry
-	since SGI syscall numbers are off by one.
-	[MIPS] (sys_pgrpsys): Rename to sys_setpgrp on SGI.
-	[MIPS] (sys_xenix): Rename to sys_syssgi on SGI.
-	[MIPS] (sys_sysmachine): Rename to sys_sysmips on SGI.
-	[MIPS]: Conditionalize SVR4 extension into SGI and Solaris classes.
-	* syscall.c (dumpio): Validate descriptor against MAX_QUALS.
-	[HAVE_PR_SYSCALL] (syscall): Conditionalize SYS_vfork.
-	[MIPS] (syscall): Add SGI section for decoding u_error and u_rval.
-	Add workaround for broken SGI pr_sysarg on syscall entry.
-	[SVR4] (syscall): Conditionalize subcall decoding for
-	SYS_ptrpsys_subcall, SYS_sigcall_subcall and SYS_context_subcall.
-	[SVR4] [MIPS] (getrval2): Handle SGI.
-	* syscallent.sh: Dork the sed line to be choosier about SYS_ lines.
-	* system.c [HAVE_SYSCONFIG_H]: Include sys/sysconfig.h.
-	[MIPS] (syssgi_options, sys_syssgi): New for SGI.
+See ChangeLog-CVS for older changes.
diff --git a/ChangeLog-CVS b/ChangeLog-CVS
new file mode 100644
index 0000000..b5262ad
--- /dev/null
+++ b/ChangeLog-CVS
@@ -0,0 +1,5614 @@
+2009-07-08  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Clean up spacing to fix warnings reported by git diff --check.
+	* ChangeLog: Fix spaces before tab in indent.
+	* bjm.c: Likewise.
+	* debian/changelog: Likewise.
+	* strace-graph: Likewise.
+	* syscall.c: Likewise.
+	* INSTALL: Fix trailing blank lines.
+	* README-linux: Likewise.
+	* README-svr4: Likewise.
+	* linux/sparc/gen.pl: Likewise.
+	* linux/sparc/syscall1.h: Likewise.
+	* linux/sparc64/syscall1.h: Likewise.
+	* linux/x86_64/gentab.pl: Likewise.
+	* sunos4/syscall.h: Likewise.
+	* test/Makefile: Likewise.
+	* debian/rules: Fix trailing whitespaces.
+	* desc.c: Likewise.
+	* svr4/syscallent.h: Likewise.
+	* test/childthread.c: Likewise.
+	* test/leaderkill.c: Likewise.
+
+2009-07-07  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* .cvsignore: Remove.
+	* README-CVS: Rename to README-hacking.
+	* Makefile.am (EXTRA_DIST): Remove README-CVS.
+
+2009-06-01  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* bjm.c (sys_query_module): Fix format warning reported by
+	gcc -Wformat-security.
+	* file.c (tprint_open_modes): Likewise.
+	* process.c (printargv): Likewise.
+	* signal.c (printsignal): Likewise.
+
+	Clean up header checks.
+	* configure.ac: Reformat AC_CHECK_HEADERS to keep it sorted and
+	easily updated, and reduce merging errors in the future.
+	* system.c: Convert all non-standard #ifdef checks for specific
+	headers to regular #ifdef HAVE_*_H checks.
+	Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+2009-04-20  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* file.c (printstatsol, printstat_sparc64):
+	Remove NULL/error check for addr parameter.
+	(printoldstat, printstat, printoldstat64):
+	Move NULL/error check for addr parameter
+	so that it happens before printstatsol/printstat_sparc64 calls.
+
+2009-04-16  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* file.c (print_dirfd): Use int for file descriptor, not a long.
+	* process.c (printwaitn): Use int for PID, not a long.
+
+2009-04-15  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* signal (sys_rt_sigtimedwait): Fix sigtimedwait syscall decoding.
+
+2009-04-15  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* signal (sys_rt_sigaction): Print struct sigaction correctly
+	in 32/64 environment.
+	* desc.c (printflock): Add #ifdefs around earlier flock 32/64 fix
+	so that we don't waste time on arches with one personality.
+
+2009-04-14  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* signal.c: Whitespace, comment, and style fixes, no code changes.
+	* file.c: Ditto.
+	* time.c: Ditto.
+	* process.c: Ditto.
+	* resource.c: Ditto.
+
+2009-03-23  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* system.c (sram_alloc_flag): Add L2_SRAM constant.
+	by Mike Frysinger (vapier AT gentoo.org).
+	(sys_sram_alloc): Fix improperly used %zu:
+	tcp->u_arg is not a size_t, it is a long.
+	* net.c (printcmsghdr): Fix improperly used %zu:
+	struct cmsghdr::cmsg_len is not a size_t.
+
+2009-03-10  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	Decode fcntl's F_{GET,SET}LEASE, F_NOTIFY, and F_DUPFD_CLOEXEC.
+	By Mike Frysinger (vapier AT gentoo.org)
+	* desc.c: Add F_SETLEASE, F_GETLEASE, F_NOTIFY,
+	F_DUPFD_CLOEXEC to fcntlcmds[]. Create notifyflags[] array.
+	(sys_fcntl): Handle new flags.
+
+	Optimize printing of open modes.
+	* defs.h: Declare sprint_open_modes(),
+	remove unused parameter in tprint_open_modes().
+	* desc.c (sprint_open_modes): Move fuction definition from here...
+	* file.c (sprint_open_modes): To here.
+	(tprint_open_modes): Use sprint_open_modes(), it already
+	generates needed string.
+	* ipc.c: Remove unused parameter from calls
+	to tprint_open_modes().
+
+2009-02-27  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	AVR32 support by Hans-Christian Egtvedt
+	(hans-christian.egtvedt AT atmel.com).
+	* configure.ac: Make it recognize avr32.
+	* defs.h: Define LINUX_AVR32.
+	* linux/avr32/syscallent.h: New file.
+	* Makefile.am: Reference linux/avr32/syscallent.h.
+	* proc.c (change_syscall, setarg): Add support for avr32.
+	(struct xlat struct_user_offsets[]): Ditto.
+	* syscall.c (get_scno): Ditto.
+	(get_error, force_result, syscall_enter): Ditto.
+	* util.c (getpc, printcall): Ditto.
+
+2009-02-25  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	CRIS support by Hinko Kocevar (hinko.kocevar AT cetrtapot.si)
+	* configure.ac: Make it recognize cris.
+	* process.c: Define ARG_xxx constants for cris.
+	(change_syscall): Add support for cris.
+	(struct_user_offsets): Add cris-specific data.
+	* signal.c (sys_sigreturn): Add support for cris.
+	* syscall.c (get_scno): Add support for cris.
+	(syscall_fixup): Add support for cris.
+	(get_error): Add support for cris.
+	(syscall_enter): Add support for cris.
+	(force_result): While at it, fix cpp directives indentation.
+	* util.c (printcall): Add support for cris.
+
+2009-02-24  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* process.c: Indent preprocessor directives so that nesting
+	can be figured out. Add PTRACE_SET_SYSCALL to ptrace_cmds[].
+	* ioctlent.sh: Improved by Mike Frysinger.
+	* HACKING-scripts: New file by Mike Frysinger.
+
+2009-02-20  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	Further signalent.h cleanup.
+	* linux/ia64/signalent.h: Remove, it is identical to common signalent.h
+	sans "SIGRTnn" definitions which are redundant.
+	* linux/powerpc/signalent.h: Remove, it is identical to common signalent.h
+	sans outdated "SIGUNUSED" which should be "SIGSYS".
+	* linux/s390/signalent.h: Ditto.
+	* linux/s390x/signalent.h: Ditto.
+	* Makefile.am: Remove references to the above files.
+
+2009-02-20  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	Patch by Mike Frysinger (vapier AT gentoo.org).
+	* linux/ioctlent.sh: Update sed machinery to parse _IOC() macros
+	with two constants.
+
+2009-02-20  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	Patch by Mike Frysinger (vapier AT gentoo.org).
+	* Makefile.am: Remove reference to linux/sh/signalent.h.
+	* linux/sh/signalent.h: Remove, it is identical to common signalent.h.
+
+2009-02-20  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	Patch by Mike Frysinger (vapier AT gentoo.org).
+	* linux/errnoent.h: Make ERRNO_58 show EDEADLOCK for POWERPC.
+	* Makefile.am: Remove reference to linux/powerpc/errnoent.h.
+	* linux/powerpc/errnoent.h: Remove, we can use common errnoent.h now.
+
+2009-02-20  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	Patch by Mike Frysinger (vapier AT gentoo.org).
+	Removing redundant errnoent.h files.
+	* Makefile.am: Remove reference to linux/ia64/errnoent.h,
+	linux/s390/errnoent.h, linux/s390x/errnoent.h and linux/sh/errnoent.h.
+	* linux/ia64/errnoent.h: Remove, this arch uses common errnoent.h.
+	* linux/s390/errnoent.h: Ditto.
+	* linux/s390x/errnoent.h: Ditto.
+	* linux/sh/errnoent.h: Ditto.
+
+2009-02-10  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac: Check for struct sigcontext.
+	* signal.c [LINUX] [M68K] (struct sigcontext): Don't define it if
+	[HAVE_STRUCT_SIGCONTEXT].
+	From Muttley Meen <muttley.meen@gmail.com>.
+
+2009-02-09  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* defs.h: Correct the comment about TCB_SUSPENDED.
+	* strace.c: Fix misplaced #endif.
+	* util.c: Indent preprocessor directives, mark code parts
+	which can never be reached by compilation because of
+	the combination of #if directives. These are likely dead code,
+	I want to remove them later.
+
+2009-01-29  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* strace.c (newoutf): Prevent -o FILENAME overflowing the stack.
+	(startup_attach): Fix wrong pid in "Process <PID> attached".
+	(handle_group_exit): Do not consider exit to be spurious if
+	tcb has TCB_STARTUP bit set - we can attach to the task
+	right before its death, it can legitimately happen.
+	(handle_stopped_tcbs): Ditto.
+
+2009-01-26  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* process.c (printwaitn): Add comment about wait4() pid expansion.
+	Use #ifdef ALPHA instead of LINUX_64BIT, it was misleading
+	(by implying "any 64-bit platform").
+	* defs.h: Remove now-unused LINUX_64BIT define.
+	* resource.c (sys_osf_getrusage): Fix indentation.
+
+2009-01-26  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* process.c (internal_clone): Fix fallout from tcb table expansion
+	simplification. Due to overlooked else, I forgot to group
+	fork_tcb(tcp) and alloctcb(pid) in a block.
+
+2009-01-23  Michal Nowak  <mnowak@redhat.com>
+
+	* syscall.c (get_scno): Fix warnings about unused variable 'pid'.
+
+2009-01-23  Michal Nowak  <mnowak@redhat.com>
+
+	* mem.c (print_ldt_entry): Fix warning:
+	Format '%#08lx' expects type 'long unsigned int', but
+	argument 2 was type 'unsigned int'.
+
+2009-01-17  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	Two cleanups: tcb table expansion failure is not really a survivable
+	event, we do not have any viable way to continue. No wonder most
+	places where that is detected have FIXMEs.
+	It's way simpler to treat as fatal failure, and handle it inside
+	tcb table expansion finctions.
+	Second cleanup: tidy up haphazard locations of a few externs.
+
+	* defs.h: Change return type of expand_tcbtab() to void.
+	Declare change_syscall().
+	* process.c: Change all callsites of alloctcb(), alloc_tcb() and
+	fork_tcb(), removing now-redundant error checks.
+	(fork_tcb): Change return type to void - it can't fail now.
+	* strace.c: Move extern declarations out of function bodies.
+	Change all callsites of alloctcb(), alloc_tcb() and
+	fork_tcb(), removing now-redundant error checks.
+	(expand_tcbtab): Change return type to void - it can't fail now.
+	On failure to expand, print a message, clean up, and exit.
+	(alloc_tcb): On failure to expand, print a message, clean up, and exit.
+	* util.c (setbpt): Remove extern declaration from function body.
+
+2009-01-14  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* linux/bfin/syscallent.h: sys_futex has 6 parameters, not 5.
+
+2009-01-13  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	Fixes for ptrace() argument parsing.
+	* process.c: Add parsing of PTRACE_SETOPTIONS, PTRACE_GETEVENTMSG,
+	PTRACE_GETSIGINFO, PTRACE_SETSIGINFO.
+	* defs.h: Declare several "extern const struct xlat" arrays here.
+	* desc.c: Remove open_mode_flags[] and open_access_modes[]
+	extern declarations.
+	* net.c: Remove open_mode_flags[] extern declaration.
+	* sock.c: Remove addrfams[] extern declaration.
+	* util.c: Remove struct_user_offsets[] extern declaration.
+	* signal.c: Remove open_mode_flags[] extern declaration.
+
+2009-01-06  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	Output format fixes, improving the situation after recent
+	change which added beeter handling of processes suddenly
+	disappearing. Now we often do not finish last line
+	before exiting in those cases.
+	The only change affecting something other than output
+	is change in umovestr where we were calling
+	abort() on ptrace error.
+
+	* strace.c (trace): If trace_syscall() failed with ESRCH,
+	finish current output line with " <unfinished ...>".
+	(mp_ioctl): While we are at it, fix gross style mismatch
+	in this function definition. No code chages.
+	* syscall.c (trace_syscall): If decode fails on syscall exit,
+	finish current output line with "= ? <unavailable>".
+	* util.c (umoven): Do not complain if error is ESRCH.
+	(umovestr): Do not complain and do not abort() if error is ESRCH.
+	* defs.h: Remove unused tcp parameter from printtrailer().
+	* process.c: Adjust printtrailer() calls accordingly.
+	* strace.c: Adjust printtrailer() calls accordingly.
+	* syscall.c: Adjust printtrailer() calls accordingly.
+
+2009-01-06  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* desc.c (printflock): Fix display of fcntl(F_SETLK) on
+	non-native 32-bit architecture.
+	Fixes RH#471169 "format fcntl64() system calls for
+	32 bit application incorrect".
+	* desc.c: const'ify two static struct xlat vector[]'s,
+	convert all remaining old style C parameter declarations
+	in this file.
+
+2008-11-13  Kirill A. Shutemov  <kirill@shutemov.name>
+
+	* linux/arm/syscallent.h: Update syscalls.
+	Based on patch by Enrico Scholz.
+
+	* linux/arm/syscallent.h: Fix build on ARM EABI which does not
+	provide syscalls socketcall and ipc.
+
+2009-01-01  Andreas Schwab  <schwab@suse.de>
+
+	* net.c (sys_accept): Properly decode third argument as pointer to
+	int.
+
+2008-12-30  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	Experimental support for -D option.
+	Unlike normal case, with -D *grandparent* process exec's,
+	becoming a traced process. Child exits (this prevents traced process
+	from having children it doesn't expect to have), and grandchild
+	attaches to grandparent similarly to strace -p PID.
+	This allows for more transparent interaction in cases
+	when process and its parent are communicating via signals,
+	wait() etc. Without -D, strace process gets lodged in between,
+	disrupting parent<->child link.
+	* strace.c: Add global flag variable daemonized_tracer for -D option.
+	(startup_attach): If -D, fork and block parent in pause().
+	In this case we are already a child, we in fact created a grandchild.
+	After attaching to grandparent, grandchild SIGKILLs parent.
+	(startup_child): If -D, parent blocks in wait(), then
+	execs the program to strace. Normally (w/o -D), it is child
+	who execs the program.
+	(main): Detect -D option, call startup_attach() if it is given.
+
+2008-12-30  Kirill A. Shutemov  <kirill@shutemov.name>
+
+	Fix some warnings on ARM build.
+	* defs.h: include <sys/ptrace.h> on arm too.
+	* syscall.c: EABI arm does not need decode_subcall(),
+	ifdef it out.
+
+2008-12-29  Nick Black  <dankamongmen@acm.org>
+
+	* linux/syscallent.h: Mark sendfile(2) as network syscall.
+	* linux/*/syscallent.h: Same, for all architectures.
+
+2008-12-17  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	Make strace detect when traced process suddenly disappeared
+	(prime example is randomly arriving SIGKILL).
+	* defs.h (do_ptrace, ptrace_restart): Declare new functions
+	* process.c: Use ptrace_restart instead of bare ptrace.
+	This catches and records ESRCH errors.
+	Print "<unavailable>" if syscall decode or result can't be
+	determined because of an earlier error in ptrace()
+	* syscall.c (trace_syscall): Stop indiscriminately bailing out
+	on errors, print "syscall(????" or even "????(????" but continue.
+	* util.c (do_ptrace, ptrace_restart): Define new functions.
+	(upeek): use do_ptrace in order to catch and record ESRCH.
+	Do not print error message in this case.
+	Fixes RH#472053.
+
+2008-12-17  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* signal.c (sys_sigaction, sys_rt_sigaction): Fix typo
+	in (sa_handler == SIG_IGN) comparison, it was using SIG_DFL
+	instead.
+
+2008-12-16  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* defs.h: Modify declaration of upeek to take struct tcb *
+	parameter instead of pid_t.
+	* process.c: Change all upeek calls accordingly.
+	* signal.c: Likewise.
+	* strace.c: Likewise.
+	* syscall.c: Likewise.
+	* util.c: Likewise.
+
+2008-11-11  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* sock.c [LINUX] (sock_ioctl): Parse more SIOCS* ioctls.
+
+2008-12-09  Roland McGrath  <roland@redhat.com>
+
+	* strace.1 (DIAGNOSTICS): New section, describe exit behavior.
+
+2008-11-09  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* process.c (prctl_options): Update constants from linux 2.6.27.
+	* system.c (capabilities): Add more capability values.
+
+	* util.c (string_quote): Fix support for NUL-terminated string.
+	Add comments.
+	(printpathn): Fix the case when "..." was appended to the output
+	but no truncation was actually made.  Add comments.
+	(printstr): Fix memory allocation.  Fix two cases when "..." was
+	appended to the output but no truncation was actually made.
+	Add comments.
+	Fixes RH#470529.
+
+2008-10-23  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Implement parsers for new linux syscalls.
+	* desc.c (do_dup2, [LINUX] sys_dup3): New functions.
+	(sys_dup2): Use do_dup2.
+	[LINUX] (sys_epoll_create1): New function.
+	[LINUX] (do_eventfd, sys_eventfd2): New functions.
+	[LINUX] (sys_eventfd): Use do_eventfd.
+	* net.c (do_pipe, [LINUX] sys_pipe2): New functions.
+	(sys_pipe): Use do_pipe.
+	* signal.c [LINUX] (do_signalfd, sys_signalfd4): New functions.
+	[LINUX] (sys_signalfd): Use do_signalfd.
+	* linux/syscall.h: Declare new sys_* functions.
+	* linux/syscallent.h: Hook up signalfd4, eventfd2, epoll_create1,
+	dup3, pipe2, inotify_init1.
+	* linux/x86_64/syscallent.h: Hook up paccept, signalfd4, eventfd2,
+	epoll_create1, dup3, pipe2, inotify_init1.
+
+2008-10-23  Mike Frysinger  <vapier@gentoo.org>
+
+	Port strace to the Blackfin architecture.
+	* configure.ac: Add bfin to supported architectures.
+	* process.c: Skip u_fpvalid/u_fpstate for Blackfin architecture.
+	(change_syscall): Support Blackfin architecture.
+	* syscall.c: Declare r0 for Blackfin architecture.
+	(get_scno): Decode Blackfin syscall number.
+	(syscall_fixup): Extract Blackfin return value.
+	(get_error): Decode Blackfin return value.
+	(force_result): Poke Blackfin return value.
+	(syscall_enter): Extract Blackfin syscall arguments.
+	* defs.h: Define TCB_WAITEXECVE for Blackfin architecture.
+	* linux/syscall.h (sys_sram_alloc): Declare for Blackfin
+	architecture.
+	* system.c (sys_sram_alloc): Decode Blackfin sram_alloc() syscall.
+	* util.c (getpc): Handle PC on Blackfin architecture.
+	(printcall): Likewise.
+	* linux/bfin/ioctlent.h, linux/bfin/syscallent.h: New Blackfin
+	headers.
+	* Makefile.am (EXTRA_DIST): Add linux/bfin/ioctlent.h and
+	linux/bfin/syscallent.h.
+
+2008-09-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Accept uclinux hosts as linux.
+
+2008-10-22  Dmitry V. Levin <ldv@altlinux.org>
+
+	Handle socket type flags introduced in linux 2.6.27.
+	* net.c (socktypes): Add SOCK_DCCP.
+	(sock_type_flags): New xlat structure.
+	(tprint_sock_type): New function.
+	(sys_socket, sys_socketpair): Use it to parse socket type and
+	socket type flags.
+
+2008-09-29  Dmitry V. Levin <ldv@altlinux.org>
+
+	* strace.c (startup_child): Save child pid for future use.
+	(main): Exit/kill ourself with straced child's exitcode/signal.
+	(trace): If signalled process pid matches the saved child pid,
+	save the signal number.  If terminated process pid matches the
+	saved child pid, save its exit status.
+	Patch from Denys Vlasenko <dvlasenk@redhat.com>
+	Fixes RH#105371.
+
+2008-09-12  Tomas Pospisek  <tpo@sourcepole.ch>
+	    Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* strace.1 (DESCRIPTION): New description of unfinished system calls
+	and system calls restarting.
+
+2008-09-03  Dmitry V. Levin <ldv@altlinux.org>
+
+	* desc.c (sys_fcntl): Do not initialize auxstr for failed syscall.
+	* process.c (sys_fork, sys_rfork) [USE_PROCFS]: Likewise.
+	* signal.c (sys_signal): Likewise.
+	* stream.c (internal_stream_ioctl): Likewise.
+	* time.c (sys_adjtimex): Likewise.
+	* syscall.c (trace_syscall): If RVAL_STR is set, then
+	print auxstr for failed syscall as well.
+
+	* syscall.c (is_restart_error): New function.
+	* defs.h (is_restart_error): Declare it.
+
+	* linux/dummy.h (sys_nanosleep): Uncouple from sys_adjtime().
+	* time.c (sys_nanosleep): New function, based on is_restart_error().
+
+	* process.c (sys_prctl): Decode PR_SET_PDEATHSIG, PR_GET_PDEATHSIG,
+	PR_SET_DUMPABLE, PR_GET_DUMPABLE, PR_SET_KEEPCAPS, PR_GET_KEEPCAPS.
+	Fix PR_GET_UNALIGN decoder.
+	(prctl_options): Add more constants.
+
+	* linux/syscallent.h: Use sys_prctl() decoder for "prctl" syscall.
+	* linux/alpha/syscallent.h: Likewise.
+	* linux/arm/syscallent.h: Likewise.
+	* linux/m68k/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
+	* linux/x86_64/syscallent.h: Likewise.
+
+2008-09-02  Dmitry V. Levin <ldv@altlinux.org>
+
+	* linux/x86_64/syscallent.h: Fix syscall numbers for "tee" and
+	"sync_file_range".
+	From Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
+
+2008-08-28  Roland McGrath  <roland@redhat.com>
+
+	* strace.1 (BUGS): New section, mention SIGTRAP interference.
+
+	* strace.spec (%ifarch %{strace64_arches}): Use cp -p instead of ln
+	for %{rhel} < 6.
+
+	* configure.ac, NEWS: Version 4.5.18.
+	* strace.spec: 4.5.18-1.
+
+2008-08-24  Roland McGrath  <roland@redhat.com>
+
+	* linux/syscall.h (SYS_socket_subcall et al, SYS_ipc_subcall et al):
+	Don't define these if [__ARM_EABI__].
+	Reported by Johannes Stezenbach <js@sig21.net>.
+
+	* syscall.c (trace_syscall): Conditionalize on [SYS_socket_subcall]
+	and [SYS_ipc_subcall] individually.
+
+	* linux/powerpc/syscallent.h: Handle subpage_prot.
+	* mem.c [LINUX && POWERPC] (sys_subpage_prot): New function.
+	* linux/syscall.h [POWERPC]: Declare it.
+	From Simon Murray <simon@transitive.com>.
+
+	* mem.c (mmap_prot): Handle PROT_SAO.
+	From Simon Murray <simon@transitive.com>.
+
+	* mem.c (madvise_flags): Typo fixes.  Rename to madvise_cmds.
+	(sys_madvise): Use printxval, not printflags.
+	Reported by Rajeev V. Pillai <rajeevvp@gmail.com>.
+
+2008-08-19  Roland McGrath  <roland@redhat.com>
+
+	* signal.c (sys_sigaction, sys_rt_sigaction): Don't omit the rest of
+	the struct after sa_handler is a known constant.  Some sa_flags bits
+	have meaning even for SIG_IGN/SIG_DFL.
+
+2008-08-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* util.c (CLONE_VM): Define if not defined already.
+	(setbpt): Clear CLONE_VM in the case we already clear CLONE_VFORK for
+	SYS_clone and SYS_clone2.
+	Reported by Michal Nowak.
+	Fixes RH#455078.
+
+2008-08-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix compiler warnings.
+	* signal.c (sys_signal): Cast to SIG_* to the matching type LONG.
+	* strace.c (trace): Variables PSR and PC are now signed.
+	* syscall.c (syscall_enter): Variable RBS_END is now signed long.
+	Remove/add the RBS_END casts appropriately.
+	* util.c [IA64] (arg_setup): Variable BSP is now signed long.
+	Remove/add the BSP casts appropriately.
+	<ia32>: Initialize *STATE.
+
+2008-07-31  Roland McGrath  <roland@redhat.com>
+
+	* Makefile.am (EXTRA_DIST): Add new linux/arm/ files.
+
+	* file.c [LINUX] (struct kernel_dirent): Define it locally,
+	do not use <linux/dirent.h>.
+	Fixes RH#457291.
+
+	* configure.ac: Add AC_HEADER_STDBOOL.
+	* defs.h [HAVE_STDBOOL_H]: #include <stdbool.h>.
+	Fixes Debian#492774.
+
+2008-07-24  Dmitry V. Levin <ldv@altlinux.org>
+
+	* strace.c (main): Fix -F option backwards compatibility.
+
+2008-07-22  Roland McGrath  <roland@redhat.com>
+
+	* Makefile.am (EXTRA_DIST): Add new debian/ files.
+
+2008-07-21  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac: Version 4.5.17.
+	* strace.spec: 4.5.17-1.
+
+	* defs.h [LINUXSPARC]: Don't #include <linux/a.out.h>.
+
+2008-07-19  Frederik Schüler <fs@debian.org>
+
+	* debian/control: Add strace64 package.
+	* debian/rules: Use debhelper flag --same-arch instead of --arch in
+	order to build strace64 only on the specified architectures.
+	* debian/strace64.install: New file, list for dh_install.
+	* debian/strace64.manpages: New file, list for dh_install.
+	* debian/changelog: Add prereleases entries.
+	Fixes Debian#491167, Debian#491188.
+
+2008-07-18  Andreas Schwab  <schwab@suse.de>
+
+	* linux/ia64/syscallent.h: Decode mincore syscall.
+
+	* linux/powerpc/syscallent.h: Fix argument count for request_key.
+
+	* term.c (term_ioctl): Decode indirect parameter as int, not long.
+
+2008-07-17  Roland McGrath  <roland@redhat.com>
+
+	* NEWS, strace.spec: Updates in preparation for release.
+
+	* process.c (printwaitn): When current personality's wordsize is
+	smaller than native, sign-extend the PID argument from 32 bits.
+
+	* process.c (futexops): Update table.
+	(sys_futex): Handle FUTEX_WAIT_BITSET correctly.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#448628.
+
+	* linux/syscallent.h: Fix "futex" argument count.
+	* linux/alpha/syscallent.h: Likewise.
+	* linux/arm/syscallent.h: Likewise.
+	* linux/hppa/syscallent.h: Likewise.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/m68k/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/x86_64/syscallent.h: Likewise.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#448629.
+
+	* signal.c (sigact_flags): Prefer SA_NODEFER to SA_NOMASK,
+	SA_RESETHAND to SA_ONESHOT.
+	Fixes RH#455821.
+
+2008-07-09  Frederik Schüler <fs@debian.org>
+
+	* debian/rules: Remove the broken udeb creation routines, and redo the
+	complete install procedure using debhelper.
+	* debian/strace.docs: New file, list for dh_installdocs.
+	* debian/strace.examples: New file, list for dh_installexamples.
+	* debian/strace.install: New file, list for dh_install.
+	* debian/strace-udeb.install: New file, list for dh_install.
+	* debian/strace.manpages : New file, list for dh_installmanpages.
+	* debian/copyright: Update.
+	* debian/control: Fix libc6 build dependency for alpha and ia64.
+	(strace-udeb: XC-Package-Type): Add header.
+	* debian/changelog: Cosmetic changes.
+
+2008-07-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Trace vfork under -f on all the platforms.
+	* strace.1 <-f>: Describe Linux catches new children immediately.
+	<-F>: Make the option obsolete.  Move the SunOS VFORK comment to the
+	`-f' option description.
+	* defs.h (followvfork): Declaration removed.
+	* strace.c (followvfork): Variable removed.
+	(main) <-F>: Merge with the `-f' option.
+	(trace): Make !FOLLOWVFORK unconditional.
+	* process.c (internal_fork): Make !FOLLOWVFORK unconditional.
+
+2008-07-01  Frederik Schüler <fs@debian.org>
+
+	* debian/changelog: List all bugs closed since the last release.
+	* debian/control: Remove Wichert Akkerman from uploaders list.
+	* debian/control: Bump standards version to 3.8.0.
+	* debian/control: Add Homepage field.
+	* debian/rules: Fix dpkg-gencontrol call.
+	* debian/compat: New file, set to compatibility level 5.
+	* debian/rules: Call dh_clean on clean target.
+	* debian/rules: Add dh_md5sums call.
+	Fixes Debian#439428.
+
+2008-06-30  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix ia64 `-f' on clone2 formerly crashing the child.
+	* util.c [IA64] (restore_arg0, restore_arg1): Define as empty.
+	Fixes RH#453438.
+
+2008-06-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* util.c (CLONE_VFORK): Define if not defined already.
+	(setbpt): Clear CLONE_VFORK for SYS_clone and SYS_clone2.
+	Reported by Vitaly Mayatskikh.
+	Fixes RH#455078.
+
+2008-06-29  Dmitry V. Levin <ldv@altlinux.org>
+
+	* linux/x86_64/syscallent.h: Remove duplicate syscall entries
+	for #283 and #284.
+
+2008-06-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* linux/syscallent.h: Remove a duplicite syscall stub #326.
+
+2008-05-27  Roland McGrath  <roland@redhat.com>
+
+	* syscall.c [LINUX] (is_negated_errno): New function.
+	(get_error) [LINUX]: Use it for all such cases.
+	Fixes RH#447587.
+
+2008-05-19  Roland McGrath  <roland@redhat.com>
+
+	* linux/x86_64/syscallent.h: Update entries for timerfd_* and fallocate.
+
+	* file.c (sys_fallocate): New function.
+	* linux/syscall.h: Declare it.
+	* linux/syscallent.h: Update entry.
+	From Kyle McMartin <kyle@mcmartin.ca>.
+
+	* time.c (sys_timerfd_create): New function.
+	(sys_timerfd_settime, sys_timerfd_gettime): New functions.
+	* linux/syscall.h: Declare them.
+	* linux/syscallent.h: Update entries for those syscalls.
+	From Kyle McMartin <kyle@mcmartin.ca>.
+
+	* debian/rules (binary-arch): Fix chmod/chown typo.
+	Fixes Debian#459255.
+
+	* debian/rules (binary-arch): Install strace-graph in examples/
+	directory under package doc.
+	Fixes Debian#469068.
+
+	* signal.c (sys_kill): When current personality's wordsize is smaller
+	than native, sign-extend the PID argument from 32 bits.
+	Fixes RH#430585.
+
+	* configure.ac: Add check for struct sigcontext_struct in <signal.h>.
+	* signal.c [! HAVE_ASM_SIGCONTEXT_H] [I386] (struct sigcontext_struct):
+	Conditionalize definition on !HAVE_STRUCT_SIGCONTEXT_STRUCT.
+	Fixes Debian#456879.
+
+	* util.c [LINUX] (setbpt): Use correct SYS_clone number for current
+	personality.
+	Fixes RH#447475.
+
+2008-05-08  David S. Miller  <davem@davemloft.net>
+
+	* syscall.c (socket_map, sparc_socket_decode): Delete.
+	(trace_syscall): Use common socketcall and ipc subcall
+	support on sparc.
+	* linux/sparc/syscall.h (sys_semtimedop): Declare.
+	(SYS_socket_subcall, SYS_sub_socket, SYS_sub_bind,
+	SYS_sub_connect, SYS_sub_listen, SYS_sub_accept,
+	SYS_sub_getsockname, SYS_sub_getpeername,
+	SYS_sub_socketpair, SYS_sub_send, SYS_sub_recv,
+	SYS_sub_sendto, SYS_sub_recvfrom, SYS_sub_shutdown,
+	SYS_sub_setsockopt, SYS_sub_getsockopt, SYS_sub_sendmsg,
+	SYS_sub_recvmsg, SYS_socket_nsubcalls, SYS_ipc_subcall,
+	SYS_sub_semop, SYS_sub_semget, SYS_sub_semctl,
+	SYS_sub_semtimedop, SYS_sub_msgsnd, SYS_sub_msgrcv,
+	SYS_sub_msgget, SYS_sub_msgctl, SYS_sub_shmat,
+	SYS_sub_shmdt, SYS_sub_shmget, SYS_sub_shmctl,
+	SYS_ipc_nsubcalls): Define
+	* linux/sparc/syscallent.h: Add socketcall and ipc entries.
+
+2008-01-25  Bruna Moreira  <bruna.moreira@indt.org>
+
+	* defs.h [ARM]: Define SUPPORTED_PERSONALITIES to 2.
+	* syscall.c (get_scno) [ARM]: Add support for architecture specific
+	syscalls.
+	* linux/arm/syscallent.h: Update network syscalls list.
+	* linux/arm/syscallent1.h: New file. Add new architecture specific
+	syscalls.
+	* linux/arm/errnoent1.h: New file.
+	* linux/arm/ioctlent1.h: New file.
+	* linux/arm/signalent1.h: New file.
+	Fixes Debian#441000.
+
+2008-01-07  Paul Mundt  <lethal@linux-sh.org>
+
+	* linux/sh64/syscallent.h: Update numerous calls, fix others.
+
+2007-08-26  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* defs.h [MIPS]: Include <sgidefs.h>.
+	(MAX_QUALS): Update for MIPS.
+	(LINUX_MIPSO32, LINUX_MIPSN32, LINUX_MIPSN64, LINUX_MIPS64): Define.
+	(struct tcb): Add ext_arg for MIPS N32.
+	(TCB_WAITEXECVE): Define for MIPS.
+	(ALIGN64): Use LINUX_MIPSO32.
+	* file.c (sys_lseek): Use ext_arg for MIPS N32.
+	(sys_readahead, sys_fadvise64_64): Likewise.
+	* io.c (sys_pread64, sys_pwrite64): Likewise.
+	* mem.c (print_mmap): Take OFFSET argument.
+	(sys_old_mmap): Update call to print_mmap.
+	(sys_mmap): Use ext_arg for MIPS N32.
+	* process.c (struct_user_offsets): Add MIPS registers.
+	* signal.c (sys_sigreturn): Handle MIPS N32 and MIPS N64.  Correct
+	MIPS O32 call to sprintsigmask.
+	* syscall.c (internal_syscall): Handle MIPS N32.  Check for
+	TCB_WAITEXECVE on MIPS.
+	(force_result): Add a comment about MIPS N32.
+	(syscall_enter): Handle MIPS N32 and MIPS N64.
+	* linux/syscall.h (sys_pread64, sys_pwrite64): Declare.
+	* linux/mips/syscallent.h: Include "dummy.h".  Handle alternate
+	MIPS ABIs.
+
+2008-04-19  Dmitry V. Levin <ldv@altlinux.org>
+
+	* file.c [_LFS64_LARGEFILE] (sys_getdents64): Do the same
+	d_reclen check as in sys_getdents: warn if d_reclen is 0 rather
+	than looping forever.
+	[FREEBSD] (sys_getdirentries): Likewise.
+	Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+	* file.c [LINUXSPARC] (printstatsol): Fix sprinttime()
+	invocation.  The sprinttime() function takes a time_t argument,
+	but timestruct_t argument was given.
+	Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+	* file.c (sprinttime): Check localtime() return value, to avoid
+	potential NULL dereference due to invalid time structures.
+	Signed-off-by: Harald van Dijk <truedfx@gentoo.org>
+	Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+	* linux/errnoent.h: Update errno list based on latest
+	linux/errno.h and asm-generic/errno*.h files.
+	Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+	* signalent.sh: Fix sort(1) old-style options.
+	* syscallent.sh: Likewise.
+	Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+	* count.c (call_summary_pers): Check calloc() return value.
+	Signed-off-by: "Yang Zhiguo" <yzgcsu@cn.fujitsu.com>
+
+2008-03-26  Roland McGrath  <roland@redhat.com>
+
+	* strace.spec (strace64_arches): Add sparc64.
+
+2007-11-20  Roland McGrath  <roland@redhat.com>
+
+	* CREDITS, ChangeLog: Converted contents to UTF8.
+
+2007-11-19  Roland McGrath  <roland@redhat.com>
+
+	* strace.spec: Add BuildRequires on libaio-devel, libacl-devel.
+
+2007-11-19  Andreas Schwab  <schwab@suse.de>
+
+	* process.c (sys_ptrace) [IA64]: For PTRACE_PEEKDATA,
+	PTRACE_PEEKTEXT and PTRACE_PEEKUSER the data is returned directly.
+
+	* linux/syscallent.h: Fix argument count for getdents64.
+	* linux/arm/syscallent.h: Likewise.
+	* linux/m68k/syscallent.h: Likewise.
+	* linux/x86_64/syscallent.h: Likewise.
+
+	* linux/ia64/syscallent.h: Use sys_getdents64.
+	* linux/sh/syscallent.h: Likewise.
+
+2007-11-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* strace.c [LINUX] (droptcb): Recurse on TCP->parent if it is a
+	TCB_EXITING zombie group leader.
+	* test/childthread.c: New file.
+	* test/.cvsignore, test/Makefile: Add it.
+	Code advisory: Roland McGrath
+	Fixes RH#354261.
+
+2007-11-03  Roland McGrath  <roland@redhat.com>
+
+	* process.c (prctl_options): Add numerous constants.
+	From Sami Farin <safari@u.safari.iki.fi>.
+	Fixes RH#364401.
+
+2007-11-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* strace.c (main): Move the STARTUP_CHILD call before setting up the
+	signal handlers.  New comment about the valid internal states.
+
+2007-11-02  Thiemo Seufer  <ths@networkno.de>
+
+	* signal.c (m_siginfo_t): Add for MIPS.
+	(sys_sigreturn): struct sigcontext on MIPS has no sigset_t member,
+	acquire the signal mask with the same trick as on Sparc.
+	Fixes Debian#448802.
+
+2007-11-01  Roland McGrath  <roland@redhat.com>
+
+	* util.c (string_quote): Return nonzero if the string was unterminated.
+	(printstr): Use that value instead of just our own test.
+	(printpathn): Likewise.
+	Fixes RH#358241.
+
+	* linux/mips/syscallent.h: Fix argument count for fadvise64_64.
+	From Paul Mundt <lethal@linux-sh.org>.
+
+	* linux/mips/syscallent.h: Fix argument count for lookup_dcookie.
+	From Paul Mundt <lethal@linux-sh.org>.
+
+	* linux/sh64/syscallent.h: Fix SYS_socket_subcall check.
+	From Paul Mundt <lethal@linux-sh.org>.
+
+	* linux/sh/syscallent.h: Update numerous calls.
+	From Paul Mundt <lethal@linux-sh.org>.
+
+2007-09-22  Dmitry V. Levin <ldv@altlinux.org>
+
+	* desc.c (sys_pselect6): Decode signal mask when entering syscall.
+	Relax signal mask size check.
+
+	* time.c (print_timespec, sprint_timespec): New functions.
+	* defs.h (print_timespec, sprint_timespec): Declare them.
+	* desc.c (sys_io_getevents): Use print_timespec.
+	* stream.c (sys_ppoll): Likewise.
+	(decode_poll): Use sprint_timespec.
+
+2007-09-22  Alan Curry <pacman@world.std.com>
+	    Dmitry V. Levin <ldv@altlinux.org>
+
+	* stream.c (decode_poll): Rearrange so that arguments are decoded
+	and printed on syscall entry, except for revents and the output
+	timespec which are now printed in the auxstr.
+	(sys_poll): Print the input timeout argument on syscall entry.
+	[LINUX] (sys_ppoll): Likewise.
+	Fixes Debian#369651.
+
+2007-09-22  Dmitry V. Levin <ldv@altlinux.org>
+
+	* desc.c (sprintflags): Remove static qualifier, add "prefix"
+	argument, move function to ...
+	* util.c (sprintflags): ... here.
+	* defs.h (sprintflags): Declare it.
+
+2007-11-01  Roland McGrath  <roland@redhat.com>
+
+	* syscall.c (get_scno) [ARM]: Check TCB_WAITEXECVE.
+	Reported by Bernhard Fischer <rep.dot.nop@gmail.com>.
+
+	* net.c (sockpacketoptions): Make PACKET_ADD_MEMBERSHIP and
+	PACKET_DROP_MEMBERSHIP conditional.
+	From Bernhard Fischer <rep.dot.nop@gmail.com>.
+
+	* configure.ac: Match sh64* for SH64, sh* for SH.
+	Reported by Bernhard Fischer <rep.dot.nop@gmail.com>.
+
+2007-10-01  Dmitry V. Levin <ldv@altlinux.org>
+
+	* net.c (printsock): Output AF_UNIX socket address using
+	printpathn() to avoid unprintable characters in output.
+	Suggested by Neil Campbell.
+
+2007-10-01  Dmitry V. Levin <ldv@altlinux.org>
+
+	* util.c (string_quote): Move quoting code from ...
+	(printstr) ... here.  Use string_quote.
+	(printpathn): Update for new string_quote interface.
+	(printpath): Use printpathn.
+
+2007-09-25  Dmitry V. Levin <ldv@altlinux.org>
+
+	* strace.c (main): Use calloc for tcbtab allocation.
+	Check calloc return value.
+	Reported by Bai Weidong.
+
+2007-09-11  Roland McGrath  <roland@redhat.com>
+
+	* linux/sparc/syscall.h: Add missing decls.
+	* linux/sparc/syscallent.h: Correct entries for setgroups32,
+	getgroups32, sys_getdents64.
+	From Jakub Bogusz <qboosh@pld-linux.org>.
+
+	* linux/alpha/syscallent.h: Correct entries for madvise, setresgid,
+	getresgid, pivot_root, mincore, pciconfig_iobase, getdents64.
+	From Jakub Bogusz <qboosh@pld-linux.org>.
+
+	* linux/syscallent.h: Fix getegid32 entry.
+	From Jakub Bogusz <qboosh@pld-linux.org>.
+
+	* defs.h [LINUXSPARC]: Use asm/psrcompat.h for [SPARC64], not asm/psr.h.
+	From Jakub Bogusz <qboosh@pld-linux.org>.
+
+	* mem.c (sys_getpagesize): Define for [SPARC || SPARC64] too.
+	From Jakub Bogusz <qboosh@pld-linux.org>.
+
+2007-08-20  Dmitry V. Levin <ldv@altlinux.org>
+
+	* syscall.c (qual_syscall, qualify): Fix nsyscalls and MAX_QUALS misuse.
+	Reported by Xiaoning Ding.
+
+2007-08-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	    Roland McGrath  <roland@redhat.com>
+
+	* file.c [!HAVE_STAT64 && LINUX && X86_64] (struct stat64): Define it.
+	[!HAVE_STAT64 && LINUX && X86_64] (HAVE_STAT64, STAT64_SIZE): Define.
+	[HAVE_STAT64] (printstat64) [STAT64_SIZE]: Add compile-time assertion.
+	Fixes RH#222275.
+
+	* file.c (printstat64): Test [HAVE_LONG_LONG] for st_size printing
+	and cast to widest type available.
+
+2007-08-03  Ulrich Drepper  <drepper@redhat.com>
+
+	* file.c (open_mode_flags): Add O_CLOEXEC.
+	* net.c (msg_flags): Add MSG_CMSG_CLOEXEC.
+	Fixes RH#365781.
+
+2007-08-03  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.16.
+	* debian/changelog, strace.spec: 4.5.16-1.
+
+	* debian/control (Build-Depends): Replace libc6-dev-s390x and
+	libc6-dev-sparc64 with gcc-multilib.
+	* debian/rules: Replace sparc-linux, s390-linux conditionals with
+	general "arch64_map" hair, handle x86_64 and powerpc64 too.
+	From Matthias Klose <doko@cs.tu-berlin.de>.
+	Fixes Debian#435303.
+
+2007-08-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* strace.c (detach): Moved the resume notification code to ...
+	(resume_from_tcp): ... a new function here.
+	(handle_group_exit): No longer detach also the thread group leader.
+	(trace): Fixed panic on exit of the TCB_GROUP_EXITING leader itself.
+	Fixes RH#247907.
+
+	* test/leaderkill.c (start): Renamed to ...
+	(start0): ... here.
+	(start1): New function.
+	(main): Created a new spare thread.
+
+2007-08-01  Roland McGrath  <roland@redhat.com>
+
+	* util.c (umoven): Don't perror for EIO.
+	(umovestr): Likewise.
+
+	* process.c (printargv): Handle boundary cases correctly.
+	Handle biarch fetching correctly.
+
+	* util.c (printstr): Don't print ... if the string matches the length
+	limit exactly.
+
+	* linux/sparc64/syscallent.h: Just #include the sparc file.
+	* linux/sparc64/syscallent1.h: Likewise.
+	* linux/sparc64/syscallent2.h: Likewise.
+
+	* linux/arm/syscallent.h: Add entry for getcpu.
+	* linux/hppa/syscallent.h: Likewise.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+
+	* linux/arm/syscallent.h: Add entry for eventfd.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+
+	* linux/arm/syscallent.h: Add entry for timerfd.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+
+	* linux/arm/syscallent.h: Add entry for signalfd.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+
+	* linux/hppa/syscallent.h: Add entry for epoll_pwait.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+
+2007-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* process.c (sys_getcpu): New function.
+	* linux/syscall.h: Declare sys_getcpu.
+	* linux/syscallent.h: Add entry for getcpu.
+
+	* desc.c (sys_eventfd): New function.
+	* linux/syscall.h: Declare sys_eventfd.
+	* linux/syscallent.h: Add entry for eventfd.
+	* linux/x86_64/syscallent.h: Likewise.
+
+	* time.c (printitv_bitness): Add missing braces to enclose
+	conditional code.
+	(TDF_TIMER_ABSTIME): Define if not already.
+	(timerfdflags): New variable.
+	(sys_timerfd): New function.
+	* linux/syscall.h: Declare sys_timerfd.
+	* linux/syscallent.h: Add timerfd entry.
+	* linux/x86_64/syscallent.h: Likewise.
+
+	* linux/syscall.h: Declare sys_signalfd.
+	* linux/syscallent.h: Add entry for signalfd.
+	* linux/x86_64/syscallent.h: Likewise.
+	* signal.c (sys_signalfd): New function.
+
+	* desc.c (sys_epoll_wait): Move body of function to ...
+	(epoll_wait_common): ...here.  New function.
+	(sys_epoll_pwait): New function.
+	* linux/syscall.h: Declare sys_epoll_pwait.
+	* linux/syscallent.h: Add entry for epoll_pwait.
+	* linux/x86_64/syscallent.h: Likewise.
+
+2007-07-23  Roland McGrath  <roland@redhat.com>
+
+	* time.c (printtv_bitness): SPECIAL only counts when tv_sec == 0.
+
+	* linux/arm/syscallent.h: Add move_pages.
+	* linux/hppa/syscallent.h: Likewise.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/m68k/syscallent.h: Likewise.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+
+	* linux/syscallent.h: move_pages takes 6 args, not 5.
+	* linux/x86_64/syscallent.h: Likewise.
+
+2007-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* defs.h: Add new parameter to printtv_bitness prototype.
+	(printttv): Pass zero for the new parameter.
+	(printtv_special): New macro.
+	* desc.c (decode_select): Pass zero for the new parameter of
+	printtv_bitness.
+	* file.c (utimensatflags): New macro.
+	(sys_osf_utimes): Pass zero for the new parameter of
+	printtv_bitness.
+	(sys_utimes): Likewise.
+	(sys_futimesat): Likewise.
+	(decode_utimes): Add new parameter.  Pass it to the
+	printtv_bitness calls.  Fix printing of time values.
+	(sys_utimensat): New function.
+	* time.c (UTIME_NOW, UTIME_OMIT): Define if not already
+	happened.
+	(printtv_bitness): Add new parameter.  Print special UTIME_*
+	values as strings if set.
+	(sys_osf_gettimeofday): Pass zero for the new parameter of
+	printtv_bitness.
+	(sys_osf_settimeofday): Likewise.
+	* linux/syscall.h: Declare sys_utimensat.
+	* linux/syscallent.h: Add utimensat entry.
+	* linux/x86_64/syscallent.h: Likewise.
+
+	* mem.c (move_pages_flags): New variable.
+	(sys_move_pages): New function.
+	* linux/syscall.h: Declare sys_move_pages.
+	* linux/syscallent.h: Add entry for sys_move_pages.
+	* linux/x86_64/syscallent.h: Likewise.
+
+	* mem.c (MPOL_MF_MOVE, MPOL_MF_MOVE_ALL): Define.
+	(mbindflags): Add MPOL_MF_MOVE and MPOL_MF_MOVE_ALL entries.
+
+2007-07-23  Roland McGrath  <roland@redhat.com>
+
+	* util.c (tv_add): Fix rounding comparison.
+	Reported by Bai Weidong <baiwd@cn.fujitsu.com>.
+
+2007-07-11  Roland McGrath  <roland@redhat.com>
+
+	* count.c (call_summary_pers): Use tv_float conversion for output of
+	cumulative time, in case it is negative from bogus -O value.
+	From Lai JiangShan <laijs@cn.fujitsu.com>.
+
+	* strace.c (handle_group_exit): Detach TCP before LEADER.
+	Don't use PTRACE_KILL on LEADER.
+
+	* util.c (printstr): Fix size calculation for outstr allocation.
+
+	* configure.ac (struct sigcontext.sc_hi2): Use #ifdef around
+	<asm/sigcontext.h> to match signal.c include conditions.
+
+2007-07-05  Roland McGrath  <roland@redhat.com>
+
+	* debian/rules: Use debian/$(package) instead of debian/tmp as temp dir.
+
+	* configure.ac: Use <stddef.h> before <linux/socket.h>.
+
+	* debian/changelog: Harmonize with debian version.
+	* debian/control (Uploaders): Fix surname spelling.
+	(Build-Depends): Make debhelper requirement (>= 5.0.0).
+	(Standards-Version): Update to 3.7.2.
+
+	* .cvsignore: Add some automake-created files.
+
+	* file.c (sys_utime): Use personality_wordsize to handle biarch.
+	Fixes RH#247185.
+
+	* signal.c (sys_sigreturn) [MIPS]: Pass 3rd arg to sprintsigmask.
+	From Zhang Le <zhilg@users.sourceforge.net>.
+
+	* strace.c (strace_fopen): [_LFS64_LARGEFILE]: Use fopen64.
+	Fixes Debian#385310.
+
+	* strace.c (main): Fix error message for unfound -u user.
+	From Srinivasa Ds <srinivasa@in.ibm.com>.
+	Fixes RH#247170.
+
+	* debian/control (Architecture): Add armel.
+
+	* linux/syscallent.h: Fix sys_delete_module arg count.
+	* linux/alpha/syscallent.h: Likewise.
+	* linux/arm/syscallent.h: Likewise.
+	* linux/hppa/syscallent.h: Likewise.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/m68k/syscallent.h: Likewise.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+	* linux/sparc64/syscallent2.h: Likewise.
+	* linux/x86_64/syscallent.h: Likewise.
+	* linux/dummy.h (sys_delete_module): Use sys_open.
+	From Johannes Stezenbach <js@linuxtv.org>.
+
+	* configure.ac: Check for struct sigcontext.sc_hi2.
+	* signal.c (sys_sigreturn) [MIPS]: Use sc_hi2 vs sc_sigset if found.
+
+	* process.c [LINUX] (futexops): Add many new values.
+	[LINUX] (futexwakeops, futexwakecmps): New tables.
+	[LINUX] (sys_futex): Use them.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#241467.
+
+2007-07-05  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* strace.c (detach): New prototype.  Extended the function comment.
+	[LINUX] (detach): Call droptcb() instead of the wrongly parametrized
+	detach() call.
+	(handle_group_exit): Call droptcb() instead of the wrongly parametrized
+	detach() call.	Always call detach() only once from the group leader.
+	Comment the leader killing known bug tested by `test/leaderkill.c'.
+	Code advisory: Roland McGrath
+	Fixes RH#240961.
+
+	* test/leaderkill.c: New file.
+	* test/.cvsignore, test/Makefile: Add it.
+
+2007-03-21  Andreas Schwab  <schwab@suse.de>
+
+	* file.c (sys_newfstatat): Don't use printstat64 on ppc64.
+
+2007-03-29  Vladimir Nadvornik <nadvornik@suse.cz>
+	    Dmitry V. Levin <ldv@altlinux.org>
+
+	Trace linux SG_IO ioctl arguments and results.
+	* scsi.c: New file.
+	* Makefile.am (strace_SOURCES): Add it.
+	* defs.h (scsi_ioctl): New function.
+	* ioctl.c (ioctl_decode): Use scsi_ioctl().
+
+2007-06-28  Dmitry V. Levin <ldv@altlinux.org>
+
+	* util.c (tv_mul): Multiply tv_usec properly.
+	Patch from Cai Fei <caifei@cn.fujitsu.com>.
+
+2007-06-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Never interrupt when the attached traced process would be left stopped.
+	* strace.c (main): `-p' attaching moved to ...
+	(startup_attach): ... a new function, renamed a variable C to TCBI.
+	Block interrupting signals since the first tracee has been attached.
+	New comment about INTERRUPTED in the nonthreaded case.
+	[LINUX] (startup_attach): Check INTERRUPTED after each attached thread.
+	(main): Command spawning moved to ...
+	(startup_child): ... a new function, replaced RETURN with EXIT.
+	[LINUX] (detach): New variable CATCH_SIGSTOP, do not signal
+	new SIGSTOP for processes still in TCB_STARTUP.
+	(main): Move signals and BLOCKED_SET init before the tracees attaching,
+	[SUNOS4] (trace): Removed fixvfork () call as a dead code, SIGSTOP must
+	have been already caught before clearing TCB_STARTUP.
+	(trace): Removed the `!WIFSTOPPED(status)' dead code.
+	Clear TCB_STARTUP only in the case the received signal was SIGSTOP.
+	New comment when `TCB_BPTSET && TCB_STARTUP' combination can be set.
+	Code advisory: Roland McGrath
+	Fixes RH#240986.
+
+2007-05-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* strace.c [LINUX] (my_tgkill): New macro.
+	[LINUX] (detach): Use my_tgkill () instead of kill(2).
+	Fixes RH#240962.
+
+2007-03-30  Dmitry V. Levin <ldv@altlinux.org>
+
+	* mem.c (mmap_flags): Add MAP_32BIT.
+	Reported by Kirill A. Shutemov.
+
+2007-01-12  Dmitry V. Levin <ldv@altlinux.org>
+
+	* sock.c (sock_ioctl): Check umove() return code.
+	[LINUX]: Handle SIOCGIFTXQLEN and SIOCGIFMAP.
+
+2007-03-16  Roland McGrath  <roland@redhat.com>
+
+	* linux/s390/syscallent.h: Use sys_restart_syscall for 7.
+	* linux/s390x/syscallent.h: Likewise.
+
+2007-02-18  Roland McGrath  <roland@redhat.com>
+
+	* strace.spec (Summary): Remove trailing period.
+	(%files): Add %doc files.
+	(%changelog): Double %s in text.
+	(BuildRoot): Change to Fedora canonical.
+	(%install): Don't use %makeinstall macro.
+	(%build): Use %{?_smp_mflags}.
+
+2007-01-16  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.15.
+	* debian/changelog, strace.spec: 4.5.15-1.
+
+2007-01-16  Dmitry V. Levin <ldv@altlinux.org>
+
+	Update mount parser to match kernel behaviour.
+	* system.c [LINUX] (MS_VERBOSE): Rename to MS_SILENT.
+	[LINUX] (MS_UNBINDABLE, MS_PRIVATE, MS_SLAVE, MS_SHARED):
+	New macros.
+	[LINUX] (mount_flags): Add them.
+	[LINUX] (MS_MGC_MSK): New macro.
+	[LINUX] (sys_mount): Update parser to match kernel behaviour:
+	discard MS_MGC_VAL magic, do not decode type and/or data
+	strings when specified flags do not imply valid strings.
+
+2007-01-12  Dmitry V. Levin <ldv@altlinux.org>
+
+	* time.c [LINUX] (tprint_timex32, tprint_timex): Decode adjtimex
+	modes as flags.
+
+2007-01-11  Dmitry V. Levin <ldv@altlinux.org>
+
+	Update umount parser.
+	* system.c [LINUX] (MNT_FORCE, MNT_DETACH, MNT_EXPIRE): New macros.
+	[LINUX] (umount_flags): New xlat structure with MNT_* entries.
+	[LINUX] (sys_umount2): Use umount_flags.
+
+	Fix open(2) flags parser.
+	* defs.h (tprint_open_modes): New function.
+	* desc.c (sprint_open_modes): New function.
+	(sys_fcntl): Use tprint_open_modes() and sprint_open_modes().
+	* file.c (openmodes): Split xlat into open_access_modes and
+	open_mode_flags.
+	(tprint_open_modes): New function.
+	(decode_open): Use it.
+	* ipc.c (sys_mq_open, printmqattr): Likewise.
+	Fixes RH#222385.
+
+2007-01-11  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.15.
+	* debian/changelog, strace.spec: 4.5.15-1.
+
+	* debian/control (Uploaders): Add Frederik Schueler <fs@debian.org>.
+
+	* strace.spec (Release): Use %{?dist}.
+
+	* system.c [LINUX] (CTL_CPU): Define in case header is missing it.
+
+2006-12-27  Dmitry V. Levin <ldv@altlinux.org>
+
+	Add const qualifier to xlookup() return value.
+	* defs.h (xlookup): Add const qualifier to return value.
+	* desc.c (sprintflags): Likewise.
+	* process.c (printpriv): Update xlookup() use.
+	* signal.c (sprintsigmask): Add const qualifier to first argument and
+	return value.
+	* util.c (xlookup): Add const qualifier to return value.
+	(printxval): Update xlookup() use.
+
+2006-12-21  Dmitry V. Levin <ldv@altlinux.org>
+
+	Move counts code to separate file.
+	* count.c: New file.
+	* Makefile.am (strace_SOURCES): Add count.c.
+	* syscall.c (call_counts, countv, counts, shortest, time_cmp,
+	syscall_cmp, count_cmp, sortfun, overhead, set_sortby,
+	set_overhead, call_summary_pers, call_summary): Move to count.c
+	* count.c (count_syscall): New function.
+	* defs.h (count_syscall): Declare it.
+	* syscall.c (trace_syscall): Use it.
+
+2006-12-20  Dmitry V. Levin <ldv@altlinux.org>
+
+	* syscall.c (internal_syscall): Change conditions for internal_exit,
+	internal_fork, internal_clone, internal_exec and internal_wait
+	calls from switching on known scno values to switching on known
+	sysent[tcp->scno].sys_func values.
+	Fixes RH#179740.
+
+	Show system call summary for each personality.
+	* syscall.c (countv): New call_counts pointers array.
+	(counts): Convert to macro wrapper around countv.
+	(call_summary_pers): New function.
+	(call_summary): Use it for each personality.
+	Fixes RH#192193.
+
+2006-12-12  Dmitry V. Levin <ldv@altlinux.org>
+
+	Fix -ff -o behaviour.  Fix piping trace output.
+	* defs.h (newoutf): Remove.
+	(alloctcb): Rename to alloc_tcb.  Add alloctcb() macro wrapper
+	around alloc_tcb().
+	* process.c [!USE_PROCFS] (internal_clone, internal_fork):
+	Remove newoutf() call.
+	* strace.c (set_cloexec_flag, strace_fopen, strace_popen,
+	swap_uid): New functions.
+	(popen_pid): New variable.
+	(newoutf): Make static, use strace_fopen().
+	(main): Use strace_fopen() and strace_popen(), remove uids
+	swapping.  Do not open outfname when followfork > 1.
+	Reinitialize tcp->outf properly.
+	(alloctcb): Rename to alloc_tcb.  Use newoutf().
+	(trace): Check popen_pid.  Remove newoutf() call.
+	[USE_PROCFS] (proc_open, proc_poll_open): Use set_cloexec_flag().
+	Fixes RH#204950, RH#218435, Debian#353935.
+
+2006-12-10  Dmitry V. Levin <ldv@altlinux.org>
+
+	Add biarch support for "struct sigevent".
+	* time.c [LINUX && SUPPORTED_PERSONALITIES > 1] (printsigevent32):
+	New function.
+	[LINUX] (printsigevent): [SUPPORTED_PERSONALITIES > 1]
+	Handle 32-bit personality.
+
+	Add biarch support for "struct timex".
+	* time.c [LINUX && SUPPORTED_PERSONALITIES > 1] (tprint_timex32):
+	New function.
+	[LINUX] (tprint_timex): New function.
+	[LINUX] (sys_adjtimex): Use it.
+
+	Enhance adjtimex parser.
+	* time.c [LINUX] (adjtimex_modes, adjtimex_status,
+	adjtimex_state): New xlat structures.
+	[LINUX] (sys_adjtimex): Print the whole struct timex.
+	Decode modes, status and return code.
+
+	Add biarch support for "struct itimerval".
+	* time.c (printitv): Rename to printitv_bitness().
+	Add printitv() macro wrapper around printitv_bitness().
+	(printitv_bitness): Handle 32-bit personality.
+	[ALPHA] (sys_osf_getitimer, sys_osf_setitimer):
+	Use printitv_bitness().
+	(tprint_timeval, tprint_timeval32): New functions.
+	(printtv_bitness, printitv_bitness, sys_adjtimex): Use them.
+	(printitv32): Remove.
+
+	Add biarch support for "struct timeval".
+	* defs.h (bitness_t): New enum type.
+	(printtv_bitness, sprinttv): New function prototypes.
+	(printtv): Convert to macro wrapper around printtv_bitness().
+	(printtv32): Remove.
+	* desc.c (decode_select): Use printtv_bitness() and sprinttv().
+	(sys_oldselect, sys_osf_select, sys_select, sys_pselect6):
+	Update decode_select() use.
+	* file.c [ALPHA] (sys_osf_utimes): Use printtv_bitness().
+	* time.c (printtv_bitness, sprinttv): New functions.
+	(printtv, printtv32): Remove.
+	[ALPHA] (sys_osf_settimeofday, sys_osf_settimeofday):
+	Use printtv_bitness().
+	Fixes RH#171626, RH#173050.
+
+	Add biarch support for "struct iovec".
+	* defs.h (personality_wordsize): Add.
+	* io.c [HAVE_SYS_UIO_H] (tprint_iov): [LINUX &&
+	SUPPORTED_PERSONALITIES > 1] Handle 32-bit personality.
+	* util.c [HAVE_SYS_UIO_H] (dumpiov): [LINUX &&
+	SUPPORTED_PERSONALITIES > 1] Likewise.
+	Patch from Jakub Jelinek.
+	Fixes RH#218433.
+
+	* time.c (sys_timer_create): Check umove() return code.
+
+	Make several global variables static.
+	#ifdef definitions of rarely unused functions.
+	* defs.h (rflag, tflag, outfname): Remove.
+	* strace.c (iflag, interactive, pflag_seen, rflag, tflag,
+	outfname, username): Make static.
+	* desc.c (sys_getdtablesize): Define only for
+	ALPHA || FREEBSD || SUNOS4.
+	* file.c (sys_fchroot): Define only for SUNOS4 || SVR4.
+	(sys_mkfifo): Define only for FREEBSD.
+	* mem.c (sys_sbrk): Define only for FREEBSD || SUNOS4.
+	(sys_getpagesize): Define only for
+	ALPHA || FREEBSD || IA64 || SUNOS4 || SVR4.
+	* net.c (sys_so_socket): Define only for SVR4.
+	* process.c (sys_gethostid): Define only for
+	FREEBSD || SUNOS4 || SVR4.
+	(sys_gethostname): Define only for
+	ALPHA || FREEBSD || SUNOS4 || SVR4.
+	(sys_setpgrp): Define only for ALPHA || SUNOS4 || SVR4.
+	(sys_execv): Define only for SPARC || SPARC64 || SUNOS4.
+	* signal.c (sys_sigblock): Define only for FREEBSD || SUNOS4.
+	(sys_sighold, sys_sigwait): Define only for SVR4.
+	(sys_killpg): Define only for FREEBSD || SUNOS4.
+	* stream.c (sys_getmsg): Define only for
+	SPARC || SPARC64 || SUNOS4 || SVR4.
+	* syscall.c (sys_indir): Define only for SUNOS4.
+
+2006-11-27  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* system.c [LINUX]: Define CTL_PROC, since Linux 2.6.18+ headers
+	removed CTL_PROC enum.	Patch from Jakub Jelinek.
+	[LINUX] (sysctl_root): Add CTL_BUS, CTL_ABI and CTL_CPU.
+
+2006-11-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* linux/ia64/syscallent.h: Add #if check to make sure that
+	SYS_socket_subcall adjustment isn't forgotten again.
+
+2006-10-16  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Implement comprehensive quotactl(2) parser for Linux.
+	* Makefile.am (strace_SOURCES): Add quota.c.
+	* quota.c: New file.
+	* resource.c: Remove old quotactl(2) parser.
+	Fixes RH#118696.
+
+2006-10-14  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* configure.ac (AC_CHECK_HEADERS): Add inttypes.h.
+	* file.c [_LFS64_LARGEFILE && (LINUX || SVR4)]:
+	Include <inttypes.h>.
+	(sys_getdents64): Use PRIu64/PRId64 to avoid gcc warnings on
+	64-bit platforms.
+
+	* strace.c (main): Check getcwd() return code.
+
+2006-10-13  Ulrich Drepper  <drepper@redhat.com>
+	    Bernhard Kaindl <bk@suse.de>
+	    Dmitry V. Levin  <ldv@altlinux.org>
+	    Michael Holzheu <holzheu@de.ibm.com>
+
+	Add hooks for new syscalls.  Add decoders for *at, inotify*,
+	pselect6, ppoll and unshare syscalls.
+
+	* defs.h: Declare print_sigset.
+	* desc.c (sys_pselect6): New function.
+	* file.c (decode_open, decode_access, decode_mkdir,
+	decode_readlink, decode_chmod, decode_utimes, decode_mknod):
+	New functions.
+	(sys_open, sys_access, sys_mkdir, sys_readlink, sys_chmod,
+	sys_utimes, sys_mknod): Use them.
+	[LINUX] (fstatatflags, unlinkatflags, inotify_modes): New
+	variables.
+	[LINUX] (print_dirfd, sys_openat, sys_faccessat,
+	sys_newfstatat, sys_mkdirat, sys_linkat, sys_unlinkat,
+	sys_symlinkat, sys_readlinkat, sys_renameat, sys_fchownat,
+	sys_fchmodat, sys_futimesat, sys_mknodat, sys_inotify_add_watch,
+	sys_inotify_rm_watch): New functions.
+	* process.c [LINUX] (sys_unshare): New function.
+	* signal.c (print_sigset): New function.
+	(sys_sigprocmask): Use it.
+	* stream.c (decode_poll): New function.
+	(sys_poll): Use it.
+	[LINUX] (sys_ppoll): New function.
+	* linux/syscall.h: Delcare new syscall handlers.
+	* linux/syscallent.h: Hook up new syscalls.
+	* linux/alpha/syscallent.h: Likewise.
+	* linux/hppa/syscallent.h: Likewise.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+	* linux/x86_64/syscallent.h: Likewise.
+	Fixes RH#178633.
+
+2006-10-06  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* strace.c [!USE_PROCFS] (trace): Presence of PT_GETSIGINFO
+	macro does not mean that PT_CR_IPSR and PT_CR_IIP macros are
+	also defined, so check them along with PT_GETSIGINFO.
+	Fixes RH#209856.
+
+2006-09-01  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* file.c (print_xattr_val): Fix memory corruption bug reported
+	by James Antill.
+	Fixes RH#200621.
+
+2006-04-21  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* defs.h [LINUX && X86_64 && !__NR_exit_group]: Define
+	__NR_exit_group.
+
+2006-03-29  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Fix race conditions in tcb allocation.
+	* process.c (fork_tcb): Return error code as documented.  Do not
+	print "tcb table full" error message.
+	[USE_PROCFS] (internal_fork): Do not print "tcb table full"
+	error message.
+	[SYS_clone || SYS_clone2] (internal_clone, internal_fork): Call
+	fork_tcb() before alloctcb().  Do not print "tcb table full"
+	error message.
+	* strace.c (main): Do not print "tcb table full" error message.
+	(expand_tcbtab): Print error message in case of memory allocation
+	failure.
+	(alloctcb): Print error message when tcb table is full.
+	(trace): Expand tcb table if necessary prior to allocating
+	entry there.  Do not print "tcb table full" error message.
+	Fixes RH#180293.
+
+2006-08-22  Roland McGrath  <roland@redhat.com>
+
+	* ipc.c (sys_msgget, sys_semget, sys_shmget): Show key values in hex.
+	Fixes RH#198179.
+
+2006-08-21  Roland McGrath  <roland@redhat.com>
+
+	* linux/syscall.h (SYS_socket_subcall): Bump to 400.
+	* linux/syscallent.h: Update table.
+	* linux/arm/syscallent.h: Likewise.
+	* linux/m68k/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
+	Fixes RH#201462.
+
+2006-04-25  Roland McGrath  <roland@redhat.com>
+
+	* strace.c (main): Fail when -c is given with -ff.
+	* strace.1: Note their incompatibility.
+	Fixes RH#187847.
+
+	* strace.c (main): Fail when nonoption args follow -p switches.
+	Fixes Debian#361302.
+
+	* Makefile.am (EXTRA_DIST): Add xlate.el.
+
+	* linux/mips/Makefile.in: File removed, unused cruft.
+	* linux/sparc/Makefile.in: Likewise.
+
+	* strace.spec (Source0): Use http://dl.sourceforge.net URL.
+
+	* ipc.c (sys_semtimedop): Fixed inverted indirect_ipccall test.
+	* linux/hppa/syscallent.h: Fixed semtimedop entry.
+	From Mike Stroyan <mike.stroyan@hp.com>.
+	Fixes Debian#340239.
+
+2006-03-30  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* linux/arm/syscallent.h: Correct the name of exit.  Remove
+	M68K conditionals and sys_security.  Correct syscalls 243-282.
+	Fixes Debian#360154.
+
+	* process.c (change_syscall): Add ARM support.
+	* syscall.c (get_scno): Handle ARM EABI.
+	Fixes Debian#360152.
+
+2006-01-16  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.14.
+	* debian/changelog, strace.spec: 4.5.14-1.
+
+2006-01-13  Roland McGrath  <roland@redhat.com>
+
+	* debian/control (Build-Depends): Add debhelper.
+
+2006-01-12  Roland McGrath  <roland@redhat.com>
+
+	* signal.c [LINUX] (sys_restart_syscall): New function.
+	* linux/syscall.h: Declare sys_restart_syscall.
+	* linux/sparc/syscall.h: Likewise.
+	* linux/syscallent.h: Call 0 is restart_syscall.
+	* linux/arm/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/m68k/syscallent.h: Likewise.
+	* linux/hppa/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+	* linux/alpha/syscallent.h: Use sys_restart_syscall.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/x86_64/syscallent.h: Likewise.
+	Fixes RH#165469, Debian#350641.
+
+2005-08-08  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* system.c [LINUX] (MS_MGC_VAL): New macro.
+	[LINUX] (mount_flags): Add it.
+	[LINUX] (sys_mount): If neither MS_BIND nor MS_MOVE bits are
+        set in the flags argument, try to fetch data string.
+	Fixes RH#165377.
+
+2006-01-12  Roland McGrath  <roland@redhat.com>
+
+	* system.c (sys_sysctl): Don't read off end of NAME when max_strlen
+	exceeds INFO.nlen.
+	From Timo Lindfors <timo.lindfors@iki.fi>.
+	Fixes Debian#339117.
+
+	* debian/rules (binary-arch): Don't pass -s to install.  Use dh_strip.
+	Fixes Debian#325132.
+
+	* debian/control (Standards-Version): Update to 3.6.2.
+
+	* defs.h [LINUXSPARC] (PERSONALITY0_WORDSIZE, PERSONALITY1_WORDSIZE):
+	New macros.
+	[SPARC64] (PERSONALITY2_WORDSIZE): New macro.
+	[X86_64] (PERSONALITY0_WORDSIZE, PERSONALITY1_WORDSIZE): New macros.
+	* syscall.c (PERSONALITY0_WORDSIZE): New macro if undefined.
+	(personality_wordsize): New variable.
+	(decode_subcall): Use it for size of argument words.
+	Fixes RH#174354.
+
+2005-11-17  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Implement qual_flags support for each personality.
+	* strace.c (main): Move qualify calls after set_personality call.
+	* syscall.c (qual_flags0): New variable..
+	[SUPPORTED_PERSONALITIES >= 2] (qual_flags1): New variable.
+	[SUPPORTED_PERSONALITIES >= 3] (qual_flags2): New variable.
+	(qual_flags): Change variable definition from array to pointer.
+	(set_personality): Initialize qual_flags variable.
+	(qualify_one): Add "pers" argument to specify personality.
+	[SUPPORTED_PERSONALITIES >= 2]: Set qual_flags1 if requested.
+	[SUPPORTED_PERSONALITIES >= 3]: Set qual_flags2 if requested.
+	(qual_syscall): Pass personality to qualify_one.
+	[SUPPORTED_PERSONALITIES >= 2]: Look for syscall also in sysent1
+	table.
+	[SUPPORTED_PERSONALITIES >= 3]: Look for syscall also in sysent2
+	table.
+	(qual_signal): Pass personality to qualify_one.
+	(qual_desc): Likewise.
+	(qualify): Use qualify_one instead of manual qual_flags
+	manipulations.
+	[SUPPORTED_PERSONALITIES >= 2]: Look for syscall also in sysent1
+	table.
+	[SUPPORTED_PERSONALITIES >= 3]: Look for syscall also in sysent2
+	table.
+	* defs.h: Update qual_flags declaration.
+	Fixes RH#173986.
+
+2005-11-14  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* syscall.c (qual_syscall): Handle numeric syscall specification.
+	Fixes RH#174798.
+
+	* syscall.c (qual_signal, qual_options): Remove redundant argument
+	check.
+
+2005-12-01  Roland McGrath  <roland@redhat.com>
+
+	* ipc.c (indirect_ipccall) [MIPS || HPPA]: Return false.
+	Fixes Debian#340239.
+
+	* Makefile.am (EXTRA_DIST): Add linux/arm/syscallent.h
+	and linux/m68k/syscallent.h.
+	Fixes Debian#336197.
+
+	* debian/control (Architecture): Add armeb.
+	Fixes Debian#335681.
+
+2005-11-02 Michal Marek  <mmarek@suse.cz>
+
+	* strace-graph (handle_trace): follow clone() and vfork() calls.
+
+2005-10-25  Heiko Carstens  <heiko.carstens@de.ibm.com>
+
+	* linux/s390/syscallent.h: Added ioprio_set, ioprio_get,
+	inotify_init, inotify_add_watch, inotify_rm_watch.
+	Corrected number of arguments for request_key.
+	* linux/s390x/syscallent.h: Likewise.
+
+2005-12-01  Roland McGrath  <roland@redhat.com>
+
+	* ipc.c (indirect_ipccall) [IA64]: Return false unless the syscall
+	number is in the low range of IA32 syscalls.
+
+2005-10-07  Andreas Schwab  <schwab@suse.de>
+
+	* linux/ia64/syscallent.h: Syscall 1105 is gettid, not ioperm.
+
+2005-12-01  Roland McGrath  <roland@redhat.com>
+
+	* resource.c (resources): Add RLIMIT_NICE, RLIMIT_RTPRIO.
+	Reported by Scott Tsai <scottt958@yahoo.com.tw>.
+
+	* ipc.c (indirect_ipccall): New function.
+	(sys_msgctl, sys_msgsnd, sys_msgrcv, sys_semop): Use that predicate
+	instead of #ifdef LINUX test.
+	[LINUX] (sys_semtimedop): Likewise.
+	(sys_shmctl, sys_shmat, sys_shmdt): Likewise.
+	Fixes RH#164755.
+
+2005-07-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* linux/x86_64/syscallent.h: Fix syscall parameter count for msgrcv and
+	msgctl.
+
+	* ipc.c (sys_msgrcv): Add entering handling and print first parameter
+	there.
+	Fixes RH#164757.
+
+2005-08-08  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* strace.1: Update "SEE ALSO" links to reference to valid
+	manpages.
+	Patch from Michail Litvak <mci@owl.openwall.com>.
+	Fixes RH#165375.
+
+2005-10-21  Roland McGrath  <roland@redhat.com>
+
+	* util.c (printpathn): Cap N at sizeof path - 1.
+
+2005-08-03  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.13.
+	* debian/changelog, strace.spec: 4.5.13-1.
+
+	* configure.ac: Check for struct dqblk.dqb_curblocks field.
+	* resource.c [LINUX] (OLD_CMD): New macro.
+	(quotacmds): Use it to hard-wire old O_* values, don't use macros.
+	(sys_quotactl): If dqb_curblocks is not there, it's called
+	dqb_curspace instead.  Print dqb_* fields as unsigned long long.
+
+2005-07-19  Michael Schmitz  <schmitz@debian.org>
+
+	Long overdue m68k cleanup.
+	* linux/syscallent.h: remove m68k declarations.
+	* linux/m68k/syscallent.h: new file, fixed up declarations
+	to match kernel version 2.6.11. Newer syscalls are sufficiently
+	different from i386 to merit a separate file.
+
+2005-08-03  Roland McGrath  <roland@redhat.com>
+
+	* linux/x86_64/syscallent.h: Update init_module argument count.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/sparc64/syscallent2.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/arm/syscallent.h: Likewise.
+
+2005-07-22  James Lentini  <jlentini@gmail.com>
+
+	* bjm.c (sys_init_module): Display all three arguments.
+	* linux/syscallent.h: Update argument count.
+
+2005-08-03  Roland McGrath  <roland@redhat.com>
+
+	* process.c (internal_wait): Don't suspend when known child is known
+	to be exiting already.
+
+	* strace.c (detach): If detaching the last live thread in a group with
+	a zombie leader, then detach the leader too.
+	(handle_group_exit): Use detach, not droptcb, for predeceased thread.
+	Mark process about to take a signal with TCB_GROUP_EXITING flag.
+	Fixes RH#161919.
+
+2005-07-19  Roland McGrath  <roland@redhat.com>
+
+	* defs.h [LINUX] [M68K] (__NR_exit_group): Define it if missing.
+	Fixes Debian#315500.
+
+2005-07-14  Heiko Carstens  <heiko.carstens@de.ibm.com>
+
+	* linux/s390/syscallent.h (sys_tgkill, vserver, fadvise64_64)
+	(statfs64, fstatfs64, remap_file_pages, mbind, get_mempolicy)
+	(set_mempolicy, mq_open, mq_unlink, mq_timedsend, mq_timedreceive)
+	(mq_notify, mq_getsetattr, sys_kexec_load, add_key, request_key)
+	(keyctl, waitid): Added.
+	* linux/s390x/syscallent.h: Likewise and added missing _llseek.
+	* linux/s390/errnoent.h (ECANCELED, ENOKEY, EKEYEXPIRED)
+	(EKEYREVOKED, EKEYREJECTED, EOWNERDEAD, ENOTRECOVERABLE): Added.
+	* linux/s390x/errnoent.h: Likewise.
+
+2005-07-05  Roland McGrath  <roland@redhat.com>
+
+	* mem.c [LINUX] (sys_old_mmap) [X86_64]: Extract 32-bit values if
+	child is 32-bit.
+	Fixes RH#162467.
+
+2005-06-08  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Introduce "-e trace=desc".
+	* defs.h (TRACE_DESC): New flag.
+	* syscall.c: Define TD macro before include of syscallent files
+	and undefine it afterwards.
+	(lookup_class): Recognize "desc" keyword.
+	* strace.1: Document "-e trace=desc".
+	* freebsd/i386/syscallent.h: Mark those syscalls which take a
+	file descriptor as an argument or return a file descriptor with
+	TD flag.
+	* linux/alpha/syscallent.h: Likewise.
+	* linux/hppa/syscallent.h: Likewise.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sh64/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/sparc64/syscallent2.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+	* linux/syscallent.h: Likewise.
+	* linux/x86_64/syscallent.h: Likewise.
+	* sunos4/syscallent.h: Likewise.
+	* svr4/syscallent.h: Likewise.
+	Fixes RH#159400.
+
+	Remove TF flag from those syscalls which have no filename argument.
+	* freebsd/i386/syscallent.h: Remove TF flag from fstat, pread,
+	pwrite, fstat, sendfile.
+	* linux/alpha/syscallent.h: Remove TF flag from read, write,
+	pread, pwrite, sendfile.
+	* linux/hppa/syscallent.h: Remove TF flag from read, write,
+	pread, pwrite, fstat64, sendfile, ftruncate64.
+	* linux/ia64/syscallent.h: Remove TF flag from read, write,
+	sendfile, fstat, fadvise64.
+	* linux/mips/syscallent.h: Remove TF flag from read, write,
+	fstatfs, fstat, pread, pwrite, sendfile, ftruncate64, fstat64,
+	sendfile64, fadvise64, fstatfs64.
+	* linux/powerpc/syscallent.h: Remove TF flag from read, write,
+	fstat, pread, pwrite, sendfile, ftruncate64, fstat64, sendfile64,
+	fadvise64, fstatfs64, fadvise64_64.
+	* linux/s390/syscallent.h: Remove TF flag from pread, pwrite,
+	sendfile, ftruncate64, fstat64, sendfile64.
+	* linux/s390x/syscallent.h: Remove TF flag from pread, pwrite,
+	sendfile, sendfile64.
+	* linux/sh/syscallent.h: Remove TF flag from pread, pwrite,
+	sendfile, fstat64.
+	* linux/sh64/syscallent.h: Remove TF flag from pread, pwrite,
+	sendfile, ftruncate64, fstat64.
+	* linux/sparc/syscallent.h: Remove TF flag from sendfile, fstat64,
+	pread, pwrite, sendfile64.
+	* linux/sparc64/syscallent2.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+	* linux/syscallent.h: Remove TF flag from pread, pwrite, sendfile,
+	ftruncate64, fstat64, sendfile64, fadvise64, fadvise64, fstatfs64,
+	fadvise64_64.
+	* linux/x86_64/syscallent.h: Remove TF flag from pread, pwrite,
+	sendfile, fadvise64_64.
+	* svr4/syscallent.h: Remove TF flag from pread, pwrite, ftruncate,
+	fstatvfs64, ftruncate64.
+	Fixes RH#159340.
+
+2005-07-04  Roland McGrath  <roland@redhat.com>
+
+	* net.c (sockipv6options): Add IPV6_ADD_MEMBERSHIP,
+	IPV6_DROP_MEMBERSHIP, IPV6_ROUTER_ALERT.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#162450.
+
+	* net.c (sockipoptions): Fix typos.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#161578.
+
+	* util.c (printnum_int): New function, printnum with s/long/int/.
+	* defs.h: Declare it.
+	* net.c (printsockopt): Use it for int-sized option.
+	Fixes RH#162449.
+	Reported by Ulrich Drepper <drepper@redhat.com>.
+
+2005-06-09  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.12.
+	* debian/changelog, strace.spec: 4.5.12-1.
+
+2005-06-08  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Minor namespace cleanup.
+	* defs.h (string_quote): Remove declaration.
+	* file.c (openmodessol) [LINUXSPARC]: Make static.
+	(fileflags): Likewise.
+	(aclcmds, aclipc) [HAVE_SYS_ACL_H]: Likewise.
+	(direnttypes) [FREEBSD || LINUX]: Likewise.
+	(xattrflags): Likewise.
+	* process.c (unalignctl_string): Make static.
+	(setarg): Disable.
+	* syscall.c (subcalls_table): Make static.
+	(socket_map) [!(LINUX && (ALPHA || MIPS))]: Likewise.
+	(sparc_socket_decode): Make static, define for [SPARC || SPARC64] only.
+	(decode_subcall): Make static.
+	(syscall_fixup): Likewise.
+	(get_error): Likewise.
+	(syscall_enter): Likewise.
+	* util.c (tv_tv): Disable.
+	(getpc): Likewise.
+	(string_quote): Make static.
+	Fixes RH#159688.
+
+2005-05-12  Philippe De Muyter  <phdm@macqel.be>
+
+	* util.c (getpc, printcall): Check #if defined(M68K), not M68k.
+	Enables `-i' on m68k machines.
+
+2005-06-06  Roland McGrath  <roland@redhat.com>
+
+	* process.c (struct_user_offsets) [X86_64]: Reorder elements so
+	matching works right.
+	Fixes RH#159787.
+
+	* linux/syscall.h (SYS_socket, SYS_bind, SYS_connect, SYS_listen)
+	(SYS_accept, SYS_getsockname, SYS_getpeername, SYS_socketpair)
+	(SYS_send, SYS_recv, SYS_sendto, SYS_recvfrom, SYS_shutdown)
+	(SYS_setsockopt, SYS_getsockopt, SYS_sendmsg, SYS_recvmsg)
+	(SYS_getsockname, SYS_semop, SYS_semgsub_et, SYS_semget, SYS_semctl)
+	(SYS_semtimedop, SYS_msgsnd, SYS_msgrcv, SYS_msgget)
+	(SYS_msgctl, SYS_shmat, SYS_shmdt, SYS_shmget)
+	(SYS_shmctl): Macros renamed to SYS_sub_*.
+	* syscall.c (dumpio): Match SYS_sub_* if defined instead of SYS_*.
+
+	* linux/syscall.h (SYS_waitid): Define if not defined.
+
+	* linux/syscallent.h: Fix pread/pwrite names to pread64/pwrite64.
+
+	* defs.h (struct sysent): New member `native_scno'.
+	(known_scno): Declare new function.
+	* linux/syscallent.h: Add new final field to interesting syscalls.
+	* syscall.c (known_scno): New function.
+	(dumpio, internal_syscall, syscall_fixup, trace_syscall): Use it.
+	* process.c (internal_fork, internal_exit): Likewise.
+	[IA64] (ARG_STACKSIZE, ARG_PTID, ARG_CTID, ARG_TLS): Likewise.
+	* strace.c (proc_open): Likewise.
+	* util.c [LINUX] (setbpt): Likewise.
+	* linux/syscall.h: Remove [!defined(X86_64)] from conditional
+	for defining SYS_socket_subcall et al.
+	* linux/syscallent.h: Likewise for #error check.
+	* syscall.c (trace_syscall): Likewise for SYS_{socketcall,ipc} cases.
+	Fixes RH#158934.
+
+2005-06-02  Roland McGrath  <roland@redhat.com>
+
+	* file.c (printstatfs64): Cast values to unsigned long long and use
+	%llu formats.
+	Fixes RH#158243.
+
+2005-05-31  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Deal with memory management issues.
+	* defs.h (tprint_iov): Update prototype.
+	* desc.c (sys_epoll_wait) [HAVE_SYS_EPOLL_H]: Do not allocate
+	epoll_event array of arbitrary size on the stack, to avoid
+	stack overflow.
+	* file.c (print_xattr_val): Check for integer overflow during
+	malloc size calculation, to avoid heap corruption.
+	* io.c (tprint_iov) [HAVE_SYS_UIO_H]: Check for integer overflow
+	during malloc size calculation, to avoid heap corruption.
+	Change iovec array handling to avoid heap memory allocation.
+	* mem.c (get_nodes) [LINUX]: Check for integer overflow during
+	size calculation and do not allocate array of arbitrary size on
+	the stack, to avoid stack overflow.
+	* net.c (printcmsghdr) [HAVE_SENDMSG]: Do not allocate array of
+	arbitrary size on the stack, to avoid stack overflow.  Do not
+	trust cmsg.cmsg_len to avoid read beyond the end of allocated
+	object.
+	(printmsghdr) [HAVE_SENDMSG]: Update tprint_iov() usage.
+	* process.c (sys_setgroups): Check for integer overflow during
+	malloc size calculation, to avoid heap corruption.  Change gid_t
+	array handling to avoid heap memory allocation.
+	(sys_getgroups): Likewise.
+	(sys_setgroups32) [LINUX]: Likewise.
+	(sys_getgroups32) [LINUX]: Likewise.
+	* stream.c (sys_poll) [HAVE_SYS_POLL_H]: Check for integer
+	overflow during malloc size calculation, to avoid heap corruption.
+	Change pollfd array handling to avoid heap memory allocation.
+	* system.c (sys_sysctl) [LINUX]: Check for integer overflow
+	during malloc size calculation, to avoid heap corruption.
+	* util.c (dumpiov) [HAVE_SYS_UIO_H]: Check for integer overflow
+	during malloc size calculation, to avoid heap corruption.
+	Fixes RH#159196.
+
+	* util.c (printxval): Change third argument from "char *" to
+	"const char *".
+	(printflags): Add third argument, "const char *", with similar
+	meaning to the third argument of printxval().
+	* defs.h (printxval): Change third argument from "char *" to
+	"const char *".
+	(printflags): Add third argument.
+	* bjm.c (sys_query_module) [LINUX]: Pass third argument to
+	printflags().
+	* desc.c (sys_fcntl): Likewise.
+	(sys_flock) [LOCK_SH]: Likewise.
+	(print_epoll_event) [HAVE_SYS_EPOLL_H]: Likewise.
+	* file.c (sys_open): Likewise.
+	(solaris_open) [LINUXSPARC]: Likewise.
+	(sys_access): Likewise.
+	(sys_chflags, sys_fchflags) [FREEBSD]: Likewise.
+	(realprintstat) [HAVE_LONG_LONG_OFF_T &&
+	HAVE_STRUCT_STAT_ST_FLAGS]: Likewise.
+	(printstat64) [HAVE_STAT64 &&
+	HAVE_STRUCT_STAT_ST_FLAGS]: Likewise.
+	(sys_setxattr, sys_fsetxattr): Likewise.
+	* ipc.c (sys_msgget, sys_msgsnd, sys_msgrcv, sys_semget,
+	sys_shmget, sys_shmat) [LINUX || SUNOS4 || FREEBSD]: Likewise.
+	(sys_mq_open) [LINUX]: Likewise.
+	(printmqattr) [HAVE_MQUEUE_H]: Likewise.
+	* mem.c (print_mmap) [!HAVE_LONG_LONG_OFF_T]: Likewise.
+	(sys_mmap64) [_LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T]: Likewise.
+	(sys_mprotect): Likewise.
+	(sys_mremap, sys_madvise, sys_mlockall) [LINUX]: Likewise.
+	(sys_msync) [MS_ASYNC]: Likewise.
+	(sys_mctl) [MC_SYNC]: Likewise.
+	(sys_remap_file_pages, sys_mbind, sys_get_mempolicy) [LINUX]:
+	Likewise.
+	* net.c (printmsghdr) [HAVE_STRUCT_MSGHDR_MSG_CONTROL]: Likewise.
+	(sys_send, sys_sendto): Likewise.
+	(sys_sendmsg) [HAVE_SENDMSG]: Likewise.
+	(sys_recv, sys_recvfrom): Likewise.
+	(sys_recvmsg) [HAVE_SENDMSG]: Likewise.
+	(printicmpfilter) [ICMP_FILTER]: Likewise.
+	* proc.c (proc_ioctl) [SVR4 && !HAVE_MP_PROCFS || FREEBSD]: Likewise.
+	* process.c (sys_clone) [LINUX]: Likewise.
+	(printwaitn): Likewise.
+	(sys_waitid) [SVR4 || LINUX]: Likewise.
+	* signal.c (sys_sigvec) [SUNOS4 || FREEBSD]: Likewise.
+	(sys_sigaction): Likewise.
+	(printcontext) [SVR4]: Likewise.
+	(print_stack_t) [LINUX) || FREEBSD]: Likewise.
+	(sys_rt_sigaction) [LINUX]: Likewise.
+	* sock.c (sock_ioctl) [LINUX]: Likewise.
+	* stream.c (sys_putmsg, sys_getmsg): Likewise.
+	(sys_putpmsg) [SYS_putpmsg]: Likewise.
+	(sys_getpmsg) [SYS_getpmsg]: Likewise.
+	(sys_poll): Likewise.
+	(print_transport_message) [TI_BIND]: Likewise.
+	(stream_ioctl): Likewise.
+	* system.c (sys_mount, sys_reboot): Likewise.
+	(sys_cacheflush) [LINUX && M68K]: Likewise.
+	(sys_capget, sys_capset) [SYS_capget]: Likewise.
+	* term.c (term_ioctl) [TIOCMGET]: Likewise.
+	* time.c (sys_clock_nanosleep, sys_timer_settime) [LINUX]:
+	Likewise.
+	Fixes RH#159310.
+
+	* bjm.c (sys_query_module) [LINUX]: Unitize "out of memory"
+	errors reporting style.
+	* strace.c (rebuild_pollv) [USE_PROCFS]: Likewise.
+	* system.c (sys_capget, sys_capset) [SYS_capget]: Likewise.
+	* util.c (printstr): Likewise.
+	(dumpiov) [HAVE_SYS_UIO_H]: Likewise.
+	(fixvfork) [SUNOS4]: Likewise.
+	* desc.c (decode_select): Continue to decode syscall arguments
+	in case of OOM condition.
+	* file.c (sys_getdents): Likewise.
+	(sys_getdents64) [_LFS64_LARGEFILE]: Likewise.
+	(sys_getdirentries) [FREEBSD]: Likewise.
+	* mem.c (sys_mincore): Changed type of variables which deal with
+	malloc size from int to unsigned long.
+	Fixes RH#159308.
+
+2005-05-22  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* bjm.c [LINUX]: Do not include <linux/linkage.h>.  It is not
+	safe to include kernel headers, and this one is not used anyway.
+	Fixes RH#158488.
+
+2005-05-26  Roland McGrath  <roland@redhat.com>
+
+	* system.c (sys_sysctl): Check for errors accessing user pointers.
+	Use malloc instead of alloca in case size is insane.
+
+2005-05-09  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac: Check for libaio.h.
+	* desc.c (sys_io_setup, sys_io_submit, sys_io_cancel,
+	sys_io_getevents, sys_io_destroy): New functions.
+	* linux/syscall.h: Declare them.
+	* linux/syscallent.h: Use those for io_* syscalls.
+	* linux/alpha/syscallent.h: Likewise.
+	* linux/hppa/syscallent.h: Likewise.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/x86_64/syscallent.h: Likewise.
+	From Zach Brown <zach.brown@oracle.com>.
+	Fixes RH#155065.
+
+	* debian/control (Architecture): Add ppc64.
+	Fixes Debian bug #301089.
+
+2005-05-05  Anton Blanchard  <anton@samba.org>
+
+	* process.c (ptrace_cmds): Add PTRACE_GETVRREGS and PTRACE_SETVRREGS
+	if defined.
+
+2005-05-09  Roland McGrath  <roland@redhat.com>
+
+	* strace.c (main): Refuse negative -s argument value.
+	Fixes Debian bug #303256.
+
+2005-04-25  Anton Blanchard  <anton@samba.org>
+
+	* file.c (openmodes): Add O_NOATIME flag if defined.
+
+2005-04-05  Anton Blanchard  <anton@samba.org>
+
+	* linux/powerpc/ioctlent.h: Regenerated.
+
+	* signal.c (signame): Don't try and dereference negative index.
+
+	* linux/powerpc/syscallent.h: Add debug_setcontext, vserver,
+	mbind, *_mempolicy, mq_*, sys_kexec_load, add_key, request_key,
+	keyctl, waitid, sys_semtimedop.  Fix various other syscalls.
+
+	* ipc.c (shm_resource_flags): New variable, table has SHM_HUGETLB
+	but not IPC_NOWAIT, which have the same value.
+	(sys_shmget): Use that instead of resource_flags.
+
+2005-03-22  Roland McGrath  <roland@redhat.com>
+
+	* desc.c (decode_select): Increase local buffer size.
+	Fixes RH#151570.
+
+	* configure.ac, NEWS: Version 4.5.11.
+	* debian/changelog, strace.spec: 4.5.11-1.
+
+	* linux/arm/syscallent.h: Fix 113 entry (syscall, not vm86old).
+
+2005-03-14  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.10.
+	* debian/changelog, strace.spec: 4.5.10-1.
+
+2005-02-26  GOTO Masanori  <gotom@debian.or.jp>
+
+	* linux/alpha/syscallent.h: Fix the reversed order of lstat64 and
+	fstat64.  Clean up osf_nrecvmsg and osf_ngetsockname.
+
+2005-02-28  Andreas Schwab  <schwab@suse.de>
+
+	* syscall.c (getrval2): Move #ifdef IA64 inside #ifdef LINUX.
+
+2005-03-14  Roland McGrath  <roland@redhat.com>
+
+	* linux/mips/syscallent.h: Update various calls.
+	From Thiemo Seufer <ths@networkno.de>.
+	Fixes Debian bug #256684.
+
+	* debian/control (Architecture): Add s390.
+	Fixes Debian bug #294172.
+
+2005-03-06  Roland McGrath  <roland@redhat.com>
+
+	* strace.c (trace) [PTRACE_GETSIGINFO]: Fetch siginfo_t for SIGSEGV
+	and SIGBUS signals, use si_addr in output.
+
+2005-03-01  Roland McGrath  <roland@redhat.com>
+
+	* file.c (print_xattr_val): Add a cast.
+
+2005-02-05  Roland McGrath  <roland@redhat.com>
+
+	* desc.c (decode_select): Calculate size of passed fd_set vectors and
+	copy in the user's size rather than the standard sizeof(fd_set).
+	Fixes Debian bug #65654, #284290.
+
+	* util.c (printpath, printpathn): Print NULL and don't try any fetch
+	when ADDR is zero.
+	Fixes Debian bug #63093.
+
+	* debian/control (Build-Depends): Fix for s390 and sparc.
+	From Bastian Blank <waldi@debian.org>.
+	Fixes Debian bug #293564.
+
+2004-12-19  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* strace.c (main) [!USE_PROCFS]: In child process, raise SIGSTOP
+	right before execv() call.  Remove fake_execve() call.
+	* defs.h (fake_execve): Remove unused declaration.
+	* process.c (fake_execve): Remove unused function.
+	Fixes RH#143365.
+
+2005-02-04  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.9.
+	* debian/changelog, strace.spec: 4.5.9-2.
+
+	* file.c (O_LARGEFILE): Omit when #undef'd because it was zero.
+
+2005-02-02  Roland McGrath  <roland@redhat.com>
+
+	* debian/control: Add strace-udeb package for installer debugging.
+	* debian/rules (binary-arch): Build it.
+	From Joshua Kwan <joshk@triplehelix.org>.
+	Fixes Debian bug #268294.
+
+	* file.c (openmodes) [O_LARGEFILE] [O_LARGEFILE == 0]: Redefine to
+	known values for Linux.
+
+	* util.c (printcall): Print 16 ?s when long is 8 bytes.
+	Fixes RH#146932.
+
+	* linux/sparc/syscall.h: Declare sys_epoll_create, sys_epoll_ctl,
+	sys_epoll_wait.
+	* linux/sparc64/syscall.h: Just #include "../sparc/syscall.h" here.
+	* ioctl.c (nioctlents2): Add const to type.
+	Fixes Debian bug #278449.
+
+	* sock.c (iffflags): New variable, table of IFF_* values.
+	(print_addr): New function.
+	(sock_ioctl): Handle SIOCGIFADDR, SIOCGIFDSTADDR, SIOCGIFBRDADDR,
+	SIOCGIFNETMASK, SIOCGIFFLAGS, SIOCGIFMETRIC, SIOCGIFMTU, SIOCGIFSLAVE,
+	SIOCGIFHWADDR.	Use print_addr for SIOCGIFCONF, SIOCGIFNAME, and
+	SIOCGIFINDEX, and fix their output.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#138223.
+	Fixes Debian bug #192164.
+
+2004-12-20  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* configure.ac: Use AC_GNU_SOURCE macro instead of changing CFLAGS.
+	* defs.h [HAVE_CONFIG_H]: Include config.h first.
+	* strace.c: Include "defs.h" first.
+	Fixes RH#143370.
+
+	* syscall.c (call_summary): Fix potential NULL dereference.
+	Fixes RH#143369.
+
+2004-12-19  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* syscall.c (qual_signal): Check bounds for numeric signal names.
+	Fix parser of symbolic signal names.
+	Fix return code, as required by qualify() function.
+	* syscall.c (qual_desc): Check bounds for descriptor number.
+	* syscall.c (qual_syscall): Correct return code, to be consistent
+	with qualify() and other qual_* functions.
+	Fixes RH#143362.
+
+2005-02-01  Roland McGrath  <roland@redhat.com>
+
+	* system.c [LINUX] (MS_MANDLOCK, MS_NOATIME, MS_NODIRATIME, MS_BIND,
+	MS_MOVE, MS_REC, MS_VERBOSE, MS_POSIXACL, MS_ACTIVE, MS_NOUSER):
+	New macros.
+	[LINUX] (mount_flags): Add them.
+	[LINUX] (sys_mount): If any of (MS_BIND|MS_MOVE|MS_REMOUNT) bits are
+	set in the flags argument, don't try to fetch the filesystem string.
+	Fixes RH#141932.
+
+	* config.guess: Update from canonical version, timestamp 2004-11-12.
+	* config.sub: Likewise, timestamp 2004-11-30.
+
+	* process.c [LINUX] [X86_64] (sys_arch_prctl): New function.
+	* linux/syscall.h: Declare it.
+	* linux/x86_64/syscallent.h: Use it.
+	Part of RH#142667.
+
+	* process.c (sys_sched_setscheduler): Use %#lx format for bad pointer.
+	(sys_sched_getparam, sys_sched_setparam): Likewise.
+	Part of RH#142667.
+
+	* signal.c [HAVE_SIGACTION] [LINUX && X86_64] (SA_RESTORER): Define
+	here too.
+	Part of RH#142667.
+
+	* linux/syscallent.h: Use sys_mincore instead of printargs.
+	* linux/x86_64/syscallent.h: Likewise.  Also use sys_getrlimit,
+	sys_semtimedop, sys_umount2.
+	Part of RH#142667.
+
+	* syscall.c (qual_signal): Fix inverted return value and bogus
+	argument to qualify_one in the named case.
+
+	* file.c (print_xattr_val): Don't use auto array sized by syscall
+	argument.  Use malloc instead, so it can fail for insane values.
+	Fixes Debian bug #283704.
+
+	* net.c (sys_getsockopt): Fix a format %ld -> %d.
+
+	* linux/syscall.h [IA64] (SYS_semtimedop): #undef it.
+
+	* syscall.c (syscall_enter) [X86_64]: Fix 32-bit argument register map
+	not to double the middle entry!
+	Fixes RH#146093.
+
+	* linux/x86_64/syscallent.h: Fix exit_group entry.
+
+	* util.c (getpc) [S390 || S390X]: Implement it.
+	Patch by David Wilder <wilder@us.ibm.com>.
+
+	* linux/ia64/syscallent.h: Add fadvise64, fstatfs64, statfs64, mbind,
+	[gs]et_mempolicy, mq_*, sys_kexec_load, vserver, and waitid.
+	Fixes RH#146245.
+
+2005-01-22  Andreas Schwab  <schwab@suse.de>
+
+	* net.c (sys_getsockopt): Change type of len to int.
+
+2004-10-19  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.8.
+	* debian/changelog, strace.spec: 4.5.8-1.
+
+	* file.c (sys_fadvise64): Conditionalize just on [LINUX].
+
+	* configure.ac: Check for sys/epoll.h.
+	* desc.c: Protect #include <sys/epoll.h> with [HAVE_SYS_EPOLL_H].
+	(epollctls, epollevents): Protect each entry with #ifdef on its macro.
+
+	* strace.c (handle_group_exit): Don't detach leader that wasn't
+	TCB_ATTACHED.  Instead mark it with TCB_GROUP_EXITING.
+	Remove droptcb loop at end, no longer required since 2.6 reports each
+	thread death.
+	Fixes RH#135254.
+
+	* strace.c (trace): Use handle_group_exit for non-TCB_ATTACHED child
+	taking signal when it has nclone_threads > 0.
+
+	* strace.c (handle_group_exit, trace): Mark leader with
+	TCB_GROUP_EXITING and don't be surprised at child deaths when their
+	leader has it set.
+	Fixes RH#132150.
+
+	* process.c (WCOREFLAG): Define if not defined.
+	(W_STOPCODE, W_EXITCODE): Likewise.
+	Reported by Marty Leisner <mleisner@eng.mc.xerox.com>.
+
+	* sock.c [! LINUX]: Include <sys/socket.h> before <sys/sockio.h>.
+	Reported by Marty Leisner <mleisner@eng.mc.xerox.com>.
+
+	* debian/rules: Make strace64.1.gz symlink to strace.1.gz instead of
+	strace64.1 to strace.1, which doesn't exist.
+	Fixes Debian bug #269220.
+
+2004-09-05  Phil Blundell  <pb@nexus.co.uk>
+
+	* linux/arm/syscallent.h: New file.
+
+2004-10-19  Roland McGrath  <roland@redhat.com>
+
+	* debian/rules (DEB_BUILD_GNU_TYPE, CONFIG_OPTS): New variables.
+	[$(DEB_HOST_GNU_TYPE) == s390-linux] (build64, HOST64, CC64): Set them.
+	(build/Makefile): Use $(CONFIG_OPTS).
+	(build64/Makefile): Pass --host as well as --build.
+	From Bastian Blank <waldi@debian.org>.
+	Fixes Debian bug #271500.
+
+	* linux/hppa/syscallent.h: Update for 2.6.9 syscalls.
+	From Randolph Chung <tausq@debian.org>
+	Fixes Debian bug #273887.
+
+	* file.c (sys_llseek): Revert last change.
+
+2004-09-14  Richard Henderson  <rth@twiddle.net>
+
+	* linux/alpha/syscallent.h: Add tgkill, *stat64, vserver, mbind,
+	[gs]et_mempolicy, mq_*, waitid.
+
+2004-10-07  Roland McGrath  <roland@redhat.com>
+
+	* file.c (sys_llssek, sys_readahead, sys_fadvise64, sys_fadvise64_64):
+	Use LONG_LONG macro.
+	* io.c (sys_pread, sys_pwrite, sys_sendfile): Likewise.
+
+	* linux/x86_64/syscallent.h: Fix botched table entries.
+	From Ulrich Drepper <drepper@redhat.com>.
+
+	* mem.c [LINUX] (sys_mbind, sys_set_mempolicy, sys_get_mempolicy):
+	New functions.
+	* linux/syscall.h: Declare them.
+	* linux/x86_64/syscallent.h: Likewise.
+	From Ulrich Drepper <drepper@redhat.com>.
+
+	* linux/syscallent.h: Handle mbind, set_mempolicy, get_mempolicy.
+	From Ulrich Drepper <drepper@redhat.com>.
+
+	* file.c [LINUX && (I386 || X86_64)] (sys_fadvise64, sys_fadvise64_64):
+	New functions.
+	* linux/syscall.h: Declare them.
+	* linux/syscallent.h: Handle fadvise64 and fadvise64_64 using those.
+	* linux/x86_64/syscallent.h: Likewise.
+	From Ulrich Drepper <drepper@redhat.com>.
+
+2004-09-13  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* linux/ioctlsort.c (main): Omit duplicate lines
+	(with same name and code) from output.
+	* linux/ioctlent.sh: Build the list of ioctls defined in
+	scsi/sg.h (0x22..), scsi/scsi.h and scsi/scsi_ioctl.h (0x53..),
+	as suggested by Peter Jones <pjones@redhat.com>
+	* linux/ioctlent.h: Regenerated.
+	Fixes RH#129808.
+
+2004-09-13  Ulrich Drepper <drepper@redhat.com>
+	    Dmitry V. Levin <ldv@altlinux.org>
+
+	* time.c [LINUX] (print_rtc): New function, for printing rtc_time
+	structure.
+	[LINUX] (rtc_ioctl): New function, for parsing RTC_* ioctls.
+	* ioctl.c [LINUX] (ioctl_decode): Call rtc_ioctl.
+	* defs.h [LINUX]: Declare rtc_ioctl.
+	Fixes RH#58606.
+
+2004-10-06  Roland McGrath  <roland@redhat.com>
+
+	* desc.c [LINUX] (sys_epoll_create, sys_epoll_ctl, sys_epoll_wait):
+	New functions.
+	* linux/syscall.h: Declare them.
+	* linux/syscallent.h: Use those for epoll_* syscalls.
+	* linux/alpha/syscallent.h: Likewise.
+	* linux/hppa/syscallent.h: Likewise.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/sparc64/syscallent.h: Likewise.
+	* linux/sparc64/syscallent2.h: Likewise.
+	* linux/x86_64/syscallent.h: Likewise.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#134463.
+
+	* resource.c (resources): Add RLIMIT_LOCKS, RLIMIT_SIGPENDING,
+	and RLIMIT_MSGQUEUE, if defined.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#133594.
+
+	* net.c [HAVE_SENDMSG] (printcmsghdr): New function.
+	(printmsghdr): Use it.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#131689.
+
+	* file.c (sprintmode): Add const to return type.
+	(sprintfstype): Likewise.
+	* signal.c (printsiginfo): Add a const.
+
+2004-09-15  Roland McGrath  <roland@redhat.com>
+
+	* linux/x86_64/syscallent.h: Use sys_waitid.
+
+	* linux/syscallent.h: waitid takes 5 arguments, and is in TP category.
+	* process.c (sys_waitid): Handle fifth argument (struct rusage *).
+
+2004-09-11  Roland McGrath  <roland@redhat.com>
+
+	* time.c (sys_clock_nanosleep): Print zero flags arg correctly.
+	(sys_timer_settime): Likewise.
+	(printsigevent): Print signals by name for SIGEV_SIGNAL.
+	(sys_timer_create): Print clock ID symbolically.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#131420.
+
+2004-09-07  Michal Ludvig  <mludvig@suse.cz>
+
+	* defs.h (nioctlents1, nsignals2): Fix typos in decls.
+
+2004-09-03  Roland McGrath  <roland@redhat.com>
+
+	* syscall.c (qual_options): Add const to defn.
+	Update all uses.
+	(call_count, error_count, tv_count): Variables removed.
+	(struct call_counts, counts): New type and variable.
+	Update all users of the old three to use the new array of structs.
+	(trace_syscall): Allocate counts on first use.
+	(sorted_count): Variable removed.
+	(call_summary): Allocate locally.
+
+	* syscall.c (sysent0, sysent1, sysent2, sysent): Add const to defn.
+	(nsyscalls0, nsyscalls1, nsyscalls2): Likewise.
+	(errnoent0, errnoent1, errnoent2, errnoent): Likewise.
+	(nerrnos0, nerrnos1, nerrnos2): Likewise.
+	* signal.c (signalent0, signalent1, signalent2): Likewise.
+	(nsignals0, nsignals1, nsignals2): Likewise.
+	(signame): LIkewise.
+	* ioctl.c (ioctlent0, ioctlent1, ioctlent2): Likewise.
+	(nioctlents0, nioctlents1, nioctlents2): Likewise.
+	(ioctl_lookup, ioctl_next_match): Likewise.
+	* defs.h: Update decls.
+	* io.c (sys_ioctl): Update users.
+
+	* util.c (xlookup, printxval, addflags, printflags): Use const for
+	struct xlat * argument.
+	* defs.h (xlookup, printxval, addflags, printflags): Update decls.
+	* bjm.c: Add const to all struct xlat defns.
+	* desc.c: Likewise.
+	* file.c: Likewise.
+	* ipc.c: Likewise.
+	* mem.c: Likewise.
+	* net.c: Likewise.
+	* proc.c: Likewise.
+	* process.c: Likewise.
+	* resource.c: Likewise.
+	* signal.c: Likewise.
+	* sock.c: Likewise.
+	* stream.c: Likewise.
+	* system.c: Likewise.
+	* term.c: Likewise.
+	* time.c: Likewise.
+	* util.c: Likewise.
+
+2004-09-01  Roland McGrath  <roland@redhat.com>
+
+	* linux/x86_64/syscallent.h: Add new entries for timer_*, clock_*, and
+	mq_* syscalls, and names only for new calls up to 252.
+	* linux/syscallent.h: Add waitid.
+	* linux/x86_64/syscallent.h: Likewise.
+	* linux/syscall.h: Declare sys_waitid.
+
+	* process.c (internal_wait): Take second arg giving index of flags
+	argument.
+	* defs.h: Update prototype.
+	* syscall.c (internal_syscall): Update caller.
+	Also use internal_wait for SYS_waitid.
+	* process.c (sys_waitid): Define for [LINUX] as well.
+	Don't tweak TCB_SUSPENDED--internal_wait does that.
+	(waitid_types): Conditionalize use of nonstandard P_* macros.
+
+2004-08-31  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.7.
+	* debian/changelog: 4.5.7-1.
+	* strace.spec: 4.5.7-2.
+
+	* debian/rules: Rewrite sparc64 change of 2004-07-12.
+	Always do each build in a separate build directory.
+	Fixes Debian bug #254728.
+
+	* time.c (clocknames): Use #ifdef around CLOCK_* uses.
+
+	* strace.1: Say that -c shows system CPU time, not real time.
+	Fixes Debian bug #254438.
+
+	* syscall.c (dumpio): Match pread and pwrite system calls too.
+	Fixes Debian bug #239947.
+
+	* net.c (sockoptions): Add all SO_* macros known in Linux 2.6.9.
+	Fixes Debian bug #171653.
+
+2004-07-12  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* signal.c [LINUX] (parse_sigset_t): Fix hex strings parser.
+	Fixes RH#128091.
+
+2004-08-30  Roland McGrath  <roland@redhat.com>
+
+	* strace.c (main): Don't call fake_execve under -c.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#129166.
+
+	* net.c (sockipoptions): Add some options.
+	[SOL_IPV6] (sockipv6options): New variable.
+	(sys_getsockopt, printsockopt): Use it for SOL_IPV6 level.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#128391.
+
+	* time.c (clocknames): New variable, symbolic names for clock_t.
+	(sys_clock_settime, sys_clock_gettime, sys_clock_nanosleep): Use it.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#129378.
+
+	* system.c (personality_options): Hard-code values here.
+	Don't #include <linux/personality.h> at all.
+	Fixes RH#130965 and Debian bug #40588.
+
+	* file.c (print_xattr_val): New function to show attribute values.
+	(sys_setxattr, sys_fsetxattr, sys_getxattr, sys_fgetxattr): Use it.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#131177.
+
+2004-07-12  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.6.
+	* strace.spec, debian/changelog: 4.5.6-1.
+
+	* Makefile.am (EXTRA_DIST): Add linux/sparc64 files.
+
+	* debian/rules: On sparc-linux, build strace64 as well.
+	From Ben Collins <bcollins@debian.org>.
+	Fixes Debian bug #254728.
+
+2004-07-07  David S. Miller  <davem@nuts.davemloft.net>
+
+	* linux/sparc/syscallent.h: Sync with reality.
+	* linux/sparc/syscall.h (sys_sendfile64, sys_futex, sys_gettid,
+	sys_sched_setaffinity, sys_sched_getaffinity, sys_setxattr,
+	sys_lsetxattr, sys_fsetxattr, sys_getxattr, sys_lgetxattr,
+	sys_fgetxattr, sys_listxattr, sys_llistxattr, sys_flistxattr,
+	sys_removexattr, sys_lremovexattr, sys_fremovexattr,
+	sys_remap_file_pages, sys_readahead, sys_tgkill, sys_statfs64,
+	sys_fstatfs64, sys_clock_settime, sys_clock_gettime,
+	sys_clock_getres, sys_clock_nanosleep, sys_timer_create,
+	sys_timer_settime, sys_timer_gettime): New declarations.
+	* linux/sparc64/dummy2.h, linux/sparc64/syscallent2.h,
+	linux/sparc64/syscall.h, linux/sparc64/errnoent.h,
+	linux/sparc64/errnoent1.h, linux/sparc64/errnoent2.h,
+	linux/sparc64/ioctlent.h, linux/sparc64/ioctlent1.h,
+	linux/sparc64/ioctlent2.h, linux/sparc64/signalent.h,
+	linux/sparc64/signalent.h, linux/sparc64/signalent.h,
+	linux/sparc64/signalent1.h, linux/sparc64/signalent2.h,
+	linux/sparc64/syscall1.h, linux/sparc64/syscallent.h,
+	linux/sparc64/syscallent1.h: New files.
+	* defs.h (LINUXSPARC): Define also when SPARC64.
+	(LINUX && SPARC64): Set SUPPORTED_PERSONALITIES to 3.
+	Ignore SIGTRAP after execve by defining TCB_WAITEXECVE.
+	Define possibly missing __NR_exit_group.  Declare getrval2.
+	* configure.ac (sparc64): New architecture case.
+	* file.c (stat_sparc64): New structure.
+	(printstat_sparc64): New output routine for that.
+	(printstat): Call it, if personality is 2.
+	(printstat64): Likewise.
+	* util.c: Conditionalize ptrace defines on LINUXSPARC
+	not LINUX && SPARC.
+	(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
+	to PTRACE_FOOREGS64 so that more sparc code can be shared
+	between 64-bit and 32-bit.
+	(_hack_syscall5): Correct trap number when SPARC64.
+	(PTRACE_WRITE{TEXT,DATA}): Add SPARC64 to ifdef guard.
+	(getpc): Handle SPARC64 && LINUX.
+	(printcall): Likewise.
+	(arg fetching/setting): Use same code for SPARC64 LINUX
+	as for SPARC.
+	(setbpt): Handle SPARC64 && LINUX.
+	(clearbpt): Likewise.
+	* signal.c: Conditionalize ptrace defines on SPARC and
+	SPARC64.
+	(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
+	to PTRACE_FOOREGS64 so that more sparc code can be shared
+	between 64-bit and 32-bit.
+	(m_siginfo): Use same definition on SPARC64 as SPARC.
+	(sys_sigreturn): Handle LINUX && SPARC64.
+	* syscall.c: Conditionalize ptrace defines on SPARC and
+	SPARC64.
+	(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
+	to PTRACE_FOOREGS64 so that more sparc code can be shared
+	between 64-bit and 32-bit.
+	(getscno): Use same static state on SPARC64 as SPARC,
+	and add SPARC64 handling.
+	(get_error): Handle LINUX && SPARC64.
+	(force_result): Likewise.
+	(syscall_enter): Likewise.
+	(trace_syscall): Handle sys_socketcall and sys_ipc on SPARC64
+	just like SPARC.
+	(getrval2): Handle LINUX && SPARC64.
+	* process.c: Conditionalize ptrace defines on SPARC and
+	SPARC64.
+	(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
+	to PTRACE_FOOREGS64 so that more sparc code can be shared
+	between 64-bit and 32-bit.
+	(change_syscall): Handle LINUX && SPARC64.
+	(struct_user_offsets): Ifdef out those which do not exist
+	on SPARC64.
+	* net.c (sys_pipe): Handle LINUX && SPARC64.
+	* ioctl.c: Fix initializer typo for nioctlents2, was
+	nioctlents1 by accident.
+
+2004-06-28  Andreas Schwab  <schwab@suse.de>
+
+	* process.c (internal_exec): Move TCB_WAITEXECVE handling here.
+	(sys_execve): Remove it here.
+
+2004-07-12  Roland McGrath  <roland@redhat.com>
+
+	* Makefile.am (EXTRA_DIST): Add linux/sh64/syscallent.h.
+
+	* debian/control (Section): Move to utils, matching Debian override.
+
+	* net.c (addrfams): Make variable global.
+	* sock.c (sock_ioctl): Decode the arguments for SIOCGIFNAME,
+	SIOCGIFINDEX, and SIOCGIFCONF.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#126917.
+
+	* linux/ioctlsort.c: Add some #includes.
+	[POWERPC]: Kludge out high bits.
+	* linux/ia64/ioctlent.h: Regenerated using RHEL3 headers.
+	* linux/powerpc/ioctlent.h: Likewise.
+
+2004-07-11  Roland McGrath  <roland@redhat.com>
+
+	* linux/ioctlent.sh: Replace asm with $asm in all places.
+
+	* configure.ac: Add I386 as AM_CONDITIONAL.
+	* Makefile.am [LINUX]: Add maintainer-mode rules to regenerate
+	the ioctlent.h file.
+
+2004-07-08  Roland McGrath  <roland@redhat.com>
+
+	* resource.c (sys_quotactl): Truncate first argument to 32 bits, since
+	that's what the kernel will do.
+
+2004-07-07  Roland McGrath  <roland@redhat.com>
+
+	* linux/ioctlent.sh: Take optional second argument to use as directory
+	name in place of `asm'.
+
+2004-06-27  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.5.
+	* strace.spec, debian/changelog: 4.5.5-1.
+
+2004-06-22  Roland McGrath  <roland@redhat.com>
+
+	* syscall.c (syscall_fixup) [LINUX && X86_64]: For 32-bit process,
+	sign extend the low 32 bits of RAX to 64 bits.
+	Fixes RH#126547.
+
+	* syscall.c (force_result): [LINUX && X86_64]: Fix RAX*4 -> RAX*8.
+
+2004-06-03  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.4.
+	* strace.spec, debian/changelog: 4.5.4-1.
+
+	* net.c (domains): Add many PF_* values #ifdef PF_*.
+	(addrfams): Add many AF_* values #ifdef AF_*.
+	Fixes Debian bug #250506.
+
+2004-05-02  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* linux/ioctlsort.c (compare): When ioctl codes equal, compare
+	names.
+	(main): Print a note that program output is generated by
+	ioctlsort.
+	* linux/ioctlent.sh: Build the list of ioctls defined in
+	linux/fb.h (0x46..), linux/kd.h (0x4B..), linux/cdrom.h (0x53..),
+	asm/ioctls.h (0x54..), linux/vt.h (0x56..), linux/videotext.h
+	(0x71..), linux/videotext.h (0x72..), asm/sockios.h (0x89..),
+	linux/sockios.h (0x89..), linux/wireless.h (0x8B..).
+	* linux/ioctlent.h: Regenerated from linux-2.6.5.
+	Fixes RH#122257.
+
+2004-06-03  Roland McGrath  <roland@redhat.com>
+
+	* debian/control (Architecture): Add amd64.
+	Fixes Debian bug #246568.
+
+	* strace.c (main) [LINUX]: Expand TCBTAB as necessary for threads
+	attached.  Attach threads only under -f.  Set TCB_FOLLOWFORK in them.
+	(expand_tcbtab): New function, broken out of ...
+	* process.c (fork_tcb): ... here, call that.
+	* defs.h: Declare expand_tcbtab.
+
+2004-04-19  Roland McGrath  <roland@redhat.com>
+
+	* process.c (printstatus): Add a space before | in output.
+
+2004-04-16  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac: Version 4.5.3.
+	* strace.spec, debian/changelog: 4.5.3-1.
+
+2004-03-18  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* resource.c (sys_quotactl) [LINUX]: Cast arithmetic shift operand
+	from long to unsigned long, to fix output of the quotactl command
+	parser.
+	Fixes RH#118694.
+
+2004-04-16  Roland McGrath  <roland@redhat.com>
+
+	* linux/s390/ioctlent.h, linux/s390x/ioctlent.h: Update DASD ioctls.
+	From Maxim Shchetynin <maxim@de.ibm.com>.
+
+	* configure.ac: Check for <mqueue.h>.
+	* ipc.c (sys_mq_open, printmqattr) [! HAVE_MQUEUE_H]: Don't try to
+	decode struct mq_attr.
+	* NEWS: Mention mq support.
+
+	* linux/syscall.h: Support new mq_* syscalls on Linux.
+	* linux/syscallent.h: Likewise.
+	* linux/dummy.h: Likewise.
+	* ipc.c: Likewise.
+	* time.c (printsigevent): Handle SIGEV_THREAD.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#120701.
+
+2004-04-13  Roland McGrath  <roland@redhat.com>
+
+	* net.c (msg_flags): Grok MSG_FIX, MSG_SYN, MSG_RST, MSG_NOSIGNAL,
+	MSG_MORE.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#120541.
+
+	* process.c (printstatus): Mask out bits presented symbolically, and
+	print "| 0xnnn" if the remaining bits are not all zero.
+	Fixes Debian bug #240062.
+
+	* process.c (print_affinitylist): Rewritten to handle indirect values.
+	(sys_sched_setaffinity, sys_sched_getaffinity): Update callers.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#118685.
+
+	* acinclude.m4: Quote first argument to AC_DEFUN in all cases.
+
+2004-04-08  Roland McGrath  <roland@redhat.com>
+
+	* strace.c (main) [LINUX]: When attaching for -p, look in
+	/proc/PID/task for all threads and attach them as presumed
+	CLONE_THREAD children.
+	* NEWS: Mention the feature.
+	Fixes RH#120462.
+
+2004-03-02  Roland McGrath  <roland@redhat.com>
+
+	* util.c (setbpt): Fix one missed spot to use new arg0_index macro.
+	From Michael Holzheu <HOLZHEU@de.ibm.com>.
+
+	* debian/control (Standards-Version): Update to 3.6.1.
+
+2004-03-01  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.2.
+	* strace.spec, debian/changelog: 4.5.2-1.
+
+	* strace.c (main): Avoid potential buffer overruns from ludicrous
+	arguments or PATH values.
+	* syscall.c (qual_signal): Bail out for too-long string.
+
+	* mem.c [LINUX]: <asm/mman.h> -> <linux/mman.h>
+	Fixes Debian bug #223207.
+
+	* linux/sparc/syscall.h: Copy linux/syscall.h decls of sys_sched_*.
+
+	* configure.ac: Check for `struct user_desc' in <asm/ldt.h>.
+	* process.c [HAVE_STRUCT_USER_DESC]: Use struct user_desc in place of
+	struct modify_ldt_ldt_s.
+	* mem.c [HAVE_STRUCT_USER_DESC]: Likewise.
+
+	* system.c (sysctl_vm): Conditionalize VM_* macro uses, add some more.
+	From Tim Yamin <plasmaroo@gentoo.org>.
+
+	* process.c (sys_execve): Clear instead of set TCB_WAITEXECVE on
+	erring syscall.
+
+	* configure.ac: Check for `struct pt_all_user_regs'
+	and `struct ia64_fpreg' in <sys/ptrace.h>.
+	* util.c, process.c, syscall.c, signal.c: Work around conflicts between
+	<sys/ptrace.h> and <linux/ptrace.h> for defining those types.
+
+	* process.c (struct_user_offsets) [LINUX && IA64]: Conditionalize
+	PT_AR_CSD and PT_AR_SSD uses in case of older kernel headers.
+
+	* util.c [LINUX] (arg0_index, arg1_index): New macros.
+	[S390 || S390X]: Define them with inverted values.
+	(setbpt): Use them for u_arg indices.
+
+2004-02-26  Andreas Schwab  <schwab@suse.de>
+
+	* defs.h [LINUX && IA64]: Declare getrval2 also on IA64.
+	* net.c (sys_pipe) [LINUX && IA64]: For IA64 use the two return values.
+	* syscall.c (getrval2) [LINUX && IA64]: Implement for IA64.
+
+2004-03-01  Roland McGrath  <roland@redhat.com>
+
+	* linux/dummy.h (sys_sched_getscheduler, sys_sched_setparam,
+	sys_sched_getparam, sys_sched_setscheduler, sys_sched_getscheduler,
+	sys_sched_get_priority_max, sys_sched_get_priority_min): Remove macros.
+	* process.c [LINUX] (sys_sched_getscheduler, sys_sched_setparam,
+	sys_sched_getparam, sys_sched_setscheduler, sys_sched_getscheduler,
+	sys_sched_get_priority_min): New functions.
+	From Ulrich Drepper <drepper@redhat.com>.
+	Fixes RH#116990.
+
+2004-02-20  Roland McGrath  <roland@redhat.com>
+
+	* linux/hppa/syscallent.h: Update some syscalls.
+	From Randolph Chung <tausq@debian.org>.
+	Fixes Debian bug #231632.
+
+2003-12-31  David Mosberger  <davidm@hpl.hp.com>
+
+	* process.c (internal_exit): For ia64, also recognize IA-32 252
+	as exit_group().
+	(change_syscall): For IA64, also support changing IA-32 syscalls.
+	* syscall.c (internal_syscall): For IA64, also recognize IA-32
+        syscall 252 (exit_group) as an internal_exit() syscall.
+	* util.c (SYS_fork): For IA64, define them to the IA-32 syscall
+	number.
+	(SYS_vfork): Likewise.
+	(arg_setup): For IA64 version, also support IA-32 syscalls.
+	(get_arg0): Likewise.
+	(get_arg1): Likewise.
+	(set_arg0): Likewise.
+	(set_arg1): Likewise.
+
+2004-02-15  Anton Blanchard  <anton@samba.org>
+
+	* linux/powerpc/syscallent.h: Add rtas call.
+	Shift multiplexed syscalls to start at 300, we are already about
+	to hit 256 real syscalls.
+	* linux/syscall.h: SYS_socket_subcall is now 300 for [POWERPC].
+
+2004-02-19  Roland McGrath  <roland@redhat.com>
+
+	* strace.c (main): Use TCP->pid, not PID, in -p message.
+	Fixes Debian bug #229802.
+
+2004-01-13  Roland McGrath  <roland@redhat.com>
+
+	* syscall.c (force_result) [LINUX] [S390 || S390X]: Remove bogus upeek
+	call.
+
+	* stream.c (internal_stream_ioctl): Fix typo strict -> struct.
+	Reported by Petter Reinholdtsen <pere@hungry.com>.
+
+2003-12-31  David Mosberger  <davidm@hpl.hp.com>
+
+	* process.c (struct_user_offsets) [IA64]: Fix up register name list.
+
+2003-12-14  Anton Blanchard  <anton@samba.org>
+
+	* file.c (sys_getdents64): Don't cast d_ino and d_off to unsigned long.
+	Use %llu formats for them.
+
+	* file.c [LINUX] (fsmagic): Add SYSFS_MAGIC.
+
+	* linux/powerpc/syscallent.h: Update to include recently added
+	syscalls.
+
+	* syscall.c (get_error) [POWERPC]: Cast result to unsigned long for
+	ppc64, we were misreporting syscalls that really succeeded as having
+	failed.
+
+2004-01-13  Roland McGrath  <roland@redhat.com>
+
+	* strace.1: Remove comment about vfork on Linux.
+	Fixes Debian bug #223390.
+
+	* file.c (direnttypes): Define under [LINUX] as well.  Add DT_UNKNOWN.
+	(sys_getdents64) [LINUX]: Print d_type field.
+
+2003-12-15  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* strace.c (trace) [WCOREDUMP]: Show coredump status of the
+	killed process if available.  Fixes RH#112117.
+
+2003-11-13  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.1.
+	* strace.spec, debian/changelog: 4.5.1-1.
+
+2003-09-06  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* defs.h (ioctl_lookup): Prototype change.
+	* ioctl.c (ioctl_next_match): New function.
+	* defs.h: Declare it.
+	* io.c (sys_ioctl): Use it, to display all possible ioctl names
+	when there's more than one match.
+	* ioctl.c (ioctl_lookup): Likewise.
+	* stream.c (internal_stream_ioctl): Likewise.
+	Patch from Solar Designer <solar@openwall.com>.
+
+2003-11-13  Roland McGrath  <roland@redhat.com>
+
+	* linux/sh/syscallent.h: Use sys_setgroups32, sys_getgroups32.
+	* linux/sh64/syscallent.h: Likewise.
+
+2003-09-06  Dmitry V. Levin  <ldv@altlinux.org>
+
+	Fixes for RH#105359.
+	* util.c (printuid): New function.
+	* defs.h: Declare it.
+	* file.c (sys_chown): Use it.
+	* file.c (sys_fchown): Likewise.
+	* process.c (sys_setreuid, sys_setregid, sys_setresuid,
+	sys_setresgid): Likewise.
+	* linux/syscallent.h: Better handle getgid32, geteuid32, getegid32,
+	setreuid32, setregid32, getgroups32, setgroups32, fchown32,
+	setresuid32, getresuid32, setresgid32, getresgid32, chown32,
+	setuid32, setgid32, setfsuid32, setfsgid32.
+	* process.c [LINUX]: Define GETGROUPS32_T.
+	* process.c [LINUX] (sys_setgroups32, sys_getgroups32):
+	New functions.
+	* linux/syscall.h (sys_setgroups32, sys_getgroups32):
+	Declare them.
+
+2003-11-11  Roland McGrath  <roland@redhat.com>
+
+	* strace.c (main): Bail with usage error for missing command before we
+	open the -o file or fiddle uids.
+
+2003-11-06  Roland McGrath  <roland@redhat.com>
+
+	* strace.c (main): Treat piped output more like file output.
+	Disallow -ff with piped output.  Fixes RH#105366.
+	Reported by Dmitry V. Levin <ldv@altlinux.org>
+
+	* strace.c (tprintf): Check result of vfprintf and use perror when it
+	fails while not writing to stderr itself.  Fixes Debian bug #218762.
+
+	* net.c (printsock): Fix typo in #ifdef AF_NETLINK.
+	From Ulrich Drepper <drepper@redhat.com>.
+
+2003-11-01  Roland McGrath  <roland@redhat.com>
+
+	* syscall.c (trace_syscall) [LINUX]: Calculate ONE_TICK once using
+	setitimer rather than hard-coding a value based on HZ.
+	Fixes RH#108012, reported by Florian La Roche <laroche@redhat.com>.
+
+2003-10-21  Roland McGrath  <roland@redhat.com>
+
+	* strace.1: Fixed a few spelling errors.
+	Fixes Debian bug #217008.
+
+	* syscall.c: Revert last change, was broken.
+
+2003-10-01  Roland McGrath  <roland@redhat.com>
+
+	* process.c (internal_clone): Don't suspend parent when call requested
+	a specific PID that is not a traced child.
+
+	* signal.c [LINUX] (parse_sigset_t): Rewrite to process hex strings
+	from right to left so we don't have to presume the size.
+	Reported by David Woodhouse <dwmw2@redhat.com>.
+
+2003-09-25  Roland McGrath  <roland@redhat.com>
+
+	* mem.c (mmap_prot) [PROT_SEM, PROT_GROWSDOWN, PROT_GROWSUP]: Include
+	these in the table if they are defined.
+
+2003-09-24  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.5.
+	* strace.spec, debian/changelog: 4.5-1.
+
+	* syscall.c (get_scno) [LINUX] [S390 || S390X]: Bail out of
+	instruction decoding branch if TCB_INSYSCALL is clear.
+	Reported by <jochen@penguin-breeder.org>.
+
+	* linux/ioctlent.h: Swap order of overloaded TC* and SNDCTL_* values.
+
+2003-09-23  Roland McGrath  <roland@redhat.com>
+
+	* strace.spec: On ppc64 (maybe others later), create an strace64
+	package as well containing just /usr/bin/strace64.
+
+	* signal.c (sprintsigmask): Print RT_%u for __SIGRTMIN..__SIGRTMAX.
+	Fixes RH#104365.
+
+2003-08-21  Roland McGrath  <roland@redhat.com>
+
+	* linux/syscallent.h: Fix mlock argument count.  Fixes RH#101499.
+	* linux/x86_64/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+
+2003-07-28  Daniel Jacobowitz  <drow@mvista.com>
+
+	* defs.h (ALIGN64): Define for MIPS.
+	* io.c (PREAD_OFFSET_ARG): Define.
+	(sys_pread, sys_pwrite): Use it.
+	* process.c (struct_user_offsets) [SH]: Check whether REG_XDREG0
+	is defined.
+	* linux/sh/syscallent.h (pread, pwrite): Take six arguments.
+	(truncate64, ftruncate64): Pretty-print.
+	* linux/mips/syscallent.h (pread, pwrite): Take six arguments.
+	(truncate64, ftruncate64): Take four arguments.
+
+2003-07-17  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.4.99.
+	* strace.spec, debian/changelog: 4.4.99-1.
+
+2003-07-15  Anton Blanchard  <anton@samba.org>
+
+	* ipc.c: Add SHM_HUGETLB field.
+	Mask out permission bits in msgget, semget and shmget before
+		printing resource_flags.
+	Mask execute permission bits (even though we dont currently
+		use them).
+
+2003-07-17  Roland McGrath  <roland@redhat.com>
+
+	* linux/powerpc/syscallent.h (tgkill): New at 250.
+
+	* linux/syscallent.h: truncate64/ftruncate64 need 3 args.
+	From Ulrich Drepper <drepper@redhat.com>.
+
+	* linux/syscallent.h: Handle statfs64, fstatfs64, utimes.
+	* file.c (printstatfs): Print f_fsid and f_frsize.
+	[LINUX] (printstatfs64, sys_statfs64, sys_fstatfs64): New functions.
+	* linux/syscall.h: Add decls.
+	From Ulrich Drepper <drepper@redhat.com>.
+
+2003-07-09  Roland McGrath  <roland@redhat.com>
+
+	* linux/ia64/syscallent.h (tgkill): New at 1235.
+
+2003-07-05  Richard Henderson  <rth@twiddle.net>
+
+	* process.c (sys_clone): Order arguments for alpha the same as x86_64.
+	* syscall.c (ERESTART_RESTARTBLOCK): New.
+	(trace_syscall): Print it.
+	* linux/alpha/syscallent.h (osf_syscall): Name properly.
+	(osf_set_program_attributes): Fix typo.
+	(osf_nfssvc): Likewise.
+	(osf_sigsendset): Likewise.
+	(getdents64, gettid, readahead, tkill, setxattr, lsetxattr, fsetxattr,
+	getxattr, lgetxattr, fgetxattr, listxattr, llistxattr, flistxattr,
+	removexattr, lremovexattr, fremovexattr, futex, sched_setaffinity,
+	sched_getaffinity, tuxcall, io_setup, io_destroy, io_getevents,
+	io_submit, io_cancel, exit_group, lookup_dcookie, epoll_create,
+	epoll_ctl, epoll_wait, remap_file_pages, set_tid_address,
+	restart_syscall, fadvise, timer_create, timer_settime, timer_gettime,
+	timer_getoverrun, timer_delete, clock_settime, clock_gettime,
+	clock_getres, clock_nanosleep, semtimedop): New.
+
+2003-07-08  Roland McGrath  <roland@redhat.com>
+
+	* signal.c (sys_tgkill): New function.
+	* linux/syscall.h: Declare it.
+	* linux/syscallent.h: Add tgkill.
+
+2003-06-27  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac: Check for type `struct __old_kernel_stat'.
+	* file.c (convertoldstat, printoldstat): Define under
+	[LINUX && HAVE_STRUCT___OLD_KERNEL_STAT] rather than a list of archs.
+	(sys_oldstat, sys_oldfstat, sys_oldlstat): Likewise.
+	* linux/dummy.h [! HAVE_STRUCT___OLD_KERNEL_STAT]
+	(sys_oldstat, sys_oldfstat, sys_oldlstat): #define to printargs.
+
+2003-06-26  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac: SHMEDIA -> SH64
+	* defs.h: Likewise.
+	* mem.c: Likewise.
+	* process.c: Likewise.
+	* sock.c: Likewise.
+	* syscall.c: Likewise.
+	* util.c: Likewise.
+	* linux/shmedia/syscallent.h: Moved to ...
+	* linux/sh64/syscallent.h: ... here.
+
+	* config.guess: Update from canonical version, timestamp 2003-06-17.
+	* config.sub: Likewise.
+
+	* syscall.c (force_result) [LINUX] [ARM]: Fix variable usage.
+	From: Joshua Neal <tinara@netpipeline.net>.
+
+	* process.c [LINUX] (sys_futex): Grok FUTEX_REQUEUE and print 5th arg.
+	* linux/syscallent.h: sys_futex argument count is now 5, not 4.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/x86_64/syscallent.h: Likewise.
+	From Jakub Jelinek <jakub@redhat.com>.
+
+	* syscall.c (get_scno) [S390 || S390X]: Fix old vs new mode detection.
+	From Michael Holzheu <HOLZHEU@de.ibm.com>.
+
+2003-06-23  Roland McGrath  <roland@redhat.com>
+
+	* net.c (sys_socket): Decode protocol for PF_INET6 same as PF_INET.
+	From Ulrich Drepper <drepper@redhat.com>.
+
+2003-06-10  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.4.98.
+	* strace.spec, debian/changelog: 4.4.98-1.
+
+2003-06-09  Roland McGrath  <roland@redhat.com>
+
+	* linux/s390x/syscallent.h: Update many syscalls.
+	* linux/syscall.h (SYS_socket_subcall): Update [S390X] value.
+
+	* linux/s390/syscallent.h: Update many syscalls.
+	* linux/syscall.h (SYS_socket_subcall): Update [S390] value.
+
+	* linux/shmedia/syscallent.h: New file.
+	From Stephen Thomas <stephen.thomas@superh.com>.
+
+	* strace.c (trace): Print a message and newline for a WIFEXITED report
+	from the process we just printed an unterminated syscall line for.
+
+2003-06-03  Roland McGrath  <roland@redhat.com>
+
+	* util.c (printcall) [LINUX]: Fix typo [IA62] -> [IA64].
+
+	Linux/ARM improvements from Russell King <rmk@arm.linux.org.uk>:
+	* defs.h [LINUX] (TCB_WAITEXECVE): Define for [ARM] too.
+	* process.c (struct_user_offsets) [LINUX] [ARM]: Add ARM registers.
+	* signal.c [LINUX] (sys_sigreturn) [ARM]: New case.
+	* syscall.c (get_scno, syscall_fixup) [LINUX] [ARM]: Case rewritten.
+	(get_error) [LINUX] [ARM]: Update.
+	(syscall_enter) [LINUX] [ARM]: New case.
+	* util.c (printcall) [LINUX] [ARM]: New case.
+
+	* debian/control (Standards-Version): Update to 3.5.10.
+
+	* strace.c (main): In PATH search, accept only a regular file with
+	execute bits set.  Fixes Debian bug #137103.
+
+2003-06-02  Roland McGrath  <roland@redhat.com>
+
+	* strace.c (main): Set -q when given -o and not -p, and not when not
+	given -o, to match what the man page always said.
+	Fixes Debian bug #47113, #153678.
+
+	* configure.ac, NEWS: Version 4.4.97.
+	* strace.spec, debian/changelog: 4.4.97-1.
+
+	* configure.ac, defs.h, mem.c, process.c, sock.c, syscall.c, util.c:
+	Merged in SHmedia port from Stephen Thomas <stephen.thomas@superh.com>.
+
+	* config.guess: Update from ftp://ftp.gnu.org/pub/gnu/config/,
+	timestamp 2003-05-22.
+	* config.sub: Likewise, timestamp 2003-05-24.
+
+2003-05-22  Roland McGrath  <roland@redhat.com>
+
+	* defs.h (struct tcb): New member `nzombies'.
+	* strace.c (alloctcb): Initialize it.
+	(droptcb): Increment our parent's zombie count.
+	* process.c (internal_wait): Don't go into TCB_SUSPENDED if the
+	process has zombies it can reap.  On the way out, if we reaped
+	an untraced process, decrement the zombie count.
+
+	* process.c (sys_clone): Mask CSIGNAL out of flags and print that
+	separately using signame.
+
+	* process.c (internal_clone) [TCB_CLONE_THREAD]: Use ARG_FLAGS instead
+	of literal 0 for index.  Consult the right flags without clobbering
+	anything when we reparent the new child to the caller's parent thread.
+
+	* linux/s390/syscallent.h: Fix sys_clone argument count.
+	* linux/s390x/syscallent.h: Likewise.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/alpha/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/sh/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/hppa/syscallent.h: Likewise.
+
+	* process.c [LINUX] [S390 || S390X] (ARG_CTID, ARG_TLS): Fix swapped
+	indices.  Reported by Jakub Jelinek <jakub@redhat.com>.
+
+	* signal.c [LINUX] (SI_SIGIO, SI_TKILL): New macros.
+	[LINUX || SVR4] (siginfo_codes): Add strings for them.
+
+	* process.c (print_affinitylist): Fix loop condition.
+	Reported by Ian Wienand <ianw@gelato.unsw.edu.au>.
+
+2003-04-10  Roland McGrath  <roland@redhat.com>
+
+	* syscall.c (qual_desc): Return zero after parsing number.
+	From Rob Leslie <rob@mars.org>, fixes Debian bug #188379.
+
+2003-04-07  Roland McGrath  <roland@redhat.com>
+
+	* linux/syscallent.h: Handle semtimedop subcall of ipc syscall.
+	* linux/syscall.h: Likewise.
+	* ipc.c [LINUX] (sys_semtimedop): New function.
+	From Ulrich Drepper <drepper@redhat.com>.
+
+	* ipc.c (sys_semget): Mask off permission bits for resource_flags.
+	From Ulrich Drepper <drepper@redhat.com>.
+
+2003-04-01  Philippe De Muyter  <phdm@macqel.be>
+
+	* sock.c, stream.c: Check #ifdef LINUX, not linux.
+	* file.c: Always provide sys_*attr, regardless of #ifdef XATTR_CREATE.
+
+2003-03-30  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.4.96.
+	* strace.spec, debian/changelog: 4.4.96-1.
+
+2003-02-26  Stuart Menefy <stuart.menefy@st.com>
+
+	Various fixes for SuperH [SH]:
+	* mem.c (sys_old_mmap): mmap() parameters passed in registers
+	* net.c (sys_pipe), syscall.c (getrval2): pipe() results returned
+	in registers
+	* process.c (change_syscall): Fixed register which holds system
+	call number
+	* util.c (arg0_offset, arg1_offset): provide definition
+	* Makefile.am: Added new files in linux/sh
+	* linux/sh/syscallent.h: New file.
+	* linux/sh/errnoent.h: New file.
+	* linux/sh/ioctlent.h: New file.
+	* linux/sh/signalent.h: New file.
+
+	* linux/ioctlent.sh: Take an arg for location of header files
+	* syscallent.sh: Replaced lost $
+
+2003-03-30  Roland McGrath  <roland@redhat.com>
+
+	* time.c [LINUX]: Handle new Linux 2.5 clock/timer syscalls.
+	* linux/syscall.h, linux/syscallent.h, linux/dummy.h: Likewise.
+	From Ulrich Drepper <drepper@redhat.com>.
+
+	* linux/syscallent.h: Use sys_getrlimit for 191.
+	Use name "old_getrlimit" for 76.
+	Reported by Ulrich Drepper <drepper@redhat.com>.
+
+2003-03-18  Roland McGrath  <roland@redhat.com>
+
+	* process.c [LINUX] (sys_clone): Don't dereference parent_tid argument.
+
+2003-03-17  Roland McGrath  <roland@redhat.com>
+
+	* linux/x86_64/syscallent.h: clone takes 5 args.
+	* process.c [LINUX] (sys_clone) [X86_64]: Fix argument order.
+
+2003-03-15  Roland McGrath  <roland@redhat.com>
+
+	* linux/x86_64/syscallent.h: Add exit_group syscall at 231.
+
+2003-03-14  Roland McGrath  <roland@redhat.com>
+
+	* linux/x86_64/syscallent.h: Update and add many 2.5 syscalls.
+
+	* linux/ia64/syscallent.h: clone takes 5 arguments.
+	* process.c [LINUX && IA64] (ARG_*): Update for 2.5 clone calls.
+
+2003-03-12  Roland McGrath  <roland@redhat.com>
+
+	* linux/ia64/syscallent.h: Fix arg counts for clone and clone2.
+	Use sys_clone for clone2.
+	* linux/syscall.h: Don't declare sys_clone2.
+	* process.c (sys_clone): Rewritten to handle both flavors,
+	print all extra args depending on flag bits.
+	(sys_clone2): Function removed.
+
+	* linux/ia64/syscallent.h: Add a bunch of 2.5 syscalls.
+
+2003-03-04  Roland McGrath  <roland@redhat.com>
+
+	* syscall.c (get_scno) [IA64]: Do TCB_WAITEXECVE check only when
+	TCB_INSYSCALL is clear, like other platforms do.
+
+2003-03-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* mem.c [LINUX] (sys_remap_file_pages): New function.
+	* linux/syscall.h: Declare it.
+	* linux/syscallent.h: Use it.
+	* linux/powerpc/syscallent.h: Likewise.
+
+	* process.c [LINUX] (sys_futex): Omit final if op is not FUTEX_WAIT.
+
+2003-02-26  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac: Fix typo in netinet/in.h check.
+	Also include <sys/types.h> and <sys/socket.h> before <netinet/in.h>.
+	Reported by Alex Semenyaka <alexs@snark.rinet.ru>.
+
+2003-02-24  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.4.95.
+	* strace.spec, debian/changelog: 4.4.95-1.
+
+	* process.c (sys_getresgid): Fix typos in argument access.
+
+2003-02-23  Roland McGrath  <roland@redhat.com>
+
+	* process.c (sys_getresuid): Fix typos in argument access.
+	Reported by Anton Blanchard <anton@samba.org>.
+
+2003-02-19  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.4.94.
+	* strace.spec, debian/changelog: 4.4.94-1.
+
+	* version.c: Removed.
+	* Makefile.am (strace_SOURCES): Remove it.
+	* strace.c: Use PACKAGE_NAME and VERSION macros instead of version var.
+
+	FreeBSD rfork support changes from Russ Cox <rsc@plan9.bell-labs.com>:
+	* syscall.c (internal_syscall): Handle SYS_rfork with internal_fork.
+	* process.c (internal_fork) [SYS_rfork]: Bail if RFPROC flag not set.
+
+2003-01-23  Roland McGrath  <roland@redhat.com>
+
+	* signal.c: Reorder #ifdefs so HAVE_ASM_SIGCONTEXT_H doesn't matter on
+	SPARC, which doesn't use the header regardless.
+
+	* util.c [LINUX && SPARC]: Do renaming kludges around <asm/reg.h>
+	like signal.c does.
+
+	* linux/sparc/syscall.h: Declare sys_getdents64, sys_llseek.
+
+	* linux/dummy.h [! SYS_getpmsg] (sys_getpmsg): #define to printargs.
+	[! SYS_putpmsg] (sys_putpmsg): Likewise.
+
+	* process.c: Reorder includes to put sys/reg.h before linux/ptrace.h,
+	since they can conflict.
+
+2003-01-21  Roland McGrath  <roland@redhat.com>
+
+	* strace.c (usage): Omit -z, since it has never worked properly.
+	* NEWS: Likewise.
+
+	* strace.c (main): Grok new option `-E var=val' or `-E var' to put
+	var=val in environ or to remove var, respectively.
+	(usage): Mention it.
+	* strace.1, NEWS: Document it.
+
+	* configure.ac, NEWS: Version 4.4.93.
+	* strace.spec, debian/changelog: 4.4.93-1.
+	* strace.spec (Source0): Use strace-VERSION.tar.bz2 now.
+
+2003-01-20  Roland McGrath  <roland@redhat.com>
+
+	* defs.h [LINUX] [S390 || S390X] (TCB_WAITEXECVE): Define it.
+	* syscall.c (get_scno, syscall_fixup) [LINUX] [S390 || S390X]: Handle
+	TCB_WAITEXECVE state with special kludges.
+
+	* process.c [LINUX] (sys_clone) [S390 || S390X]: Argument order is
+	reversed from other architectures.
+
+	* process.c (sys_execve) [LINUX]: Make setting TCB_WAITEXECVE flag
+	conditional on [TCB_WAITEXECVE] instead of list of processors.
+
+	* util.c (restore_arg0): Evaluate args in no-op defns.
+
+	* util.c [S390 || S390X] (arg0_offset, arg1_offset): Fix definitions
+	for clone call on S390.  From Michael Holzheu <holzheu@de.ibm.com>.
+
+2003-01-17  Anton Blanchard <anton@samba.org>
+
+	* util.c [LINUX] (setbpt): Handle SYS_vfork like SYS_fork.
+
+	* linux/syscall.h (SYS_socket_subcall): 256 also for POWERPC.
+
+2003-01-14  Roland McGrath  <roland@redhat.com>
+
+	* linux/powerpc/errnoent.h: Add missing errnos.
+	* linux/powerpc/ioctlent.h: Update ioctl values.
+	From Anton Blanchard <anton@samba.org>.
+
+	* io.c [LINUX] (sys_pread, sys_pwrite): Fix last change.
+	From Anton Blanchard <anton@samba.org>.
+
+	* linux/hppa/syscallent.h: Use sys_getdents64, sys_truncate64,
+	sys_ftruncate64, instead of printargs, for those syscalls.
+	* linux/mips/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+	* linux/s390/syscallent.h: Likewise.
+	* linux/sparc/syscallent.h: Likewise.
+
+	* linux/syscall.h (SYS_socket_subcall): Only 256 for S390, S390X.
+	All others at the moment use linux/syscallent.h, where it's 300.
+
+	* strace.1: Update bug reporting info.
+
+	* resource.c [LINUX] (quotacmds): Grok new command encodings.
+	From Nathan Scott <nathans@debian.org>.
+
+	* configure.ac, NEWS: Version 4.4.92.
+	* strace.spec, debian/changelog: 4.4.92-1.
+
+	* configure.ac: Match powerpc* (includes powerpc64), and don't match
+	ppc (never comes out of config.sub).
+
+	* process.c (sys_ptrace): Use #lx format for address argument.
+	[POWERPC]: Use sizeof(unsigned long) in place of 4 for multipliers.
+	* process.c [POWERPC]: Likewise.
+	* signal.c (sys_sigreturn) [POWERPC]: Likewise.
+	* syscall.c (get_scno) [POWERPC]: Likewise.
+	* util.c [POWERPC]: Likewise.
+	(printnum): Use long for NUM.
+	From Anton Blanchard <anton@samba.org>.
+
+	* defs.h (ALIGN64): Fix defn for PPC, same as FreeBSD one.
+
+	* util.c [LINUX] (restore_arg0, restore_arg1): New macros, defined
+	appropriately via set_arg0 or no-ops for each architecture.
+	(clearbpt): Use those instead of set_arg0 and set_arg1.
+
+	* defs.h [_LARGEFILE64_SOURCE] (_LFS64_LARGEFILE): Define it.
+	* linux/syscallent.h: Use sys_getdents64, sys_truncate64,
+	sys_ftruncate64, instead of printargs, for those syscalls.
+
+	* process.c: Use <linux/ptrace.h> regardless of <sys/reg.h>.
+	(sys_ptrace): Use printxval.
+	(ptrace_cmds): Make PTRACE_GETREGS et al conditional on #ifdef PTRACE_*
+	instead of only #ifdef SUNOS4.  Add PTRACE_[GS]ETFPXREGS.
+
+	* ipc.c (PRINTCTL): New macro.  #ifdef IPC_64, factor out the flag and
+	print it before using printxval.
+	(sys_msgctl, sys_semctl, sys_shmctl): Use it.
+
+2003-01-13  Roland McGrath  <roland@redhat.com>
+
+	* config.guess: Update from ftp://ftp.gnu.org/pub/gnu/config/,
+	timestamp 2003-01-10.
+	* config.sub: Likewise, timestamp 2003-01-03.
+	* install-sh: Update from Automake 1.7.2.
+
+	* linux/powerpc/signalent.h: Add SIGRTMIN.
+	From Anton Blanchard <anton@samba.org>.
+
+	* linux/powerpc/syscallent.h: Add missing system calls.
+	Decode more system calls, we were just printargs for many things.
+	Remove some x86-specific system calls.
+	Remove two syscalls between the socket and ipc syscalls,
+	it was resulting in all IPC syscalls being off by two.
+
+	* ioctl.c (ioctl_decode) [POWERPC]: Decode term ioctls like Alpha.
+	From Anton Blanchard <anton@samba.org>.
+
+	* defs.h [POWERPC] (UESP, EIP, EAX, ORIG_EAX): Remove this cruft.
+	[LINUX && POWERPC && !__powerpc64__] (ALIGN64): New macro.
+	* io.c (sys_pread, sys_pwrite): Use ALIGN64.
+	From Anton Blanchard <anton@samba.org>.
+
+	* term.c [LINUX]: Get kernel definition of struct termios.
+	From Anton Blanchard <anton@samba.org>.
+
+	* linux/ioctlent.sh: Look in sound/ directory too.
+	From Anton Blanchard <anton@samba.org>.
+
+	* desc.c (printflock64): Fix ADDR argument type.
+	From Anton Blanchard <anton@samba.org>.
+
+	* strace.c [! HAVE_STRSIGNAL]: Clean up #ifdefs on decls for
+	sys_siglist and _sys_siglist.
+	Reported by John Hughes <john@Calva.COM>.
+
+	* net.c: HAVE_OPTHDR -> HAVE_STRUCT_OPTHDR
+	Reported by John Hughes <john@Calva.COM>.
+
+	* linux/syscall.h [ARM] (SYS_socket_subcall): Set to 300.
+
+2003-01-10  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, NEWS: Version 4.4.91.
+	* strace.spec, debian/changelog: 4.4.91-1
+
+	* util.c [LINUX && X86_64] (arg0_offset, arg1_offset): Use correct
+	values for x86-64, conditional on current_personality.
+
+	* strace.c (droptcb): Clear flags word before calling rebuild_pollv.
+
+	* configure.ac: Check struct T_conn_res for QUEUE_ptr or ACCEPTOR_id.
+	* stream.c (print_transport_message): Use #ifdefs for those members.
+
+	* strace.c (rebuild_pollv): Fix typo: struct poll -> struct pollfd.
+
+	* configure.ac: Fix siginfo_t/sig_atomic_t checks.
+	Use prerequisite #include <netinet/in.h> for netinet/*.h checks.
+
+	* strace.c (pfd2tcb): Fix for new tcbtab type.
+	(rebuild_pollv): Likewise.
+	(detach): Put variables used under [LINUX] inside #ifdef.
+
+	* process.c (change_syscall) [POWERPC]: Add missing return.
+	* util.c [POWERPC] (arg0_offset): Set to 4*PT_R3, not 4*PT_ORIG_R3.
+
+	* strace.spec: New file.
+	* debian/changelog: 4.4.90-1
+	* debian/rules (binary-arch): Depend on build.
+	(clean): Don't try to run Makefile.in.
+	* debian/control (Standards-Version): Now 3.5.8.
+
+	* configure.ac: Diddle CFLAGS after AC_PROG_CC, not before.
+
+2003-01-09  Roland McGrath  <roland@redhat.com>
+
+	* syscall.c (force_result) [S390 || S390X]: Fix typo.
+
+	* debian/control: Update Maintainer: field.
+
+2003-01-08  Roland McGrath  <roland@redhat.com>
+
+	* NEWS: Update for 4.4.90 test release.
+
+	Support for new Linux 2.5 thread features.
+	* defs.h [LINUX]: Define __NR_exit_group if not defined.
+	(struct tcb): New members nclone_threads, nclone_detached,
+	and nclone_waiting.
+	(TCB_CLONE_DETACHED, TCB_CLONE_THREAD, TCB_GROUP_EXITING): New macros.
+	(waiting_parent): Macro removed.
+	(pid2tcb): Declare it.
+	* process.c (internal_clone) [TCB_CLONE_THREAD]: Reparent the new
+	child to our parent if we are a CLONE_THREAD child ourselves.
+	Maintain TCB_CLONE_THREAD and TCB_CLONE_DETACHED flags and counts.
+	(internal_wait) [TCB_CLONE_THREAD]: Factor out detached children when
+	determining if we have any.  If TCB_CLONE_THREAD is set, check
+	parent's children instead of our own, and bump nclone_waiting count.
+	(internal_exit) [__NR_exit_group]: Set the TCB_GROUP_EXITING flag if
+	the syscall was exit_group.
+	* syscall.c (internal_syscall): Use internal_exit for exit_group.
+	* strace.c (pid2tcb): No longer static.
+	(alloctcb) [TCB_CLONE_THREAD]: Initialize new fields.
+	(droptcb) [TCB_CLONE_THREAD]: Maintain new fields.
+	If we have thread children, set TCB_EXITING and don't clear the TCB.
+	(resume) [TCB_CLONE_THREAD]: Decrement parent's nclone_waiting.
+	(detach) [TCB_CLONE_THREAD]: When calling resume, check all thread
+	children of our parent that might be waiting for us too.
+	[TCB_GROUP_EXITING] (handle_group_exit): New function.
+	(trace) [TCB_GROUP_EXITING]: Use that in place of detach or droptcb.
+
+	Revamp -f support for Linux.
+	* util.c [LINUX] (setbpt, clearbpt): New implementations that tweak
+	the system call to be clone with CLONE_PTRACE set.  Various new static
+	helper functions.
+	* process.c (internal_clone): Define also #ifdef SYS_clone2.
+	Initialize TCPCHILD->parent field.
+	[CLONE_PTRACE]: Don't do PTRACE_ATTACH here, because it's preattached.
+	Check in case the new child is in the tcb already.
+	(internal_fork) [LINUX]: Just call internal_clone.
+	* strace.c (trace) [LINUX]: Under -f/-F, grok an unknown pid
+	reporting to wait, put it in the TCB with TCB_ATTACHED|TCB_SUSPENDED.
+
+	* linux/x86_64/syscallent1.h (sys_oldlstat): #define as printargs.
+
+	* file.c [LINUX]: #undef st_[amc]time in case they are macros.
+
+	* Makefile.am (AM_CFLAGS): New variable, define to $(WARNFLAGS).
+
+	* Makefile.am (EXTRA_DIST): Remove debian/postinst and debian/prerm.
+
+2003-01-09  Wichert Akkerman  <wichert@deephackmode.org>
+
+	* debian/postinst, debian/prerm: removed, /usr/doc symlink is no
+	longer used
+	* debian/rules: no longer install postinst and prerm
+	* debian/control: do not end summary with full stop (lintian)
+
+2002-12-30  Roland McGrath  <roland@redhat.com>
+
+	* Makefile.am (bin_SCRIPTS): New variable, list strace-graph.
+	(EXTRA_DIST): Add missing files.
+
+	* configure.ac: Fix asm/sigcontext.h check to include prerequisite.
+
+	* syscall.c (qualify_one): New function.
+	(qual_options): Replace lookup field with qualify, update initializer.
+	(qualify): Update caller.
+	(qual_signal, qual_fault, qual_desc): Rewritten from lookup_*.
+	(qual_syscall): Rewritten lookup_syscall, match name more than once.
+	Fixes RH#70579, bites IA64 -efoo when foo exists on IA32.
+
+	* version.c (version): Make const, bump to 4.4.90.
+	* strace.c: Update decl.
+
+	* Makefile.am [LINUX && X86_64]: Remove cruft.
+	* linux/x86_64/errnoent1.h: New file.
+	* linux/x86_64/ioctlent1.h: New file.
+	* linux/x86_64/signalent1.h: New file.
+	* linux/x86_64/syscallent1.h: New file.
+	* linux/x86_64/i386-headers.diff: File removed.
+	* linux/x86_64/makeheaders.sh: File removed.
+	* linux/x86_64/Makefile.in: File removed.
+
+	* linux/syscallent.h [X86_64]: Disable sanity checks, subcall stuff is
+	already broken for 32-bit personality on x86-64.
+
+2002-12-29  Roland McGrath  <roland@redhat.com>
+
+	* configure.ac, Makefile.am: Punt subdirs, handle everything here.
+	* linux/Makefile.am: File removed.
+	* freebsd/Makefile.am: File removed.
+	* sunos4/Makefile.in: File removed.
+	* svr4/Makefile.in: File removed.
+
+	* linux/alpha/Makefile.in: File removed.
+	* linux/hppa/Makefile.in: File removed.
+	* linux/ia64/Makefile.in: File removed.
+	* linux/powerpc/Makefile.in: File removed.
+	* linux/s390/Makefile.in: File removed.
+	* linux/s390x/Makefile.in: File removed.
+
+2002-12-26  Roland McGrath  <roland@redhat.com>
+
+	* syscallent.sh: Grok three flavors of #define line, uniquify.
+	* linux/hppa/syscallent.sh: File removed.
+	* linux/powerpc/syscallent.sh: File removed.
+
+	* linux/Makefile.am: New file.
+	* linux/Makefile.in: File removed.
+	* freebsd/Makefile.am: New file.
+	* freebsd/i386/Makefile.am: New file.
+	* freebsd/i386/Makefile.in: File removed.
+
+2002-12-22  Roland McGrath  <roland@redhat.com>
+
+	Update to Autoconf 2.57, and Automakify with version 1.7.
+	* Makefile.am: New file.
+	* Makefile.in: File removed.
+	* configure.in: Moved to ...
+	* configure.ac: ... here.  Update for Autoconf 2.5x and Automake.
+	* aclocal.m4: Moved to ...
+	* acinclude.m4: ... here.  Update for Autoconf 2.5x.
+	* acconfig.h: File removed.
+	* AUTHORS: New file, makes automake happy.
+	* autogen.sh: File removed.
+	* README-CVS: Update to recommend autoreconf instead.
+	* file.c: HAVE_ST_* -> HAVE_STRUCT_STAT_ST_*.
+	* net.c: HAVE_SIN6_SCOPE_ID -> HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID,
+	HAVE_MSG_CONTROL -> HAVE_STRUCT_MSGHDR_MSG_CONTROL.
+	* strace.c: *_DECLARED -> HAVE_DECL_*
+	* stream.c: HAVE_* -> HAVE_STRUCT_*
+
+	* linux/Makefile.in (ioctldefs.h ioctls.h): Use $(SHELL) instead of
+	sh, and use $(srcdir) to find the script.
+	* linux/powerpc/Makefile.in (ioctlent.raw): Find ioctlent.sh in ../.
+	(ioctlsort.o): Use ../ioctlsort.c, not ../../ioctlsort.c.
+	* linux/x86_64/Makefile.in (headers): Renamed to all.
+	* linux/alpha/Makefile.in: Add empty install target.
+	* linux/x86_64/Makefile.in: Likewise.
+	* linux/powerpc/Makefile.in: Likewise.
+	* linux/Makefile.in: Likewise.
+
+2002-12-26  Roland McGrath  <roland@redhat.com>
+
+	* defs.h [LINUX && MIPS] (MAX_QUALS): Set to 5000, not 4999.
+	From Daniel Jacobowitz <drow@false.org>.
+
+2002-12-21  Roland McGrath  <roland@redhat.com>
+
+	* linux/syscallent.h: Add some new 2.5 syscall names.
+	Now clone takes 5 args.
+	* process.c [LINUX] (clone_flags): Update with 2.5 flag bits.
+	[LINUX] (sys_clone): Print new args.
+	* mem.c (print_ldt_entry): Make global.
+
+	* linux/syscall.h [I386 || IA64] (SYS_socket_subcall): Bump to 300 for
+	safety, since up to 260 are already used in 2.5 kernels.
+	* linux/syscallent.h: Update the table.
+	* linux/ia64/syscallent.h: Likewise.
+
+	* syscall.c (force_result): New function.
+	* process.c (internal_wait): Handle ECHILD exit from wait call with
+	WNOHANG flag set; force the return value to 0 in the inferior when it
+	has live children we are tracing.
+	* NEWS: Mention the bug fix.
+
+2002-12-17  Roland McGrath  <roland@redhat.com>
+
+	* linux/ia64/syscallent.h: Remove placeholders 275-298 to catch up
+	with linux/syscallent.h additions.
+
+	* strace.c (tcbtab): Make this a pointer to pointers, not an array.
+	(tcbtabsize): New variable.
+	(main): Initialize them using dynamic allocation.
+	(alloctcb, main): Use tcbtabsize in place of MAX_PROCS; indirect.
+	(pid2tcb, cleanup): Likewise.
+	[USE_PROCFS] (pollv): Make this a pointer, not an array; make static.
+	(rebuild_pollv): Dynamically allocate the vector.
+	* defs.h (tcbtab): Update decls.
+	(MAX_PROCS): Macro removed, no more static limit on this.
+	* process.c (fork_tcb): New function.
+	(internal_clone, internal_fork): Use it instead of checking nprocs.
+
+	* strace.c (detach) [LINUX]: Use __WALL (or a second try with __WCLONE)
+	in wait after sending SIGSTOP.
+
+2002-12-16  Roland McGrath  <roland@redhat.com>
+
+	* signal.c (sprintsigmask): Increase static buffer size to account for
+	worst possible case.  Reported by Daniel Jacobowitz <drow@false.org>.
+
+	* process.c [LINUX] (wait4_options): Fix __WCLONE value.  Add
+	__WNOTHREAD and __WALL.
+
+	* strace.c (trace) [LINUX]: Only check errno if wait4 actually fails,
+	so we don't repeat a wait and thus drop a status.  Fixes RH#62591.
+
+2002-12-15  Roland McGrath  <roland@redhat.com>
+
+	* process.c (setarg) [POWERPC]: Support it.
+
+	* util.c [POWERPC] (LOOP): Fix value, now 0x48000000 (0: b 0b).
+	Old value was bogus, not even a proper instruction.
+	From Guy M. Streeter <streeter@redhat.com>.
+
+	* strace.c (main) [! USE_PROCFS]: Always reset SIGCHLD to SIG_DFL.
+
+	* configure.in: Don't check for putpmsg.
+	* stream.c (sys_getpmsg, sys_putpmsg): Make these conditional on
+	#ifdef SYS_*, rather than on HAVE_PUTPMSG.
+
+	* aclocal.m4 (AC_STAT64): Include <linux/types.h> before <asm/stat.h>
+	in test.  Test our own #ifdef LINUX rather than predefined `linux'.
+
+	* linux/powerpc/syscallent.h: Use sys_llseek for _llseek.
+	* linux/sparc/syscallent.h: Likewise.
+	* linux/hppa/syscallent.h: Likewise.
+
+	* syscall.c (syscall_enter) [LINUX && POWERPC]: Define PT_ORIG_R3 if
+	not defined, since <asm/ptrace.h> defines it only #ifdef __KERNEL__.
+	* process.c: Likewise.
+
+	* desc.c (sys_osf_select): Add missing return type.
+
+	* syscall.c (trace_syscall): Use strerror, not sys_errlist/sys_nerr.
+
+	* linux/ia64/syscallent.h: Remove macros for sys_delete_module,
+	sys_nanosleep, both already in linux/dummy.h.
+
+	* syscall.c (get_scno): Move static `currpers' inside #ifdef X86_64.
+	(trace_syscall): Fix return without value.
+
+	* linux/syscallent.h: Update table with names of new syscalls
+	io_setup, io_destroy, io_getvents, io_submit, io_cancel.
+	* linux/ia64/syscallent.h: Likewise.
+	* linux/powerpc/syscallent.h: Likewise.
+
+	* signal.c [LINUX && I386]: Provide SA_RESTORER constant if not
+	defined.  If the bit is set, print the sa_restorer field of sigaction.
+
+	* mem.c: Add sys_{get,set}_thread_area.
+	* linux/syscall.h: Declare them.
+	* linux/syscallent.h: Update the table for these.
+	* linux/dummy.h (sys_modify_ldt): Define only #ifndef I386.
+	(sys_get_thread_area, sys_set_thread_area): New macros #ifndef I386.
+
+	* configure.in: Check for linux/xattr.h and linux/futex.h headers.
+	* linux/syscall.h: Add sys_* decls for new syscalls getpmsg, putpmsg,
+	readahead, sendfile64, setxattr, fsetxattr, getxattr, fgetxattr, int
+	listxattr, flistxattr, removexattr, fremovexattr, sched_setaffinity,
+	sched_getaffinity, futex.
+	* linux/syscallent.h: Update the table.
+	* io.c: Add sys_sendfile64.
+	* file.c: Add sys_readahead, sys_*xattr.
+	* process.c: Add sys_futex, sys_*affinity.
+
+	* linux/syscall.h (SYS_socket_subcall): Define to 256 on all machines.
+	(SYS_ipc_subcall): Always SYS_socket_subcall + SYS_socket_nsubcalls.
+	* linux/syscallent.h: Update the table for socket and ipc subcalls.
+
+2002-11-09  Heiko Carstens <heiko.carstens@de.ibm.com>
+
+	Bugfix for s390/s390x:
+	* syscall.c: Fixed scno derivation for s390/s390x.
+
+2002-11-06  Michal Ludvig  <mludvig@suse.cz>
+
+	Merged patch from Steven J. Hill <sjhill@realitydiluted.com>
+	to allow the compilation of a native MIPS strace.
+
+2002-11-06  Michal Ludvig  <mludvig@suse.cz>
+
+	From Marty Leisner <leisner@rochester.rr.com>,
+	rewritten by mludvig:
+	* strace.c (not_failing_only): New.
+	(usage): Added -z switch description.
+	(main): Added -z switch parsing to not_failing_only variable.
+	* syscall.c (trace_syscall): Added not_failing_only handling.
+
+2002-10-08  Heiko Carstens <heiko.carstens@de.ibm.com>
+
+	Missing complete changelog for 2002-10-07 commit:
+	* Makefile.in: Added linux/s390, linux/s390x to ALL_SUBDIRS.
+	* acconfig.h: New define for s390x.
+	* config.sub: Added missing define for s390 and new one for s390x.
+	* configure.in: Added new define for s390x.
+	* file.c: Added missing #undef dirent64 and new defines for s390x.
+	* linux/s390: New directory.
+	* linux/s390/Makefile.in: New file.
+	* linux/s390/errnoent.h: New file.
+	* linux/s390/ioctlent.h: New file.
+	* linux/s390/signalent.h: New file.
+	* linux/s390/syscallent.h: New file.
+	* linux/s390x: New directoy.
+	* linux/s390x/Makefile.in: New file.
+	* linux/s390x/errnoent.h: New file.
+	* linux/s390x/ioctlent.h: New file.
+	* linux/s390x/signalent.h: New file.
+	* linux/s390x/syscallent.h: New file.
+	* linux/syscall.h: Added sys_mincore() prototype and added new
+	s390x defines.
+	* process.c: Added s390x defines.
+	(change_syscall): Changed handling for s390.
+	(setarg): Added missing s390/s390x code in setarg().
+	* signal.c: Added s390x define.
+	(sys_sigreturn): Bugfix in s390/s390x code (wrong number of
+	arguments to sprintsigmask()).
+	* stream.c (internal_stream_ioctl): Changed int cast to long cast,
+	since printstr() expects a long.
+	* syscall.c (decode_subcall): Changed several variables to be long
+	instead of int to match 64 bit requirements. Added s390x defines.
+	(syscall_enter): Changed upeek() call to match s390 and s390x
+	requirements.
+	* util.c: Added s390x defines.
+
+2002-10-07  Michal Ludvig  <mludvig@suse.cz>
+
+	Merged s390x port by Heiko Carstens <Heiko.Carstens@de.ibm.com>
+	and bugfixes to s390 by D.J. Barrow.
+
+2002-09-23  Michal Ludvig  <mludvig@suse.cz>
+
+	Merged x86-64 port by Andi Kleen <ak@suse.de>
+	and Michal Ludvig <mludvig@suse.cz>
+	* Makefile.in: New target 'headers'. Failure ignored.
+	* acconfig.h: New defines for x86-64.
+	* configure.in: Ditto.
+	* defs.h: Ditto.
+	* file.c: Ditto.
+	* signal.c: Ditto.
+	* process.c: Added support for x86-64.
+	* util.c: Ditto.
+	* syscall.c: Ditto + added automatic personality switching.
+	* linux/syscall.h: Ditto.
+	* linux/x86_64: New directory.
+	* linux/x86_64/Makefile.in: New file.
+	* linux/x86_64/gentab.pl: Ditto.
+	* linux/x86_64/i386-headers.diff: Ditto.
+	* linux/x86_64/makeheaders.sh: Ditto.
+	* linux/x86_64/syscallent.h: Ditto.
+	* mem.c (print_mmap): Always print arg[4] as int.
+
+2002-09-23  Michal Ludvig  <mludvig@suse.cz>
+
+	* configure.in: Fix regular expressions.
+	* linux/syscall.h: Added missing braces in prototype of
+	sys_getdents64().
+	* file.c: Use '#ifdef LINUX' instead of '#ifdef linux'.
+	(struct fileflags): Made extern to inhibit compiation warnings.
+	(sys_getdents64): Merged LINUX and SVR4 part.
+	* syscall.c (get_scno): Split multiline string into two distinct
+	strings.
+
+2002-05-24  John Hughes <john@calva.com>
+
+	* stream.h, net.h: Avoid possible infinite loop caused by
+	unsigned arithmetic in preceeding change.
+
+2002-05-23  John Hughes <john@calva.com>
+
+	* acconfig.h: Add HAVE_OPTHDR and HAVE_T_OPTHDR defines.
+
+	* aclocal.m4: Add tests for struct opthdr in sys/socket.h and
+	struct t_opthdr in sys/tiuser.h, define HAVE_OPTHDR and HAVE_T_OPTHDR
+	if found.
+
+	* configure.in: use tests for struct opthdr and struct t_opthdr.
+
+	* defs.h: add new function print_sock_optmgmt.
+
+	* io.c: add hack that lets ioctl decode functions set auxilliary
+	string return.
+
+	* stream.c: better decoding for timod ioctls.
+
+	* net.c: add function print_sock_optmgmt, used by timod ioctl
+	decoding functions in stream.c.
+
+2002-05-23  John Hughes <john@calva.com>
+
+	* acconfig.h: Make autoheader happy about Linux/SuperH
+
+2002-05-23  John Hughes <john@calva.com>
+
+	* strace.c: Get rid of warning if not using POLL_HACK
+
+2002-05-22  John Hughes <john@calva.com>
+
+	* net.c: Simplify {get,set}sockopt, decode SO_LINGER, cope with
+	options that are not just ints, cope with systems that don't
+	#define SOL_TCP and so on.
+
+2002-05-21  John Hughes <john@calva.com>
+
+	* strace.c: Fix warning if POLL_HACK is used.
+
+2002-05-17  John Hughes <john@calva.com>
+
+	* svr4/ioctlent.sh: Some defines on UW come with too many spaces.
+
+2002-05-17  John Hughes <john@calva.com>
+
+	* svr4/ioctlent.sh: Cope with #defines wrapped in #ifdefs.
+
+2002-05-17  John Hughes <john@calva.com>
+
+	* stream.c: tidy up output a little.
+
+2002-05-17  John Hughes <john@calva.com>
+
+	* process.c, svr4/dummy.h, svr4/syscall.h: decode arguments
+	to procpriv syscall.
+
+2002-05-01  Wichert Akkerman <wichert@deephackmode.org>
+
+	* configure.in, defs.h, process.c, sock.c, syscall.c, util.c: merge
+	  patch from Greg Banks <gbanks@pocketpenguins.com> for Linux/SuperH
+	  support
+
+2002-04-01  Wichert Akkerman <wichert@deephackmode.org>
+
+	* strace.c: close tcp->outf in droptcb()
+
+2002-04-01  Wichert Akkerman <wichert@deephackmode.org>
+
+	* net.c: decode packet options
+
+2002-03-31  Wichert Akkerman <wichert@deephackmode.org>
+
+	* linux/{alpha,hppa,ia64,mips,powerpc,sparc}/syscallent.h: regenerated
+
+2002-03-31  Wichert Akkerman <wichert@deephackmode.org>
+
+	* debian/*: added
+	* linux/syscallent.h: fix typo and add the reserved stream syscalls
+	* defs.h, file.c, io.c: fix signed/unsigned issues
+	* syscall.c: check for negative u_errors
+	* cvsbuild: renamed to autogen.sh
+
+2001-12-17  Wichert Akkerman <wakkerma@debian.org>
+
+	* net.c: add new TCP socket options
+
+2001-10-26  John Hughes <john@calva.com>
+
+	* svr4/ioctlent.sh: Cope with #define lines containing
+	comments that terminate on subsequent lines.  Used to
+	comment out subsequent ioctls!
+
+2001-10-25  Wichert Akkerman <wakkerma@debian.org>
+
+	* linux/ioctlent.h: regenerated using current scripts so
+	  term ioctls are included
+
+2001-10-19  John Hughes  <john@Calva.COM>
+
+	* strace.c(proc_open): On SVR4 only trace the syscalls,
+	signals and faults we care about.
+
+2001-10-18  John Hughes  <john@Calva.COM>
+
+	* acconfig.h: Add HAS_SIGINFO_T.
+	* aclocal.m4: add check for siginfo_t in signal.h.
+	* configure.in: use check for siginfo_t.
+	* defs.h: if HAVE_SIGINFO_T the declare printsiginfo.  On SVR4
+	  allow access to siginfo when signal recieved.
+	* process.c: Remove SVR4 only version of printsiginfo.
+	* signal.c: merge SVR4 and LINUX versions of printsiginfo.
+	* strace.c: on SVR4 print siginfo when signal recieved.
+
+2001-10-18  John Hughes  <john@Calva.COM>
+
+	* system.c(sys_ssisys): handle return values for ssisys
+
+2001-10-18  John Hughes  <john@Calva.COM>
+
+	* signal.c: handle sigwait
+	* svr4/dummy.c: Move sigwait to done
+	* svr4/syscall.h: handle sigwait
+
+2001-10-16  John Hughes  <john@Calva.COM>
+
+	* system.c(sys_ssisys): decode some args for ssisys.
+
+2001-10-16  John Hughes  <john@Calva.COM>
+
+	* mem.c: MS_SYNC is zero, so must be first in xlat list.
+
+	* svr4/dummy.h: memcntl is much like mctl.
+
+2001-10-16  John Hughes  <john@Calva.COM>
+
+	* util.c (umovestr): UnixWare (svr4?) returns 0 when trying
+	to read unmapped page.  Make it possible to strace ksh.
+
+2001-10-03  David Mosberger  <davidm@hpl.hp.com>
+
+	* process.c (internal_clone): Avoid race condition by clearing
+	breakpoint after attaching to child.
+
+2001-10-02  David Mosberger  <davidm@hpl.hp.com>
+
+	* linux/ia64/syscallent.h: Define ia32 syscall numbers (originally
+	by Don Dugger, with my refinements).
+
+	* linux/ia64/ioctlent.h: Regenerate and manually merge conflicting
+	ioctls (TCGETS & SNDCTL_TMR_TIMEBASE, etc.).
+
+	* linux/ia64/Makefile.in (ioctldefs.h ioctls.h): Update for
+	new ioctlent.h generation scheme.
+
+	* linux/syscall.h (sys_clone2): Declare.
+	[IA64] Define ia32 socket, ipc, and extra syscall numbers.
+
+	* linux/ioctlent.sh (regexp): Also handle <asm/ioctls.h> so we
+	don't miss the tty ioctls (unfortunately, some of the sound timer
+	ioctls are in conflict with them!).
+
+	* util.c (setbpt) [IA64]: Add ia32 support (by Don Dugger).
+	(clrbpt) [IA64]: Ditto.
+
+	* syscall.c (internal_syscall): Handle SYS_clone2, SYS32_wait4,
+	and SYS32_exit.
+	(get_scno): Get ia32 syscall number from r1 (orig eax) instead of
+	r8 (eax).  Handle TCB_WAITEXECVE.
+	(syscall_fixup): Handle ia64.
+	(syscall_enter): Fix argument fetching for ia64.
+
+	* strace.c [IA64 && LINUX]: Include <asm/ptrace_offsets.h>.
+	(trace) [PT_GETSIGINFO]: Print signal address and pc if possible.
+
+	* process.c (tcp): New function.
+	(change_syscall): Add support for ia64 linux.
+	(sys_execve): Turn on TCB_WAITEXECVE for ia64 linux.
+
+	* desc.c (getlk): Cast l_len to "long long" to avoid warnings when
+	type is narrower.
+	* resource.c (sprintrlim64): Ditto.
+
+	* defs.h (TCB_WAITEXECVE) [IA64]: Define.
+	[IA64]: Declare "ia32" variable.
+
+	* bjm.c: Do not include <linux/module.h>.  It's not safe to include
+	kernel headers.  Declare the necessary constants and structures
+	directly instead.
+
+2001-10-01  David Mosberger  <davidm@hpl.hp.com>
+
+	* signal.c (parse_sigset_t): New function.
+	(sigishandled): Fix off-by-one bug by using parse_sigset_t() and
+	avoiding relying on internal layout of sigset_t datastructure.
+
+2001-04-26  David Mosberger  <davidm@hpl.hp.com>
+
+	* linux/ia64/syscallent.h: Add getunwind().
+
+2001-04-11  David Mosberger  <davidm@hpl.hp.com>
+
+	* syscall.c (syscall_enter): Use PT_RBS_END instead of deprecated
+	PT_AR_BSP.  Pick up arguments starting with out0, which is not
+	always the same as r32 (e.g., consider inlined syscalls).
+
+2001-09-28   John Hughes <john@Calva.COM>
+
+  * process.c: FreeBSD-CURRENT no longer has PT_READ_U, and anyway we
+    were showing it as PT_WRITE_U!  Fix from Maxime Henrion.
+
+2001-09-18   John Hughes <john@Calva.COM>
+
+  * net.c: fix display of sockaddr structures, sometimes too many "}",
+    sometimes too few.  Fix suggested by Richard Kettlewell.
+
+2001-08-19   Wichert Akkerman <wakkerma@debian.org>
+
+  * signal.c: do not include asm/sigcontext.h on IA64 since it gets
+    the struct from bits/sigcontext.h already which signal.h includes.
+
+2001-08-03   Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/ioctlent.sh: change regexps so we catch sound ioctls as well in
+    Linux
+  * linux/Makefile.in: fix a few things so the ioctl list is generated
+    properly
+  * ioctl.c: remember to shift ioctl masks as well
+
+2001-08-03   Wichert Akkerman <wakkerma@debian.org>
+
+  * Linux/**/syscallent.h: synchronize section for fcntl and use sys_fcntl
+    for sys_fcntl as well
+
+2001-08-03   Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/hppa/syscallent.h: updated from Matthew Wilcox
+
+2001-08-03   Wichert Akkerman <wakkerma@debian.org>
+
+  * process.c: seems Linux/IA64 changed register names on us, switch to
+    using new names.
+
+2001-08-03   Wichert Akkerman <wakkerma@debian.org>
+
+  * strace.c: set CLOEXEC  flag for outputfile
+
+2001-08-03   Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/sparc/syscall.h, linux/sparc/syscallent.h: add some LFS calls
+
+2001-07-23  Wichert Akkerman <wakkerma@debian.org>
+
+  * configure.in: Support cross-compiling between architectures
+
+2001-07-13  Wichert Akkerman <wakkerma@debian.org>
+
+  * configure.in: add S390 to architecture list
+
+2001-07-10  John Hughes <john@Calva.COM>
+
+  * TODO, defs.h, io.h, net.c, strace.c, syscall.c, util.c: Merge fixes
+    from Richard Kettlewell <rkettlewell@zeus.com> which add I/O dumping
+    of args to readv/writev.  Also gets rid of redundant printiovec
+    routine from net.c (duplicate of tprint_iov in util.c).
+
+2001-07-02  Wichert Akkerman <wakkerma@debian.org>
+
+  * config.{guess,sub}: updated
+
+2001-05-15  John Hughes <john@Calva.COM>
+
+  * signal.c: pass a pointer to sigmask to printsigmask from printcontext,
+    it was just passing the sigmask (ucp->uc_sigmask).
+
+2001-05-15  John Hughes <john@Calva.COM>
+
+  * util.c: Don't run off the end of valid memory in umovestr when
+    USE_PROCFS.  Important for FREEBSD systems (which seem to have an
+    unmapped page just after the args/env area).
+
+2001-04-18  John Hughes <john@Calva.COM>
+
+  * configure.in: test for sys/nscsys.h, the non-stop clusters includes.
+  * process.c: handle rfork{1,all} and rexecve calls on non-stop clusters.
+  * syscall.c: treat rfork{1,all} and fork{1,all} as fork like calls.
+    Treat rexecve as an exec.
+  * system.c: decode arguments to ssisys call on nsc systems.
+  * svr4/dummy.h, svr4/syscall.h: now we handle rfork{1,all}, ssisys and
+    rexecve calls.
+
+2001-04-12  Wichert Akkerman <wakkerma@debian.org>
+
+  * process.c: fix cast for powerpc code
+  * linux/powerpc/syscallent.h: update syscall list
+  * README: fix address for the strace mailinglist
+  * signal.c: switch to using /proc/<pid>/status on Linux so we can get
+    the realtime signals as well
+
+2001-04-10  Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge patches from Maciej W. Rozycki:
+    + util.c: add code to print PC for MIPS
+    + linux/mips/syscallent.h: updated
+    + system.c: formating fixes for sys_sysmips
+    + configure.in: test for yet more headers
+    + stream.c: use configure-headertests instead of relying on OS hints
+
+2001-04-07  Wichert Akkerman <wakkerma@debian.org>
+
+  * NEWS: start 4.3.1 items
+  * version.c: updated to say 4.3.1 (was still 4.2, oops!)
+
+2001-04-07  Wichert Akkerman <wakkerma@debian.org>
+
+  * configure.in: test for asm/sysmips.h and linux/utsname.h
+  * linux/syscall.h: fix a typo for sys_sysmips
+  * system.c: include asm/sysmips.h and linux/utsname.h if they exist,
+    fix typo
+
+2001-03-31  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/mips/ioctlent.h: updated using new Linux ioctl setup
+
+2001-03-31  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/ia64/ioctlent.h: regenerated
+
+2001-03-31  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/{alpha,ia64,powerpc}/ioctlent.sh: removed, all archs use the
+    general Linux ioctlent.sh
+
+2001-03-31  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/ioctlent.sh: add dir variable for location of kernel headers
+
+2001-03-29  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/ia64/ioctlent.h: updated using new Linux ioctl setup
+
+2001-03-29  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/powerpc/ioctlent.h: updated using new Linux ioctl setup
+
+2001-03-29  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/hppa/ioctlent.h: updated using new Linux ioctl setup
+
+2001-03-29  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/alpha/ioctlent.h: updated using new Linux ioctl setup
+
+2001-03-28  Wichert Akkerman <wakkerma@debian.org>
+
+  * configure.in: use sparc* so we can compile on sparc64 as well
+  * process.c, syscall.c: work around double define of fpq, fq and fpu
+    structs on Linux/sparc, and use regs instead of pt_regs
+  * don't use asm/sigcontext.h on Linux/sparc
+
+2001-03-28  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/sparc/ioctlent.h: updated using new Linux ioctl setup
+
+2001-03-28  Wichert Akkerman <wakkerma@debian.org>
+
+  * strace.c: use __WALL as wait4 flag if it exists so we can properly
+    trace threaded programs
+
+2001-03-27  John Hughes <john@Calva.COM>
+
+  * aclocal.m4: add check for endianness of long long.
+  * acconfig.h: add #define for LITTLE_ENDIAN_LONG_LONG.
+  * configure.in: check for endianness of long long.
+  * defs.h: change LONG_LONG macro to work with either endianness of
+    long long.
+
+2001-03-27  John Hughes <john@Calva.COM>
+
+  * net.c: Make compilable by SCO UDK compiler (doesn't like empty
+    initialisation list for array).
+
+2001-03-27  John Hughes <john@Calva.COM>
+
+  * svr4/syscallent.h: ntp_adjtime entry was duplicated on Solaris
+    systems - bad merge of Harald Boehme's patch by me.
+
+2001-03-27  Wichert Akkerman <wakkerma@debian.org>
+
+  * lots of files: add Linux/hppa support
+
+2001-03-19  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/mips/syscallent.h: we can't have -1 nargs, change to 0
+  * linux/syscallent.h: not that syscalls 220 and 221 are used now
+  * config.guess: updated
+
+2001-03-17  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/ioclsort.c: new file
+  * linux/ioctlent.sh: complete rewrite to use a more sane approach to get
+    the ioctl list that doesn't involve attempting to #include all kernel
+    headers
+  * linux/.cvsignore: added ioctdefs.h and ioctls.h which are generated
+    by the new ioctlent.sh
+  * ioctl.c: only look at the number and type bits for linux, since
+    ioctlent.sh no longer supplies the others
+
+2001-03-08  John Hughes <john@Calva.COM>
+
+  * freebsd/syscalls.pl: On FreeBSD we must cope with COMPATibility syscalls,
+    pretend they have names ending with "?" so that -e trace=stat (for
+    example) will work.
+  * freebsd/i386/syscallent.h: add ? to compatability syscalls.
+  * freebsd/i386/syscall.h: consistency.
+
+2001-03-08  John Hughes <john@Calva.COM>
+
+  * acconfig.h: add new ST_xxx defines.
+  * aclocal.m4: macros to check for more fields in struct stat.
+  * configure.in: use new macros to check for fields in struct stat.
+  * file.c: use new defines to replace #ifdef FREEBSD by #if HAVE_ST_xxx.
+
+2001-03-08  John Hughes <john@Calva.COM>
+
+  * defs.h: rename wimpy get64 as powerful new LONG_LONG
+  * file.c: use LONG_LONG
+  * io.c: use LONG_LONG
+  * mem.c use LONG_LONG
+
+2001-03-08  John Hughes <john@Calva.COM>
+
+  * acconfig.h: new #defines HAVE_LONG_LONG_OFF_T and HAVE_LONG_LONG_RLIM_T.
+  * aclocal.m4: routines to check for long long off_t and rlim_t.
+  * configure.in: check for long long off_t and rlim_t.
+  * desc.c: if HAVE_LONG_LONG_OFF_T treat flock as flock64
+  * file.c: if HAVE_LONG_LONG_OFF_T treat stat,lstat,fstat and lseek as 64
+    bit versions.
+  * io.c: if HAVE_LONG_LONG_OFF_T use 64 bit versions of pread and pwrite.
+  * mem.c: if HAVE_LONG_LONG_OFF_T use 64 bit version of mmap
+  * resource.c: if HAVE_LONG_LONG_OFF_T use 64 bit versions of getrlimit
+    and setrlimit.
+  * freebsd/syscalls.print: don't explicitly use 64 bit versions of calls,
+    now done automaticaly for us.
+  * freebsd/i386/syscall.h: ditto.
+  * freebsd/i386/syscallent.h ditto.
+
+2001-03-07  John Hughes <john@Calva.COM>
+
+  * desc.c: On FreeBSD flock structure uses 64 bit offsets.
+  * file.c: On FreeBSD use stat64 and pals instead of stat.
+  * freebsd/syscalls.print: use stat64, lstat64 and fstat64.
+  * freebsd/i386/syscall.h: ditto.
+  * freebsd/i386/syscallent.h: ditto.
+
+2001-03-07  John Hughes <john@Calva.COM>
+
+  * file.c: merge missing part of Harald Böhme's solaris patches,
+    was only declaring sys_{stat64,lstat64,fstat64} on linux!
+
+2001-03-07  John Hughes <john@Calva.COM>
+
+  * svr4/dummy.h: fix multiple define warning on non LFS64 systems.
+  * svr4/syscallent.h: pread/pwrite are TF calls.
+
+2001-03-07  John Hughes <john@Calva.COM>
+
+  * defs.h: add ALIGN64 macro to cope with FreeBSD's strange insistence
+    on alignment for off_t (64 bit) arguments.  Also simplify get64 so
+    we don't need to know endianness of long long.
+  * file.c: FreeBSD now uses 64 bit versions of lseek, truncate,
+    ftruncate, allows reduction in numvber of horrid #if's
+  * io.c: FreeBSD now uses 64 bit versions of pread, pwrite.
+  * mem.c: FreeBSD now uses 64 bit version of mmap.
+  * freebsd/syscalls.print: use 64 bit versions of various syscalls.
+  * freebsd/i386/syscall.h: use 64 bit versions of various syscalls.
+  * freebsd/i386/syscallent.h: use 64 bit versions of various syscalls.
+
+2001-03-06  John Hughes <john@Calva.COM>
+
+  * file.c: Implement truncate64 and ftruncate64
+  * svr4/dummy.h: add dummies for truncate64 and ftruncate64 for non
+    LFS64 systems.
+  * svr4/syscall.h: add declarations for truncate64 and ftruncate64.
+
+2001-03-06  John Hughes <john@Calva.COM>
+
+  * freebsd/syscalls.pl: fix for FreeBSD 4.1 (new optional field in
+    syscall master file).
+
+2001-03-06  John Hughes <john@Calva.COM>
+
+  * syscall.c: fix for FreeBSD 4.1 (SYS_semconfig has disappeared).  Also
+    zap incorrect syscall subarg range check.
+
+2001-03-06  John Hughes <john@Calva.COM>
+
+  * configure.in, defs.h, desc.c, file.c, io.c, mem.c, net.c, resource.c,
+    signal.c, syscall.c, svr4/dummy.h, svr4/syscall.h, svr4/syscallent.h:
+    merge Harald Böhme's solaris patches (_LFS64_LARGEFILE and kernel aio
+    mostly).
+
+2001-03-06  John Hughes <john@Calva.COM>
+
+  * dummy.h: add unimplemented UW sycalls
+  * syscall.h: we can do settimeofday for UW, whopee!
+  * syscallent.h: fix unimplemented UW syscalls
+
+2001-03-06  John Hughes <john@Calva.COM>
+
+  * aclocal.m4: look for pr_syscall in pr_lwp if we HAVE_MP_PROCFS
+  * defs.h: add PR_SYSCALL to allow use of pr_lwp.pr_syscall if it exists.
+  * syscall.c: use PR_SYSCALL instead of pr_syscall, fix up UnixWare code
+    so it doesn't try to use pr_sysarg.
+
+2001-03-06  John Hughes <john@Calva.COM>
+
+  * aclocal.m4: on systems other than linux look for stat64 in sys/stat.h
+  * file.c: handle xstat version _STAT64_VER, aka stat64.
+
+2001-03-06  John Hughes <john@Calva.COM>
+
+  * net.c: make sure SOL_ options are defined before using.
+  * signal.c: declare sigset variable, only used on linux, inside #ifdef.
+
+2001-02-21  Wichert Akkerman <wakkerma@debian.org>
+
+  * net.c: fix format for printing Unix domain sockets
+
+2001-02-19  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/mips/syscallent.h: use new sys_sysmips
+  * system.c: add sys_sysmips decoding
+
+2001-02-16  Wichert Akkerman <wakkerma@debian.org>
+
+  * CREDITS: add Arkadiusz Miskiewicz <misiek@pld.org.pl> who
+    submitted the IP6 scope ID updates
+  * acconfig.h: add HAVE_SIN6_SCOPE_ID and HAVE_SIN6_SCOPE_ID_LINUX
+  * aclocal.m4: add AC_SIN6_SCOPE_ID to check if sin6_scope_id is
+    available
+  * configure.in: check for if_indextoname function and sin6_scope_id
+  * net.c: teach printsock about IP6 scope ids
+
+2001-02-16  Wichert Akkerman <wakkerma@debian.org>
+
+  * configure.in: test for netinet/tcp.h and netinet/udp.h existance
+  * net.c: include netinet/tcp.h and netinet/udp.h if they exist
+  * Makefile.in: use @mandir@ and @bindir@
+
+2000-11-26  Wichert Akkerman <wakkerma@debian.org>
+
+  *  net.c: fix formating error in sys_setsockopt
+  *  net.c: add list of socketlayers and use that for [gs]etsockopt
+
+2000-10-12  Wichert Akkerman <wakkerma@debian.org>
+
+  * time.c: use sys/timex.h so things compile with 2.2 kernels
+  * stream.c: test if MSG_* constants are #defined
+
+2000-09-03  Wichert Akkerman <wakkerma@debian.org>
+
+  * process.c: perform bpt trick for clone as well so we can get the
+    pid of the child before it starts doing something
+  * file.c: rename dirent64 struct to kernel_dirent64 so things compile
+    again with newer libcs
+  * test/clone.c: improve our testcase a bit
+  * Merge another patch from Gäel Roualland with FreeBSD updates
+
+2000-09-01  Wichert Akkerman <wakkerma@debian.org>
+
+  * lots of files: merge patch from Gaël Roualland to add
+    support for FreeBSD.
+
+2000-08-09  Wichert Akkerman <wakkerma@debian.org>
+
+  * file.c: update to reflect that st_ino suddenly became a long long
+    in the in Linux 2.4.0-test6
+
+2000-08-09  Wichert Akkerman <wakkerma@debian.org>
+
+  * test/clone.c: minor fixup
+  * Another bunch of patches from John Hughes merged:
+  * signal.c:
+    + SVR4 printcontext(): sigset_t != sigset_t*
+    + getcontext returns a value, so print on exit of syscall
+    + add UC_FP to ucontext_flags for OS writers that can't spell
+    + sys_signal(): special case SIG_{ERR,DFL,IGN}
+    + decode_subcall(): only do subcall range checking when needed
+  * bunch of UnixWare updates
+  * aclocal.m4, acconfig.h, configure.in: add test for long long type
+
+2000-07-04  Wichert Akkerman <wakkerma@debian.org>
+
+  * net.c: add SOL_PACKET and SOL_RAW socket options, update
+    SOL_IP and SOL_TCP
+
+2000-06-23  Wichert Akkerman <wakkerma@debian.org>
+
+  * strace.c: close outf before we exec a child process
+
+2000-06-09  Ulrich Drepper  <drepper@redhat.com>
+
+  * configure.in: Don't link against libnsl on Linux, it's unnecessary.
+  * defs.h (struct tcb): Make auxstr member const.
+  * file.c (fsmagic): And many more magic numbers.
+  * util.c: Don't include <linux/ptrace.h> for glibc 2.1 and up.
+
+2000-04-26  Wichert Akkerman <wakkerma@debian.org>
+
+  * defs.h: balance #if/#endif again
+  * system.c: fix return statements in sys_capget()
+  * Merge updates from Topi Miettinen <Topi.Miettinen@nic.fi>:
+    + file.c: add F_[SG]ETSIG to fcntl flags
+    + strace.c: don't setre[gu]id if not needed
+    + system.c: handle sys_reboot for Linux
+    + term.c: add baudrate constants up to B4000000
+    + linux/**/syscallent.h: note that munlockall has no arguments
+
+2000-04-25  David Mosberger  <davidm@hpl.hp.com>
+
+  * CREDITS: fix email address
+  * process.c: handle PR_[GS]ET_UNALIGN and PR_[GS]ET_KEEPCAPS
+  * signal.c: honour offset of sigconfig in sigframe structure for
+    Linux/ia64
+  * linux/ia64/syscallent.h: Add perfmonctl, pivotroot, mincore, and
+    madvise syscalls.
+  * syscall.c (syscall_enter): With Kevin's latest ptrace patches,
+    AR_BSP points to the _end_ of the active register frame, so we need
+    to adjust bsp by moving it back by the size of the active frame
+    before using it.
+
+2000-04-24  Wichert Akkerman <wakkerma@debian.org>
+
+  * process.c: add sparc support to change_syscall
+
+2000-04-22  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/mips/syscallent.h: fix some typos
+
+2000-04-14  Wichert Akkerman <wakkerma@debian.org>
+
+  * linux/mips/syscallent.h: added names for SVR4, SYSV, BSD4.3 and POSIX
+    syscalls
+
+2000-04-13  Wichert Akkerman <wakkerma@debian.org>
+
+  * defs.h: Linux/MIPS uses syscalls up to >4k, so set MAX_QUALS to
+    4999
+
+2000-04-09  Wichert Akkerman <wakkerma@debian.org>
+
+  * README-linux: updated to note that strace might not compile
+    with development kernels
+  * bjm.c: sys_query_module: check if malloc succeeds
+  * system.c: sys_cap[gs]et(): check if malloc succeeds, only malloc once
+  * linux/syscallent.h: updated for 2.3.99pre3
+  * linux/alpha/syscallent.h: updated for 2.3.99pre3, add all osf syscalls
+    even though Linux doesn't implement them
+  * syscall.c: add global variables for MIPS registers as well
+  * syscall.c: move global variables to before get_scno since that uses them
+  * util.c: oops, misspelled defined
+  * process.c: fix ptrace calls in change_syscall
+  * mem.c: decode sys_madvise
+  * Merge patch from Topi Miettinen <Topi.Miettinen@nic.fi>
+    + add support for quotactl, fdatasync, mlock, mlockall, munlockall & acct
+    + small fix for RLIMIT_* and RUSAGE_BOTH
+    + enhace support for capget and capset
+
+2000-02-19 Wichert Akkerman <wakkerma@debian.org>
+
+  * test/vfork.c: new file to test vfork traces
+  * test/.cvsignore: new file
+  * defs.h: Up maximum number of traced processed to 64
+  * strace.c: Disable some debugging code from davidm
+  * implement setarg for more architectures
+  * implement change_syscall
+
+1999-12-27  Morten Welinder  <terra@diku.dk>
+
+	* syscall.c (lookup_signal, lookup_desc): isdigit requires an
+	_unsigned_ char parameter.
+
+2000-02-14 Wichert Akkerman <wakkerma@debian.org>
+
+  * S390 updates
+
+2000-02-03 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge Linux/ia64 patches
+
+2000-01-02 Pavel Machek	     <pavel@ucw.cz>
+
+  * probe if sys/poll.h exists in configure + minor cleanups
+
+  * syscall.c: split trace_syscall into few pieces to make code readable
+
+2000-01-21 Wichert Akkerman  <wakkerma@debian.org>
+
+  * Release version 4.2 to get the current updates out and so
+    we can concentrate in finishing the clone support.
+
+2000-01-11 Wichert Akkerman  <wakkerma@debian.org>
+
+  * Add 1900 to tm_year in sprinttime
+
+1999-12-24  Wichert Akkerman  <wakkerma@debian.org>
+
+ * file.c: protect printstat64 with STAT64 instead of linux so we can
+   compile on Linux architectures that don't have it
+ * util.c: fix LOOP for ARM
+
+Fri Dec 24 18:05:00 EST 1999
+
+1999-12-23  Ulrich Drepper  <drepper@cygnus.com>
+
+ * file.c: Use ugly libc_stat trick also for stat64.
+   Implement sys_stat64, sys_fstat64, sys_lstat64, and printstat64.
+ * process.c (internal_clone): Fix a few typos and add definitions to make
+   it at least compile.
+ * linux/syscall.h: Declare sys_stat64, sys_lstat64, and sys_fstat64.
+ * linux/syscallent.h: Define table entries for sys_stat64, sys_lstat64,
+   and sys_fstat64.
+ * aclocal.m4: Define AC_STAT64.
+ * acconfig.h: Define HAVE_STAT64.
+ * configure.in: Add AC_STAT64.
+
+Thu Dec 23 15:01:37 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge patch from ftp://oss.software.ibm.com/linux390/ to add
+    support for Linux on the IBM S/390 architecture
+  * process.c: add internal_clone(), currently only shows the options
+  * syscall.c: use internal_clone to handle SYS_clone
+
+Mon Dec 20 00:27:50 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Rewrite mmap-handling to support mmap2 on Linux
+
+Tue Dec 14 11:35:16 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Note that Linux can handle sys_semop() as well
+
+Tue Nov 30 11:05:26 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Include linux/in6.h for glibc2.0 and older
+
+Mon Nov 29 16:33:04 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge patches from John Hughes to make configure support UnixWare
+
+Sat Nov 27 21:38:17 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Enhance sys_query_module
+
+Fri Nov 26 10:51:55 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Patches from John Hughes:
+    + cosmectic fix in sys_getpmsg
+    + allow net.c to compile on systems without AF_INET6
+    + Only use long_to_sigset on Linux systems
+    + UnixWare treats sigmask_t and sigmask_t* as the same thing
+    + Add pollhack
+    + Parse mount arguments for UnixWare
+    + ACL fixes for UnixWare
+
+Fri Nov 26 01:28:09 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Release 4.1 to get all the changes made out there
+
+Thu Nov 18 18:04:04 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge stracefork from Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
+    + Socket calls parsed better
+	+ bunch of alpha OSF syscalls added
+	+ Fix alpha 32/64 bit issues
+
+Mon Nov  1 20:52:08 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Move Linux kernelmodule-functions from system.c to bjm.c and
+    remove duplicate for sys_create_module
+  * Linux MIPS updates:
+    + Play with #ifdef's in net.c to get IPv6 right
+    + Use printargs for vm86-syscall
+
+Sun Oct 31 22:03:00 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge Linux mips patch from Florian Lohoff <flo@rfc822.org>
+
+Mon Oct 11 00:36:25 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge patch from Keith Owens <kaos@ocs.com.au> to sys_query_module
+    and sys_delete_module correctly
+
+Wed Oct  6 02:00:33 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Update cvsbuild to give a better error if autoconf isn't installed
+  * Add test for linux/ptrace.h to configure
+  * Since we define GNU_SOURCE in the Makefile we don't need to define
+    USE_GNU in file.c anymore
+
+Fri Sep 10 04:35:16 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * #define USE_GNU before including file.c so we get some extra O_* flags
+
+Tue Aug 31 16:27:21 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Add missing } in IPv6 output
+
+Tue Aug 31 01:23:08 CEST 1999  Wichert Akkerman <wakkerma@debian.org>
+
+  * Update copyright for strace-graph to BSD to be consistent with
+    the rest of strace
+
+Mon Aug 30 00:53:57 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge patch from Daniel Jacobowitz: KERN_JAVA_* and KERN_SECURELVL aren't
+    defined for all kernelversions
+  * Add strace-graph, written by Richard Braakman <dark@xs4all.nl>
+
+Thu Aug 19 13:10:15 CEST 1999 Jakub Jelinek <jj@ultra.linux.cz>
+
+  * linux/sparc/syscall.h: Declare create_module/init_module.
+  * configure.in: Allow compilation in a different directory
+    than the source one.
+  * signal.c: Use asm/reg.h and struct regs instead of pt_regs
+    so that we don't depend on asm/ptrace.h which clashes with
+    glibc sys/ptrace.h.
+  * util.c: Likewise.
+  * syscall.c: Likewise.
+
+Wed Aug  4 18:01:50 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Syscall 94 on Linux alpha is sys_poll
+
+Sun Jul 25 14:38:33 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge in UnixWare patches from John Hughes <john@Calva.COM>
+
+Thu Jul 15 23:00:32 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge patch from Maciej W. Rozycki <macro@ds2.pg.gda.pl>:
+    + Correctly implement fix sys_createmodule (Linux)
+    + Add limited handlig of sys_initmodule (Linux)
+
+Tue Jul 13 17:07:50 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Add configure-test for sys/reg.h and use that
+  * Use sys/reg.h instead of asm/ptrace.h
+
+Sat Jul 10 01:46:10 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Remove hack in signal.c for arm architecture
+  * Add hack so we compile correctly on powerpc
+
+Fri Jul  9 02:28:16 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Add a corrected patch from Daniel Jacobowitz
+
+Thu Jul  8 16:00:04 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge patch from Daniel Jacobowitz to allow us to use the kernel types
+    for the stat structure
+
+Thu Jun 24 15:54:18 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Fix test for sys/reg include
+
+Tue Jun 22 17:26:33 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Fixed some Linux/powerpc sillyness, thanks to Daniel Jacobowitz
+  * Fixed some SunOS compile problems earlier that I forgot to include
+    here
+
+Mon Jun 14 12:44:25 CEST 1999
+
+  * Avoid leakint fd into child when forking, patch from
+    John Hughes <john@Calva.COM>
+
+Fri Jun 11 14:54:47 CEST 1999
+
+  * Applied IRIX64 patch from Thomas E. Dickey <dickey@clark.net>
+  * Applied Solaris and manpage updates from Guy Harris <guy@netapp.com>
+
+Wed Jun  9 14:48:49 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Brought syscall list for alpha up to date
+
+Wed Jun  2 18:30:12 CEST 1999 Jakub Jelinek <jj@ultra.linux.cz>
+
+  * system.c: sys_umount2 syscall support.
+  * linux/sparc/errnoent.h: Update sparc-linux errnos.
+  * linux/sparc/syscall.h: Update used sparc-linux syscalls.
+  * linux/sparc/syscallent.h: Match 2.2.9 system calls.
+  * file.c: sparc-linux asm/stat.h uses dev_t etc. types,
+    so it needs strace's own copy of the stat structure.
+  * util.c: Make it compile on sparc-linux.
+  * strace.c: Fix strace -f and -ff operation on sparc-linux.
+  * signal.c: rt_sigaction has different arguments on sparc*-linux
+    and alpha-linux.
+  * syscall.c: Recognize sparc64-linux binaries.
+
+Fri May 28 21:09:00 PST Ulrich Drepper <drepper@cygnus.com>
+
+  * configure.in: Fix typo (CFLAG -> CFLAGS).
+
+  * syscall.c: Don't include linux/ptrace.h explicitly for glibc.
+
+Thu May 27 13:59:27 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Add some sysctl support, patch from Ulrich Drepper
+
+Wed May 26 01:04:34 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Use kernel dirent structure for Linux
+
+Sun May  9 02:18:30 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge in patches from Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
+    + some layout and other minor fixes
+    + add some m68k-specific things to linux/syscallent.h. Note that m68k
+      is similar enough to i386 to not need it's own subdirectory
+    + add support for sendfile and mremap syscalls for Linux
+  * Merge in patches from Sascha Schumann <sascha@schumann.2ns.de>
+    + ioctls.h vs sys/ioctl.h on Alpha platform
+    + pointer was casted to an int in stream.c
+    + strsignal() needs -D_GNU_SOURCE in CFLAGS
+    + several other casts changed
+    + correct ARM/POWERPC architecture defines in acconfig.h
+  * Merge in patches from Morten Welinder <terra@diku.dk>
+    + add some autoconf-tests for includefiles
+    + handle solaris version of sigcontext struct (actually I hacked this
+      up again, but the idea is his :)
+
+Sun Apr 18 22:32:42 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Update syscalls for linux alpha, patch from Bart Warmerdam
+    <bartw@debian.org>
+  * Update sparc code so it actually compiles
+
+Fri Apr 16 02:18:05 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Add support for old_*stat functions for Linux. Please note you need
+    to use reasonably recent kernel headers to compile strace now.
+  * Change references to LINUX into linux in file.c
+  * Fix include for LDT in mem.c
+
+Thu Apr 15 22:28:15 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Change in strace maintainership, jrs passed the torch to me.
+  * Use autoconf 2.13
+  * Incorporate all changes already made in the Debian strace package:
+    + compiles with more Linux kernels
+    + added support for more Linux architectures
+    + add support for a lot of extra syscalls
+    + fix some problems with hanging children
+    + check stray syscall after execv
+    + decode capget and capset arguments
+    + add more constants to net.c
+    + detect ROSE networking
+    + add more protocol families to domains
+    + add IPIP protocol
+    + added MSG_PROXY and MSG_CTRUNC to msg_flags
+    + added SO_BSDCOMPAT and SO_REUSEPORT to sockoptions
+    + added IP, IPX and TCP-options
+    + added IP, IPX and TCP support to get-/setsockopt()
+    + added IPX support
+    + updated handling of signals
+
+Sun Oct 27 22:28:00 1996  J. Richard Sladkey  <jrs@world.std.com>
+
+	* util.c (umovestr) [LINUX]: Handle Linux like SunOS4
+	instead of SVR4.  That is, read a few bytes at a time
+	to avoid overrunning the end of the stack.
+
+Fri May 31 01:48:49 1996  J. Richard Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.1 is released.
+
+Thu May 23 01:04:43 1996  J. Richard Sladkey  <jrs@world.std.com>
+
+	* aclocal.m4 (AC_DECL_SYS_ERRLIST): Try looking in stdio.h
+	as well since that's where glibc declares it.  Go figure.
+	* signal.c (sys_sigreturn) [ALPHA]: Use sigcontext
+	instead of sigcontext_struct since glibc v5+ apparently
+	plays games with the native OS namespace.
+	From David Mosberger-Tang <davidm@AZStarNet.com>.
+
+Mon May 20 23:17:14 1996  J. Richard Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.14 is released.
+
+	* aclocal.m4 (AC_STRUCT_MSG_CONTROL): New macro.
+	* configure.in: Add call to AC_STRUCT_MSG_CONTROL.
+	* net.c (printmsghdr): Handle BSD 4.3 and 4.4 msghdr members
+	differently.
+	Reported by Henrik Storner <storner@osiris.ping.dk>.
+
+	* configure.in: (AC_CHECK_{HEADERS,FUNCS}): Add checks for
+	sys/filio.h and sys/stream.h and remove check for poll.
+	* desc.c (decode_select, sys_select, sys_oldselect) [LINUX]:
+	Handle old and new styles of argument passing for select on Linux.
+	* ioctl.c, stream.c: Conditionalize stream code on presence of
+	sys/stream.h instead of poll because glibc implements poll but
+	not the rest of the stream interface.
+	* signal.c [LINUX]: Standardize on the name sigcontext_struct.
+	(sys_sigprocmask) [ALPHA]: Handle OSF flavor which is more like
+	sigsetmask.
+	* term.c (term_ioctl): Use _VMIN, if present, for TC{G,S}ETA*.
+	* util.c (umoven, umovestr): Move data in long-sized chunks
+	at a time, instead of hard coding it to be 4.
+	From David Mosberger-Tang <davidm@AZStarNet.com>.
+
+Mon May 20 01:19:36 1996  J. Richard Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.13 is released.
+
+	* configure.in (AC_CHECK_HEADERS): Add check for asm/sigcontext.h.
+	* signal.c [HAVE_ASM_SIGCONTEXT_H]: Conditionally include
+	asm/sigcontext.h to define sigcontext_struct and don't define it
+	locally if the header is present.
+
+	* syscall.c (nerrnos{0,2}): Correct size computation.
+
+	* Makefile.in: Remove dependencies and rules relating to files
+	normally found in the os directory.  Because of the new scheme we
+	don't know precisely where they come from.  Sigh.
+	* signalent.sh: Make it work for sunos4, linux, and svr4.
+	* {sunos4,linux{,/alpha},svr4}/Makefile.in: Make rules correspond
+	to traditional make syntax.  Add signalent.h to files which can
+	unconditionally be rebuilt.  Prevent signalent.h from being
+	unconditionally being rebuilt since it's customized.
+	* {sunos4,linux{,/alpha},svr4}/{ioctlent,errnoent,signalent}.h:
+	Use versions built by {ioctlent,errnoent,signaltent}.sh.
+	* sunos4/ioctlent.sh: Work around sprintf troubles with SunOS
+	4.1.4 and gcc 2.7.2.
+
+Sun May 19 17:14:09 1996  J. Richard Sladkey  <jrs@world.std.com>
+
+	* configure.in, Makefile.in: Add OSARCH concept to finish
+	build support for the alpha.
+	* Makefile.in, linux/Makefile.in: Rewrite clean, distclean,
+	and maintainer-clean rules.
+	* defs.h, ioctlsort.c: Make ioctl code member unsigned.
+	* ioctl.c, ioctlsort.c (compare): Perform explicit checking
+	for less, greater, and equal since subtraction on two's
+	complement numbers isn't an order relation (it isn't transitive)!
+	* linux/Makefile.in: Add rules for the signalent.h file.
+	* linux/alpha/Makefile.in: New file.
+
+Sun May 19 01:12:28 1996  J. Richard Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.12 is released.
+
+	* linux{,alpha}/ioctlent.sh: Tweak for recent kernels.
+	From Michael E Chastain <mec@duracef.shout.net>.
+
+	* defs.h (SUPPORTED_PERSONALITES, DEFAULT_PERSONALITY): New.
+	* syscall.c (set_personality): New.
+	* strace.c (main): Call set_personality.
+	* defs.h, syscall.c, ioctl.c, signal.c: Make sysent, errnoent,
+	ioctlent, and signalent indirect pointers and redirect them
+	based on personality.
+	* {sunos4,svr4,linux{,/alpha}}/signalent.h: New files.
+	Suggested by Tom Dyas <tdyas@eden.rutgers.edu>.
+
+	* util.c (upeek): Handle case where ptrace returns a long
+	and sizeof(long) != sizeof(int).
+	From Richard Henderson <richard@twiddle.tamu.edu>
+
+Fri May 17 21:03:36 1996  J. Richard Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.11 is released.
+
+	* many files: Fix more printf warnings for other platforms.
+
+	* ipc.c (sys_msgrcv) [LINUX]: Conditionalize definition of ipc_wrapper.
+
+	* linux/dummy.h: Handle missing library support for {send,recv}msg.
+	Reported by Thomas Bogendoerfer <tsbogend@bigbug.franken.de>.
+
+	* linux/syscall.h (sys_utimes): Fix a typo in the declaration.
+	From Thomas Bogendoerfer <tsbogend@bigbug.franken.de>.
+
+Fri May 17 00:50:06 1996  J. Richard Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.10 is released.
+
+	* Makfile.in: Add os/arch to includes so that a given arch
+	(like alpha) can override the native arch (like i386).
+	* configure.in: Check for sendmsg.
+
+	* net.c: Make sendmsg and recvmsg dependent on an autoconf
+	test.  Reported by Michael E Chastain <mec@duracef.shout.net>.
+
+	* acconfig.h, configure.in: Detect the alpha.
+	* ioctl.c: Handle the alpha.
+	* defs.h: Make some members long for the alpha.  Define
+	some register nicknames.  Add support for WAITEXECVE.
+	* file.c [ALPHA]: Support the alpha for statfs.  Add
+	osf_statfs and osf_fstatfs for the alpha.  Make damn sure
+	major and minor results are suitable for passing to printf.
+	* signal.c, syscall.c: Support the alpha.
+	* process.c: Add alpha user offsets.
+	* most files: Use %l? for printf arguments since
+	most are now longs for the alpha.
+	* linux/alpha/{errnoent.h,ioctlent.{h,sh},syscallent.h}:
+	New for the alpha.
+	From Thomas Bogendoerfer <tsbogend@bigbug.franken.de>.
+
+Wed May 15 00:29:37 1996  J. Richard Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.9 is released.
+
+	* config.in, config.sub, install-sh: Upgrade to autoconf 2.10.
+
+	* linux/dummy.h, linux/syscallent.h, linux/syscall.h: Add recent
+	Linux kernel version system calls.
+
+Wed Mar 13 01:03:38 1996  J. Richard Sladkey  <jrs@world.std.com>
+
+	* ipc.c [SUNOS4]: Add SunOS support for decoding IPC calls.
+	* syscall.c [SUNOS4]: Compile decode_subcall on SunOS and
+	decode IPC calls using it.
+	* sunos4/dummy.h: Alias sys_semop to printargs.
+	* sunos4/syscall.h: Add new pseudo syscalls for IPC.
+	* sunos4/syscallent.h: Include new subcalls for IPC.
+	From Matthias Pfaller <leo@dachau.marco.de>.
+
+Tue Feb 13 22:08:25 1996  J. Richard Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.8 is released.
+
+	* time.c [LINUX]: Explicitly include linux/version.h.
+
+	* strace.c (main): Don't let them even *try* to
+	get strace to attach to itself since some systems
+	don't handle this case very gracefully.
+	Reported by David S. Miller <davem@caip.rutgers.edu>.
+
+	* Makefile.in (distclean): Fix it for subdirectories.
+
+	* sunos4/syscallent.h, svr4/syscallent.h: Fill in the new
+	sys_flags member for each defined system call.
+
+Fri Dec  8 01:17:28 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* defs.h (TRACE_*): New flags to describe what class
+	of system call each system call is.
+	(sysent): Add sys_flags member.
+	* syscall.c (sysent): Define (and later undef) abbreviations
+	for the system call class flags.
+	(lookup_class): New function to translate strings to
+	system call class flags.
+	(qualify): Handle new system call class mechanism.
+	* linux/syscallent.h: Fill in the new sys_flags member
+	for each defined system call.
+
+	* defs.h (print_sock): Remove redundant and non-K&R C
+	compatible prototype.  From Juergen Weigert
+	<jnweiger@immd4.informatik.uni-erlangen.de>.
+
+Thu Dec  7 01:17:40 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* linux/ioctlent.sh: Tweak to improve ioctl accuracy.
+	From Michael E Chastain <mec@duracef.shout.net>.
+
+	* system.c (includes) [LINUX]: Add linux/nfs.h for recent
+	kernels.  From Michael E Chastain <mec@duracef.shout.net>.
+
+Wed Dec  6 21:52:28 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* file.c (sprintfstype): Enclose string result in double
+	quotes.
+
+	* time.c (sys_adjtimex) [LINUX]: Conditionalize
+	constantly evolving timex structure.
+	From Aaron Ucko <UCKO@VAX1.ROCKHURST.EDU>.
+
+	* defs.h, syscall.c, strace.c: Rename syscall to
+	trace_syscall and change prototype and all callers
+	because of broken Linux shared libraries.
+	From Aaron Ucko <UCKO@VAX1.ROCKHURST.EDU>.
+
+	* Makefile.in (clean): Check for a file with test -f not
+	test -d.  From Aaron Ucko <UCKO@VAX1.ROCKHURST.EDU>.
+
+Tue Sep 26 02:32:31 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.7 is released.
+
+	* util.c (string_quote): Fix thinko which caused core
+	dumps for strings with quotes in them.
+	Reported by Marty Leisner <leisner@sdsp.mc.xerox.com>.
+
+	* linux/Makefile.in (errnoent.h rule): Grab all errno.h
+	files from /usr/include, not just the linux one.
+	From Michael E Chastain <mec@duracef.shout.net>.
+
+	* linux/errnoent.sh: Total rewrite to handle more ioctls with
+	fewer false positives on more kernel flavors.
+	From Michael E Chastain <mec@duracef.shout.net>.
+
+Mon Sep  4 01:29:22 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.6 is released.
+
+	* linux/dummy.h, linux/syscall.h, linux/syscallent.h: Add
+	sys_msync.
+	* mem.c (mctl_funcs, mctl_lockas, sys_mctl): Conditionalize
+	on MC_SYNC instead of HAVE_MCTL.
+	(mctl_sync): Conditionalize on MS_ASYNC instead of HAVE_MCTL.
+	(sys_msync): New function.
+
+Sat Sep  2 12:06:04 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* linux/dummy.h, linux/syscall.h, linux/syscallent.h: Add
+	sys_flock and sys_getdents.
+	* desc.c (flockcmds, sys_flock): Conditionalize on LOCK_SH
+	not SUNOS4.
+	* file.c (sys_getdents): Define unconditionally and handle
+	LINUX case.
+	* strace.c (main): Disallow username option unless both real
+	and effective uids are root.
+
+Wed Aug 30 01:29:58 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* strace.c (main): Ensure that run_uid and run_gid are
+	always set to something meaningful.
+	(main, newoutf) [!SVR4]: Swap real and effective uids while
+	opening any output files.
+	(main) [!SVR4]: Treat effective uid of root as a request
+	to handle suid binaries correctly using the real uid of
+	the invoking user.
+
+Sat Aug 19 00:06:08 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* Makefile.in: Add `|| true' to clean rule because
+	although GNU make 3.74 uses `sh -c' to invoke commands
+	every other make in the world uses `sh -ec'.
+
+	* syscall.c (syscall) [SVR4, MIPS]: The fifth and subsequent
+	arguments appear to be stored on the stack, not in the
+	registers following A3 (empirical result).
+
+	* defs.h: Add prototype for printsock.
+	* svr4/dummy.h: Remove generic handling of sys_mount.
+	* system.c [SVR4, MIPS]: Include several system headers to cleanly
+	get access to SGI mount information.
+	(mount_flags, nfs_flags) [SVR4, MIPS]: New objects.
+	(sys_mount) [SVR4, MIPS]: New function.
+	(sys_mount) [SVR4, !MIPS]: New function.
+
+Tue Jul  4 00:30:34 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.5 is released.
+
+	* desc.c, resource.c, strace.c, syscall.c, time.c: Cast tv_sec and
+	tv_usec members to long when using printf.
+
+	* ipc.c: Omit define of __KERNEL__.
+	({MSG,SEM,SHM}_{STAT,INFO}): Explicitly define those things we
+	want which __KERNEL__ used to provide.
+	(sys_msgrcv): Change reference to ipc_kludge structure to
+	look-alike ipc_wrapper to avoid dependence on __KERNEL__.
+
+	mem.c (mmap_flags) [MAP_{GROWSDOWN,DENYWRITE,EXECUTABLE}]: Add
+	Linux specific options.
+
+	syscall.c: Use SYS_ERRLIST_DECLARED instead of guessing.
+	[E{RESTART{SYS,NO{INTR,HAND}},NOIOCTLCMD}]: Explicitly define
+	instead of depending of __KERNEL__.
+
+	term.c: Cast c_{i,o,c,l}flag to long when using printf.
+
+Tue Jun  6 00:27:48 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* aclocal.m4 (AC_DECL_SYS_ERRLIST, AC_DECL__SYS_SIGLIST): New.
+	* configure.in: Call AC_DECL_SYS_ERRLIST, AC_DECL_SYS_SIGLIST,
+	and AC_DECL__SYS_SIGLIST.
+	* acconfig.h (SYS_ERRLIST_DECLARED): New.
+	* strace.c (strerror): Use SYS_ERRLIST_DECLARED.
+	(strsignal): Use SYS_SIGLIST_DECLARED.
+
+	net.c (sys_socket): Omit inadvertent surplus comma when
+	protocol family isn't PF_INET.
+
+	util.c (dumpstr): Fix incorrect printing of one too many
+	characters when the length is not an even multiple of 16 bytes.
+	Reported by Juergen Weigert
+	<jnweiger@immd4.informatik.uni-erlangen.de>.
+
+Thu May  4 23:37:47 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* ioctl.c (compare): Change prototype to match POSIX qsort.
+	* signal.c (sigishandled) [SVR4]: Omit everything after return.
+	* strace.c (trace) [SVR4]: Break out of for loop instead of
+	returning when finished so final return statement is executed.
+	* syscall.c (internal_syscall): Add more SYS_wait* variations.
+	(syscall) [LINUX]: Correct typo which commented out the M68K
+	argument to ifdef.
+	* util.c (printstr): Cast unsigned char pointer argument
+	to char pointer in umovestr call.
+	(dumpstr): Likewise for umoven.
+
+Wed May  3 01:10:56 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.4 is released.
+
+	* signal.c (sys_sigblock): Move after the definition of
+	sys_sigsetmask that it calls to avoid an implicit declaration.
+	* stream.c (transport_user_options, transport_server_options):
+	Only needed if TI_BIND is defined.
+	* configure.in: Add -Wno-implicit to WARNFLAGS on SunOS 4.x.
+
+	* process.c (internal_fork) [SVR4]: Fix a typo that omitted
+	the tcp arguement from the call to exiting.  Add getrval2
+	check so no fork processing is done in the child.
+	(printwaitn): Initialize exited so that its value is defined
+	for all flows of execution.
+
+Tue May  2 22:39:42 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* linux/dummy.h: Add aliases for sysfs, personality, afs_syscall,
+	setfsuid, setfsgid, and _llseek syscalls.
+	* linux/syscall.h: Add prototypes for them.
+	* linux/syscallent.h: Add them to the syscall entries table.
+	* system.c (headers) [LINUX]: Include linux/unistd.h to get __NR_*
+	defines and conditionally include linux/personality.h if
+	__NR_personality is defined.
+	(personality_options) [LINUX]: New table.
+	(sys_personality) [LINUX]: New function.
+
+Tue May  2 00:20:39 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* strace.c (trace) [!SVR4]: Change forever loop to one predicated
+	on the number of traced processes so that we can have untraced
+	children (e.g. via popen).
+
+	* strace (main) [!SVR4]: Call fake_execve to get the actual
+	exec and its arguments into the trace.
+	(environ): Declare it.
+	* process.c (fake_execve): New function.
+	(headers): Include sys/syscall.h to get SYS_* defines.
+
+	* process.c (sys_execv, sys_execve): Surround argument annotations
+	with C comment delimiters.
+	(printargv, printargc): The arg vector is an array of char pointers
+	not ints.
+
+	* strace.c (printleader): Also check for multiple -p arguments
+	when deciding whether to print the pid field.
+
+	* strace.c (strerror) [!HAVE_STRERROR]: New function.
+	* defs.h (strerror, strsignal): Add these prototypes if we provide
+	the functions.
+	* configure.in (AC_CHECK_FUNCS): Add strerror.
+
+	* strace.c (main, proc_poller): Add SIGPIPE to the list of caught
+	and blocked signals.
+
+	* strace.c (main): Add username option.  Verify they are root before
+	letting them use it.  Look up the ids in the password file.  Set
+	them just before executing the program.
+	From Reuben Sumner <rasumner@undergrad.math.uwaterloo.ca>.
+
+Sat Apr 29 00:09:56 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.3 is released.
+
+	* system.c (mount_flags) [LINUX]: Omit duplicated MS_NOSUID entry.
+	From Reuben Sumner <rasumner@undergrad.math.uwaterloo.ca>.
+
+	* strace.c (outfname): Initialize to NULL.
+	(main): Defer output file processing until after arguments.
+	Allow either a pipe or a bang for command arguments.
+	Check if outfname is NULL instead of checking outf for stderr.
+	Reinitialize each startup TCB's outf to fix -p/-o ordering bug.
+	(droptcb): Reset close TCB's outf to NULL instead of stderr.
+	(tprintf): Avoid calling vfprintf if outf is NULL.
+
+	* strace.c (main): Use popen if -o argument begins with a pipe.
+	From Marty Leisner <leisner@sdsp.mc.xerox.com>.
+
+	* process.c (printstatus): Fix a typo where WIFSIGNALED was meant
+	but WIFSTOPPED was used.
+
+	* Makefile.in: Add an EXTRA_DEFS variable and use it in the .c.o
+	rule to prevent the comment from being untrue.
+
+Fri Apr 28 22:01:56 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* strace.c (sys_exit): Move follow fork code to internal_exit.
+	(sys_fork): Move follow fork code to internal_fork.
+	(sys_execv, sys_execve): Move follow fork code to internal_exec.
+	(sys_waitpid, sys_wait4): Move follow fork code to internal_wait.
+	(vforking): Remove this static variable and check scno in
+	internal_fork instead.
+	(internal_exit, internal_fork, internal_exec, internal_wait): New
+	functions.
+	* defs.h: Add prototypes for the new internal_* functions.
+	* syscall.c (syscall): Move syscall entering trace qualifier check
+	and reprint checking after context decoding and precede them with
+	a call to internal_syscall.  Precede syscall exiting trace
+	qualifier check with a call to internal_syscall.
+	(internal_syscall): New function.
+
+	* defs.h (struct tcb): Make scno signed.
+	* strace.c (syscall) Make u_error signed.
+	[LINUX, I386]: Avoid unsigned cast in eax check.
+	* syscall.c (sys_indir): Make i, scno, and nargs signed.
+	* desc.c (sys_select): Make cumlen unsigned
+
+Mon Apr 24 23:52:47 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* net.c (socktypes): Add SOCK_PACKET.
+
+Sun Apr  2 23:50:39 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* Makefile (clean): Check explicitly for a Makefile in subdirs
+	before running make in them.
+
+Sun Mar 26 12:37:21 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* strace.c [MIPS] (proc_open): Conditionalize run on MIPS.
+	[MIPS] (detach): Initialize error for MIPS case.
+	(trace): Initialize ioctl_result and ioctl_errno for overly helpful
+	compilers.
+	* syscall.c (decode_subcall): Move variable i into conditionals
+	that use use it.
+	* system.c (syssgi_options): Conditionalize SGI_RECVLMSG and
+	SGI_SET_FPDEBUG that SGI decided to drop.  I don't have the stomach
+	to change them all.
+	* term.c (term_ioctl): Force [c_[iocl]flags members to long before
+	printing since we don't know what the size of their type is.
+	* util.c [SVR4, MIPS] (umoven): Prevent MIPS from using pread even
+	if autoconf detects it since it seems to either not work or do
+	something else entirely on Irix 5.3.
+
+Sun Mar 26 00:01:11 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.2 is released.
+	* linux/dummy.h: Make sys_fchdir like sys_close instead of printargs
+	so that the file descriptor arg is decimal.
+
+Sat Mar 25 22:50:13 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* net.c [LINUX] (protocols): Explicitly define all IPPROTO_* entries
+	because on Linux they are enumerators.
+
+	* system.c [LINUX] (mount_flags): Handle renaming of MS_SYNC to
+	MS_SYNCHRONOUS.
+
+	* util.c (printxval): When there is no translation, print the actual
+	number first and the the default value as a C comment.
+
+	* net.c (sys_send, sys_sendto, sys_sendmsg, sys_getsockopt,
+	sys_setsockopt): Change first argument from unsigned to signed to
+	cater to the frequent practice of calling system calls with a file
+	descriptor of -1.
+	* mem.c (sys_mmap): Likewise.
+
+Sun Mar 19 13:53:52 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* signal.c [LINUX] (signalent): Handle old and new values of SIGIO.
+
+Sun Dec 11 22:51:51 1994  Rick Sladkey  <jrs@world.std.com>
+
+	* version.c: Version 3.0.1 is released.
+	* Makefile.in, configure.in, aclocal.m4: Changes for autoconf 2.0.
+	* config.guess, config.guess: Update from the FSF.
+	* install-sh: New from the FSF.
+
+Mon Dec  5 20:51:29 1994  Rick Sladkey  <jrs@world.std.com>
+
+	* Makefile.in: Add m68k arch.
+	* acconfig.h (M68K): Add m68k define.
+	* configure.in: Add detection of arch m68k.
+	* process.c [M68K] (struct_user_offsets): Support m68k registers and
+	offsets.
+	* signal.c [M68K] (sigcontext_struct): Support m68k sigcontext
+	structure.
+	[M68K] (sys_sigreturn): Support m68k sigreturn handling.
+	* syscall.c [M68K] (syscall): Support m68k syscall number register
+	and errno in d0 instead of eax.
+	* util.c [M68K] (getpc, printcall, setbpt, clearbpt): Support m68k
+	program counter in PT_PC instead of EIP.
+	[M68K] (LOOP): Support m68k loop instruction.
+	From Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
+
+	* mem.c [MAP_ANONYMOUS] (mmap_flags): Correct inadvertent reference
+	to MAP_FIXED instead of MAP_ANONYMOUS.
+	From Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
+
+	* signal.c [LINUX] (signalent): Signal 30 is now SIGPWR.
+	From Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
+
+Mon Dec  5 01:05:46 1994  Rick Sladkey  <jrs@world.std.com>
+
+	* defs.h (tprintf): Fix typo in non-gcc ansi prototype for tprintf.
+	Reported by Thanh Ma <tma@encore.com>.
+
+	* strace.c (cleanup): Send SIGCONT before SIGTERM because Linux
+	1.1.62 doesn't continue a traced child when the parent exits.
+	Reported by Matt Day <mday@artisoft.com>.
+
+	* system.c [LINUX]: Include netinet/in.h before arpa/inet.h.
+
+	* util.c (printstr): Fix longstanding bug in notating string
+	continuation.
+
+	* strace.c [SVR4] (proc_open): Specifically wait for the child the
+	child to go into the execve syscall to avoid spurious traces.
+	[LINUX] (detach): Conditionalize the status variable.
+
+Sun Dec  4 23:21:42 1994  Rick Sladkey  <jrs@world.std.com>
+
+	* Makefile.in: Add mips arch.
+	* acconfig.h (MIPS): Add mips define.
+	* configure.in: Add detection of opsys irix5 and arch mips.  Check
+	for prctl function.
+	Check for sys/sysconfig.h header.
+	* defs.h (MAX_ARGS): Bump maximum syscall arguments from 8 to 32.
+	* file.c [SVR4]: Include sys/cred.h.
+	(access_flags): Update access flags for SGI.
+	(sprinttime): Change type of sprinttime argument from unsigned
+	long to time_t.
+	* process.c [HAVE_PRCTL]: Include sys/prctl.h.
+	[HAVE_PRCTL] (prctl_options, sys_prctl): New for SGI.
+	(printsiginfo): Conditionally compile SI_TIMER and SI_MESGQ.
+	Cast si_band member to long before printing.
+	* signal.c (sigact_flags): Add _SA_BSDCALL for SGI.
+	(sigprocmaskcmds): Add SIG_SETMASK32 for SGI.
+	* strace.c [SVR4] [MIPS]:
+	(foobar): New dummy signal handler.
+	(main): Install a dummy signal handler in the child before pausing
+	to work around an SGI bug in PRSABORT.
+	(proc_open): Send a interrupt to the child instead of aborting the
+	syscall which doesn't work on Irix5.2.
+	* svr4/dummy.h: Add new unfinished SGI syscalls
+	(e.g. sys_sysmp, sys_sginap, etc.).  Handle some SGI syscalls like
+	existing calls (e.g. sys_ksigaction like sys_sigaction).
+	Printargs does the print thing for sys_sethostid.
+	* svr4/syscall.h: Declare all new SGI syscalls.
+	(SGI_KLUDGE): Define syscall table starting index to be 1 for SGI
+	and add it to all subcall entry points.
+	(SYS_pgrpsys_subcall, SYS_sigcall_subcall, SYS_context): Don't
+	decode as subcalls on MIPS. Instead, use the normal syscalls.
+	* svr4/syscallent.h [MIPS]: Lead syscall table with a dummy entry
+	since SGI syscall numbers are off by one.
+	[MIPS] (sys_pgrpsys): Rename to sys_setpgrp on SGI.
+	[MIPS] (sys_xenix): Rename to sys_syssgi on SGI.
+	[MIPS] (sys_sysmachine): Rename to sys_sysmips on SGI.
+	[MIPS]: Conditionalize SVR4 extension into SGI and Solaris classes.
+	* syscall.c (dumpio): Validate descriptor against MAX_QUALS.
+	[HAVE_PR_SYSCALL] (syscall): Conditionalize SYS_vfork.
+	[MIPS] (syscall): Add SGI section for decoding u_error and u_rval.
+	Add workaround for broken SGI pr_sysarg on syscall entry.
+	[SVR4] (syscall): Conditionalize subcall decoding for
+	SYS_ptrpsys_subcall, SYS_sigcall_subcall and SYS_context_subcall.
+	[SVR4] [MIPS] (getrval2): Handle SGI.
+	* syscallent.sh: Dork the sed line to be choosier about SYS_ lines.
+	* system.c [HAVE_SYSCONFIG_H]: Include sys/sysconfig.h.
+	[MIPS] (syssgi_options, sys_syssgi): New for SGI.
diff --git a/INSTALL b/INSTALL
index a2c8722..7a11ed0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -178,4 +178,3 @@
      script, and exit.
 
 `configure' also accepts some other, not widely useful, options.
-
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index d590926..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,101 +0,0 @@
-# Automake input for strace.
-
-bin_PROGRAMS = strace
-man_MANS = strace.1
-bin_SCRIPTS = strace-graph
-
-# OS is one of `linux', `sunos4', `svr4', or `freebsd'.
-OS		= @opsys@
-# ARCH is `i386', `m68k', `sparc', etc.
-ARCH		= @arch@
-
-AM_CFLAGS = $(WARNFLAGS)
-INCLUDES = -I$(OS)/$(ARCH) -I$(srcdir)/$(OS)/$(ARCH) -I$(OS) -I$(srcdir)/$(OS)
-
-strace_SOURCES = strace.c syscall.c util.c desc.c file.c ipc.c \
-		 io.c ioctl.c mem.c net.c process.c bjm.c \
-		 resource.c signal.c sock.c system.c term.c time.c \
-		 proc.c stream.c
-noinst_HEADERS = defs.h
-
-EXTRA_DIST = $(man_MANS) errnoent.sh signalent.sh syscallent.sh ioctlsort.c \
-     	     debian/changelog debian/control debian/copyright debian/rules \
-	     strace.spec \
-	     strace-graph COPYRIGHT CREDITS PORTING \
-	     README-CVS README-freebsd README-linux README-sunos4 README-svr4 \
-	     linux/ioctlsort.c linux/ioctlent.sh \
-	     linux/ioctlent.h linux/errnoent.h linux/signalent.h \
-	     linux/syscall.h linux/syscallent.h linux/dummy.h \
-	     linux/alpha/errnoent.h linux/alpha/ioctlent.h \
-	     linux/alpha/signalent.h linux/alpha/syscallent.h \
-	     linux/hppa/errnoent.h linux/hppa/ioctlent.h \
-	     linux/hppa/signalent.h linux/hppa/syscallent.h \
-	     linux/ia64/syscallent.h linux/ia64/errnoent.h \
-	     linux/ia64/ioctlent.h linux/ia64/signalent.h \
-     	     linux/mips/ioctlent.sh linux/mips/errnoent.h \
-	     linux/mips/ioctlent.h linux/mips/signalent.h \
-	     linux/mips/syscallent.h \
-	     linux/powerpc/syscallent.h \
-	     linux/powerpc/errnoent.h linux/powerpc/ioctlent.h \
-	     linux/powerpc/signalent.h \
-	     linux/s390/errnoent.h linux/s390/ioctlent.h \
-	     linux/s390/signalent.h linux/s390/syscallent.h \
-	     linux/s390x/errnoent.h linux/s390x/ioctlent.h \
-	     linux/s390x/signalent.h linux/s390x/syscallent.h \
-	     linux/sh/syscallent.h linux/sh/errnoent.h \
-	     linux/sh/ioctlent.h linux/sh/signalent.h \
-	     linux/sh64/syscallent.h \
-	     linux/sparc/dummy2.h \
-	     linux/sparc/errnoent.h linux/sparc/errnoent1.h \
-	     linux/sparc/ioctlent.h linux/sparc/ioctlent1.h \
-	     linux/sparc/signalent.h linux/sparc/signalent1.h \
-	     linux/sparc/syscall.h linux/sparc/syscall1.h \
-	     linux/sparc/syscallent.h linux/sparc/syscallent1.h \
-	     linux/sparc/gen.pl linux/sparc/syscall.h.2 \
-	     linux/sparc64/dummy2.h linux/sparc64/errnoent.h \
-	     linux/sparc64/errnoent1.h linux/sparc64/errnoent2.h \
-	     linux/sparc64/ioctlent.h linux/sparc64/ioctlent1.h \
-	     linux/sparc64/ioctlent2.h linux/sparc64/signalent.h \
-	     linux/sparc64/signalent1.h linux/sparc64/signalent2.h \
-	     linux/sparc64/syscall.h linux/sparc64/syscall1.h \
-	     linux/sparc64/syscallent.h linux/sparc64/syscallent1.h \
-	     linux/sparc64/syscallent2.h \
-	     linux/x86_64/syscallent.h linux/x86_64/gentab.pl \
-	     linux/x86_64/errnoent1.h linux/x86_64/ioctlent1.h \
-	     linux/x86_64/signalent1.h linux/x86_64/syscallent1.h \
-	     freebsd/ioctlent.sh \
-	     freebsd/syscalls.cat freebsd/syscalls.pl freebsd/syscalls.print \
-	     freebsd/i386/errnoent.h freebsd/i386/ioctlent.h \
-	     freebsd/i386/signalent.h \
-	     freebsd/i386/syscall.h freebsd/i386/syscallent.h \
-	     sunos4/dummy.h sunos4/errnoent.h \
-	     sunos4/ioctlent.h sunos4/ioctlent.sh sunos4/signalent.h \
-	     sunos4/syscall.h sunos4/syscallent.h \
-	     svr4/dummy.h svr4/errnoent.h svr4/ioctlent.h svr4/ioctlent.sh \
-	     svr4/signalent.h svr4/syscall.h svr4/syscallent.h
-
-if MAINTAINER_MODE
-if LINUX
-
-IOCTLDIR = /usr/include
-IOCTLASM = asm
-
-if I386
-ioctlent_h = linux/ioctlent.h
-else
-ioctlent_h = linux/$(ARCH)/ioctlent.h
-endif
-
-BUILT_SOURCES = $(ioctlent_h)
-
-$(srcdir)/$(ioctlent_h): ioctlsort
-	$(<D)/$(<F) > $@
-ioctlsort: $(srcdir)/linux/ioctlsort.c ioctls.h ioctldefs.h
-	$(filter-out -I%,$(LINK.c)) -I. -I$(IOCTLDIR) $(filter -I%,$(LINK.c)) \
-	  -o $@ $<
-ioctls.h: $(srcdir)/linux/ioctlent.sh
-	$(SHELL) $< $(IOCTLDIR) $(IOCTLASM)
-ioctldefs.h: ioctls.h ;
-
-endif
-endif
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 9be0641..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,760 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Automake input for strace.
-
-
-
-SOURCES = $(strace_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = strace$(EXEEXT)
-DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS \
-	ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
-	install-sh missing mkinstalldirs
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(man1dir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_strace_OBJECTS = strace.$(OBJEXT) syscall.$(OBJEXT) util.$(OBJEXT) \
-	desc.$(OBJEXT) file.$(OBJEXT) ipc.$(OBJEXT) io.$(OBJEXT) \
-	ioctl.$(OBJEXT) mem.$(OBJEXT) net.$(OBJEXT) process.$(OBJEXT) \
-	bjm.$(OBJEXT) resource.$(OBJEXT) signal.$(OBJEXT) \
-	sock.$(OBJEXT) system.$(OBJEXT) term.$(OBJEXT) time.$(OBJEXT) \
-	proc.$(OBJEXT) stream.$(OBJEXT)
-strace_OBJECTS = $(am_strace_OBJECTS)
-strace_LDADD = $(LDADD)
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(strace_SOURCES)
-DIST_SOURCES = $(strace_SOURCES)
-man1dir = $(mandir)/man1
-NROFF = nroff
-MANS = $(man_MANS)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FREEBSD_FALSE = @FREEBSD_FALSE@
-FREEBSD_TRUE = @FREEBSD_TRUE@
-I386_FALSE = @I386_FALSE@
-I386_TRUE = @I386_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LINUX_FALSE = @LINUX_FALSE@
-LINUX_TRUE = @LINUX_TRUE@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUNOS4_FALSE = @SUNOS4_FALSE@
-SUNOS4_TRUE = @SUNOS4_TRUE@
-SVR4_FALSE = @SVR4_FALSE@
-SVR4_TRUE = @SVR4_TRUE@
-VERSION = @VERSION@
-WARNFLAGS = @WARNFLAGS@
-X86_64_FALSE = @X86_64_FALSE@
-X86_64_TRUE = @X86_64_TRUE@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-arch = @arch@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-opsys = @opsys@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-man_MANS = strace.1
-bin_SCRIPTS = strace-graph
-
-# OS is one of `linux', `sunos4', `svr4', or `freebsd'.
-OS = @opsys@
-# ARCH is `i386', `m68k', `sparc', etc.
-ARCH = @arch@
-AM_CFLAGS = $(WARNFLAGS)
-INCLUDES = -I$(OS)/$(ARCH) -I$(srcdir)/$(OS)/$(ARCH) -I$(OS) -I$(srcdir)/$(OS)
-strace_SOURCES = strace.c syscall.c util.c desc.c file.c ipc.c \
-		 io.c ioctl.c mem.c net.c process.c bjm.c \
-		 resource.c signal.c sock.c system.c term.c time.c \
-		 proc.c stream.c
-
-noinst_HEADERS = defs.h
-EXTRA_DIST = $(man_MANS) errnoent.sh signalent.sh syscallent.sh ioctlsort.c \
-     	     debian/changelog debian/control debian/copyright debian/rules \
-	     strace.spec \
-	     strace-graph COPYRIGHT CREDITS PORTING \
-	     README-CVS README-freebsd README-linux README-sunos4 README-svr4 \
-	     linux/ioctlsort.c linux/ioctlent.sh \
-	     linux/ioctlent.h linux/errnoent.h linux/signalent.h \
-	     linux/syscall.h linux/syscallent.h linux/dummy.h \
-	     linux/alpha/errnoent.h linux/alpha/ioctlent.h \
-	     linux/alpha/signalent.h linux/alpha/syscallent.h \
-	     linux/hppa/errnoent.h linux/hppa/ioctlent.h \
-	     linux/hppa/signalent.h linux/hppa/syscallent.h \
-	     linux/ia64/syscallent.h linux/ia64/errnoent.h \
-	     linux/ia64/ioctlent.h linux/ia64/signalent.h \
-     	     linux/mips/ioctlent.sh linux/mips/errnoent.h \
-	     linux/mips/ioctlent.h linux/mips/signalent.h \
-	     linux/mips/syscallent.h \
-	     linux/powerpc/syscallent.h \
-	     linux/powerpc/errnoent.h linux/powerpc/ioctlent.h \
-	     linux/powerpc/signalent.h \
-	     linux/s390/errnoent.h linux/s390/ioctlent.h \
-	     linux/s390/signalent.h linux/s390/syscallent.h \
-	     linux/s390x/errnoent.h linux/s390x/ioctlent.h \
-	     linux/s390x/signalent.h linux/s390x/syscallent.h \
-	     linux/sh/syscallent.h linux/sh/errnoent.h \
-	     linux/sh/ioctlent.h linux/sh/signalent.h \
-	     linux/sh64/syscallent.h \
-	     linux/sparc/dummy2.h \
-	     linux/sparc/errnoent.h linux/sparc/errnoent1.h \
-	     linux/sparc/ioctlent.h linux/sparc/ioctlent1.h \
-	     linux/sparc/signalent.h linux/sparc/signalent1.h \
-	     linux/sparc/syscall.h linux/sparc/syscall1.h \
-	     linux/sparc/syscallent.h linux/sparc/syscallent1.h \
-	     linux/sparc/gen.pl linux/sparc/syscall.h.2 \
-	     linux/sparc64/dummy2.h linux/sparc64/errnoent.h \
-	     linux/sparc64/errnoent1.h linux/sparc64/errnoent2.h \
-	     linux/sparc64/ioctlent.h linux/sparc64/ioctlent1.h \
-	     linux/sparc64/ioctlent2.h linux/sparc64/signalent.h \
-	     linux/sparc64/signalent1.h linux/sparc64/signalent2.h \
-	     linux/sparc64/syscall.h linux/sparc64/syscall1.h \
-	     linux/sparc64/syscallent.h linux/sparc64/syscallent1.h \
-	     linux/sparc64/syscallent2.h \
-	     linux/x86_64/syscallent.h linux/x86_64/gentab.pl \
-	     linux/x86_64/errnoent1.h linux/x86_64/ioctlent1.h \
-	     linux/x86_64/signalent1.h linux/x86_64/syscallent1.h \
-	     freebsd/ioctlent.sh \
-	     freebsd/syscalls.cat freebsd/syscalls.pl freebsd/syscalls.print \
-	     freebsd/i386/errnoent.h freebsd/i386/ioctlent.h \
-	     freebsd/i386/signalent.h \
-	     freebsd/i386/syscall.h freebsd/i386/syscallent.h \
-	     sunos4/dummy.h sunos4/errnoent.h \
-	     sunos4/ioctlent.h sunos4/ioctlent.sh sunos4/signalent.h \
-	     sunos4/syscall.h sunos4/syscallent.h \
-	     svr4/dummy.h svr4/errnoent.h svr4/ioctlent.h svr4/ioctlent.sh \
-	     svr4/signalent.h svr4/syscall.h svr4/syscallent.h
-
-@LINUX_TRUE@@MAINTAINER_MODE_TRUE@IOCTLDIR = /usr/include
-@LINUX_TRUE@@MAINTAINER_MODE_TRUE@IOCTLASM = asm
-@I386_FALSE@@LINUX_TRUE@@MAINTAINER_MODE_TRUE@ioctlent_h = linux/$(ARCH)/ioctlent.h
-@I386_TRUE@@LINUX_TRUE@@MAINTAINER_MODE_TRUE@ioctlent_h = linux/ioctlent.h
-@LINUX_TRUE@@MAINTAINER_MODE_TRUE@BUILT_SOURCES = $(ioctlent_h)
-all: $(BUILT_SOURCES) config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-strace$(EXEEXT): $(strace_OBJECTS) $(strace_DEPENDENCIES) 
-	@rm -f strace$(EXEEXT)
-	$(LINK) $(strace_LDFLAGS) $(strace_OBJECTS) $(strace_LDADD) $(LIBS)
-install-binSCRIPTS: $(bin_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-binSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bjm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/desc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioctl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strace.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/syscall.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/system.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/term.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-uninstall-info-am:
-install-man1: $(man1_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@case `sed 15q $(srcdir)/NEWS` in \
-	*"$(VERSION)"*) : ;; \
-	*) \
-	  echo "NEWS not updated; not releasing" 1>&2; \
-	  exit 1;; \
-	esac
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/debian $(distdir)/freebsd $(distdir)/freebsd/i386 $(distdir)/linux $(distdir)/linux/alpha $(distdir)/linux/hppa $(distdir)/linux/ia64 $(distdir)/linux/mips $(distdir)/linux/powerpc $(distdir)/linux/s390 $(distdir)/linux/s390x $(distdir)/linux/sh $(distdir)/linux/sh64 $(distdir)/linux/sparc $(distdir)/linux/sparc64 $(distdir)/linux/x86_64 $(distdir)/sunos4 $(distdir)/svr4
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(HEADERS) config.h
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-man
-
-install-exec-am: install-binPROGRAMS install-binSCRIPTS
-
-install-info: install-info-am
-
-install-man: install-man1
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-info-am uninstall-man
-
-uninstall-man: uninstall-man1
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-binSCRIPTS install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-man1 install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-info-am uninstall-man uninstall-man1
-
-
-@LINUX_TRUE@@MAINTAINER_MODE_TRUE@$(srcdir)/$(ioctlent_h): ioctlsort
-@LINUX_TRUE@@MAINTAINER_MODE_TRUE@	$(<D)/$(<F) > $@
-@LINUX_TRUE@@MAINTAINER_MODE_TRUE@ioctlsort: $(srcdir)/linux/ioctlsort.c ioctls.h ioctldefs.h
-@LINUX_TRUE@@MAINTAINER_MODE_TRUE@	$(filter-out -I%,$(LINK.c)) -I. -I$(IOCTLDIR) $(filter -I%,$(LINK.c)) \
-@LINUX_TRUE@@MAINTAINER_MODE_TRUE@	  -o $@ $<
-@LINUX_TRUE@@MAINTAINER_MODE_TRUE@ioctls.h: $(srcdir)/linux/ioctlent.sh
-@LINUX_TRUE@@MAINTAINER_MODE_TRUE@	$(SHELL) $< $(IOCTLDIR) $(IOCTLASM)
-@LINUX_TRUE@@MAINTAINER_MODE_TRUE@ioctldefs.h: ioctls.h ;
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/NEWS b/NEWS
index 264142b..b1891a9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,181 @@
+Noteworthy changes in release 4.6
+=================================
+
+* Changes in behavior
+  * Print diagnostic information about changes in personality mode to
+    standard error instead of standard output.
+
+* Improvements
+  * Implemented a new method of following clone, fork, and vfork
+    syscalls using the Linux kernel's explicit facilities for tracing
+    creation of threads and child processes.
+  * Implemented CLONE_PARENT and CLONE_UNTRACED flags handling.
+  * Implemented decoding of TLS syscalls on m68k.
+  * Implemented biarch support on powerpc64.
+  * Implemented biarch support for getrlimit() and setrlimit().
+  * Implemented decoding of struct ucred in getsockopt SO_PEERCRED.
+  * Implemented SOL_SCTP socket options decoding.
+  * Added HDIO_* ioctl names.
+    (Addresses Debian bug #450953).
+  * Added LOOP_* ioctl names.
+  * Updated lists of CLOCK_*, CLONE_*, MS_*, and SOL_* constants
+    to match Linux 2.6.37.
+  * Updated the list of IPPROTO_* constants to match netinet/in.h.
+  * Implemented decoding of HDIO_* and BLK* ioctls.
+  * Added MicroBlaze architecture support.
+  * Added new syscall entries to match Linux 2.6.37.
+  * Regenerated list of ioctl names from Linux 2.6.37.
+  * Enhanced signal notification decoding.
+  * Documented -C and -D options.
+
+* Bug fixes
+  * Fixed fetching syscall arguments on m68k.
+  * Fixed an error when judging whether a process has children.
+  * Fixed get/set_robust_list syscall numbers for powerpc.
+  * Fixed a corner case in printing clone flags.
+  * Fixed cross-compiling issues.
+  * Fixed build issues on powerpc64, SH and SPARC.
+  * Fixed syscall flags of fstatat*, mmap, mmap2, fadvise64*, swapoff,
+    fgetxattr, flistxattr, fremovexattr, epoll_create, fallocate,
+    fanotify_init, and fanotify_mark syscalls.
+  * Fixed decoding of get[ug]id, gete[ug]id and setfs[ug]id return values.
+  * Fixed biarch support in IO dumping.
+  * Fixed raw exit_group decoding.
+  * Fixed decoding of file descriptors on 64-bit architectures.
+  * Fixed a corner case in waitpid handling.
+    (Addresses Red Hat bug #663547).
+  * Fixed stat64 decoding on mips
+    (Addresses Debian bug #599028).
+  * Fixed misleading italics in the manual page.
+    (Addresses Debian bug #589323).
+
+Noteworthy changes in release 4.5.20
+====================================
+
+* Improvements
+  * Implemented decoding of new linux syscalls: inotify_init1, recvmmsg.
+  * Implemented basic decoding of new linux syscalls: preadv, pwritev,
+    rt_tgsigqueueinfo, perf_event_open.
+  * Enhanced decoding of recently added syscalls on non-x86 architectures
+    by replacing a bare decoder with elaborate parsers enabled earlier
+    for x86/x86-64.
+  * Implemented -C option to combine regular and -c output.
+    (Addresses Debian bug #466196)
+  * Enhanced decoding of mbind and mremap syscalls.
+  * Enhanced SOL_PACKET socket options decoding.
+  * Regenerated list of ioctl names from linux 2.6.33.
+  * Added TILE architecture support.
+
+* Bug fixes
+  * Fixed build with Linux kernel headers 2.6.32-rc5+.
+    (Addresses Debian bug #560516 and Fedora bug #539044)
+  * Fixed build on mips.
+  * Fixed handling of Linux systems without struct statfs64.
+  * Fixed reporting signal mask by sigreturn on powerpc.
+  * Fixed potential stack buffer overflow in select decoder.
+    (Addresses Fedora bug #556678)
+  * Corrected msgsnd indirect ipccall decoding.
+  * Corrected decoding of 64bit syscalls.
+    (Addresses Debian bug #570603)
+  * Corrected getsockopt decoding on architectures where
+    sizeof(long) > sizeof(int).
+    (Addresses Debian bug #494844)
+  * Corrected decoding of epoll_pwait.
+    (Addresses Debian bug #513014)
+  * Corrected handling of killed threads.
+
+Noteworthy changes in release 4.5.19
+====================================
+
+* Changes in behavior
+  * When command exits, strace now exits with the same exit status.
+    If command is terminated by a signal, strace terminates itself
+    with the same signal, so that strace can be used as a wrapper
+    process transparent to the invoking parent process.
+    When using -p option, the exit status of strace is zero unless
+    there was an unexpected error in doing the tracing.
+    (Addresses Fedora bug #105371 and Debian bug #37665)
+
+* Improvements
+  * Implemented decoding of new Linux syscalls: accept4, dup3,
+    epoll_create1, eventfd2, inotify_init1, pipe2, signalfd4.
+  * Implemented decoding of socket type flags introduced in Linux 2.6.27.
+  * Implemented decoding of accept4 socketcall.
+  * Enhanced prctl decoding.
+  * Enhanced nanosleep decoding.
+  * Enhanced ptrace decoding.
+  * Enhanced futex decoding.
+  * Enhanced CAP_* decoding.
+  * Enhanced SIOCS* ioctls decoding.
+  * Enhanced fcntl F_* flags decoding.
+  * Enhanced semop/semtimedop decoding.
+  * Updated ARM architecture support.
+  * Added Blackfin architecture support.
+  * Added AVR32 architecture support.
+  * Added CRIS architecture support.
+  * Made strace detect when traced process suddenly disappeared.
+
+* Bug fixes
+  * Fixed syscall numbers for tee and sync_file_range.
+    (Addresses Debian bug #503124)
+  * Fixed several bugs in strings decoder, including potential heap
+    memory corruption.
+    (Addresses Fedora bugs #470529, #478324 and #511035)
+  * Marked sendfile(2) as a network syscall.
+    (Addresses Debian bug #509499)
+  * Fixed accept(2) decoding.
+    (Addresses Debian bug #507573)
+  * Fixed sigtimedwait(2) decoding.
+  * Fixed build on ARM EABI.
+    (Addresses Debian bugs #520084 and #535564, and Fedora bug #507576)
+  * Fixed display of 32-bit fcntl(F_SETLK) on 64-bit architectures.
+    (Addresses Red Hat bug #471169)
+  * Fixed display of 32-bit argv array on 64-bit architectures.
+    (Addresses Fedora bug #519480)
+  * Fixed display of 32-bit struct sigaction on 64-bit architectures.
+  * Fixed HPPA architecture support.
+    (Addresses Debian bugs #437928 and #546619)
+
+Changes in 4.5.18
+==============
+* Bug fixes.
+* Support new Linux/PPC system call subpage_prot and PROT_SAO flag.
+* In sigaction system call, display sa_flags value along with SIG_DFL/SIG_IGN.
+
+Changes in 4.5.17
+==============
+* Many bug fixes.
+* -F is now deprecated, -f has traced vfork too on Linux for a long time now.
+* Print O_CLOEXEC, MSG_CMSG_CLOEXEC flag bits.
+* Improved output for prctl system call on Linux.
+* Improved support for Linux/ARM.
+* SA_NOMASK is now spelled SA_NODEFER, and SA_ONESHOT is spelled SA_RESETHAND.
+
+Changes in 4.5.16
+==============
+* Bug fixes.
+* Improved output for delete_module, futex, and mbind system calls on Linux.
+* Improved output for SG_IO ioctls on Linux.
+* Support new Linux system calls move_pages, utimensat, signalfd, timerfd,
+  eventfd, getcpu, epoll_pwait.
+
+Changes in 4.5.15
+==============
+* Bug fixes.
+* Several biarch improvements.
+* Improved output for adjtimex, sysctl, quotactl, mount, umount.
+* Support new Linux system calls *at, inotify*, pselect6, ppoll and unshare.
+
+Changes in 4.5.14
+==============
+* Bug fixes.
+* Accept numeric system calls in -e.
+
+Changes in 4.5.13
+==============
+* Bug fixes.
+* Introduce "-e trace=desc".
+
 Changes in 4.5.12
 ==============
 * Bug fixes.
diff --git a/README b/README
index 914cede..51490cb 100644
--- a/README
+++ b/README
@@ -24,9 +24,8 @@
 See the file TODO if you feel like helping out.
 
 You can get the latest version of strace from its homepage at
-http://www.liacs.nl/~wichert/strace/ .
+http://sourceforge.net/projects/strace/ .
 
 Please send bug reports and enhancements to the strace
 mailinglist at strace-devel@lists.sourceforge.net, or directly to
 Wichert Akkerman <wakkerma@debian.org>
-
diff --git a/README-Android b/README-Android
index 453a3c1..0f45fe6 100644
--- a/README-Android
+++ b/README-Android
@@ -1,11 +1,14 @@
-Steps to build from original source:
+Strace on Android
 
-1) apply arm-eabi.patch from Debian bug tracker
+The Android port of Strace does not use the configure scripts or Makefiles
+from the original source distribution.
 
-2) run configure as follows
-./configure CFLAGS=-I/android/device/system/kernel_headers/ ./configure  --prefix=/data/ --build=arm-unknown-linux-gnu
+Build Strace on Android using the Android build system, like the rest
+of the system.
 
-(note this uses the desktop gcc and glibc headers)
+Android-specific customizations are immortalized in Android.patch to
+ease future upgrades.
 
-3) Further modifications as change history will show
+This file can be regenerated using:
 
+diff -r -u -d path-to-original-unmodified-strace . | grep -v "Only in" > android.patch
diff --git a/README-linux b/README-linux
index e2f9779..62df258 100644
--- a/README-linux
+++ b/README-linux
@@ -7,7 +7,7 @@
 you use recent kernel headers. Strace needs those to get the proper data
 structures and constatns used by the kernel, since these can be
 different from the structures that the C library uses. Currently you
-will need at least a 2.2.7 or newer kernel. 
+will need at least a 2.2.7 or newer kernel.
 
 To complicate things a bit further strace might not compile if you are
 using development kernels. These tend to have headers that conflict with
@@ -29,4 +29,3 @@
 
 * you can link /usr/include/linux and /usr/include/asm to the
   corresponding directories in your kernel source-tree.
-
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index dc0ca09..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,281 +0,0 @@
-dnl
-dnl This file contains macros used in configure.ac.
-dnl automake uses this file to generate aclocal.m4, which is used by autoconf.
-dnl
-
-dnl ### A macro to find the include directory, useful for cross-compiling.
-AC_DEFUN([AC_INCLUDEDIR],
-[AC_REQUIRE([AC_PROG_AWK])dnl
-AC_SUBST(includedir)
-AC_MSG_CHECKING(for primary include directory)
-includedir=/usr/include
-if test -n "$GCC"
-then
-	>conftest.c
-	new_includedir=`
-		$CC -v -E conftest.c 2>&1 | $AWK '
-			/^End of search list/ { print last; exit }
-			{ last = [$]1 }
-		'
-	`
-	rm -f conftest.c
-	if test -n "$new_includedir" && test -d "$new_includedir"
-	then
-		includedir=$new_includedir
-	fi
-fi
-AC_MSG_RESULT($includedir)
-])
-
-dnl ### A macro to set gcc warning flags.
-define(AC_WARNFLAGS,
-[AC_SUBST(WARNFLAGS)
-if test -z "$WARNFLAGS"
-then
-	if test -n "$GCC"
-	then
-		# If we're using gcc we want warning flags.
-		WARNFLAGS=-Wall
-	fi
-fi
-])
-
-dnl ### A macro to determine if we have a "MP" type procfs
-AC_DEFUN([AC_MP_PROCFS],
-[AC_MSG_CHECKING(for MP procfs)
-AC_CACHE_VAL(ac_cv_mp_procfs,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <stdio.h>
-#include <signal.h>
-#include <sys/procfs.h>
-
-main()
-{
-	int pid;
-	char proc[32];
-	FILE *ctl;
-	FILE *status;
-	int cmd;
-	struct pstatus pstatus;
-
-	if ((pid = fork()) == 0) {
-		pause();
-		exit(0);
-	}
-	sprintf(proc, "/proc/%d/ctl", pid);
-	if ((ctl = fopen(proc, "w")) == NULL)
-		goto fail;
-	sprintf(proc, "/proc/%d/status", pid);
-	if ((status = fopen (proc, "r")) == NULL)
-		goto fail;
-	cmd = PCSTOP;
-	if (write (fileno (ctl), &cmd, sizeof cmd) < 0)
-		goto fail;
-	if (read (fileno (status), &pstatus, sizeof pstatus) < 0)
-		goto fail;
-	kill(pid, SIGKILL);
-	exit(0);
-fail:
-	kill(pid, SIGKILL);
-	exit(1);
-}
-]])],[ac_cv_mp_procfs=yes],[ac_cv_mp_procfs=no],[
-# Guess or punt.
-case "$host_os" in
-svr4.2*|svr5*)
-	ac_cv_mp_procfs=yes
-	;;
-*)
-	ac_cv_mp_procfs=no
-	;;
-esac
-])])
-AC_MSG_RESULT($ac_cv_mp_procfs)
-if test "$ac_cv_mp_procfs" = yes
-then
-	AC_DEFINE([HAVE_MP_PROCFS], 1,
-[Define if you have a SVR4 MP type procfs.
-I.E. /dev/xxx/ctl, /dev/xxx/status.
-Also implies that you have the pr_lwp member in prstatus.])
-fi
-])
-
-dnl ### A macro to determine if procfs is pollable.
-AC_DEFUN([AC_POLLABLE_PROCFS],
-[AC_MSG_CHECKING(for pollable procfs)
-AC_CACHE_VAL(ac_cv_pollable_procfs,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <stdio.h>
-#include <signal.h>
-#include <sys/procfs.h>
-#include <sys/stropts.h>
-#include <poll.h>
-
-#ifdef HAVE_MP_PROCFS
-#define PIOCSTOP	PCSTOP
-#define POLLWANT	POLLWRNORM
-#define PROC		"/proc/%d/ctl"
-#define PROC_MODE	"w"
-int IOCTL (int fd, int cmd, int arg) {
-	return write (fd, &cmd, sizeof cmd);
-}
-#else
-#define POLLWANT	POLLPRI
-#define	PROC		"/proc/%d"
-#define PROC_MODE	"r+"
-#define IOCTL		ioctl
-#endif
-
-main()
-{
-	int pid;
-	char proc[32];
-	FILE *pfp;
-	struct pollfd pfd;
-
-	if ((pid = fork()) == 0) {
-		pause();
-		exit(0);
-	}
-	sprintf(proc, PROC, pid);
-	if ((pfp = fopen(proc, PROC_MODE)) == NULL)
-		goto fail;
-	if (IOCTL(fileno(pfp), PIOCSTOP, NULL) < 0)
-		goto fail;
-	pfd.fd = fileno(pfp);
-	pfd.events = POLLWANT;
-	if (poll(&pfd, 1, 0) < 0)
-		goto fail;
-	if (!(pfd.revents & POLLWANT))
-		goto fail;
-	kill(pid, SIGKILL);
-	exit(0);
-fail:
-	kill(pid, SIGKILL);
-	exit(1);
-}
-]])],[ac_cv_pollable_procfs=yes],[ac_cv_pollable_procfs=no],[
-# Guess or punt.
-case "$host_os" in
-solaris2*|irix5*|svr4.2uw*|svr5*)
-	ac_cv_pollable_procfs=yes
-	;;
-*)
-	ac_cv_pollable_procfs=no
-	;;
-esac
-])])
-AC_MSG_RESULT($ac_cv_pollable_procfs)
-if test "$ac_cv_pollable_procfs" = yes
-then
-	AC_DEFINE([HAVE_POLLABLE_PROCFS], 1,
-[Define if you have SVR4 and the poll system call works on /proc files.])
-fi
-])
-
-dnl ### A macro to determine if the prstatus structure has a pr_syscall member.
-AC_DEFUN([AC_STRUCT_PR_SYSCALL],
-[AC_MSG_CHECKING(for pr_syscall in struct prstatus)
-AC_CACHE_VAL(ac_cv_struct_pr_syscall,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/procfs.h>]], [[#ifdef HAVE_MP_PROCFS
-pstatus_t s;
-s.pr_lwp.pr_syscall
-#else
-prstatus_t s;
-s.pr_syscall
-#endif]])],[ac_cv_struct_pr_syscall=yes],[ac_cv_struct_pr_syscall=no])])
-AC_MSG_RESULT($ac_cv_struct_pr_syscall)
-if test "$ac_cv_struct_pr_syscall" = yes
-then
-	AC_DEFINE([HAVE_PR_SYSCALL], 1,
-[Define if the prstatus structure in sys/procfs.h has a pr_syscall member.])
-fi
-])
-
-dnl ### A macro to determine whether stat64 is defined.
-AC_DEFUN([AC_STAT64],
-[AC_MSG_CHECKING(for stat64 in (asm|sys)/stat.h)
-AC_CACHE_VAL(ac_cv_type_stat64,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef LINUX
-#include <linux/types.h>
-#include <asm/stat.h>
-#else
-#include <sys/stat.h>
-#endif]], [[struct stat64 st;]])],[ac_cv_type_stat64=yes],[ac_cv_type_stat64=no])])
-AC_MSG_RESULT($ac_cv_type_stat64)
-if test "$ac_cv_type_stat64" = yes
-then
-	AC_DEFINE([HAVE_STAT64], 1,
-[Define if stat64 is available in asm/stat.h.])
-fi
-])
-
-dnl ### A macro to determine if off_t is a long long
-AC_DEFUN([AC_OFF_T_IS_LONG_LONG],
-[AC_MSG_CHECKING(for long long off_t)
-AC_CACHE_VAL(ac_cv_have_long_long_off_t,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/types.h>
-main () {
-	if (sizeof (off_t) == sizeof (long long) &&
-	    sizeof (off_t) > sizeof (long))
-	    return 0;
-	return 1;
-}
-]])],[ac_cv_have_long_long_off_t=yes],[ac_cv_have_long_long_off_t=no],[# Should try to guess here
-ac_cv_have_long_long_off_t=no
-])])
-AC_MSG_RESULT($ac_cv_have_long_long_off_t)
-if test "$ac_cv_have_long_long_off_t" = yes
-then
-	AC_DEFINE([HAVE_LONG_LONG_OFF_T], 1, [Define if off_t is a long long.])
-fi
-])
-
-dnl ### A macro to determine if rlim_t is a long long
-AC_DEFUN([AC_RLIM_T_IS_LONG_LONG],
-[AC_MSG_CHECKING(for long long rlim_t)
-AC_CACHE_VAL(ac_cv_have_long_long_rlim_t,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-main () {
-	if (sizeof (rlim_t) == sizeof (long long) &&
-	    sizeof (rlim_t) > sizeof (long))
-	    return 0;
-	return 1;
-}
-]])],[ac_cv_have_long_long_rlim_t=yes],[ac_cv_have_long_long_rlim_t=no],[# Should try to guess here
-ac_cv_have_long_long_rlim_t=no
-])])
-AC_MSG_RESULT($ac_cv_have_long_long_rlim_t)
-if test "$ac_cv_have_long_long_rlim_t" = yes
-then
-	AC_DEFINE([HAVE_LONG_LONG_RLIM_T], 1, [Define if rlim_t is a long long.])
-fi
-])
-
-dnl ### A macro to determine endianness of long long
-AC_DEFUN([AC_LITTLE_ENDIAN_LONG_LONG],
-[AC_MSG_CHECKING(for little endian long long)
-AC_CACHE_VAL(ac_cv_have_little_endian_long_long,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-int main () {
-	union {
-		long long ll;
-		long l [2];
-	} u;
-	u.ll = 0x12345678;
-	if (u.l[0] == 0x12345678)
-		return 0;
-	return 1;
-}
-]])],[ac_cv_have_little_endian_long_long=yes],[ac_cv_have_little_endian_long_long=no],[# Should try to guess here
-ac_cv_have_little_endian_long_long=no
-])])
-AC_MSG_RESULT($ac_cv_have_little_endian_long_long)
-if test "$ac_cv_have_little_endian_long_long" = yes
-then
-	AC_DEFINE([HAVE_LITTLE_ENDIAN_LONG_LONG], 1,
-[Define if long long is little-endian.])
-fi
-])
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index d5f3158..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,892 +0,0 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Copyright (C) 2002, 2003, 2005  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.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.5])])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  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.
-
-# 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/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# 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 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# 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 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# 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 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# 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 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# 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 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  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.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  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
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-# 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 4
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  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 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# 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 4
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005  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.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  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 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# 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 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  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.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  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
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([acinclude.m4])
diff --git a/android/arch/arm/config.h b/android/arch/arm/config.h
deleted file mode 100644
index 69989af..0000000
--- a/android/arch/arm/config.h
+++ /dev/null
@@ -1,422 +0,0 @@
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define for the Alpha architecture. */
-/* #undef ALPHA */
-
-/* Define for the ARM architecture. */
-#define ARM 1
-
-/* Define for the FreeBSD operating system. */
-/* #undef FREEBSD */
-
-/* Define to the type of elements in the array set by `getgroups'. Usually
-   this is either `int' or `gid_t'. */
-#define GETGROUPS_T gid_t
-
-/* Define to 1 if you have the <asm/reg.h> header file. */
-/* #undef HAVE_ASM_REG_H */
-
-/* Define to 1 if you have the <asm/sigcontext.h> header file. */
-#define HAVE_ASM_SIGCONTEXT_H 1
-
-/* Define to 1 if you have the <asm/sysmips.h> header file. */
-/* #undef HAVE_ASM_SYSMIPS_H */
-
-/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you
-   don't. */
-#define HAVE_DECL_SYS_ERRLIST 1
-
-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
-   don't. */
-#define HAVE_DECL_SYS_SIGLIST 1
-
-/* Define to 1 if you have the declaration of `_sys_siglist', and to 0 if you
-   don't. */
-//ANDROID
-//#define HAVE_DECL__SYS_SIGLIST 1
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the `getdents' function. */
-/* #undef HAVE_GETDENTS */
-
-/* Define to 1 if you have the `if_indextoname' function. */
-#define HAVE_IF_INDEXTONAME 1
-
-/* Define to 1 if you have the `inet_ntop' function. */
-#define HAVE_INET_NTOP 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <ioctls.h> header file. */
-/* #undef HAVE_IOCTLS_H */
-
-/* Define to 1 if you have the <libaio.h> header file. */
-/* #undef HAVE_LIBAIO_H */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
-
-/* Define to 1 if you have the <linux/icmp.h> header file. */
-#define HAVE_LINUX_ICMP_H 1
-
-/* Define to 1 if you have the <linux/if_packet.h> header file. */
-#define HAVE_LINUX_IF_PACKET_H 1
-
-/* Define to 1 if you have the <linux/in6.h> header file. */
-#define HAVE_LINUX_IN6_H 1
-
-/* Define to 1 if you have the <linux/netlink.h> header file. */
-#define HAVE_LINUX_NETLINK_H 1
-
-/* Define to 1 if you have the <linux/ptrace.h> header file. */
-//ANDROID
-//#define HAVE_LINUX_PTRACE_H 1
-
-/* Define to 1 if you have the <linux/utsname.h> header file. */
-#define HAVE_LINUX_UTSNAME_H 1
-
-/* Define if long long is little-endian. */
-#define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-
-/* Define to 1 if the system has the type `long long'. */
-#define HAVE_LONG_LONG 1
-
-/* Define if off_t is a long long. */
-/* #undef HAVE_LONG_LONG_OFF_T */
-
-/* Define if rlim_t is a long long. */
-/* #undef HAVE_LONG_LONG_RLIM_T */
-
-/* Define to 1 if you have the `mctl' function. */
-/* #undef HAVE_MCTL */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have a SVR4 MP type procfs. I.E. /dev/xxx/ctl,
-   /dev/xxx/status. Also implies that you have the pr_lwp member in prstatus.
-   */
-/* #undef HAVE_MP_PROCFS */
-
-/* Define to 1 if you have the <mqueue.h> header file. */
-//ANDROID
-//#define HAVE_MQUEUE_H 1
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the <netinet/udp.h> header file. */
-#define HAVE_NETINET_UDP_H 1
-
-/* Define if you have SVR4 and the poll system call works on /proc files. */
-/* #undef HAVE_POLLABLE_PROCFS */
-
-/* Define to 1 if you have the <poll.h> header file. */
-#define HAVE_POLL_H 1
-
-/* Define to 1 if you have the `prctl' function. */
-#define HAVE_PRCTL 1
-
-/* Define to 1 if you have the `pread' function. */
-#define HAVE_PREAD 1
-
-/* Define if the prstatus structure in sys/procfs.h has a pr_syscall member.
-   */
-/* #undef HAVE_PR_SYSCALL */
-
-/* Define to 1 if you have the `sendmsg' function. */
-#define HAVE_SENDMSG 1
-
-/* Define to 1 if you have the `sigaction' function. */
-#define HAVE_SIGACTION 1
-
-/* Define to 1 if the system has the type `siginfo_t'. */
-#define HAVE_SIGINFO_T 1
-
-/* Define to 1 if the system has the type `sig_atomic_t'. */
-#define HAVE_SIG_ATOMIC_T 1
-
-/* Define if stat64 is available in asm/stat.h. */
-#define HAVE_STAT64 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <stropts.h> header file. */
-//ANDROID
-//#define HAVE_STROPTS_H 1
-
-/* Define to 1 if you have the `strsignal' function. */
-//ANDROID
-#include <sys/cdefs.h>
-#ifdef __BIONIC__
-#define HAVE_STRSIGNAL 1
-#endif
-
-/* Define to 1 if the system has the type `struct ia64_fpreg'. */
-/* #undef HAVE_STRUCT_IA64_FPREG */
-
-/* Define to 1 if `msg_control' is member of `struct msghdr'. */
-#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-
-/* Define to 1 if the system has the type `struct opthdr'. */
-/* #undef HAVE_STRUCT_OPTHDR */
-
-/* Define to 1 if the system has the type `struct pt_all_user_regs'. */
-/* #undef HAVE_STRUCT_PT_ALL_USER_REGS */
-
-/* Define to 1 if `sin6_scope_id' is member of `struct sockaddr_in6'. */
-#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-
-/* Define to 1 if `st_aclcnt' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_ACLCNT */
-
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-
-/* Define to 1 if `st_blocks' is member of `struct stat'. */
-#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-
-/* Define to 1 if `st_flags' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_FLAGS */
-
-/* Define to 1 if `st_fstype' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_FSTYPE */
-
-/* Define to 1 if `st_gen' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_GEN */
-
-/* Define to 1 if `st_level' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_LEVEL */
-
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-
-/* Define to 1 if `ACCEPTOR_id' is member of `struct T_conn_res'. */
-/* #undef HAVE_STRUCT_T_CONN_RES_ACCEPTOR_ID */
-
-/* Define to 1 if `QUEUE_ptr' is member of `struct T_conn_res'. */
-/* #undef HAVE_STRUCT_T_CONN_RES_QUEUE_PTR */
-
-/* Define to 1 if the system has the type `struct t_opthdr'. */
-/* #undef HAVE_STRUCT_T_OPTHDR */
-
-/* Define to 1 if the system has the type `struct user_desc'. */
-#define HAVE_STRUCT_USER_DESC 1
-
-/* Define to 1 if the system has the type `struct __old_kernel_stat'. */
-#define HAVE_STRUCT___OLD_KERNEL_STAT 1
-
-/* Define to 1 if you have the <sys/acl.h> header file. */
-/* #undef HAVE_SYS_ACL_H */
-
-/* Define to 1 if you have the <sys/aio.h> header file. */
-/* #undef HAVE_SYS_AIO_H */
-
-/* Define to 1 if you have the <sys/asynch.h> header file. */
-/* #undef HAVE_SYS_ASYNCH_H */
-
-/* Define to 1 if you have the <sys/conf.h> header file. */
-/* #undef HAVE_SYS_CONF_H */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/door.h> header file. */
-/* #undef HAVE_SYS_DOOR_H */
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-#define HAVE_SYS_EPOLL_H 1 
-/* Define to 1 if you have the <sys/filio.h> header file. */
-/* #undef HAVE_SYS_FILIO_H */
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/nscsys.h> header file. */
-/* #undef HAVE_SYS_NSCSYS_H */
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#define HAVE_SYS_POLL_H 1
-
-/* Define to 1 if you have the <sys/ptrace.h> header file. */
-#define HAVE_SYS_PTRACE_H 1
-
-/* Define to 1 if you have the <sys/reg.h> header file. */
-//ANDROID
-//#define HAVE_SYS_REG_H 1
-
-/* Define to 1 if you have the `sys_siglist' function. */
-#define HAVE_SYS_SIGLIST 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/stream.h> header file. */
-/* #undef HAVE_SYS_STREAM_H */
-
-/* Define to 1 if you have the <sys/sysconfig.h> header file. */
-/* #undef HAVE_SYS_SYSCONFIG_H */
-
-/* Define to 1 if you have the <sys/tihdr.h> header file. */
-/* #undef HAVE_SYS_TIHDR_H */
-
-/* Define to 1 if you have the <sys/tiuser.h> header file. */
-/* #undef HAVE_SYS_TIUSER_H */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-#define HAVE_SYS_VFS_H 1
-
-/* Define to 1 if you have the <termio.h> header file. */
-#define HAVE_TERMIO_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `_sys_siglist' function. */
-//ANDROID
-//#define HAVE__SYS_SIGLIST 1
-
-/* Define for the HPPA architecture. */
-/* #undef HPPA */
-
-/* Define for the i386 architecture. */
-/* #undef I386 */
-
-/* Define for the IA64 architecture. */
-/* #undef IA64 */
-
-/* Define for the Linux operating system. */
-#define LINUX 1
-
-/* Define for the m68k architecture. */
-/* #undef M68K */
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
-   */
-/* #undef MAJOR_IN_MKDEV */
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in
-   <sysmacros.h>. */
-/* #undef MAJOR_IN_SYSMACROS */
-
-/* Define for the MIPS architecture. */
-/* #undef MIPS */
-
-/* Name of package */
-#define PACKAGE "strace"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "strace"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "strace 4.5.12"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "strace"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.5.12"
-
-/* Define for the PowerPC architecture. */
-/* #undef POWERPC */
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define for the S390 architecture. */
-/* #undef S390 */
-
-/* Define for the S390x architecture. */
-/* #undef S390X */
-
-/* Define for the SH architecture. */
-/* #undef SH */
-
-/* Define for the SH64 architecture. */
-/* #undef SH64 */
-
-/* Define for the SPARC architecture. */
-/* #undef SPARC */
-
-/* Define for the SPARC64 architecture. */
-/* #undef SPARC64 */
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define for the SunOS 4.x operating system. */
-/* #undef SUNOS4 */
-
-/* Define if you are have a SPARC with SUNOS4 and your want a version of
-   strace that will work on sun4, sun4c and sun4m kernel architectures. Only
-   useful if you have a symbolic link from machine to /usr/include/sun4 in the
-   compilation directory. */
-/* #undef SUNOS4_KERNEL_ARCH_KLUDGE */
-
-/* Define for the System V release 4 operating system or a derivative like
-   Solaris 2.x or Irix 5.x. */
-/* #undef SVR4 */
-
-/* Define for UnixWare systems. */
-/* #undef UNIXWARE */
-
-/* Version number of package */
-#define VERSION "4.5.12"
-
-/* Define for the AMD x86-64 architecture. */
-/* #undef X86_64 */
-
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef gid_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef mode_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef uid_t */
diff --git a/android/arch/sh/config.h b/android/arch/sh/config.h
deleted file mode 100644
index c151eaf..0000000
--- a/android/arch/sh/config.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define for the Alpha architecture. */
-/* #undef ALPHA */
-
-/* Define for the ARM architecture. */
-/* #undef ARM */
-
-/* Define for the FreeBSD operating system. */
-/* #undef FREEBSD */
-
-/* Define to the type of elements in the array set by `getgroups'. Usually
-   this is either `int' or `gid_t'. */
-#define GETGROUPS_T gid_t
-
-/* Define to 1 if you have the <asm/reg.h> header file. */
-/* #undef HAVE_ASM_REG_H */
-
-/* Define to 1 if you have the <asm/sigcontext.h> header file. */
-#define HAVE_ASM_SIGCONTEXT_H 1
-
-/* Define to 1 if you have the <asm/sysmips.h> header file. */
-/* #undef HAVE_ASM_SYSMIPS_H */
-
-/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you
-   don't. */
-#define HAVE_DECL_SYS_ERRLIST 1
-
-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
-   don't. */
-#define HAVE_DECL_SYS_SIGLIST 1
-
-/* Define to 1 if you have the declaration of `_sys_siglist', and to 0 if you
-   don't. */
-//ANDROID
-//#define HAVE_DECL__SYS_SIGLIST 1
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the `getdents' function. */
-/* #undef HAVE_GETDENTS */
-
-/* Define to 1 if you have the `if_indextoname' function. */
-#define HAVE_IF_INDEXTONAME 1
-
-/* Define to 1 if you have the `inet_ntop' function. */
-#define HAVE_INET_NTOP 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <ioctls.h> header file. */
-/* #undef HAVE_IOCTLS_H */
-
-/* Define to 1 if you have the <libaio.h> header file. */
-/* #undef HAVE_LIBAIO_H */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
-
-/* Define to 1 if you have the <linux/icmp.h> header file. */
-#define HAVE_LINUX_ICMP_H 1
-
-/* Define to 1 if you have the <linux/if_packet.h> header file. */
-#define HAVE_LINUX_IF_PACKET_H 1
-
-/* Define to 1 if you have the <linux/in6.h> header file. */
-#define HAVE_LINUX_IN6_H 1
-
-/* Define to 1 if you have the <linux/netlink.h> header file. */
-#define HAVE_LINUX_NETLINK_H 1
-
-/* Define to 1 if you have the <linux/ptrace.h> header file. */
-//ANDROID
-//#define HAVE_LINUX_PTRACE_H 1
-
-/* Define to 1 if you have the <linux/utsname.h> header file. */
-#define HAVE_LINUX_UTSNAME_H 1
-
-/* Define if long long is little-endian. */
-#define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-
-/* Define to 1 if the system has the type `long long'. */
-#define HAVE_LONG_LONG 1
-
-/* Define if off_t is a long long. */
-/* #undef HAVE_LONG_LONG_OFF_T */
-
-/* Define if rlim_t is a long long. */
-/* #undef HAVE_LONG_LONG_RLIM_T */
-
-/* Define to 1 if you have the `mctl' function. */
-/* #undef HAVE_MCTL */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have a SVR4 MP type procfs. I.E. /dev/xxx/ctl,
-   /dev/xxx/status. Also implies that you have the pr_lwp member in prstatus.
-   */
-/* #undef HAVE_MP_PROCFS */
-
-/* Define to 1 if you have the <mqueue.h> header file. */
-//ANDROID
-//#define HAVE_MQUEUE_H 1
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the <netinet/udp.h> header file. */
-#define HAVE_NETINET_UDP_H 1
-
-/* Define if you have SVR4 and the poll system call works on /proc files. */
-/* #undef HAVE_POLLABLE_PROCFS */
-
-/* Define to 1 if you have the <poll.h> header file. */
-#define HAVE_POLL_H 1
-
-/* Define to 1 if you have the `prctl' function. */
-#define HAVE_PRCTL 1
-
-/* Define to 1 if you have the `pread' function. */
-#define HAVE_PREAD 1
-
-/* Define if the prstatus structure in sys/procfs.h has a pr_syscall member.
-   */
-/* #undef HAVE_PR_SYSCALL */
-
-/* Define to 1 if you have the `sendmsg' function. */
-#define HAVE_SENDMSG 1
-
-/* Define to 1 if you have the `sigaction' function. */
-#define HAVE_SIGACTION 1
-
-/* Define to 1 if the system has the type `siginfo_t'. */
-#define HAVE_SIGINFO_T 1
-
-/* Define to 1 if the system has the type `sig_atomic_t'. */
-#define HAVE_SIG_ATOMIC_T 1
-
-/* Define if stat64 is available in asm/stat.h. */
-#define HAVE_STAT64 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <stropts.h> header file. */
-//ANDROID
-//#define HAVE_STROPTS_H 1
-
-/* Define to 1 if you have the `strsignal' function. */
-//ANDROID
-#include <sys/cdefs.h>
-#ifdef __BIONIC__
-#define HAVE_STRSIGNAL 1
-#endif
-
-/* Define to 1 if the system has the type `struct ia64_fpreg'. */
-/* #undef HAVE_STRUCT_IA64_FPREG */
-
-/* Define to 1 if `msg_control' is member of `struct msghdr'. */
-#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-
-/* Define to 1 if the system has the type `struct opthdr'. */
-/* #undef HAVE_STRUCT_OPTHDR */
-
-/* Define to 1 if the system has the type `struct pt_all_user_regs'. */
-/* #undef HAVE_STRUCT_PT_ALL_USER_REGS */
-
-/* Define to 1 if `sin6_scope_id' is member of `struct sockaddr_in6'. */
-#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-
-/* Define to 1 if `st_aclcnt' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_ACLCNT */
-
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-
-/* Define to 1 if `st_blocks' is member of `struct stat'. */
-#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-
-/* Define to 1 if `st_flags' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_FLAGS */
-
-/* Define to 1 if `st_fstype' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_FSTYPE */
-
-/* Define to 1 if `st_gen' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_GEN */
-
-/* Define to 1 if `st_level' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_LEVEL */
-
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-
-/* Define to 1 if `ACCEPTOR_id' is member of `struct T_conn_res'. */
-/* #undef HAVE_STRUCT_T_CONN_RES_ACCEPTOR_ID */
-
-/* Define to 1 if `QUEUE_ptr' is member of `struct T_conn_res'. */
-/* #undef HAVE_STRUCT_T_CONN_RES_QUEUE_PTR */
-
-/* Define to 1 if the system has the type `struct t_opthdr'. */
-/* #undef HAVE_STRUCT_T_OPTHDR */
-
-/* Define to 1 if the system has the type `struct user_desc'. */
-#define HAVE_STRUCT_USER_DESC 1
-
-/* Define to 1 if the system has the type `struct __old_kernel_stat'. */
-#define HAVE_STRUCT___OLD_KERNEL_STAT 1
-
-/* Define to 1 if you have the <sys/acl.h> header file. */
-/* #undef HAVE_SYS_ACL_H */
-
-/* Define to 1 if you have the <sys/aio.h> header file. */
-/* #undef HAVE_SYS_AIO_H */
-
-/* Define to 1 if you have the <sys/asynch.h> header file. */
-/* #undef HAVE_SYS_ASYNCH_H */
-
-/* Define to 1 if you have the <sys/conf.h> header file. */
-/* #undef HAVE_SYS_CONF_H */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/door.h> header file. */
-/* #undef HAVE_SYS_DOOR_H */
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-#define HAVE_SYS_EPOLL_H 1
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-/* #undef HAVE_SYS_FILIO_H */
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/nscsys.h> header file. */
-/* #undef HAVE_SYS_NSCSYS_H */
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#define HAVE_SYS_POLL_H 1
-
-/* Define to 1 if you have the <sys/ptrace.h> header file. */
-#define HAVE_SYS_PTRACE_H 1
-
-/* Define to 1 if you have the <sys/reg.h> header file. */
-//ANDROID
-//#define HAVE_SYS_REG_H 1
-
-/* Define to 1 if you have the `sys_siglist' function. */
-#define HAVE_SYS_SIGLIST 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/stream.h> header file. */
-/* #undef HAVE_SYS_STREAM_H */
-
-/* Define to 1 if you have the <sys/sysconfig.h> header file. */
-/* #undef HAVE_SYS_SYSCONFIG_H */
-
-/* Define to 1 if you have the <sys/tihdr.h> header file. */
-/* #undef HAVE_SYS_TIHDR_H */
-
-/* Define to 1 if you have the <sys/tiuser.h> header file. */
-/* #undef HAVE_SYS_TIUSER_H */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-#define HAVE_SYS_VFS_H 1
-
-/* Define to 1 if you have the <termio.h> header file. */
-#define HAVE_TERMIO_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `_sys_siglist' function. */
-//ANDROID
-//#define HAVE__SYS_SIGLIST 1
-
-/* Define for the HPPA architecture. */
-/* #undef HPPA */
-
-/* Define for the i386 architecture. */
-/* #undef I386 */
-
-/* Define for the IA64 architecture. */
-/* #undef IA64 */
-
-/* Define for the Linux operating system. */
-#define LINUX 1
-
-/* Define for the m68k architecture. */
-/* #undef M68K */
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
-   */
-/* #undef MAJOR_IN_MKDEV */
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in
-   <sysmacros.h>. */
-/* #undef MAJOR_IN_SYSMACROS */
-
-/* Define for the MIPS architecture. */
-/* #undef MIPS */
-
-/* Name of package */
-#define PACKAGE "strace"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "strace"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "strace 4.5.12"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "strace"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.5.12"
-
-/* Define for the PowerPC architecture. */
-/* #undef POWERPC */
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define for the S390 architecture. */
-/* #undef S390 */
-
-/* Define for the S390x architecture. */
-/* #undef S390X */
-
-/* Define for the SH architecture. */
-#define SH 1
-
-/* Define for the SH64 architecture. */
-/* #undef SH64 */
-
-/* Define for the SPARC architecture. */
-/* #undef SPARC */
-
-/* Define for the SPARC64 architecture. */
-/* #undef SPARC64 */
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define for the SunOS 4.x operating system. */
-/* #undef SUNOS4 */
-
-/* Define if you are have a SPARC with SUNOS4 and your want a version of
-   strace that will work on sun4, sun4c and sun4m kernel architectures. Only
-   useful if you have a symbolic link from machine to /usr/include/sun4 in the
-   compilation directory. */
-/* #undef SUNOS4_KERNEL_ARCH_KLUDGE */
-
-/* Define for the System V release 4 operating system or a derivative like
-   Solaris 2.x or Irix 5.x. */
-/* #undef SVR4 */
-
-/* Define for UnixWare systems. */
-/* #undef UNIXWARE */
-
-/* Version number of package */
-#define VERSION "4.5.12"
-
-/* Define for the AMD x86-64 architecture. */
-/* #undef X86_64 */
-
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef gid_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef mode_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef uid_t */
diff --git a/android/arch/x86/config.h b/android/arch/x86/config.h
deleted file mode 100644
index 2bdaa17..0000000
--- a/android/arch/x86/config.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define for the Alpha architecture. */
-/* #undef ALPHA */
-
-/* Define for the ARM architecture. */
-/* #undef ARM */
-
-/* Define for the FreeBSD operating system. */
-/* #undef FREEBSD */
-
-/* Define to the type of elements in the array set by `getgroups'. Usually
-   this is either `int' or `gid_t'. */
-#define GETGROUPS_T gid_t
-
-/* Define to 1 if you have the <asm/reg.h> header file. */
-/* #undef HAVE_ASM_REG_H */
-
-/* Define to 1 if you have the <asm/sigcontext.h> header file. */
-#define HAVE_ASM_SIGCONTEXT_H 1
-
-/* Define to 1 if you have the <asm/sysmips.h> header file. */
-/* #undef HAVE_ASM_SYSMIPS_H */
-
-/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you
-   don't. */
-#define HAVE_DECL_SYS_ERRLIST 1
-
-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
-   don't. */
-#define HAVE_DECL_SYS_SIGLIST 1
-
-/* Define to 1 if you have the declaration of `_sys_siglist', and to 0 if you
-   don't. */
-//ANDROID
-//#define HAVE_DECL__SYS_SIGLIST 1
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the `getdents' function. */
-/* #undef HAVE_GETDENTS */
-
-/* Define to 1 if you have the `if_indextoname' function. */
-#define HAVE_IF_INDEXTONAME 1
-
-/* Define to 1 if you have the `inet_ntop' function. */
-#define HAVE_INET_NTOP 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <ioctls.h> header file. */
-/* #undef HAVE_IOCTLS_H */
-
-/* Define to 1 if you have the <libaio.h> header file. */
-/* #undef HAVE_LIBAIO_H */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
-
-/* Define to 1 if you have the <linux/icmp.h> header file. */
-#define HAVE_LINUX_ICMP_H 1
-
-/* Define to 1 if you have the <linux/if_packet.h> header file. */
-#define HAVE_LINUX_IF_PACKET_H 1
-
-/* Define to 1 if you have the <linux/in6.h> header file. */
-#define HAVE_LINUX_IN6_H 1
-
-/* Define to 1 if you have the <linux/netlink.h> header file. */
-#define HAVE_LINUX_NETLINK_H 1
-
-/* Define to 1 if you have the <linux/ptrace.h> header file. */
-//ANDROID
-//#define HAVE_LINUX_PTRACE_H 1
-
-/* Define to 1 if you have the <linux/utsname.h> header file. */
-#define HAVE_LINUX_UTSNAME_H 1
-
-/* Define if long long is little-endian. */
-#define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-
-/* Define to 1 if the system has the type `long long'. */
-#define HAVE_LONG_LONG 1
-
-/* Define if off_t is a long long. */
-/* #undef HAVE_LONG_LONG_OFF_T */
-
-/* Define if rlim_t is a long long. */
-/* #undef HAVE_LONG_LONG_RLIM_T */
-
-/* Define to 1 if you have the `mctl' function. */
-/* #undef HAVE_MCTL */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have a SVR4 MP type procfs. I.E. /dev/xxx/ctl,
-   /dev/xxx/status. Also implies that you have the pr_lwp member in prstatus.
-   */
-/* #undef HAVE_MP_PROCFS */
-
-/* Define to 1 if you have the <mqueue.h> header file. */
-//ANDROID
-//#define HAVE_MQUEUE_H 1
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the <netinet/udp.h> header file. */
-#define HAVE_NETINET_UDP_H 1
-
-/* Define if you have SVR4 and the poll system call works on /proc files. */
-/* #undef HAVE_POLLABLE_PROCFS */
-
-/* Define to 1 if you have the <poll.h> header file. */
-#define HAVE_POLL_H 1
-
-/* Define to 1 if you have the `prctl' function. */
-#define HAVE_PRCTL 1
-
-/* Define to 1 if you have the `pread' function. */
-#define HAVE_PREAD 1
-
-/* Define if the prstatus structure in sys/procfs.h has a pr_syscall member.
-   */
-/* #undef HAVE_PR_SYSCALL */
-
-/* Define to 1 if you have the `sendmsg' function. */
-#define HAVE_SENDMSG 1
-
-/* Define to 1 if you have the `sigaction' function. */
-#define HAVE_SIGACTION 1
-
-/* Define to 1 if the system has the type `siginfo_t'. */
-#define HAVE_SIGINFO_T 1
-
-/* Define to 1 if the system has the type `sig_atomic_t'. */
-#define HAVE_SIG_ATOMIC_T 1
-
-/* Define if stat64 is available in asm/stat.h. */
-#define HAVE_STAT64 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <stropts.h> header file. */
-//ANDROID
-//#define HAVE_STROPTS_H 1
-
-/* Define to 1 if you have the `strsignal' function. */
-//ANDROID
-#include <sys/cdefs.h>
-#ifdef __BIONIC__
-#define HAVE_STRSIGNAL 1
-#endif
-
-/* Define to 1 if the system has the type `struct ia64_fpreg'. */
-/* #undef HAVE_STRUCT_IA64_FPREG */
-
-/* Define to 1 if `msg_control' is member of `struct msghdr'. */
-#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-
-/* Define to 1 if the system has the type `struct opthdr'. */
-/* #undef HAVE_STRUCT_OPTHDR */
-
-/* Define to 1 if the system has the type `struct pt_all_user_regs'. */
-/* #undef HAVE_STRUCT_PT_ALL_USER_REGS */
-
-/* Define to 1 if `sin6_scope_id' is member of `struct sockaddr_in6'. */
-#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-
-/* Define to 1 if `st_aclcnt' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_ACLCNT */
-
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-
-/* Define to 1 if `st_blocks' is member of `struct stat'. */
-#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-
-/* Define to 1 if `st_flags' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_FLAGS */
-
-/* Define to 1 if `st_fstype' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_FSTYPE */
-
-/* Define to 1 if `st_gen' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_GEN */
-
-/* Define to 1 if `st_level' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_LEVEL */
-
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-
-/* Define to 1 if `ACCEPTOR_id' is member of `struct T_conn_res'. */
-/* #undef HAVE_STRUCT_T_CONN_RES_ACCEPTOR_ID */
-
-/* Define to 1 if `QUEUE_ptr' is member of `struct T_conn_res'. */
-/* #undef HAVE_STRUCT_T_CONN_RES_QUEUE_PTR */
-
-/* Define to 1 if the system has the type `struct t_opthdr'. */
-/* #undef HAVE_STRUCT_T_OPTHDR */
-
-/* Define to 1 if the system has the type `struct user_desc'. */
-#define HAVE_STRUCT_USER_DESC 1
-
-/* Define to 1 if the system has the type `struct __old_kernel_stat'. */
-#define HAVE_STRUCT___OLD_KERNEL_STAT 1
-
-/* Define to 1 if you have the <sys/acl.h> header file. */
-/* #undef HAVE_SYS_ACL_H */
-
-/* Define to 1 if you have the <sys/aio.h> header file. */
-/* #undef HAVE_SYS_AIO_H */
-
-/* Define to 1 if you have the <sys/asynch.h> header file. */
-/* #undef HAVE_SYS_ASYNCH_H */
-
-/* Define to 1 if you have the <sys/conf.h> header file. */
-/* #undef HAVE_SYS_CONF_H */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/door.h> header file. */
-/* #undef HAVE_SYS_DOOR_H */
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-#define HAVE_SYS_EPOLL_H 1
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-/* #undef HAVE_SYS_FILIO_H */
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/nscsys.h> header file. */
-/* #undef HAVE_SYS_NSCSYS_H */
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#define HAVE_SYS_POLL_H 1
-
-/* Define to 1 if you have the <sys/ptrace.h> header file. */
-#define HAVE_SYS_PTRACE_H 1
-
-/* Define to 1 if you have the <sys/reg.h> header file. */
-//ANDROID
-//#define HAVE_SYS_REG_H 1
-
-/* Define to 1 if you have the `sys_siglist' function. */
-#define HAVE_SYS_SIGLIST 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/stream.h> header file. */
-/* #undef HAVE_SYS_STREAM_H */
-
-/* Define to 1 if you have the <sys/sysconfig.h> header file. */
-/* #undef HAVE_SYS_SYSCONFIG_H */
-
-/* Define to 1 if you have the <sys/tihdr.h> header file. */
-/* #undef HAVE_SYS_TIHDR_H */
-
-/* Define to 1 if you have the <sys/tiuser.h> header file. */
-/* #undef HAVE_SYS_TIUSER_H */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-#define HAVE_SYS_VFS_H 1
-
-/* Define to 1 if you have the <termio.h> header file. */
-#define HAVE_TERMIO_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `_sys_siglist' function. */
-//ANDROID
-//#define HAVE__SYS_SIGLIST 1
-
-/* Define for the HPPA architecture. */
-/* #undef HPPA */
-
-/* Define for the i386 architecture. */
-#define I386 1
-
-/* Define for the IA64 architecture. */
-/* #undef IA64 */
-
-/* Define for the Linux operating system. */
-#define LINUX 1
-
-/* Define for the m68k architecture. */
-/* #undef M68K */
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
-   */
-/* #undef MAJOR_IN_MKDEV */
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in
-   <sysmacros.h>. */
-/* #undef MAJOR_IN_SYSMACROS */
-
-/* Define for the MIPS architecture. */
-/* #undef MIPS */
-
-/* Name of package */
-#define PACKAGE "strace"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "strace"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "strace 4.5.12"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "strace"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.5.12"
-
-/* Define for the PowerPC architecture. */
-/* #undef POWERPC */
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define for the S390 architecture. */
-/* #undef S390 */
-
-/* Define for the S390x architecture. */
-/* #undef S390X */
-
-/* Define for the SH architecture. */
-/* #undef SH */
-
-/* Define for the SH64 architecture. */
-/* #undef SH64 */
-
-/* Define for the SPARC architecture. */
-/* #undef SPARC */
-
-/* Define for the SPARC64 architecture. */
-/* #undef SPARC64 */
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define for the SunOS 4.x operating system. */
-/* #undef SUNOS4 */
-
-/* Define if you are have a SPARC with SUNOS4 and your want a version of
-   strace that will work on sun4, sun4c and sun4m kernel architectures. Only
-   useful if you have a symbolic link from machine to /usr/include/sun4 in the
-   compilation directory. */
-/* #undef SUNOS4_KERNEL_ARCH_KLUDGE */
-
-/* Define for the System V release 4 operating system or a derivative like
-   Solaris 2.x or Irix 5.x. */
-/* #undef SVR4 */
-
-/* Define for UnixWare systems. */
-/* #undef UNIXWARE */
-
-/* Version number of package */
-#define VERSION "4.5.12"
-
-/* Define for the AMD x86-64 architecture. */
-/* #undef X86_64 */
-
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef gid_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef mode_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef uid_t */
diff --git a/arm-eabi.patch b/arm-eabi.patch
deleted file mode 100644
index 53e27f8..0000000
--- a/arm-eabi.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-2006-03-30  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* process.c (change_syscall): Add ARM support.
-	* syscall.c (get_scno): Handle ARM EABI.
-
-Index: strace/process.c
-===================================================================
---- strace.orig/process.c	2006-03-30 17:36:14.000000000 -0500
-+++ strace/process.c	2006-03-30 17:44:16.000000000 -0500
-@@ -694,6 +694,16 @@ int new;
-                                    0x100000 | new) < 0)
-                        return -1;
-        return 0;
-+#elif defined(ARM)
-+       /* Some kernels support this, some (pre-2.6.16 or so) don't.  */
-+# ifndef PTRACE_SET_SYSCALL
-+#  define PTRACE_SET_SYSCALL 23
-+# endif
-+
-+       if (ptrace (PTRACE_SET_SYSCALL, tcp->pid, 0, new) != 0)
-+		return -1;
-+
-+       return 0;
- #else
- #warning Do not know how to handle change_syscall for this architecture
- #endif /* architecture */
-Index: strace/syscall.c
-===================================================================
---- strace.orig/syscall.c	2006-03-30 17:36:14.000000000 -0500
-+++ strace/syscall.c	2006-03-30 17:44:16.000000000 -0500
-@@ -1108,16 +1108,25 @@ struct tcb *tcp;
- 				return 0;
- 			}
- 
--			if ((scno & 0x0ff00000) != 0x0f900000) {
--				fprintf(stderr, "syscall: unknown syscall trap 0x%08lx\n",
--					scno);
--				return -1;
--			}
-+			/* Handle the EABI syscall convention.  We do not
-+			   bother converting structures between the two
-+			   ABIs, but basic functionality should work even
-+			   if strace and the traced program have different
-+			   ABIs.  */
-+			if (scno == 0xef000000) {
-+				scno = regs.ARM_r7;
-+			} else {
-+				if ((scno & 0x0ff00000) != 0x0f900000) {
-+					fprintf(stderr, "syscall: unknown syscall trap 0x%08lx\n",
-+						scno);
-+					return -1;
-+				}
- 
--			/*
--			 * Fixup the syscall number
--			 */
--			scno &= 0x000fffff;
-+				/*
-+				 * Fixup the syscall number
-+				 */
-+				scno &= 0x000fffff;
-+			}
- 		}
- 
- 		if (tcp->flags & TCB_INSYSCALL) {
diff --git a/bjm.c b/bjm.c
index 20085c5..225b422 100644
--- a/bjm.c
+++ b/bjm.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: bjm.c,v 1.15 2005/06/01 19:02:37 roland Exp $
+ *	$Id$
  */
 #include "defs.h"
 
@@ -100,52 +100,54 @@
 };
 
 int
-sys_query_module(tcp)
-struct tcb *tcp;
+sys_query_module(struct tcb *tcp)
 {
-
-	if (exiting(tcp)) {
+	if (entering(tcp)) {
 		printstr(tcp, tcp->u_arg[0], -1);
 		tprintf(", ");
 		printxval(which, tcp->u_arg[1], "QM_???");
 		tprintf(", ");
-		if (!verbose(tcp)) {
-			tprintf("%#lx, %lu, %#lx", tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[4]);
-		} else if (tcp->u_rval!=0) {
-			size_t	ret;
-			umove(tcp, tcp->u_arg[4], &ret);
-			tprintf("%#lx, %lu, %Zu", tcp->u_arg[2], tcp->u_arg[3], ret);
+	} else {
+		size_t ret;
+
+		if (!verbose(tcp) || syserror(tcp) ||
+		    umove(tcp, tcp->u_arg[4], &ret) < 0) {
+			tprintf("%#lx, %lu, %#lx", tcp->u_arg[2],
+				tcp->u_arg[3], tcp->u_arg[4]);
 		} else if (tcp->u_arg[1]==QM_INFO) {
 			struct module_info	mi;
-			size_t			ret;
-			umove(tcp, tcp->u_arg[2], &mi);
-			tprintf("{address=%#lx, size=%lu, flags=", mi.addr, mi.size);
-			printflags(modflags, mi.flags, "MOD_???");
-			tprintf(", usecount=%lu}", mi.usecount);
-			umove(tcp, tcp->u_arg[4], &ret);
-			tprintf(", %Zu", ret);
+			if (umove(tcp, tcp->u_arg[2], &mi) < 0) {
+				tprintf("%#lx, ", tcp->u_arg[2]);
+			} else {
+				tprintf("{address=%#lx, size=%lu, flags=",
+					mi.addr, mi.size);
+				printflags(modflags, mi.flags, "MOD_???");
+				tprintf(", usecount=%lu}, ", mi.usecount);
+			}
+			tprintf("%Zu", ret);
 		} else if ((tcp->u_arg[1]==QM_MODULES) ||
-			       	(tcp->u_arg[1]==QM_DEPS) ||
-			       	(tcp->u_arg[1]==QM_REFS)) {
-			size_t	ret;
-
-			umove(tcp, tcp->u_arg[4], &ret);
+			   (tcp->u_arg[1]==QM_DEPS) ||
+			   (tcp->u_arg[1]==QM_REFS)) {
 			tprintf("{");
 			if (!abbrev(tcp)) {
-				char*	data	= (char*)malloc(tcp->u_arg[3]);
+				char*	data	= malloc(tcp->u_arg[3]);
 				char*	mod	= data;
 				size_t	idx;
 
-				if (data==NULL) {
+				if (!data) {
 					fprintf(stderr, "out of memory\n");
 					tprintf(" /* %Zu entries */ ", ret);
 				} else {
-					umoven(tcp, tcp->u_arg[2], tcp->u_arg[3], data);
-					for (idx=0; idx<ret; idx++) {
-						if (idx!=0)
-							tprintf(",");
-						tprintf("%s", mod);
-						mod+=strlen(mod)+1;
+					if (umoven(tcp, tcp->u_arg[2],
+						tcp->u_arg[3], data) < 0) {
+						tprintf(" /* %Zu entries */ ", ret);
+					} else {
+						for (idx=0; idx<ret; idx++) {
+							tprintf("%s%s",
+								(idx ? ", " : ""),
+								mod);
+							mod += strlen(mod)+1;
+						}
 					}
 					free(data);
 				}
@@ -153,22 +155,27 @@
 				tprintf(" /* %Zu entries */ ", ret);
 			tprintf("}, %Zu", ret);
 		} else if (tcp->u_arg[1]==QM_SYMBOLS) {
-			size_t	ret;
-			umove(tcp, tcp->u_arg[4], &ret);
 			tprintf("{");
 			if (!abbrev(tcp)) {
-				char*			data	= (char *)malloc(tcp->u_arg[3]);
+				char*			data	= malloc(tcp->u_arg[3]);
 				struct module_symbol*	sym	= (struct module_symbol*)data;
 				size_t			idx;
 
-				if (data==NULL) {
+				if (!data) {
 					fprintf(stderr, "out of memory\n");
 					tprintf(" /* %Zu entries */ ", ret);
 				} else {
-					umoven(tcp, tcp->u_arg[2], tcp->u_arg[3], data);
-					for (idx=0; idx<ret; idx++) {
-						tprintf("{name=%s, value=%lu} ", data+(long)sym->name, sym->value);
-						sym++;
+					if (umoven(tcp, tcp->u_arg[2],
+						tcp->u_arg[3], data) < 0) {
+						tprintf(" /* %Zu entries */ ", ret);
+					} else {
+						for (idx=0; idx<ret; idx++) {
+							tprintf("%s{name=%s, value=%lu}",
+								(idx ? " " : ""),
+								data+(long)sym->name,
+								sym->value);
+							sym++;
+						}
 					}
 					free(data);
 				}
@@ -199,8 +206,9 @@
 struct tcb *tcp;
 {
 	if (entering(tcp)) {
-		printpath(tcp, tcp->u_arg[0]);
-		tprintf(", %#lx", tcp->u_arg[1]);
+		tprintf("%#lx, ", tcp->u_arg[0]);
+		tprintf("%lu, ", tcp->u_arg[1]);
+		printstr(tcp, tcp->u_arg[2], -1);
 	}
 	return 0;
 }
diff --git a/block.c b/block.c
new file mode 100644
index 0000000..807c849
--- /dev/null
+++ b/block.c
@@ -0,0 +1,283 @@
+/*
+ * Copyright (c) 2009, 2010 Jeff Mahoney <jeffm@suse.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "defs.h"
+#ifdef LINUX
+#include <stdint.h>
+#include <inttypes.h>
+#include <linux/blkpg.h>
+#include <linux/fs.h>
+#include <linux/hdreg.h>
+
+/* ioctls <= 114 are present in Linux 2.4. The following ones have been
+ * added since then and headers containing them may not be available on
+ * every system. */
+
+#define BLKTRACE_BDEV_SIZE      32
+struct blk_user_trace_setup {
+	char name[BLKTRACE_BDEV_SIZE];	/* output */
+	uint16_t act_mask;		/* input */
+	uint32_t buf_size;		/* input */
+	uint32_t buf_nr;		/* input */
+	uint64_t start_lba;
+	uint64_t end_lba;
+	uint32_t pid;
+};
+
+#ifndef BLKTRACESETUP
+#define BLKTRACESETUP _IOWR(0x12,115,struct blk_user_trace_setup)
+#endif
+#ifndef BLKTRACESTART
+#define BLKTRACESTART _IO(0x12,116)
+#endif
+#ifndef BLKTRACESTART
+#define BLKTRACESTOP _IO(0x12,117)
+#endif
+#ifndef BLKTRACETEARDOWN
+#define BLKTRACETEARDOWN _IO(0x12,118)
+#endif
+#ifndef BLKDISCARD
+#define BLKDISCARD _IO(0x12,119)
+#endif
+#ifndef BLKIOMIN
+#define BLKIOMIN _IO(0x12,120)
+#endif
+#ifndef BLKIOOPT
+#define BLKIOOPT _IO(0x12,121)
+#endif
+#ifndef BLKALIGNOFF
+#define BLKALIGNOFF _IO(0x12,122)
+#endif
+#ifndef BLKPBSZGET
+#define BLKPBSZGET _IO(0x12,123)
+#endif
+#ifndef BLKDISCARDZEROES
+#define BLKDISCARDZEROES _IO(0x12,124)
+#endif
+#ifndef BLKSECDISCARD
+#define BLKSECDISCARD _IO(0x12,125)
+#endif
+
+static const struct xlat blkpg_ops[] = {
+	{ BLKPG_ADD_PARTITION,	"BLKPG_ADD_PARTITION", },
+	{ BLKPG_DEL_PARTITION,	"BLKPG_DEL_PARTITION", },
+	{ 0,			NULL },
+};
+
+static void
+print_blkpg_req(struct tcb *tcp, struct blkpg_ioctl_arg *blkpg)
+{
+	struct blkpg_partition p;
+
+	tprintf("{");
+	printxval(blkpg_ops, blkpg->op, "BLKPG_???");
+
+	tprintf(", flags=%d, datalen=%d, ",
+		blkpg->flags, blkpg->datalen);
+
+	if (umove(tcp, (long) blkpg->data, &p) < 0)
+		tprintf("%#lx}", (long) blkpg->data);
+	else
+		tprintf("{start=%lld, length=%lld, pno=%d, "
+			"devname=\"%.*s\", volname=\"%.*s\"}}",
+			p.start, p.length, p.pno,
+			(int) sizeof(p.devname), p.devname,
+			(int) sizeof(p.volname), p.volname);
+}
+
+int
+block_ioctl(struct tcb *tcp, long code, long arg)
+{
+	switch (code) {
+	/* take arg as a value, not as a pointer */
+	case BLKRASET:
+	case BLKFRASET:
+		if (entering(tcp))
+			tprintf(", %ld", arg);
+		break;
+
+	/* take a signed int */
+	case BLKROSET:
+	case BLKBSZSET:
+		if (entering(tcp)) {
+			int val;
+			if (umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %d", val);
+		}
+		break;
+
+	/* returns an unsigned short */
+	case BLKSECTGET:
+		if (exiting(tcp)) {
+			unsigned short val;
+			if (syserror(tcp) || umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %hu", val);
+		}
+		break;
+
+	/* return a signed int */
+	case BLKROGET:
+	case BLKBSZGET:
+	case BLKSSZGET:
+	case BLKALIGNOFF:
+		if (exiting(tcp)) {
+			int val;
+			if (syserror(tcp) || umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %d", val);
+		}
+		break;
+
+	/* return an unsigned int */
+	case BLKPBSZGET:
+	case BLKIOMIN:
+	case BLKIOOPT:
+	case BLKDISCARDZEROES:
+		if (exiting(tcp)) {
+			unsigned int val;
+			if (syserror(tcp) || umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %u", val);
+		}
+		break;
+
+	/* return a signed long */
+	case BLKRAGET:
+	case BLKFRAGET:
+		if (exiting(tcp)) {
+			long val;
+			if (syserror(tcp) || umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %ld", val);
+		}
+		break;
+
+	/* returns an unsigned long */
+	case BLKGETSIZE:
+		if (exiting(tcp)) {
+			unsigned long val;
+			if (syserror(tcp) || umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %lu", val);
+			}
+		break;
+
+	/* return an uint64_t */
+	case BLKGETSIZE64:
+		if (exiting(tcp)) {
+			uint64_t val;
+			if (syserror(tcp) || umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %" PRIu64, val);
+		}
+		break;
+
+	/* More complex types */
+	case BLKDISCARD:
+	case BLKSECDISCARD:
+		if (entering(tcp)) {
+			uint64_t range[2];
+			if (umove(tcp, arg, range) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", {%" PRIx64 ", %" PRIx64 "}",
+					range[0], range[1]);
+		}
+		break;
+
+	case HDIO_GETGEO:
+		if (exiting(tcp)) {
+			struct hd_geometry geo;
+			if (syserror(tcp) || umove(tcp, arg, &geo) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", {heads=%hhu, sectors=%hhu, "
+					"cylinders=%hu, start=%lu}",
+					geo.heads, geo.sectors,
+					geo.cylinders, geo.start);
+		}
+		break;
+
+	case BLKPG:
+		if (entering(tcp)) {
+			struct blkpg_ioctl_arg blkpg;
+			if (umove(tcp, arg, &blkpg) < 0)
+				tprintf(", %#lx", arg);
+			else {
+				tprintf(", ");
+				print_blkpg_req(tcp, &blkpg);
+			}
+		}
+		break;
+
+	case BLKTRACESETUP:
+		if (entering(tcp)) {
+			struct blk_user_trace_setup buts;
+			if (umove(tcp, arg, &buts) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", {act_mask=%hu, buf_size=%u, "
+					"buf_nr=%u, start_lba=%" PRIu64 ", "
+					"end_lba=%" PRIu64 ", pid=%u}",
+					buts.act_mask, buts.buf_size,
+					buts.buf_nr, buts.start_lba,
+					buts.end_lba, buts.pid);
+		}
+		if (exiting(tcp)) {
+			struct blk_user_trace_setup buts;
+			if (syserror(tcp) || umove(tcp, arg, &buts) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", {name=\"%.*s\"}",
+					(int) sizeof(buts.name), buts.name);
+		}
+		break;
+
+	/* No arguments or unhandled */
+	case BLKTRACESTART:
+	case BLKTRACESTOP:
+	case BLKTRACETEARDOWN:
+	case BLKFLSBUF: /* Requires driver knowlege */
+	case BLKRRPART: /* No args */
+	default:
+		if (entering(tcp))
+			tprintf(", %#lx", arg);
+		break;
+
+	};
+	return 1;
+}
+#endif /* LINUX */
diff --git a/config.guess b/config.guess
deleted file mode 100755
index 8229471..0000000
--- a/config.guess
+++ /dev/null
@@ -1,1453 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-timestamp='2004-11-12'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit 0 ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit 0 ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit 0 ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 4204290..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,412 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define for the Alpha architecture. */
-#undef ALPHA
-
-/* Define for the ARM architecture. */
-#undef ARM
-
-/* Define for the FreeBSD operating system. */
-#undef FREEBSD
-
-/* Define to the type of elements in the array set by `getgroups'. Usually
-   this is either `int' or `gid_t'. */
-#undef GETGROUPS_T
-
-/* Define to 1 if you have the <asm/reg.h> header file. */
-#undef HAVE_ASM_REG_H
-
-/* Define to 1 if you have the <asm/sigcontext.h> header file. */
-#undef HAVE_ASM_SIGCONTEXT_H
-
-/* Define to 1 if you have the <asm/sysmips.h> header file. */
-#undef HAVE_ASM_SYSMIPS_H
-
-/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you
-   don't. */
-#undef HAVE_DECL_SYS_ERRLIST
-
-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
-   don't. */
-#undef HAVE_DECL_SYS_SIGLIST
-
-/* Define to 1 if you have the declaration of `_sys_siglist', and to 0 if you
-   don't. */
-#undef HAVE_DECL__SYS_SIGLIST
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the `getdents' function. */
-#undef HAVE_GETDENTS
-
-/* Define to 1 if you have the `if_indextoname' function. */
-#undef HAVE_IF_INDEXTONAME
-
-/* Define to 1 if you have the `inet_ntop' function. */
-#undef HAVE_INET_NTOP
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <ioctls.h> header file. */
-#undef HAVE_IOCTLS_H
-
-/* Define to 1 if you have the <libaio.h> header file. */
-#undef HAVE_LIBAIO_H
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-#undef HAVE_LIBNSL
-
-/* Define to 1 if you have the <linux/icmp.h> header file. */
-#undef HAVE_LINUX_ICMP_H
-
-/* Define to 1 if you have the <linux/if_packet.h> header file. */
-#undef HAVE_LINUX_IF_PACKET_H
-
-/* Define to 1 if you have the <linux/in6.h> header file. */
-#undef HAVE_LINUX_IN6_H
-
-/* Define to 1 if you have the <linux/netlink.h> header file. */
-#undef HAVE_LINUX_NETLINK_H
-
-/* Define to 1 if you have the <linux/ptrace.h> header file. */
-#undef HAVE_LINUX_PTRACE_H
-
-/* Define to 1 if you have the <linux/utsname.h> header file. */
-#undef HAVE_LINUX_UTSNAME_H
-
-/* Define if long long is little-endian. */
-#undef HAVE_LITTLE_ENDIAN_LONG_LONG
-
-/* Define to 1 if the system has the type `long long'. */
-#undef HAVE_LONG_LONG
-
-/* Define if off_t is a long long. */
-#undef HAVE_LONG_LONG_OFF_T
-
-/* Define if rlim_t is a long long. */
-#undef HAVE_LONG_LONG_RLIM_T
-
-/* Define to 1 if you have the `mctl' function. */
-#undef HAVE_MCTL
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if you have a SVR4 MP type procfs. I.E. /dev/xxx/ctl,
-   /dev/xxx/status. Also implies that you have the pr_lwp member in prstatus.
-   */
-#undef HAVE_MP_PROCFS
-
-/* Define to 1 if you have the <mqueue.h> header file. */
-#undef HAVE_MQUEUE_H
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#undef HAVE_NETINET_TCP_H
-
-/* Define to 1 if you have the <netinet/udp.h> header file. */
-#undef HAVE_NETINET_UDP_H
-
-/* Define if you have SVR4 and the poll system call works on /proc files. */
-#undef HAVE_POLLABLE_PROCFS
-
-/* Define to 1 if you have the <poll.h> header file. */
-#undef HAVE_POLL_H
-
-/* Define to 1 if you have the `prctl' function. */
-#undef HAVE_PRCTL
-
-/* Define to 1 if you have the `pread' function. */
-#undef HAVE_PREAD
-
-/* Define if the prstatus structure in sys/procfs.h has a pr_syscall member.
-   */
-#undef HAVE_PR_SYSCALL
-
-/* Define to 1 if you have the `sendmsg' function. */
-#undef HAVE_SENDMSG
-
-/* Define to 1 if you have the `sigaction' function. */
-#undef HAVE_SIGACTION
-
-/* Define to 1 if the system has the type `siginfo_t'. */
-#undef HAVE_SIGINFO_T
-
-/* Define to 1 if the system has the type `sig_atomic_t'. */
-#undef HAVE_SIG_ATOMIC_T
-
-/* Define if stat64 is available in asm/stat.h. */
-#undef HAVE_STAT64
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <stropts.h> header file. */
-#undef HAVE_STROPTS_H
-
-/* Define to 1 if you have the `strsignal' function. */
-#undef HAVE_STRSIGNAL
-
-/* Define to 1 if the system has the type `struct ia64_fpreg'. */
-#undef HAVE_STRUCT_IA64_FPREG
-
-/* Define to 1 if `msg_control' is member of `struct msghdr'. */
-#undef HAVE_STRUCT_MSGHDR_MSG_CONTROL
-
-/* Define to 1 if the system has the type `struct opthdr'. */
-#undef HAVE_STRUCT_OPTHDR
-
-/* Define to 1 if the system has the type `struct pt_all_user_regs'. */
-#undef HAVE_STRUCT_PT_ALL_USER_REGS
-
-/* Define to 1 if `sin6_scope_id' is member of `struct sockaddr_in6'. */
-#undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
-
-/* Define to 1 if `st_aclcnt' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_ACLCNT
-
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_BLKSIZE
-
-/* Define to 1 if `st_blocks' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_BLOCKS
-
-/* Define to 1 if `st_flags' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_FLAGS
-
-/* Define to 1 if `st_fstype' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_FSTYPE
-
-/* Define to 1 if `st_gen' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_GEN
-
-/* Define to 1 if `st_level' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_LEVEL
-
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_RDEV
-
-/* Define to 1 if `ACCEPTOR_id' is member of `struct T_conn_res'. */
-#undef HAVE_STRUCT_T_CONN_RES_ACCEPTOR_ID
-
-/* Define to 1 if `QUEUE_ptr' is member of `struct T_conn_res'. */
-#undef HAVE_STRUCT_T_CONN_RES_QUEUE_PTR
-
-/* Define to 1 if the system has the type `struct t_opthdr'. */
-#undef HAVE_STRUCT_T_OPTHDR
-
-/* Define to 1 if the system has the type `struct user_desc'. */
-#undef HAVE_STRUCT_USER_DESC
-
-/* Define to 1 if the system has the type `struct __old_kernel_stat'. */
-#undef HAVE_STRUCT___OLD_KERNEL_STAT
-
-/* Define to 1 if you have the <sys/acl.h> header file. */
-#undef HAVE_SYS_ACL_H
-
-/* Define to 1 if you have the <sys/aio.h> header file. */
-#undef HAVE_SYS_AIO_H
-
-/* Define to 1 if you have the <sys/asynch.h> header file. */
-#undef HAVE_SYS_ASYNCH_H
-
-/* Define to 1 if you have the <sys/conf.h> header file. */
-#undef HAVE_SYS_CONF_H
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/door.h> header file. */
-#undef HAVE_SYS_DOOR_H
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-#undef HAVE_SYS_EPOLL_H
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-#undef HAVE_SYS_FILIO_H
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_NDIR_H
-
-/* Define to 1 if you have the <sys/nscsys.h> header file. */
-#undef HAVE_SYS_NSCSYS_H
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#undef HAVE_SYS_POLL_H
-
-/* Define to 1 if you have the <sys/ptrace.h> header file. */
-#undef HAVE_SYS_PTRACE_H
-
-/* Define to 1 if you have the <sys/reg.h> header file. */
-#undef HAVE_SYS_REG_H
-
-/* Define to 1 if you have the `sys_siglist' function. */
-#undef HAVE_SYS_SIGLIST
-
-/* 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/stream.h> header file. */
-#undef HAVE_SYS_STREAM_H
-
-/* Define to 1 if you have the <sys/sysconfig.h> header file. */
-#undef HAVE_SYS_SYSCONFIG_H
-
-/* Define to 1 if you have the <sys/tihdr.h> header file. */
-#undef HAVE_SYS_TIHDR_H
-
-/* Define to 1 if you have the <sys/tiuser.h> header file. */
-#undef HAVE_SYS_TIUSER_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#undef HAVE_SYS_UIO_H
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-#undef HAVE_SYS_VFS_H
-
-/* Define to 1 if you have the <termio.h> header file. */
-#undef HAVE_TERMIO_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `_sys_siglist' function. */
-#undef HAVE__SYS_SIGLIST
-
-/* Define for the HPPA architecture. */
-#undef HPPA
-
-/* Define for the i386 architecture. */
-#undef I386
-
-/* Define for the IA64 architecture. */
-#undef IA64
-
-/* Define for the Linux operating system. */
-#undef LINUX
-
-/* Define for the m68k architecture. */
-#undef M68K
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
-   */
-#undef MAJOR_IN_MKDEV
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in
-   <sysmacros.h>. */
-#undef MAJOR_IN_SYSMACROS
-
-/* Define for the MIPS architecture. */
-#undef MIPS
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define for the PowerPC architecture. */
-#undef POWERPC
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* Define for the S390 architecture. */
-#undef S390
-
-/* Define for the S390x architecture. */
-#undef S390X
-
-/* Define for the SH architecture. */
-#undef SH
-
-/* Define for the SH64 architecture. */
-#undef SH64
-
-/* Define for the SPARC architecture. */
-#undef SPARC
-
-/* Define for the SPARC64 architecture. */
-#undef SPARC64
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-#undef STAT_MACROS_BROKEN
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define for the SunOS 4.x operating system. */
-#undef SUNOS4
-
-/* Define if you are have a SPARC with SUNOS4 and your want a version of
-   strace that will work on sun4, sun4c and sun4m kernel architectures. Only
-   useful if you have a symbolic link from machine to /usr/include/sun4 in the
-   compilation directory. */
-#undef SUNOS4_KERNEL_ARCH_KLUDGE
-
-/* Define for the System V release 4 operating system or a derivative like
-   Solaris 2.x or Irix 5.x. */
-#undef SVR4
-
-/* Define for UnixWare systems. */
-#undef UNIXWARE
-
-/* Version number of package */
-#undef VERSION
-
-/* Define for the AMD x86-64 architecture. */
-#undef X86_64
-
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef gid_t
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef mode_t
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef uid_t
diff --git a/config.log b/config.log
deleted file mode 100644
index 98b732b..0000000
--- a/config.log
+++ /dev/null
@@ -1,5401 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by strace configure 4.5.12, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ ./configure --prefix=/data/ --build=arm-unknown-linux-gnu
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = skywriting.corp.google.com
-uname -m = x86_64
-uname -r = 2.6.18.5-gg19workstation-mixed64-32
-uname -s = Linux
-uname -v = #1 SMP Tue Nov 20 16:02:52 PST 2007
-
-/usr/bin/uname -p = unknown
-/bin/uname -X     = unknown
-
-/bin/arch              = x86_64
-/usr/bin/arch -k       = unknown
-/usr/convex/getsysinfo = unknown
-hostinfo               = unknown
-/bin/machine           = unknown
-/usr/bin/oslevel       = unknown
-/bin/universe          = unknown
-
-PATH: /usr/local/symlinks
-PATH: /usr/local/scripts
-PATH: /usr/local/sbin
-PATH: /usr/local/bin
-PATH: /usr/sbin
-PATH: /usr/bin
-PATH: /sbin
-PATH: /bin
-PATH: /usr/bin/X11
-PATH: /android/device/prebuilt/Linux/toolchain/bin/
-PATH: /home/mkf/bin
-PATH: /android/device/out/host/linux-x86/bin
-PATH: /android/device/prebuilt/Linux/toolchain/arm-elf
-PATH: /android/device/tools/qtools
-PATH: /android/device/prebuilt/Linux/toolchain-eabi-4.2.1/bin
-PATH: /android/device/prebuilt/Linux/toolchain-eabi-4.2.1/bin
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-configure:1358: checking for a BSD-compatible install
-configure:1413: result: /usr/bin/install -c
-configure:1424: checking whether build environment is sane
-configure:1467: result: yes
-configure:1532: checking for gawk
-configure:1548: found /usr/bin/gawk
-configure:1558: result: gawk
-configure:1568: checking whether make sets $(MAKE)
-configure:1588: result: yes
-configure:1756: checking whether to enable maintainer-specific portions of Makefiles
-configure:1765: result: no
-configure:1786: checking build system type
-configure:1804: result: arm-unknown-linux-gnu
-configure:1812: checking host system type
-configure:1826: result: arm-unknown-linux-gnu
-configure:1835: checking for supported operating system
-configure:1894: result: linux
-configure:1897: checking for supported architecture
-configure:2028: result: arm
-configure:2141: checking for gcc
-configure:2157: found /usr/bin/gcc
-configure:2167: result: gcc
-configure:2411: checking for C compiler version
-configure:2414: gcc --version </dev/null >&5
-gcc (GCC) 4.0.3 (Ubuntu 4.0.3-1ubuntu5)
-Copyright (C) 2006 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:2417: $? = 0
-configure:2419: gcc -v </dev/null >&5
-Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --enable-languages=c,c++,java,f95,objc,ada,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.0 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-java-awt=gtk-default --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/jre --enable-mpfr --disable-werror --with-tune=pentium4 --enable-checking=release i486-linux-gnu
-Thread model: posix
-gcc version 4.0.3 (Ubuntu 4.0.3-1ubuntu5)
-configure:2422: $? = 0
-configure:2424: gcc -V </dev/null >&5
-gcc: '-V' option must have argument
-configure:2427: $? = 1
-configure:2450: checking for C compiler default output file name
-configure:2453: gcc -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:2456: $? = 0
-configure:2502: result: a.out
-configure:2507: checking whether the C compiler works
-configure:2513: ./a.out
-configure:2516: $? = 0
-configure:2533: result: yes
-configure:2540: checking whether we are cross compiling
-configure:2542: result: no
-configure:2545: checking for suffix of executables
-configure:2547: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:2550: $? = 0
-configure:2575: result: 
-configure:2581: checking for suffix of object files
-configure:2602: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:2605: $? = 0
-configure:2627: result: o
-configure:2631: checking whether we are using the GNU C compiler
-configure:2655: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:2661: $? = 0
-configure:2665: test -z 
-			 || test ! -s conftest.err
-configure:2668: $? = 0
-configure:2671: test -s conftest.o
-configure:2674: $? = 0
-configure:2687: result: yes
-configure:2693: checking whether gcc accepts -g
-configure:2714: gcc -c -g  conftest.c >&5
-configure:2720: $? = 0
-configure:2724: test -z 
-			 || test ! -s conftest.err
-configure:2727: $? = 0
-configure:2730: test -s conftest.o
-configure:2733: $? = 0
-configure:2744: result: yes
-configure:2761: checking for gcc option to accept ANSI C
-configure:2831: gcc  -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:2837: $? = 0
-configure:2841: test -z 
-			 || test ! -s conftest.err
-configure:2844: $? = 0
-configure:2847: test -s conftest.o
-configure:2850: $? = 0
-configure:2868: result: none needed
-configure:2886: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:2: error: syntax error before 'me'
-configure:2892: $? = 1
-configure: failed program was:
-| #ifndef __cplusplus
-|   choke me
-| #endif
-configure:3036: checking for style of include used by make
-configure:3064: result: GNU
-configure:3092: checking dependency style of gcc
-configure:3182: result: gcc3
-configure:3207: checking for primary include directory
-configure:3225: result: /usr/include
-configure:3274: checking how to run the C preprocessor
-configure:3309: gcc -E  conftest.c
-configure:3315: $? = 0
-configure:3347: gcc -E  conftest.c
-conftest.c:14:28: error: ac_nonexistent.h: No such file or directory
-configure:3353: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:3392: result: gcc -E
-configure:3416: gcc -E  conftest.c
-configure:3422: $? = 0
-configure:3454: gcc -E  conftest.c
-conftest.c:14:28: error: ac_nonexistent.h: No such file or directory
-configure:3460: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:3505: checking for egrep
-configure:3515: result: grep -E
-configure:3521: checking whether gcc needs -traditional
-configure:3563: result: no
-configure:3583: checking for a BSD-compatible install
-configure:3638: result: /usr/bin/install -c
-configure:3649: checking for an ANSI C-conforming const
-configure:3716: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:3722: $? = 0
-configure:3726: test -z 
-			 || test ! -s conftest.err
-configure:3729: $? = 0
-configure:3732: test -s conftest.o
-configure:3735: $? = 0
-configure:3746: result: yes
-configure:3756: checking for ANSI C header files
-configure:3781: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:3787: $? = 0
-configure:3791: test -z 
-			 || test ! -s conftest.err
-configure:3794: $? = 0
-configure:3797: test -s conftest.o
-configure:3800: $? = 0
-configure:3889: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-conftest.c: In function 'main':
-conftest.c:31: warning: incompatible implicit declaration of built-in function 'exit'
-configure:3892: $? = 0
-configure:3894: ./conftest
-configure:3897: $? = 0
-configure:3912: result: yes
-configure:3930: checking for dirent.h that defines DIR
-configure:3954: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:3960: $? = 0
-configure:3964: test -z 
-			 || test ! -s conftest.err
-configure:3967: $? = 0
-configure:3970: test -s conftest.o
-configure:3973: $? = 0
-configure:3984: result: yes
-configure:3997: checking for library containing opendir
-configure:4027: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:4033: $? = 0
-configure:4037: test -z 
-			 || test ! -s conftest.err
-configure:4040: $? = 0
-configure:4043: test -s conftest
-configure:4046: $? = 0
-configure:4116: result: none required
-configure:4252: checking whether stat file-mode macros are broken
-configure:4300: result: no
-configure:4324: checking for sys/types.h
-configure:4340: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:4346: $? = 0
-configure:4350: test -z 
-			 || test ! -s conftest.err
-configure:4353: $? = 0
-configure:4356: test -s conftest.o
-configure:4359: $? = 0
-configure:4370: result: yes
-configure:4324: checking for sys/stat.h
-configure:4340: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:4346: $? = 0
-configure:4350: test -z 
-			 || test ! -s conftest.err
-configure:4353: $? = 0
-configure:4356: test -s conftest.o
-configure:4359: $? = 0
-configure:4370: result: yes
-configure:4324: checking for stdlib.h
-configure:4340: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:4346: $? = 0
-configure:4350: test -z 
-			 || test ! -s conftest.err
-configure:4353: $? = 0
-configure:4356: test -s conftest.o
-configure:4359: $? = 0
-configure:4370: result: yes
-configure:4324: checking for string.h
-configure:4340: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:4346: $? = 0
-configure:4350: test -z 
-			 || test ! -s conftest.err
-configure:4353: $? = 0
-configure:4356: test -s conftest.o
-configure:4359: $? = 0
-configure:4370: result: yes
-configure:4324: checking for memory.h
-configure:4340: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:4346: $? = 0
-configure:4350: test -z 
-			 || test ! -s conftest.err
-configure:4353: $? = 0
-configure:4356: test -s conftest.o
-configure:4359: $? = 0
-configure:4370: result: yes
-configure:4324: checking for strings.h
-configure:4340: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:4346: $? = 0
-configure:4350: test -z 
-			 || test ! -s conftest.err
-configure:4353: $? = 0
-configure:4356: test -s conftest.o
-configure:4359: $? = 0
-configure:4370: result: yes
-configure:4324: checking for inttypes.h
-configure:4340: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:4346: $? = 0
-configure:4350: test -z 
-			 || test ! -s conftest.err
-configure:4353: $? = 0
-configure:4356: test -s conftest.o
-configure:4359: $? = 0
-configure:4370: result: yes
-configure:4324: checking for stdint.h
-configure:4340: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:4346: $? = 0
-configure:4350: test -z 
-			 || test ! -s conftest.err
-configure:4353: $? = 0
-configure:4356: test -s conftest.o
-configure:4359: $? = 0
-configure:4370: result: yes
-configure:4324: checking for unistd.h
-configure:4340: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:4346: $? = 0
-configure:4350: test -z 
-			 || test ! -s conftest.err
-configure:4353: $? = 0
-configure:4356: test -s conftest.o
-configure:4359: $? = 0
-configure:4370: result: yes
-configure:4382: checking for struct stat.st_blksize
-configure:4405: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:4411: $? = 0
-configure:4415: test -z 
-			 || test ! -s conftest.err
-configure:4418: $? = 0
-configure:4421: test -s conftest.o
-configure:4424: $? = 0
-configure:4481: result: yes
-configure:4491: checking for struct stat.st_blocks
-configure:4514: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:4520: $? = 0
-configure:4524: test -z 
-			 || test ! -s conftest.err
-configure:4527: $? = 0
-configure:4530: test -s conftest.o
-configure:4533: $? = 0
-configure:4590: result: yes
-configure:4600: checking for struct stat.st_aclcnt
-configure:4623: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:65: error: 'struct stat' has no member named 'st_aclcnt'
-configure:4629: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| int
-| main ()
-| {
-| static struct stat ac_aggr;
-| if (ac_aggr.st_aclcnt)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:4667: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:65: error: 'struct stat' has no member named 'st_aclcnt'
-configure:4673: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| int
-| main ()
-| {
-| static struct stat ac_aggr;
-| if (sizeof ac_aggr.st_aclcnt)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:4699: result: no
-configure:4709: checking for struct stat.st_flags
-configure:4732: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:65: error: 'struct stat' has no member named 'st_flags'
-configure:4738: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| int
-| main ()
-| {
-| static struct stat ac_aggr;
-| if (ac_aggr.st_flags)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:4776: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:65: error: 'struct stat' has no member named 'st_flags'
-configure:4782: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| int
-| main ()
-| {
-| static struct stat ac_aggr;
-| if (sizeof ac_aggr.st_flags)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:4808: result: no
-configure:4818: checking for struct stat.st_fstype
-configure:4841: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:65: error: 'struct stat' has no member named 'st_fstype'
-configure:4847: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| int
-| main ()
-| {
-| static struct stat ac_aggr;
-| if (ac_aggr.st_fstype)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:4885: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:65: error: 'struct stat' has no member named 'st_fstype'
-configure:4891: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| int
-| main ()
-| {
-| static struct stat ac_aggr;
-| if (sizeof ac_aggr.st_fstype)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:4917: result: no
-configure:4927: checking for struct stat.st_gen
-configure:4950: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:65: error: 'struct stat' has no member named 'st_gen'
-configure:4956: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| int
-| main ()
-| {
-| static struct stat ac_aggr;
-| if (ac_aggr.st_gen)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:4994: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:65: error: 'struct stat' has no member named 'st_gen'
-configure:5000: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| int
-| main ()
-| {
-| static struct stat ac_aggr;
-| if (sizeof ac_aggr.st_gen)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:5026: result: no
-configure:5036: checking for struct stat.st_level
-configure:5059: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:65: error: 'struct stat' has no member named 'st_level'
-configure:5065: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| int
-| main ()
-| {
-| static struct stat ac_aggr;
-| if (ac_aggr.st_level)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:5103: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:65: error: 'struct stat' has no member named 'st_level'
-configure:5109: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| int
-| main ()
-| {
-| static struct stat ac_aggr;
-| if (sizeof ac_aggr.st_level)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:5135: result: no
-configure:5145: checking for struct stat.st_rdev
-configure:5168: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:5174: $? = 0
-configure:5178: test -z 
-			 || test ! -s conftest.err
-configure:5181: $? = 0
-configure:5184: test -s conftest.o
-configure:5187: $? = 0
-configure:5244: result: yes
-configure:5255: checking for stat64 in (asm|sys)/stat.h
-configure:5281: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:5287: $? = 0
-configure:5291: test -z 
-			 || test ! -s conftest.err
-configure:5294: $? = 0
-configure:5297: test -s conftest.o
-configure:5300: $? = 0
-configure:5312: result: yes
-configure:5324: checking return type of signal handlers
-configure:5355: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:5361: $? = 0
-configure:5365: test -z 
-			 || test ! -s conftest.err
-configure:5368: $? = 0
-configure:5371: test -s conftest.o
-configure:5374: $? = 0
-configure:5385: result: void
-configure:5393: checking for uid_t in sys/types.h
-configure:5416: result: yes
-configure:5431: checking for mode_t
-configure:5455: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:5461: $? = 0
-configure:5465: test -z 
-			 || test ! -s conftest.err
-configure:5468: $? = 0
-configure:5471: test -s conftest.o
-configure:5474: $? = 0
-configure:5485: result: yes
-configure:5497: checking type of array argument to getgroups
-configure:5535: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-conftest.c: In function 'main':
-conftest.c:50: warning: incompatible implicit declaration of built-in function 'exit'
-configure:5538: $? = 0
-configure:5540: ./conftest
-configure:5543: $? = 0
-configure:5576: result: gid_t
-configure:5584: checking whether sys/types.h defines makedev
-configure:5605: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:5611: $? = 0
-configure:5615: test -z 
-			 || test ! -s conftest.err
-configure:5618: $? = 0
-configure:5621: test -s conftest
-configure:5624: $? = 0
-configure:5637: result: yes
-configure:5938: checking for sig_atomic_t
-configure:5963: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:5969: $? = 0
-configure:5973: test -z 
-			 || test ! -s conftest.err
-configure:5976: $? = 0
-configure:5979: test -s conftest.o
-configure:5982: $? = 0
-configure:5993: result: yes
-configure:6003: checking for siginfo_t
-configure:6028: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6034: $? = 0
-configure:6038: test -z 
-			 || test ! -s conftest.err
-configure:6041: $? = 0
-configure:6044: test -s conftest.o
-configure:6047: $? = 0
-configure:6058: result: yes
-configure:6069: checking for struct sockaddr_in6.sin6_scope_id
-configure:6095: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6101: $? = 0
-configure:6105: test -z 
-			 || test ! -s conftest.err
-configure:6108: $? = 0
-configure:6111: test -s conftest.o
-configure:6114: $? = 0
-configure:6174: result: yes
-configure:6185: checking for long long
-configure:6209: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6215: $? = 0
-configure:6219: test -z 
-			 || test ! -s conftest.err
-configure:6222: $? = 0
-configure:6225: test -s conftest.o
-configure:6228: $? = 0
-configure:6239: result: yes
-configure:6250: checking for little endian long long
-configure:6280: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6283: $? = 0
-configure:6285: ./conftest
-configure:6288: $? = 0
-configure:6303: result: yes
-configure:6314: checking for long long off_t
-configure:6340: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6343: $? = 0
-configure:6345: ./conftest
-configure:6348: $? = 1
-configure: program exited with status 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| /* end confdefs.h.  */
-| #include <sys/types.h>
-| main () {
-| 	if (sizeof (off_t) == sizeof (long long) &&
-| 	    sizeof (off_t) > sizeof (long))
-| 	    return 0;
-| 	return 1;
-| }
-| 
-configure:6363: result: no
-configure:6374: checking for long long rlim_t
-configure:6402: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6405: $? = 0
-configure:6407: ./conftest
-configure:6410: $? = 1
-configure: program exited with status 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| /* end confdefs.h.  */
-| #include <sys/types.h>
-| #include <sys/time.h>
-| #include <sys/resource.h>
-| main () {
-| 	if (sizeof (rlim_t) == sizeof (long long) &&
-| 	    sizeof (rlim_t) > sizeof (long))
-| 	    return 0;
-| 	return 1;
-| }
-| 
-configure:6425: result: no
-configure:6436: checking for struct opthdr
-configure:6461: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:43: error: invalid application of 'sizeof' to incomplete type 'struct opthdr' 
-configure:6467: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| /* end confdefs.h.  */
-| #include <sys/socket.h>
-| 
-| int
-| main ()
-| {
-| if ((struct opthdr *) 0)
-|   return 0;
-| if (sizeof (struct opthdr))
-|   return 0;
-|   ;
-|   return 0;
-| }
-configure:6491: result: no
-configure:6502: checking for struct t_opthdr
-configure:6527: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:36:24: error: sys/tiuser.h: No such file or directory
-conftest.c: In function 'main':
-conftest.c:43: error: invalid application of 'sizeof' to incomplete type 'struct t_opthdr' 
-configure:6533: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| /* end confdefs.h.  */
-| #include <sys/tiuser.h>
-| 
-| int
-| main ()
-| {
-| if ((struct t_opthdr *) 0)
-|   return 0;
-| if (sizeof (struct t_opthdr))
-|   return 0;
-|   ;
-|   return 0;
-| }
-configure:6557: result: no
-configure:6655: checking for sigaction
-configure:6712: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6718: $? = 0
-configure:6722: test -z 
-			 || test ! -s conftest.err
-configure:6725: $? = 0
-configure:6728: test -s conftest
-configure:6731: $? = 0
-configure:6743: result: yes
-configure:6655: checking for strerror
-configure:6712: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6718: $? = 0
-configure:6722: test -z 
-			 || test ! -s conftest.err
-configure:6725: $? = 0
-configure:6728: test -s conftest
-configure:6731: $? = 0
-configure:6743: result: yes
-configure:6655: checking for strsignal
-configure:6712: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6718: $? = 0
-configure:6722: test -z 
-			 || test ! -s conftest.err
-configure:6725: $? = 0
-configure:6728: test -s conftest
-configure:6731: $? = 0
-configure:6743: result: yes
-configure:6655: checking for pread
-configure:6712: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6718: $? = 0
-configure:6722: test -z 
-			 || test ! -s conftest.err
-configure:6725: $? = 0
-configure:6728: test -s conftest
-configure:6731: $? = 0
-configure:6743: result: yes
-configure:6655: checking for sys_siglist
-configure:6712: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6718: $? = 0
-configure:6722: test -z 
-			 || test ! -s conftest.err
-configure:6725: $? = 0
-configure:6728: test -s conftest
-configure:6731: $? = 0
-configure:6743: result: yes
-configure:6655: checking for _sys_siglist
-configure:6712: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6718: $? = 0
-configure:6722: test -z 
-			 || test ! -s conftest.err
-configure:6725: $? = 0
-configure:6728: test -s conftest
-configure:6731: $? = 0
-configure:6743: result: yes
-configure:6655: checking for getdents
-configure:6712: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-/tmp/ccI4ybUo.o: In function `main':conftest.c:(.text+0x22): undefined reference to `getdents'
-/tmp/ccI4ybUo.o:(.data+0x0): undefined reference to `getdents'
-collect2: ld returned 1 exit status
-configure:6718: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| /* end confdefs.h.  */
-| /* Define getdents to an innocuous variant, in case <limits.h> declares getdents.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define getdents innocuous_getdents
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char getdents (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef getdents
-| 
-| /* Override any gcc2 internal prototype to avoid an error.  */
-| #ifdef __cplusplus
-| extern "C"
-| {
-| #endif
-| /* We use char because int might match the return type of a gcc2
-|    builtin and then its argument prototype would still apply.  */
-| char getdents ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined (__stub_getdents) || defined (__stub___getdents)
-| choke me
-| #else
-| char (*f) () = getdents;
-| #endif
-| #ifdef __cplusplus
-| }
-| #endif
-| 
-| int
-| main ()
-| {
-| return f != getdents;
-|   ;
-|   return 0;
-| }
-configure:6743: result: no
-configure:6655: checking for mctl
-configure:6712: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-/tmp/ccORY4qv.o: In function `main':conftest.c:(.text+0x22): undefined reference to `mctl'
-/tmp/ccORY4qv.o:(.data+0x0): undefined reference to `mctl'
-collect2: ld returned 1 exit status
-configure:6718: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| /* end confdefs.h.  */
-| /* Define mctl to an innocuous variant, in case <limits.h> declares mctl.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define mctl innocuous_mctl
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char mctl (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef mctl
-| 
-| /* Override any gcc2 internal prototype to avoid an error.  */
-| #ifdef __cplusplus
-| extern "C"
-| {
-| #endif
-| /* We use char because int might match the return type of a gcc2
-|    builtin and then its argument prototype would still apply.  */
-| char mctl ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined (__stub_mctl) || defined (__stub___mctl)
-| choke me
-| #else
-| char (*f) () = mctl;
-| #endif
-| #ifdef __cplusplus
-| }
-| #endif
-| 
-| int
-| main ()
-| {
-| return f != mctl;
-|   ;
-|   return 0;
-| }
-configure:6743: result: no
-configure:6655: checking for prctl
-configure:6712: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6718: $? = 0
-configure:6722: test -z 
-			 || test ! -s conftest.err
-configure:6725: $? = 0
-configure:6728: test -s conftest
-configure:6731: $? = 0
-configure:6743: result: yes
-configure:6655: checking for sendmsg
-configure:6712: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6718: $? = 0
-configure:6722: test -z 
-			 || test ! -s conftest.err
-configure:6725: $? = 0
-configure:6728: test -s conftest
-configure:6731: $? = 0
-configure:6743: result: yes
-configure:6655: checking for inet_ntop
-configure:6712: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6718: $? = 0
-configure:6722: test -z 
-			 || test ! -s conftest.err
-configure:6725: $? = 0
-configure:6728: test -s conftest
-configure:6731: $? = 0
-configure:6743: result: yes
-configure:6655: checking for if_indextoname
-configure:6712: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-configure:6718: $? = 0
-configure:6722: test -z 
-			 || test ! -s conftest.err
-configure:6725: $? = 0
-configure:6728: test -s conftest
-configure:6731: $? = 0
-configure:6743: result: yes
-configure:6794: checking sys/reg.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking sys/reg.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for sys/reg.h
-configure:6917: result: yes
-configure:6794: checking sys/filio.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:81:23: error: sys/filio.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <sys/filio.h>
-configure:6835: result: no
-configure:6839: checking sys/filio.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:47:23: error: sys/filio.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| /* end confdefs.h.  */
-| #include <sys/filio.h>
-configure:6875: result: no
-configure:6910: checking for sys/filio.h
-configure:6917: result: no
-configure:6794: checking sys/acl.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:81:21: error: sys/acl.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <sys/acl.h>
-configure:6835: result: no
-configure:6839: checking sys/acl.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:47:21: error: sys/acl.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| /* end confdefs.h.  */
-| #include <sys/acl.h>
-configure:6875: result: no
-configure:6910: checking for sys/acl.h
-configure:6917: result: no
-configure:6794: checking sys/asynch.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:81:24: error: sys/asynch.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <sys/asynch.h>
-configure:6835: result: no
-configure:6839: checking sys/asynch.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:47:24: error: sys/asynch.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| /* end confdefs.h.  */
-| #include <sys/asynch.h>
-configure:6875: result: no
-configure:6910: checking for sys/asynch.h
-configure:6917: result: no
-configure:6794: checking sys/door.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:81:22: error: sys/door.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <sys/door.h>
-configure:6835: result: no
-configure:6839: checking sys/door.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:47:22: error: sys/door.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| /* end confdefs.h.  */
-| #include <sys/door.h>
-configure:6875: result: no
-configure:6910: checking for sys/door.h
-configure:6917: result: no
-configure:6794: checking stropts.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking stropts.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for stropts.h
-configure:6917: result: yes
-configure:6794: checking sys/conf.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:82:22: error: sys/conf.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <sys/conf.h>
-configure:6835: result: no
-configure:6839: checking sys/conf.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:48:22: error: sys/conf.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| /* end confdefs.h.  */
-| #include <sys/conf.h>
-configure:6875: result: no
-configure:6910: checking for sys/conf.h
-configure:6917: result: no
-configure:6794: checking sys/stream.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:82:24: error: sys/stream.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <sys/stream.h>
-configure:6835: result: no
-configure:6839: checking sys/stream.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:48:24: error: sys/stream.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| /* end confdefs.h.  */
-| #include <sys/stream.h>
-configure:6875: result: no
-configure:6910: checking for sys/stream.h
-configure:6917: result: no
-configure:6794: checking sys/tihdr.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:82:23: error: sys/tihdr.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <sys/tihdr.h>
-configure:6835: result: no
-configure:6839: checking sys/tihdr.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:48:23: error: sys/tihdr.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| /* end confdefs.h.  */
-| #include <sys/tihdr.h>
-configure:6875: result: no
-configure:6910: checking for sys/tihdr.h
-configure:6917: result: no
-configure:6794: checking sys/tiuser.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:82:24: error: sys/tiuser.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <sys/tiuser.h>
-configure:6835: result: no
-configure:6839: checking sys/tiuser.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:48:24: error: sys/tiuser.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| /* end confdefs.h.  */
-| #include <sys/tiuser.h>
-configure:6875: result: no
-configure:6910: checking for sys/tiuser.h
-configure:6917: result: no
-configure:6794: checking sys/sysconfig.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:82:27: error: sys/sysconfig.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <sys/sysconfig.h>
-configure:6835: result: no
-configure:6839: checking sys/sysconfig.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:48:27: error: sys/sysconfig.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| /* end confdefs.h.  */
-| #include <sys/sysconfig.h>
-configure:6875: result: no
-configure:6910: checking for sys/sysconfig.h
-configure:6917: result: no
-configure:6794: checking ioctls.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:82:20: error: ioctls.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <ioctls.h>
-configure:6835: result: no
-configure:6839: checking ioctls.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:48:20: error: ioctls.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| /* end confdefs.h.  */
-| #include <ioctls.h>
-configure:6875: result: no
-configure:6910: checking for ioctls.h
-configure:6917: result: no
-configure:6794: checking sys/ioctl.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking sys/ioctl.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for sys/ioctl.h
-configure:6917: result: yes
-configure:6794: checking sys/ptrace.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking sys/ptrace.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for sys/ptrace.h
-configure:6917: result: yes
-configure:6794: checking termio.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking termio.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for termio.h
-configure:6917: result: yes
-configure:6794: checking linux/ptrace.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking linux/ptrace.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for linux/ptrace.h
-configure:6917: result: yes
-configure:6794: checking asm/reg.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:86:21: error: asm/reg.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <asm/reg.h>
-configure:6835: result: no
-configure:6839: checking asm/reg.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:52:21: error: asm/reg.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| /* end confdefs.h.  */
-| #include <asm/reg.h>
-configure:6875: result: no
-configure:6910: checking for asm/reg.h
-configure:6917: result: no
-configure:6794: checking sys/uio.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking sys/uio.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for sys/uio.h
-configure:6917: result: yes
-configure:6794: checking sys/aio.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:87:21: error: sys/aio.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <sys/aio.h>
-configure:6835: result: no
-configure:6839: checking sys/aio.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:53:21: error: sys/aio.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| /* end confdefs.h.  */
-| #include <sys/aio.h>
-configure:6875: result: no
-configure:6910: checking for sys/aio.h
-configure:6917: result: no
-configure:6794: checking poll.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking poll.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for poll.h
-configure:6917: result: yes
-configure:6794: checking sys/poll.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking sys/poll.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for sys/poll.h
-configure:6917: result: yes
-configure:6794: checking sys/vfs.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking sys/vfs.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for sys/vfs.h
-configure:6917: result: yes
-configure:6794: checking asm/sysmips.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:90:25: error: asm/sysmips.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <asm/sysmips.h>
-configure:6835: result: no
-configure:6839: checking asm/sysmips.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:56:25: error: asm/sysmips.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| /* end confdefs.h.  */
-| #include <asm/sysmips.h>
-configure:6875: result: no
-configure:6910: checking for asm/sysmips.h
-configure:6917: result: no
-configure:6794: checking linux/utsname.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking linux/utsname.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for linux/utsname.h
-configure:6917: result: yes
-configure:6794: checking sys/nscsys.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:91:24: error: sys/nscsys.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <sys/nscsys.h>
-configure:6835: result: no
-configure:6839: checking sys/nscsys.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:57:24: error: sys/nscsys.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| /* end confdefs.h.  */
-| #include <sys/nscsys.h>
-configure:6875: result: no
-configure:6910: checking for sys/nscsys.h
-configure:6917: result: no
-configure:6794: checking mqueue.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking mqueue.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for mqueue.h
-configure:6917: result: yes
-configure:6794: checking sys/epoll.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6812: $? = 0
-configure:6816: test -z 
-			 || test ! -s conftest.err
-configure:6819: $? = 0
-configure:6822: test -s conftest.o
-configure:6825: $? = 0
-configure:6835: result: yes
-configure:6839: checking sys/epoll.h presence
-configure:6849: gcc -E  conftest.c
-configure:6855: $? = 0
-configure:6875: result: yes
-configure:6910: checking for sys/epoll.h
-configure:6917: result: yes
-configure:6794: checking libaio.h usability
-configure:6806: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:93:20: error: libaio.h: No such file or directory
-configure:6812: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| #define HAVE_MQUEUE_H 1
-| #define HAVE_SYS_EPOLL_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <libaio.h>
-configure:6835: result: no
-configure:6839: checking libaio.h presence
-configure:6849: gcc -E  conftest.c
-conftest.c:59:20: error: libaio.h: No such file or directory
-configure:6855: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| #define HAVE_MQUEUE_H 1
-| #define HAVE_SYS_EPOLL_H 1
-| /* end confdefs.h.  */
-| #include <libaio.h>
-configure:6875: result: no
-configure:6910: checking for libaio.h
-configure:6917: result: no
-configure:6937: checking for linux/icmp.h
-configure:6952: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6958: $? = 0
-configure:6962: test -z 
-			 || test ! -s conftest.err
-configure:6965: $? = 0
-configure:6968: test -s conftest.o
-configure:6971: $? = 0
-configure:6982: result: yes
-configure:6937: checking for linux/in6.h
-configure:6952: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6958: $? = 0
-configure:6962: test -z 
-			 || test ! -s conftest.err
-configure:6965: $? = 0
-configure:6968: test -s conftest.o
-configure:6971: $? = 0
-configure:6982: result: yes
-configure:6937: checking for linux/netlink.h
-configure:6952: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6958: $? = 0
-configure:6962: test -z 
-			 || test ! -s conftest.err
-configure:6965: $? = 0
-configure:6968: test -s conftest.o
-configure:6971: $? = 0
-configure:6982: result: yes
-configure:6937: checking for linux/if_packet.h
-configure:6952: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:6958: $? = 0
-configure:6962: test -z 
-			 || test ! -s conftest.err
-configure:6965: $? = 0
-configure:6968: test -s conftest.o
-configure:6971: $? = 0
-configure:6982: result: yes
-configure:6997: checking for asm/sigcontext.h
-configure:7013: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:7019: $? = 0
-configure:7023: test -z 
-			 || test ! -s conftest.err
-configure:7026: $? = 0
-configure:7029: test -s conftest.o
-configure:7032: $? = 0
-configure:7043: result: yes
-configure:7059: checking for netinet/tcp.h
-configure:7075: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:7081: $? = 0
-configure:7085: test -z 
-			 || test ! -s conftest.err
-configure:7088: $? = 0
-configure:7091: test -s conftest.o
-configure:7094: $? = 0
-configure:7105: result: yes
-configure:7059: checking for netinet/udp.h
-configure:7075: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:7081: $? = 0
-configure:7085: test -z 
-			 || test ! -s conftest.err
-configure:7088: $? = 0
-configure:7091: test -s conftest.o
-configure:7094: $? = 0
-configure:7105: result: yes
-configure:7117: checking for MP procfs
-configure:7179: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-conftest.c: In function 'main':
-conftest.c:78: error: storage size of 'pstatus' isn't known
-conftest.c:82: warning: incompatible implicit declaration of built-in function 'exit'
-conftest.c:90: error: 'PCSTOP' undeclared (first use in this function)
-conftest.c:90: error: (Each undeclared identifier is reported only once
-conftest.c:90: error: for each function it appears in.)
-conftest.c:96: warning: incompatible implicit declaration of built-in function 'exit'
-configure:7182: $? = 1
-configure: program exited with status 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| #define HAVE_MQUEUE_H 1
-| #define HAVE_SYS_EPOLL_H 1
-| #define HAVE_LINUX_ICMP_H 1
-| #define HAVE_LINUX_IN6_H 1
-| #define HAVE_LINUX_NETLINK_H 1
-| #define HAVE_LINUX_IF_PACKET_H 1
-| #define HAVE_ASM_SIGCONTEXT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define HAVE_NETINET_UDP_H 1
-| /* end confdefs.h.  */
-| 
-| #include <stdio.h>
-| #include <signal.h>
-| #include <sys/procfs.h>
-| 
-| main()
-| {
-| 	int pid;
-| 	char proc[32];
-| 	FILE *ctl;
-| 	FILE *status;
-| 	int cmd;
-| 	struct pstatus pstatus;
-| 
-| 	if ((pid = fork()) == 0) {
-| 		pause();
-| 		exit(0);
-| 	}
-| 	sprintf(proc, "/proc/%d/ctl", pid);
-| 	if ((ctl = fopen(proc, "w")) == NULL)
-| 		goto fail;
-| 	sprintf(proc, "/proc/%d/status", pid);
-| 	if ((status = fopen (proc, "r")) == NULL)
-| 		goto fail;
-| 	cmd = PCSTOP;
-| 	if (write (fileno (ctl), &cmd, sizeof cmd) < 0)
-| 		goto fail;
-| 	if (read (fileno (status), &pstatus, sizeof pstatus) < 0)
-| 		goto fail;
-| 	kill(pid, SIGKILL);
-| 	exit(0);
-| fail:
-| 	kill(pid, SIGKILL);
-| 	exit(1);
-| }
-| 
-configure:7202: result: no
-configure:7213: checking for pollable procfs
-configure:7290: gcc -o conftest -I/android/device/system/kernel_headers/   conftest.c  >&5
-conftest.c: In function 'main':
-conftest.c:97: warning: incompatible implicit declaration of built-in function 'exit'
-conftest.c:102: error: 'PIOCSTOP' undeclared (first use in this function)
-conftest.c:102: error: (Each undeclared identifier is reported only once
-conftest.c:102: error: for each function it appears in.)
-conftest.c:111: warning: incompatible implicit declaration of built-in function 'exit'
-configure:7293: $? = 1
-configure: program exited with status 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| #define HAVE_MQUEUE_H 1
-| #define HAVE_SYS_EPOLL_H 1
-| #define HAVE_LINUX_ICMP_H 1
-| #define HAVE_LINUX_IN6_H 1
-| #define HAVE_LINUX_NETLINK_H 1
-| #define HAVE_LINUX_IF_PACKET_H 1
-| #define HAVE_ASM_SIGCONTEXT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define HAVE_NETINET_UDP_H 1
-| /* end confdefs.h.  */
-| 
-| #include <stdio.h>
-| #include <signal.h>
-| #include <sys/procfs.h>
-| #include <sys/stropts.h>
-| #include <poll.h>
-| 
-| #ifdef HAVE_MP_PROCFS
-| #define PIOCSTOP	PCSTOP
-| #define POLLWANT	POLLWRNORM
-| #define PROC		"/proc/%d/ctl"
-| #define PROC_MODE	"w"
-| int IOCTL (int fd, int cmd, int arg) {
-| 	return write (fd, &cmd, sizeof cmd);
-| }
-| #else
-| #define POLLWANT	POLLPRI
-| #define	PROC		"/proc/%d"
-| #define PROC_MODE	"r+"
-| #define IOCTL		ioctl
-| #endif
-| 
-| main()
-| {
-| 	int pid;
-| 	char proc[32];
-| 	FILE *pfp;
-| 	struct pollfd pfd;
-| 
-| 	if ((pid = fork()) == 0) {
-| 		pause();
-| 		exit(0);
-| 	}
-| 	sprintf(proc, PROC, pid);
-| 	if ((pfp = fopen(proc, PROC_MODE)) == NULL)
-| 		goto fail;
-| 	if (IOCTL(fileno(pfp), PIOCSTOP, NULL) < 0)
-| 		goto fail;
-| 	pfd.fd = fileno(pfp);
-| 	pfd.events = POLLWANT;
-| 	if (poll(&pfd, 1, 0) < 0)
-| 		goto fail;
-| 	if (!(pfd.revents & POLLWANT))
-| 		goto fail;
-| 	kill(pid, SIGKILL);
-| 	exit(0);
-| fail:
-| 	kill(pid, SIGKILL);
-| 	exit(1);
-| }
-| 
-configure:7313: result: no
-configure:7325: checking for struct msghdr.msg_control
-configure:7349: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:7355: $? = 0
-configure:7359: test -z 
-			 || test ! -s conftest.err
-configure:7362: $? = 0
-configure:7365: test -s conftest.o
-configure:7368: $? = 0
-configure:7426: result: yes
-configure:7437: checking for pr_syscall in struct prstatus
-configure:7464: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:76: error: 'prstatus_t' has no member named 'pr_syscall'
-configure:7470: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| #define HAVE_MQUEUE_H 1
-| #define HAVE_SYS_EPOLL_H 1
-| #define HAVE_LINUX_ICMP_H 1
-| #define HAVE_LINUX_IN6_H 1
-| #define HAVE_LINUX_NETLINK_H 1
-| #define HAVE_LINUX_IF_PACKET_H 1
-| #define HAVE_ASM_SIGCONTEXT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define HAVE_NETINET_UDP_H 1
-| #define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-| /* end confdefs.h.  */
-| #include <sys/procfs.h>
-| int
-| main ()
-| {
-| #ifdef HAVE_MP_PROCFS
-| pstatus_t s;
-| s.pr_lwp.pr_syscall
-| #else
-| prstatus_t s;
-| s.pr_syscall
-| #endif
-|   ;
-|   return 0;
-| }
-configure:7495: result: no
-configure:7507: checking for struct T_conn_res.QUEUE_ptr
-configure:7532: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:67:24: error: sys/stream.h: No such file or directory
-conftest.c:68:23: error: sys/tihdr.h: No such file or directory
-conftest.c: In function 'main':
-conftest.c:73: error: storage size of 'ac_aggr' isn't known
-conftest.c:73: error: storage size of 'ac_aggr' isn't known
-configure:7538: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| #define HAVE_MQUEUE_H 1
-| #define HAVE_SYS_EPOLL_H 1
-| #define HAVE_LINUX_ICMP_H 1
-| #define HAVE_LINUX_IN6_H 1
-| #define HAVE_LINUX_NETLINK_H 1
-| #define HAVE_LINUX_IF_PACKET_H 1
-| #define HAVE_ASM_SIGCONTEXT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define HAVE_NETINET_UDP_H 1
-| #define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-| /* end confdefs.h.  */
-| #include <sys/stream.h>
-| #include <sys/tihdr.h>
-| 
-| int
-| main ()
-| {
-| static struct T_conn_res ac_aggr;
-| if (ac_aggr.QUEUE_ptr)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:7578: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:67:24: error: sys/stream.h: No such file or directory
-conftest.c:68:23: error: sys/tihdr.h: No such file or directory
-conftest.c: In function 'main':
-conftest.c:73: error: storage size of 'ac_aggr' isn't known
-conftest.c:73: error: storage size of 'ac_aggr' isn't known
-configure:7584: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| #define HAVE_MQUEUE_H 1
-| #define HAVE_SYS_EPOLL_H 1
-| #define HAVE_LINUX_ICMP_H 1
-| #define HAVE_LINUX_IN6_H 1
-| #define HAVE_LINUX_NETLINK_H 1
-| #define HAVE_LINUX_IF_PACKET_H 1
-| #define HAVE_ASM_SIGCONTEXT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define HAVE_NETINET_UDP_H 1
-| #define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-| /* end confdefs.h.  */
-| #include <sys/stream.h>
-| #include <sys/tihdr.h>
-| 
-| int
-| main ()
-| {
-| static struct T_conn_res ac_aggr;
-| if (sizeof ac_aggr.QUEUE_ptr)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:7610: result: no
-configure:7620: checking for struct T_conn_res.ACCEPTOR_id
-configure:7645: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:67:24: error: sys/stream.h: No such file or directory
-conftest.c:68:23: error: sys/tihdr.h: No such file or directory
-conftest.c: In function 'main':
-conftest.c:73: error: storage size of 'ac_aggr' isn't known
-conftest.c:73: error: storage size of 'ac_aggr' isn't known
-configure:7651: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| #define HAVE_MQUEUE_H 1
-| #define HAVE_SYS_EPOLL_H 1
-| #define HAVE_LINUX_ICMP_H 1
-| #define HAVE_LINUX_IN6_H 1
-| #define HAVE_LINUX_NETLINK_H 1
-| #define HAVE_LINUX_IF_PACKET_H 1
-| #define HAVE_ASM_SIGCONTEXT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define HAVE_NETINET_UDP_H 1
-| #define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-| /* end confdefs.h.  */
-| #include <sys/stream.h>
-| #include <sys/tihdr.h>
-| 
-| int
-| main ()
-| {
-| static struct T_conn_res ac_aggr;
-| if (ac_aggr.ACCEPTOR_id)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:7691: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c:67:24: error: sys/stream.h: No such file or directory
-conftest.c:68:23: error: sys/tihdr.h: No such file or directory
-conftest.c: In function 'main':
-conftest.c:73: error: storage size of 'ac_aggr' isn't known
-conftest.c:73: error: storage size of 'ac_aggr' isn't known
-configure:7697: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| #define HAVE_MQUEUE_H 1
-| #define HAVE_SYS_EPOLL_H 1
-| #define HAVE_LINUX_ICMP_H 1
-| #define HAVE_LINUX_IN6_H 1
-| #define HAVE_LINUX_NETLINK_H 1
-| #define HAVE_LINUX_IF_PACKET_H 1
-| #define HAVE_ASM_SIGCONTEXT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define HAVE_NETINET_UDP_H 1
-| #define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-| /* end confdefs.h.  */
-| #include <sys/stream.h>
-| #include <sys/tihdr.h>
-| 
-| int
-| main ()
-| {
-| static struct T_conn_res ac_aggr;
-| if (sizeof ac_aggr.ACCEPTOR_id)
-| return 0;
-|   ;
-|   return 0;
-| }
-configure:7723: result: no
-configure:7735: checking for struct __old_kernel_stat
-configure:7760: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:7766: $? = 0
-configure:7770: test -z 
-			 || test ! -s conftest.err
-configure:7773: $? = 0
-configure:7776: test -s conftest.o
-configure:7779: $? = 0
-configure:7790: result: yes
-configure:7802: checking for struct pt_all_user_regs
-configure:7827: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:75: error: invalid application of 'sizeof' to incomplete type 'struct pt_all_user_regs' 
-configure:7833: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| #define HAVE_MQUEUE_H 1
-| #define HAVE_SYS_EPOLL_H 1
-| #define HAVE_LINUX_ICMP_H 1
-| #define HAVE_LINUX_IN6_H 1
-| #define HAVE_LINUX_NETLINK_H 1
-| #define HAVE_LINUX_IF_PACKET_H 1
-| #define HAVE_ASM_SIGCONTEXT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define HAVE_NETINET_UDP_H 1
-| #define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-| #define HAVE_STRUCT___OLD_KERNEL_STAT 1
-| /* end confdefs.h.  */
-| #include <sys/ptrace.h>
-| 
-| int
-| main ()
-| {
-| if ((struct pt_all_user_regs *) 0)
-|   return 0;
-| if (sizeof (struct pt_all_user_regs))
-|   return 0;
-|   ;
-|   return 0;
-| }
-configure:7857: result: no
-configure:7867: checking for struct ia64_fpreg
-configure:7892: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:75: error: invalid application of 'sizeof' to incomplete type 'struct ia64_fpreg' 
-configure:7898: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "strace"
-| #define PACKAGE_TARNAME "strace"
-| #define PACKAGE_VERSION "4.5.12"
-| #define PACKAGE_STRING "strace 4.5.12"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "strace"
-| #define VERSION "4.5.12"
-| #define LINUX 1
-| #define ARM 1
-| #define _GNU_SOURCE 1
-| #define STDC_HEADERS 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-| #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-| #define HAVE_STRUCT_STAT_ST_RDEV 1
-| #define HAVE_STAT64 1
-| #define RETSIGTYPE void
-| #define GETGROUPS_T gid_t
-| #define HAVE_SIG_ATOMIC_T 1
-| #define HAVE_SIGINFO_T 1
-| #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-| #define HAVE_LONG_LONG 1
-| #define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_STRERROR 1
-| #define HAVE_STRSIGNAL 1
-| #define HAVE_PREAD 1
-| #define HAVE_SYS_SIGLIST 1
-| #define HAVE__SYS_SIGLIST 1
-| #define HAVE_PRCTL 1
-| #define HAVE_SENDMSG 1
-| #define HAVE_INET_NTOP 1
-| #define HAVE_IF_INDEXTONAME 1
-| #define HAVE_SYS_REG_H 1
-| #define HAVE_STROPTS_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_PTRACE_H 1
-| #define HAVE_TERMIO_H 1
-| #define HAVE_LINUX_PTRACE_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_VFS_H 1
-| #define HAVE_LINUX_UTSNAME_H 1
-| #define HAVE_MQUEUE_H 1
-| #define HAVE_SYS_EPOLL_H 1
-| #define HAVE_LINUX_ICMP_H 1
-| #define HAVE_LINUX_IN6_H 1
-| #define HAVE_LINUX_NETLINK_H 1
-| #define HAVE_LINUX_IF_PACKET_H 1
-| #define HAVE_ASM_SIGCONTEXT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define HAVE_NETINET_UDP_H 1
-| #define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-| #define HAVE_STRUCT___OLD_KERNEL_STAT 1
-| /* end confdefs.h.  */
-| #include <sys/ptrace.h>
-| 
-| int
-| main ()
-| {
-| if ((struct ia64_fpreg *) 0)
-|   return 0;
-| if (sizeof (struct ia64_fpreg))
-|   return 0;
-|   ;
-|   return 0;
-| }
-configure:7922: result: no
-configure:7934: checking for struct user_desc
-configure:7959: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:7965: $? = 0
-configure:7969: test -z 
-			 || test ! -s conftest.err
-configure:7972: $? = 0
-configure:7975: test -s conftest.o
-configure:7978: $? = 0
-configure:7989: result: yes
-configure:8001: checking whether sys_errlist is declared
-configure:8025: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:8031: $? = 0
-configure:8035: test -z 
-			 || test ! -s conftest.err
-configure:8038: $? = 0
-configure:8041: test -s conftest.o
-configure:8044: $? = 0
-configure:8055: result: yes
-configure:8073: checking whether sys_siglist is declared
-configure:8098: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:8104: $? = 0
-configure:8108: test -z 
-			 || test ! -s conftest.err
-configure:8111: $? = 0
-configure:8114: test -s conftest.o
-configure:8117: $? = 0
-configure:8128: result: yes
-configure:8144: checking whether _sys_siglist is declared
-configure:8169: gcc -c -I/android/device/system/kernel_headers/  conftest.c >&5
-configure:8175: $? = 0
-configure:8179: test -z 
-			 || test ! -s conftest.err
-configure:8182: $? = 0
-configure:8185: test -s conftest.o
-configure:8188: $? = 0
-configure:8199: result: yes
-configure:8220: checking for perl
-configure:8238: found /usr/bin/perl
-configure:8250: result: /usr/bin/perl
-configure:8418: creating ./config.status
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by strace config.status 4.5.12, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status 
-
-on skywriting.corp.google.com
-
-config.status:716: creating Makefile
-config.status:820: creating config.h
-config.status:1226: executing depfiles commands
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_build=arm-unknown-linux-gnu
-ac_cv_build_alias=arm-unknown-linux-gnu
-ac_cv_c_compiler_gnu=yes
-ac_cv_c_const=yes
-ac_cv_env_CC_set=
-ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=set
-ac_cv_env_CFLAGS_value=-I/android/device/system/kernel_headers/
-ac_cv_env_CPPFLAGS_set=
-ac_cv_env_CPPFLAGS_value=
-ac_cv_env_CPP_set=
-ac_cv_env_CPP_value=
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_build_alias_set=set
-ac_cv_env_build_alias_value=arm-unknown-linux-gnu
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
-ac_cv_exeext=
-ac_cv_func__sys_siglist=yes
-ac_cv_func_getdents=no
-ac_cv_func_if_indextoname=yes
-ac_cv_func_inet_ntop=yes
-ac_cv_func_mctl=no
-ac_cv_func_prctl=yes
-ac_cv_func_pread=yes
-ac_cv_func_sendmsg=yes
-ac_cv_func_sigaction=yes
-ac_cv_func_strerror=yes
-ac_cv_func_strsignal=yes
-ac_cv_func_sys_siglist=yes
-ac_cv_have_decl__sys_siglist=yes
-ac_cv_have_decl_sys_errlist=yes
-ac_cv_have_decl_sys_siglist=yes
-ac_cv_have_little_endian_long_long=yes
-ac_cv_have_long_long_off_t=no
-ac_cv_have_long_long_rlim_t=no
-ac_cv_header_asm_reg_h=no
-ac_cv_header_asm_sigcontext_h=yes
-ac_cv_header_asm_sysmips_h=no
-ac_cv_header_dirent_dirent_h=yes
-ac_cv_header_inttypes_h=yes
-ac_cv_header_ioctls_h=no
-ac_cv_header_libaio_h=no
-ac_cv_header_linux_icmp_h=yes
-ac_cv_header_linux_if_packet_h=yes
-ac_cv_header_linux_in6_h=yes
-ac_cv_header_linux_netlink_h=yes
-ac_cv_header_linux_ptrace_h=yes
-ac_cv_header_linux_utsname_h=yes
-ac_cv_header_memory_h=yes
-ac_cv_header_mqueue_h=yes
-ac_cv_header_netinet_tcp_h=yes
-ac_cv_header_netinet_udp_h=yes
-ac_cv_header_poll_h=yes
-ac_cv_header_stat_broken=no
-ac_cv_header_stdc=yes
-ac_cv_header_stdint_h=yes
-ac_cv_header_stdlib_h=yes
-ac_cv_header_string_h=yes
-ac_cv_header_strings_h=yes
-ac_cv_header_stropts_h=yes
-ac_cv_header_sys_acl_h=no
-ac_cv_header_sys_aio_h=no
-ac_cv_header_sys_asynch_h=no
-ac_cv_header_sys_conf_h=no
-ac_cv_header_sys_door_h=no
-ac_cv_header_sys_epoll_h=yes
-ac_cv_header_sys_filio_h=no
-ac_cv_header_sys_ioctl_h=yes
-ac_cv_header_sys_nscsys_h=no
-ac_cv_header_sys_poll_h=yes
-ac_cv_header_sys_ptrace_h=yes
-ac_cv_header_sys_reg_h=yes
-ac_cv_header_sys_stat_h=yes
-ac_cv_header_sys_stream_h=no
-ac_cv_header_sys_sysconfig_h=no
-ac_cv_header_sys_tihdr_h=no
-ac_cv_header_sys_tiuser_h=no
-ac_cv_header_sys_types_h=yes
-ac_cv_header_sys_types_h_makedev=yes
-ac_cv_header_sys_uio_h=yes
-ac_cv_header_sys_vfs_h=yes
-ac_cv_header_termio_h=yes
-ac_cv_header_unistd_h=yes
-ac_cv_host=arm-unknown-linux-gnu
-ac_cv_host_alias=arm-unknown-linux-gnu
-ac_cv_member_struct_T_conn_res_ACCEPTOR_id=no
-ac_cv_member_struct_T_conn_res_QUEUE_ptr=no
-ac_cv_member_struct_msghdr_msg_control=yes
-ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
-ac_cv_member_struct_stat_st_aclcnt=no
-ac_cv_member_struct_stat_st_blksize=yes
-ac_cv_member_struct_stat_st_blocks=yes
-ac_cv_member_struct_stat_st_flags=no
-ac_cv_member_struct_stat_st_fstype=no
-ac_cv_member_struct_stat_st_gen=no
-ac_cv_member_struct_stat_st_level=no
-ac_cv_member_struct_stat_st_rdev=yes
-ac_cv_mp_procfs=no
-ac_cv_objext=o
-ac_cv_path_PERL=/usr/bin/perl
-ac_cv_path_install='/usr/bin/install -c'
-ac_cv_pollable_procfs=no
-ac_cv_prog_AWK=gawk
-ac_cv_prog_CPP='gcc -E'
-ac_cv_prog_ac_ct_CC=gcc
-ac_cv_prog_cc_g=yes
-ac_cv_prog_cc_stdc=
-ac_cv_prog_egrep='grep -E'
-ac_cv_prog_gcc_traditional=no
-ac_cv_prog_make_make_set=yes
-ac_cv_search_opendir='none required'
-ac_cv_struct_pr_syscall=no
-ac_cv_type_getgroups=gid_t
-ac_cv_type_long_long=yes
-ac_cv_type_mode_t=yes
-ac_cv_type_sig_atomic_t=yes
-ac_cv_type_siginfo_t=yes
-ac_cv_type_signal=void
-ac_cv_type_stat64=yes
-ac_cv_type_struct___old_kernel_stat=yes
-ac_cv_type_struct_ia64_fpreg=no
-ac_cv_type_struct_opthdr=no
-ac_cv_type_struct_pt_all_user_regs=no
-ac_cv_type_struct_t_opthdr=no
-ac_cv_type_struct_user_desc=yes
-ac_cv_type_uid_t=yes
-am_cv_CC_dependencies_compiler_type=gcc3
-
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-
-ACLOCAL='${SHELL} /android/sandbox/mkf/funpack/strace-4.5.12/missing --run aclocal-1.9'
-AMDEPBACKSLASH='\'
-AMDEP_FALSE='#'
-AMDEP_TRUE=''
-AMTAR='${SHELL} /android/sandbox/mkf/funpack/strace-4.5.12/missing --run tar'
-AUTOCONF='${SHELL} /android/sandbox/mkf/funpack/strace-4.5.12/missing --run autoconf'
-AUTOHEADER='${SHELL} /android/sandbox/mkf/funpack/strace-4.5.12/missing --run autoheader'
-AUTOMAKE='${SHELL} /android/sandbox/mkf/funpack/strace-4.5.12/missing --run automake-1.9'
-AWK='gawk'
-CC='gcc'
-CCDEPMODE='depmode=gcc3'
-CFLAGS='-I/android/device/system/kernel_headers/'
-CPP='gcc -E'
-CPPFLAGS=''
-CYGPATH_W='echo'
-DEFS='-DHAVE_CONFIG_H'
-DEPDIR='.deps'
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
-EGREP='grep -E'
-EXEEXT=''
-FREEBSD_FALSE=''
-FREEBSD_TRUE='#'
-I386_FALSE=''
-I386_TRUE='#'
-INSTALL_DATA='${INSTALL} -m 644'
-INSTALL_PROGRAM='${INSTALL}'
-INSTALL_SCRIPT='${INSTALL}'
-INSTALL_STRIP_PROGRAM='${SHELL} $(install_sh) -c -s'
-LDFLAGS=''
-LIBOBJS=''
-LIBS=''
-LINUX_FALSE='#'
-LINUX_TRUE=''
-LTLIBOBJS=''
-MAINT='#'
-MAINTAINER_MODE_FALSE=''
-MAINTAINER_MODE_TRUE='#'
-MAKEINFO='${SHELL} /android/sandbox/mkf/funpack/strace-4.5.12/missing --run makeinfo'
-OBJEXT='o'
-PACKAGE='strace'
-PACKAGE_BUGREPORT=''
-PACKAGE_NAME='strace'
-PACKAGE_STRING='strace 4.5.12'
-PACKAGE_TARNAME='strace'
-PACKAGE_VERSION='4.5.12'
-PATH_SEPARATOR=':'
-PERL='/usr/bin/perl'
-SET_MAKE=''
-SHELL='/bin/sh'
-STRIP=''
-SUNOS4_FALSE=''
-SUNOS4_TRUE='#'
-SVR4_FALSE=''
-SVR4_TRUE='#'
-VERSION='4.5.12'
-WARNFLAGS='-Wall'
-X86_64_FALSE=''
-X86_64_TRUE='#'
-ac_ct_CC='gcc'
-ac_ct_STRIP=''
-am__fastdepCC_FALSE='#'
-am__fastdepCC_TRUE=''
-am__include='include'
-am__leading_dot='.'
-am__quote=''
-am__tar='${AMTAR} chof - "$$tardir"'
-am__untar='${AMTAR} xf -'
-arch='arm'
-bindir='${exec_prefix}/bin'
-build='arm-unknown-linux-gnu'
-build_alias='arm-unknown-linux-gnu'
-build_cpu='arm'
-build_os='linux-gnu'
-build_vendor='unknown'
-datadir='${prefix}/share'
-exec_prefix='${prefix}'
-host='arm-unknown-linux-gnu'
-host_alias=''
-host_cpu='arm'
-host_os='linux-gnu'
-host_vendor='unknown'
-includedir='/usr/include'
-infodir='${prefix}/info'
-install_sh='/android/sandbox/mkf/funpack/strace-4.5.12/install-sh'
-libdir='${exec_prefix}/lib'
-libexecdir='${exec_prefix}/libexec'
-localstatedir='${prefix}/var'
-mandir='${prefix}/man'
-mkdir_p='mkdir -p --'
-oldincludedir='/usr/include'
-opsys='linux'
-prefix='/data/'
-program_transform_name='s,x,x,'
-sbindir='${exec_prefix}/sbin'
-sharedstatedir='${prefix}/com'
-sysconfdir='${prefix}/etc'
-target_alias=''
-
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-
-#define ARM 1
-#define GETGROUPS_T gid_t
-#define HAVE_ASM_SIGCONTEXT_H 1
-#define HAVE_DECL_SYS_ERRLIST 1
-#define HAVE_DECL_SYS_SIGLIST 1
-#define HAVE_DECL__SYS_SIGLIST 1
-#define HAVE_DIRENT_H 1
-#define HAVE_IF_INDEXTONAME 1
-#define HAVE_INET_NTOP 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_LINUX_ICMP_H 1
-#define HAVE_LINUX_IF_PACKET_H 1
-#define HAVE_LINUX_IN6_H 1
-#define HAVE_LINUX_NETLINK_H 1
-#define HAVE_LINUX_PTRACE_H 1
-#define HAVE_LINUX_UTSNAME_H 1
-#define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-#define HAVE_LONG_LONG 1
-#define HAVE_MEMORY_H 1
-#define HAVE_MQUEUE_H 1
-#define HAVE_NETINET_TCP_H 1
-#define HAVE_NETINET_UDP_H 1
-#define HAVE_POLL_H 1
-#define HAVE_PRCTL 1
-#define HAVE_PREAD 1
-#define HAVE_SENDMSG 1
-#define HAVE_SIGACTION 1
-#define HAVE_SIGINFO_T 1
-#define HAVE_SIG_ATOMIC_T 1
-#define HAVE_STAT64 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRERROR 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STROPTS_H 1
-#define HAVE_STRSIGNAL 1
-#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-#define HAVE_STRUCT_USER_DESC 1
-#define HAVE_STRUCT___OLD_KERNEL_STAT 1
-#define HAVE_SYS_EPOLL_H 1
-#define HAVE_SYS_IOCTL_H 1
-#define HAVE_SYS_POLL_H 1
-#define HAVE_SYS_PTRACE_H 1
-#define HAVE_SYS_REG_H 1
-#define HAVE_SYS_SIGLIST 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_UIO_H 1
-#define HAVE_SYS_VFS_H 1
-#define HAVE_TERMIO_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE__SYS_SIGLIST 1
-#define LINUX 1
-#define PACKAGE "strace"
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_NAME "strace"
-#define PACKAGE_STRING "strace 4.5.12"
-#define PACKAGE_TARNAME "strace"
-#define PACKAGE_VERSION "4.5.12"
-#define RETSIGTYPE void
-#define STDC_HEADERS 1
-#define VERSION "4.5.12"
-#define _GNU_SOURCE 1
-
-configure: exit 0
diff --git a/config.status b/config.status
deleted file mode 100755
index 2457e7c..0000000
--- a/config.status
+++ /dev/null
@@ -1,1317 +0,0 @@
-#! /bin/sh
-# Generated by configure.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=${CONFIG_SHELL-/bin/sh}
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by strace $as_me 4.5.12, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-config_files=" Makefile"
-config_headers=" config.h"
-config_commands=" depfiles"
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-ac_cs_version="\
-strace config.status 4.5.12
-configured by ./configure, generated by GNU Autoconf 2.59,
-  with options \"'--prefix=/data/' '--build=arm-unknown-linux-gnu' 'CFLAGS=-I/android/device/system/kernel_headers/' 'build_alias=arm-unknown-linux-gnu'\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=.
-INSTALL="/usr/bin/install -c"
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-if $ac_cs_recheck; then
-  echo "running /bin/sh ./configure " '--prefix=/data/' '--build=arm-unknown-linux-gnu' 'CFLAGS=-I/android/device/system/kernel_headers/' 'build_alias=arm-unknown-linux-gnu' $ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec /bin/sh ./configure '--prefix=/data/' '--build=arm-unknown-linux-gnu' 'CFLAGS=-I/android/device/system/kernel_headers/' 'build_alias=arm-unknown-linux-gnu' $ac_configure_extra_args --no-create --no-recursion
-fi
-
-#
-# INIT-COMMANDS section.
-#
-
-AMDEP_TRUE="" ac_aux_dir="."
-
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t$/@;t t/; /@;t t$/s/[\\&,]/\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF
-s,@SHELL@,/bin/sh,;t t
-s,@PATH_SEPARATOR@,:,;t t
-s,@PACKAGE_NAME@,strace,;t t
-s,@PACKAGE_TARNAME@,strace,;t t
-s,@PACKAGE_VERSION@,4.5.12,;t t
-s,@PACKAGE_STRING@,strace 4.5.12,;t t
-s,@PACKAGE_BUGREPORT@,,;t t
-s,@exec_prefix@,${prefix},;t t
-s,@prefix@,/data/,;t t
-s,@program_transform_name@,s,x,x,,;t t
-s,@bindir@,${exec_prefix}/bin,;t t
-s,@sbindir@,${exec_prefix}/sbin,;t t
-s,@libexecdir@,${exec_prefix}/libexec,;t t
-s,@datadir@,${prefix}/share,;t t
-s,@sysconfdir@,${prefix}/etc,;t t
-s,@sharedstatedir@,${prefix}/com,;t t
-s,@localstatedir@,${prefix}/var,;t t
-s,@libdir@,${exec_prefix}/lib,;t t
-s,@includedir@,/usr/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,${prefix}/info,;t t
-s,@mandir@,${prefix}/man,;t t
-s,@build_alias@,arm-unknown-linux-gnu,;t t
-s,@host_alias@,,;t t
-s,@target_alias@,,;t t
-s,@DEFS@,-DHAVE_CONFIG_H,;t t
-s,@ECHO_C@,,;t t
-s,@ECHO_N@,-n,;t t
-s,@ECHO_T@,,;t t
-s,@LIBS@,,;t t
-s,@INSTALL_PROGRAM@,${INSTALL},;t t
-s,@INSTALL_SCRIPT@,${INSTALL},;t t
-s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
-s,@CYGPATH_W@,echo,;t t
-s,@PACKAGE@,strace,;t t
-s,@VERSION@,4.5.12,;t t
-s,@ACLOCAL@,${SHELL} /android/sandbox/mkf/funpack/strace-4.5.12/missing --run aclocal-1.9,;t t
-s,@AUTOCONF@,${SHELL} /android/sandbox/mkf/funpack/strace-4.5.12/missing --run autoconf,;t t
-s,@AUTOMAKE@,${SHELL} /android/sandbox/mkf/funpack/strace-4.5.12/missing --run automake-1.9,;t t
-s,@AUTOHEADER@,${SHELL} /android/sandbox/mkf/funpack/strace-4.5.12/missing --run autoheader,;t t
-s,@MAKEINFO@,${SHELL} /android/sandbox/mkf/funpack/strace-4.5.12/missing --run makeinfo,;t t
-s,@install_sh@,/android/sandbox/mkf/funpack/strace-4.5.12/install-sh,;t t
-s,@STRIP@,,;t t
-s,@ac_ct_STRIP@,,;t t
-s,@INSTALL_STRIP_PROGRAM@,${SHELL} $(install_sh) -c -s,;t t
-s,@mkdir_p@,mkdir -p --,;t t
-s,@AWK@,gawk,;t t
-s,@SET_MAKE@,,;t t
-s,@am__leading_dot@,.,;t t
-s,@AMTAR@,${SHELL} /android/sandbox/mkf/funpack/strace-4.5.12/missing --run tar,;t t
-s,@am__tar@,${AMTAR} chof - "$$tardir",;t t
-s,@am__untar@,${AMTAR} xf -,;t t
-s,@MAINTAINER_MODE_TRUE@,#,;t t
-s,@MAINTAINER_MODE_FALSE@,,;t t
-s,@MAINT@,#,;t t
-s,@build@,arm-unknown-linux-gnu,;t t
-s,@build_cpu@,arm,;t t
-s,@build_vendor@,unknown,;t t
-s,@build_os@,linux-gnu,;t t
-s,@host@,arm-unknown-linux-gnu,;t t
-s,@host_cpu@,arm,;t t
-s,@host_vendor@,unknown,;t t
-s,@host_os@,linux-gnu,;t t
-s,@opsys@,linux,;t t
-s,@arch@,arm,;t t
-s,@LINUX_TRUE@,,;t t
-s,@LINUX_FALSE@,#,;t t
-s,@I386_TRUE@,#,;t t
-s,@I386_FALSE@,,;t t
-s,@X86_64_TRUE@,#,;t t
-s,@X86_64_FALSE@,,;t t
-s,@SUNOS4_TRUE@,#,;t t
-s,@SUNOS4_FALSE@,,;t t
-s,@SVR4_TRUE@,#,;t t
-s,@SVR4_FALSE@,,;t t
-s,@FREEBSD_TRUE@,#,;t t
-s,@FREEBSD_FALSE@,,;t t
-s,@CC@,gcc,;t t
-s,@CFLAGS@,-I/android/device/system/kernel_headers/,;t t
-s,@LDFLAGS@,,;t t
-s,@CPPFLAGS@,,;t t
-s,@ac_ct_CC@,gcc,;t t
-s,@EXEEXT@,,;t t
-s,@OBJEXT@,o,;t t
-s,@DEPDIR@,.deps,;t t
-s,@am__include@,include,;t t
-s,@am__quote@,,;t t
-s,@AMDEP_TRUE@,,;t t
-s,@AMDEP_FALSE@,#,;t t
-s,@AMDEPBACKSLASH@,\,;t t
-s,@CCDEPMODE@,depmode=gcc3,;t t
-s,@am__fastdepCC_TRUE@,,;t t
-s,@am__fastdepCC_FALSE@,#,;t t
-s,@WARNFLAGS@,-Wall,;t t
-s,@CPP@,gcc -E,;t t
-s,@EGREP@,grep -E,;t t
-s,@PERL@,/usr/bin/perl,;t t
-s,@LIBOBJS@,,;t t
-s,@LTLIBOBJS@,,;t t
-CEOF
-
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  sed "/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}
-
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-  # Handle all the #define templates only if necessary.
-  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then
-  # If there are no defines, we may have an empty if/fi
-  :
-  cat >$tmp/defines.sed <<CEOF
-/^[	 ]*#[	 ]*define/!b
-t clr
-: clr
-${ac_dA}PACKAGE_NAME${ac_dB}PACKAGE_NAME${ac_dC}"strace"${ac_dD}
-${ac_dA}PACKAGE_TARNAME${ac_dB}PACKAGE_TARNAME${ac_dC}"strace"${ac_dD}
-${ac_dA}PACKAGE_VERSION${ac_dB}PACKAGE_VERSION${ac_dC}"4.5.12"${ac_dD}
-${ac_dA}PACKAGE_STRING${ac_dB}PACKAGE_STRING${ac_dC}"strace 4.5.12"${ac_dD}
-${ac_dA}PACKAGE_BUGREPORT${ac_dB}PACKAGE_BUGREPORT${ac_dC}""${ac_dD}
-${ac_dA}PACKAGE${ac_dB}PACKAGE${ac_dC}"strace"${ac_dD}
-${ac_dA}VERSION${ac_dB}VERSION${ac_dC}"4.5.12"${ac_dD}
-${ac_dA}LINUX${ac_dB}LINUX${ac_dC}1${ac_dD}
-${ac_dA}ARM${ac_dB}ARM${ac_dC}1${ac_dD}
-${ac_dA}_GNU_SOURCE${ac_dB}_GNU_SOURCE${ac_dC}1${ac_dD}
-${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD}
-${ac_dA}HAVE_DIRENT_H${ac_dB}HAVE_DIRENT_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_TYPES_H${ac_dB}HAVE_SYS_TYPES_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_STAT_H${ac_dB}HAVE_SYS_STAT_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STDLIB_H${ac_dB}HAVE_STDLIB_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRING_H${ac_dB}HAVE_STRING_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_MEMORY_H${ac_dB}HAVE_MEMORY_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRINGS_H${ac_dB}HAVE_STRINGS_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_INTTYPES_H${ac_dB}HAVE_INTTYPES_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STDINT_H${ac_dB}HAVE_STDINT_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRUCT_STAT_ST_BLKSIZE${ac_dB}HAVE_STRUCT_STAT_ST_BLKSIZE${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRUCT_STAT_ST_BLOCKS${ac_dB}HAVE_STRUCT_STAT_ST_BLOCKS${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRUCT_STAT_ST_RDEV${ac_dB}HAVE_STRUCT_STAT_ST_RDEV${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STAT64${ac_dB}HAVE_STAT64${ac_dC}1${ac_dD}
-${ac_dA}RETSIGTYPE${ac_dB}RETSIGTYPE${ac_dC}void${ac_dD}
-${ac_dA}GETGROUPS_T${ac_dB}GETGROUPS_T${ac_dC}gid_t${ac_dD}
-${ac_dA}HAVE_SIG_ATOMIC_T${ac_dB}HAVE_SIG_ATOMIC_T${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SIGINFO_T${ac_dB}HAVE_SIGINFO_T${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID${ac_dB}HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LONG_LONG${ac_dB}HAVE_LONG_LONG${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LITTLE_ENDIAN_LONG_LONG${ac_dB}HAVE_LITTLE_ENDIAN_LONG_LONG${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SIGACTION${ac_dB}HAVE_SIGACTION${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRERROR${ac_dB}HAVE_STRERROR${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRSIGNAL${ac_dB}HAVE_STRSIGNAL${ac_dC}1${ac_dD}
-${ac_dA}HAVE_PREAD${ac_dB}HAVE_PREAD${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_SIGLIST${ac_dB}HAVE_SYS_SIGLIST${ac_dC}1${ac_dD}
-${ac_dA}HAVE__SYS_SIGLIST${ac_dB}HAVE__SYS_SIGLIST${ac_dC}1${ac_dD}
-CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-
-  cat >$tmp/defines.sed <<CEOF
-/^[	 ]*#[	 ]*define/!b
-t clr
-: clr
-${ac_dA}HAVE_PRCTL${ac_dB}HAVE_PRCTL${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SENDMSG${ac_dB}HAVE_SENDMSG${ac_dC}1${ac_dD}
-${ac_dA}HAVE_INET_NTOP${ac_dB}HAVE_INET_NTOP${ac_dC}1${ac_dD}
-${ac_dA}HAVE_IF_INDEXTONAME${ac_dB}HAVE_IF_INDEXTONAME${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_REG_H${ac_dB}HAVE_SYS_REG_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STROPTS_H${ac_dB}HAVE_STROPTS_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_IOCTL_H${ac_dB}HAVE_SYS_IOCTL_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_PTRACE_H${ac_dB}HAVE_SYS_PTRACE_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_TERMIO_H${ac_dB}HAVE_TERMIO_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LINUX_PTRACE_H${ac_dB}HAVE_LINUX_PTRACE_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_UIO_H${ac_dB}HAVE_SYS_UIO_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_POLL_H${ac_dB}HAVE_POLL_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_POLL_H${ac_dB}HAVE_SYS_POLL_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_VFS_H${ac_dB}HAVE_SYS_VFS_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LINUX_UTSNAME_H${ac_dB}HAVE_LINUX_UTSNAME_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_MQUEUE_H${ac_dB}HAVE_MQUEUE_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_EPOLL_H${ac_dB}HAVE_SYS_EPOLL_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LINUX_ICMP_H${ac_dB}HAVE_LINUX_ICMP_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LINUX_IN6_H${ac_dB}HAVE_LINUX_IN6_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LINUX_NETLINK_H${ac_dB}HAVE_LINUX_NETLINK_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LINUX_IF_PACKET_H${ac_dB}HAVE_LINUX_IF_PACKET_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_ASM_SIGCONTEXT_H${ac_dB}HAVE_ASM_SIGCONTEXT_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_NETINET_TCP_H${ac_dB}HAVE_NETINET_TCP_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_NETINET_UDP_H${ac_dB}HAVE_NETINET_UDP_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRUCT_MSGHDR_MSG_CONTROL${ac_dB}HAVE_STRUCT_MSGHDR_MSG_CONTROL${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRUCT___OLD_KERNEL_STAT${ac_dB}HAVE_STRUCT___OLD_KERNEL_STAT${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRUCT_USER_DESC${ac_dB}HAVE_STRUCT_USER_DESC${ac_dC}1${ac_dD}
-${ac_dA}HAVE_DECL_SYS_ERRLIST${ac_dB}HAVE_DECL_SYS_ERRLIST${ac_dC}1${ac_dD}
-${ac_dA}HAVE_DECL_SYS_SIGLIST${ac_dB}HAVE_DECL_SYS_SIGLIST${ac_dC}1${ac_dD}
-${ac_dA}HAVE_DECL__SYS_SIGLIST${ac_dB}HAVE_DECL__SYS_SIGLIST${ac_dC}1${ac_dD}
-CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-
-  fi # grep
-
-  # Handle all the #undef templates
-  cat >$tmp/undefs.sed <<CEOF
-/^[	 ]*#[	 ]*undef/!b
-t clr
-: clr
-${ac_uA}PACKAGE_NAME${ac_uB}PACKAGE_NAME${ac_uC}"strace"${ac_uD}
-${ac_uA}PACKAGE_TARNAME${ac_uB}PACKAGE_TARNAME${ac_uC}"strace"${ac_uD}
-${ac_uA}PACKAGE_VERSION${ac_uB}PACKAGE_VERSION${ac_uC}"4.5.12"${ac_uD}
-${ac_uA}PACKAGE_STRING${ac_uB}PACKAGE_STRING${ac_uC}"strace 4.5.12"${ac_uD}
-${ac_uA}PACKAGE_BUGREPORT${ac_uB}PACKAGE_BUGREPORT${ac_uC}""${ac_uD}
-${ac_uA}PACKAGE${ac_uB}PACKAGE${ac_uC}"strace"${ac_uD}
-${ac_uA}VERSION${ac_uB}VERSION${ac_uC}"4.5.12"${ac_uD}
-${ac_uA}LINUX${ac_uB}LINUX${ac_uC}1${ac_uD}
-${ac_uA}ARM${ac_uB}ARM${ac_uC}1${ac_uD}
-${ac_uA}_GNU_SOURCE${ac_uB}_GNU_SOURCE${ac_uC}1${ac_uD}
-${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD}
-${ac_uA}HAVE_DIRENT_H${ac_uB}HAVE_DIRENT_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_TYPES_H${ac_uB}HAVE_SYS_TYPES_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_STAT_H${ac_uB}HAVE_SYS_STAT_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STDLIB_H${ac_uB}HAVE_STDLIB_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRING_H${ac_uB}HAVE_STRING_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_MEMORY_H${ac_uB}HAVE_MEMORY_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRINGS_H${ac_uB}HAVE_STRINGS_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_INTTYPES_H${ac_uB}HAVE_INTTYPES_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STDINT_H${ac_uB}HAVE_STDINT_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRUCT_STAT_ST_BLKSIZE${ac_uB}HAVE_STRUCT_STAT_ST_BLKSIZE${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRUCT_STAT_ST_BLOCKS${ac_uB}HAVE_STRUCT_STAT_ST_BLOCKS${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRUCT_STAT_ST_RDEV${ac_uB}HAVE_STRUCT_STAT_ST_RDEV${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STAT64${ac_uB}HAVE_STAT64${ac_uC}1${ac_uD}
-${ac_uA}RETSIGTYPE${ac_uB}RETSIGTYPE${ac_uC}void${ac_uD}
-${ac_uA}GETGROUPS_T${ac_uB}GETGROUPS_T${ac_uC}gid_t${ac_uD}
-${ac_uA}HAVE_SIG_ATOMIC_T${ac_uB}HAVE_SIG_ATOMIC_T${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SIGINFO_T${ac_uB}HAVE_SIGINFO_T${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID${ac_uB}HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LONG_LONG${ac_uB}HAVE_LONG_LONG${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LITTLE_ENDIAN_LONG_LONG${ac_uB}HAVE_LITTLE_ENDIAN_LONG_LONG${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SIGACTION${ac_uB}HAVE_SIGACTION${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRERROR${ac_uB}HAVE_STRERROR${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRSIGNAL${ac_uB}HAVE_STRSIGNAL${ac_uC}1${ac_uD}
-${ac_uA}HAVE_PREAD${ac_uB}HAVE_PREAD${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_SIGLIST${ac_uB}HAVE_SYS_SIGLIST${ac_uC}1${ac_uD}
-${ac_uA}HAVE__SYS_SIGLIST${ac_uB}HAVE__SYS_SIGLIST${ac_uC}1${ac_uD}
-CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-
-  cat >$tmp/undefs.sed <<CEOF
-/^[	 ]*#[	 ]*undef/!b
-t clr
-: clr
-${ac_uA}HAVE_PRCTL${ac_uB}HAVE_PRCTL${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SENDMSG${ac_uB}HAVE_SENDMSG${ac_uC}1${ac_uD}
-${ac_uA}HAVE_INET_NTOP${ac_uB}HAVE_INET_NTOP${ac_uC}1${ac_uD}
-${ac_uA}HAVE_IF_INDEXTONAME${ac_uB}HAVE_IF_INDEXTONAME${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_REG_H${ac_uB}HAVE_SYS_REG_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STROPTS_H${ac_uB}HAVE_STROPTS_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_IOCTL_H${ac_uB}HAVE_SYS_IOCTL_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_PTRACE_H${ac_uB}HAVE_SYS_PTRACE_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_TERMIO_H${ac_uB}HAVE_TERMIO_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LINUX_PTRACE_H${ac_uB}HAVE_LINUX_PTRACE_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_UIO_H${ac_uB}HAVE_SYS_UIO_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_POLL_H${ac_uB}HAVE_POLL_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_POLL_H${ac_uB}HAVE_SYS_POLL_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_VFS_H${ac_uB}HAVE_SYS_VFS_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LINUX_UTSNAME_H${ac_uB}HAVE_LINUX_UTSNAME_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_MQUEUE_H${ac_uB}HAVE_MQUEUE_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_EPOLL_H${ac_uB}HAVE_SYS_EPOLL_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LINUX_ICMP_H${ac_uB}HAVE_LINUX_ICMP_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LINUX_IN6_H${ac_uB}HAVE_LINUX_IN6_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LINUX_NETLINK_H${ac_uB}HAVE_LINUX_NETLINK_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LINUX_IF_PACKET_H${ac_uB}HAVE_LINUX_IF_PACKET_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_ASM_SIGCONTEXT_H${ac_uB}HAVE_ASM_SIGCONTEXT_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_NETINET_TCP_H${ac_uB}HAVE_NETINET_TCP_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_NETINET_UDP_H${ac_uB}HAVE_NETINET_UDP_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRUCT_MSGHDR_MSG_CONTROL${ac_uB}HAVE_STRUCT_MSGHDR_MSG_CONTROL${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRUCT___OLD_KERNEL_STAT${ac_uB}HAVE_STRUCT___OLD_KERNEL_STAT${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRUCT_USER_DESC${ac_uB}HAVE_STRUCT_USER_DESC${ac_uC}1${ac_uD}
-${ac_uA}HAVE_DECL_SYS_ERRLIST${ac_uB}HAVE_DECL_SYS_ERRLIST${ac_uC}1${ac_uD}
-${ac_uA}HAVE_DECL_SYS_SIGLIST${ac_uB}HAVE_DECL_SYS_SIGLIST${ac_uC}1${ac_uD}
-${ac_uA}HAVE_DECL__SYS_SIGLIST${ac_uB}HAVE_DECL__SYS_SIGLIST${ac_uC}1${ac_uD}
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-  esac
-done
-
-{ (exit 0); exit 0; }
diff --git a/config.sub b/config.sub
deleted file mode 100755
index 987b17d..0000000
--- a/config.sub
+++ /dev/null
@@ -1,1566 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-timestamp='2004-11-30'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| msp430 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| msp430-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/configure b/configure
deleted file mode 100755
index 7dcdfb0..0000000
--- a/configure
+++ /dev/null
@@ -1,9730 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for strace 4.5.12.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME='strace'
-PACKAGE_TARNAME='strace'
-PACKAGE_VERSION='4.5.12'
-PACKAGE_STRING='strace 4.5.12'
-PACKAGE_BUGREPORT=''
-
-ac_unique_file="strace.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os opsys arch LINUX_TRUE LINUX_FALSE I386_TRUE I386_FALSE X86_64_TRUE X86_64_FALSE SUNOS4_TRUE SUNOS4_FALSE SVR4_TRUE SVR4_FALSE FREEBSD_TRUE FREEBSD_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE WARNFLAGS CPP EGREP PERL LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-ac_prev=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_option in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures strace 4.5.12 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of strace 4.5.12:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-strace configure 4.5.12
-generated by GNU Autoconf 2.59
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by strace $as_me 4.5.12, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-          ac_config_headers="$ac_config_headers config.h"
-
-am__api_version="1.9"
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL=$ac_install_sh
-  fi
-fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$AWK" && break
-done
-
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-all:
-	@echo 'ac_maketemp="$(MAKE)"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  SET_MAKE=
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='strace'
- VERSION='4.5.12'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  STRIP=$ac_ct_STRIP
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi;
-  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-
-echo "$as_me:$LINENO: checking for supported operating system" >&5
-echo $ECHO_N "checking for supported operating system... $ECHO_C" >&6
-case "$host_os" in
-linux*)
-	opsys=linux
-
-cat >>confdefs.h <<\_ACEOF
-#define LINUX 1
-_ACEOF
-
-	;;
-sunos4*)
-	opsys=sunos4
-
-cat >>confdefs.h <<\_ACEOF
-#define SUNOS4 1
-_ACEOF
-
-	;;
-solaris2* | sysv[45]* | irix[56]*)
-	opsys=svr4
-
-cat >>confdefs.h <<\_ACEOF
-#define SVR4 1
-_ACEOF
-
-	case "$host_os" in
-	sysv4.2uw*)
-
-cat >>confdefs.h <<\_ACEOF
-#define UNIXWARE 2
-_ACEOF
-
-		;;
-	sysv5*)
-
-cat >>confdefs.h <<\_ACEOF
-#define UNIXWARE 7
-_ACEOF
-
-		;;
-	esac
-	;;
-freebsd*)
-	opsys=freebsd
-
-cat >>confdefs.h <<\_ACEOF
-#define FREEBSD 1
-_ACEOF
-
-	;;
-*)
-	echo "$as_me:$LINENO: result: NO!" >&5
-echo "${ECHO_T}NO!" >&6
-	{ { echo "$as_me:$LINENO: error: operating system $host_os is not supported by strace" >&5
-echo "$as_me: error: operating system $host_os is not supported by strace" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-esac
-echo "$as_me:$LINENO: result: $opsys" >&5
-echo "${ECHO_T}$opsys" >&6
-
-echo "$as_me:$LINENO: checking for supported architecture" >&5
-echo $ECHO_N "checking for supported architecture... $ECHO_C" >&6
-case "$host_cpu" in
-i[3456]86|pentium)
-	arch=i386
-
-cat >>confdefs.h <<\_ACEOF
-#define I386 1
-_ACEOF
-
-	;;
-ia64)
-	arch=ia64
-
-cat >>confdefs.h <<\_ACEOF
-#define IA64 1
-_ACEOF
-
-	;;
-m68k)
-	arch=m68k
-
-cat >>confdefs.h <<\_ACEOF
-#define M68K 1
-_ACEOF
-
-	;;
-sparc64*)
-	arch=sparc64
-
-cat >>confdefs.h <<\_ACEOF
-#define SPARC64 1
-_ACEOF
-
-	;;
-sparc*)
-	arch=sparc
-
-cat >>confdefs.h <<\_ACEOF
-#define SPARC 1
-_ACEOF
-
-	;;
-mips*)
-	arch=mips
-
-cat >>confdefs.h <<\_ACEOF
-#define MIPS 1
-_ACEOF
-
-	;;
-alpha*)
-	arch=alpha
-
-cat >>confdefs.h <<\_ACEOF
-#define ALPHA 1
-_ACEOF
-
-	;;
-powerpc*)
-	arch=powerpc
-
-cat >>confdefs.h <<\_ACEOF
-#define POWERPC 1
-_ACEOF
-
-	;;
-arm*)
-	arch=arm
-
-cat >>confdefs.h <<\_ACEOF
-#define ARM 1
-_ACEOF
-
-	;;
-s390)
-	arch=s390
-
-cat >>confdefs.h <<\_ACEOF
-#define S390 1
-_ACEOF
-
-	;;
-s390x)
-	arch=s390x
-
-cat >>confdefs.h <<\_ACEOF
-#define S390X 1
-_ACEOF
-
-	;;
-hppa*|parisc*)
-	arch=hppa
-
-cat >>confdefs.h <<\_ACEOF
-#define HPPA 1
-_ACEOF
-
-	;;
-sh)
-	arch=sh
-
-cat >>confdefs.h <<\_ACEOF
-#define SH 1
-_ACEOF
-
-	;;
-sh64)
-	arch=sh64
-
-cat >>confdefs.h <<\_ACEOF
-#define SH64 1
-_ACEOF
-
-	;;
-x86?64*)
-	arch=x86_64
-
-cat >>confdefs.h <<\_ACEOF
-#define X86_64 1
-_ACEOF
-
-	;;
-*)
-	echo "$as_me:$LINENO: result: NO!" >&5
-echo "${ECHO_T}NO!" >&6
-	{ { echo "$as_me:$LINENO: error: architecture $host_cpu is not supported by strace" >&5
-echo "$as_me: error: architecture $host_cpu is not supported by strace" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-esac
-echo "$as_me:$LINENO: result: $arch" >&5
-echo "${ECHO_T}$arch" >&6
-
-
-
-
-
-
-if test x$opsys = xlinux; then
-  LINUX_TRUE=
-  LINUX_FALSE='#'
-else
-  LINUX_TRUE='#'
-  LINUX_FALSE=
-fi
-
-
-
-if test x$arch = xi386; then
-  I386_TRUE=
-  I386_FALSE='#'
-else
-  I386_TRUE='#'
-  I386_FALSE=
-fi
-
-
-
-if test x$arch = xx86_64; then
-  X86_64_TRUE=
-  X86_64_FALSE='#'
-else
-  X86_64_TRUE='#'
-  X86_64_FALSE=
-fi
-
-
-
-if test x$opsys = xsunos4; then
-  SUNOS4_TRUE=
-  SUNOS4_FALSE='#'
-else
-  SUNOS4_TRUE='#'
-  SUNOS4_FALSE=
-fi
-
-
-
-if test x$opsys = xsvr4; then
-  SVR4_TRUE=
-  SVR4_FALSE='#'
-else
-  SVR4_TRUE='#'
-  SVR4_FALSE=
-fi
-
-
-
-if test x$opsys = xfreebsd; then
-  FREEBSD_TRUE=
-  FREEBSD_FALSE='#'
-else
-  FREEBSD_TRUE='#'
-  FREEBSD_FALSE=
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
-    * )
-	break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-          ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval="$enable_dependency_tracking"
-
-fi;
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-
-depcc="$CC"   am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
-
-
-
-
-echo "$as_me:$LINENO: checking for primary include directory" >&5
-echo $ECHO_N "checking for primary include directory... $ECHO_C" >&6
-includedir=/usr/include
-if test -n "$GCC"
-then
-	>conftest.c
-	new_includedir=`
-		$CC -v -E conftest.c 2>&1 | $AWK '
-			/^End of search list/ { print last; exit }
-			{ last = $1 }
-		'
-	`
-	rm -f conftest.c
-	if test -n "$new_includedir" && test -d "$new_includedir"
-	then
-		includedir=$new_includedir
-	fi
-fi
-echo "$as_me:$LINENO: result: $includedir" >&5
-echo "${ECHO_T}$includedir" >&6
-
-
-if test "x$opsys" = "xsunos4" && test "x$arch" = "xsparc"
-then
-	echo "$as_me:$LINENO: checking for valid machine include directory" >&5
-echo $ECHO_N "checking for valid machine include directory... $ECHO_C" >&6
-	if test -d "$includedir/sun4"
-	then
-		rm -f machine
-		ln -s $includedir/sun4 machine
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define SUNOS4_KERNEL_ARCH_KLUDGE 1
-_ACEOF
-
-	else
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-	fi
-fi
-
-
-if test -z "$WARNFLAGS"
-then
-	if test -n "$GCC"
-	then
-		# If we're using gcc we want warning flags.
-		WARNFLAGS=-Wall
-	fi
-fi
-
-if test "x$opsys" = "xsunos4"
-then
-	if test -n "$GCC"
-	then
-		# SunOS 4.x header files don't declare int functions.
-		WARNFLAGS="$WARNFLAGS -Wno-implicit"
-	fi
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
-if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
-echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
-if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-    ac_pattern="Autoconf.*'x'"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sgtty.h>
-Autoconf TIOCGETP
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
-  ac_cv_prog_gcc_traditional=yes
-else
-  ac_cv_prog_gcc_traditional=no
-fi
-rm -f conftest*
-
-
-  if test $ac_cv_prog_gcc_traditional = no; then
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <termio.h>
-Autoconf TCGETA
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
-  ac_cv_prog_gcc_traditional=yes
-fi
-rm -f conftest*
-
-  fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
-  if test $ac_cv_prog_gcc_traditional = yes; then
-    CC="$CC -traditional"
-  fi
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL=$ac_install_sh
-  fi
-fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset x;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-  }
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_const=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_const=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-
-
-
-
-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <$ac_hdr>
-
-int
-main ()
-{
-if ((DIR *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-_ACEOF
-
-ac_header_dirent=$ac_hdr; break
-fi
-
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_opendir=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char opendir ();
-int
-main ()
-{
-opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="none required"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_opendir" = no; then
-  for ac_lib in dir; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char opendir ();
-int
-main ()
-{
-opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6
-if test "$ac_cv_search_opendir" != no; then
-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-
-fi
-
-else
-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_opendir=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char opendir ();
-int
-main ()
-{
-opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="none required"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_opendir" = no; then
-  for ac_lib in x; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char opendir ();
-int
-main ()
-{
-opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6
-if test "$ac_cv_search_opendir" != no; then
-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-
-fi
-
-fi
-
-echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
-echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
-if test "${ac_cv_header_stat_broken+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined(S_ISBLK) && defined(S_IFDIR)
-# if S_ISBLK (S_IFDIR)
-You lose.
-# endif
-#endif
-
-#if defined(S_ISBLK) && defined(S_IFCHR)
-# if S_ISBLK (S_IFCHR)
-You lose.
-# endif
-#endif
-
-#if defined(S_ISLNK) && defined(S_IFREG)
-# if S_ISLNK (S_IFREG)
-You lose.
-# endif
-#endif
-
-#if defined(S_ISSOCK) && defined(S_IFREG)
-# if S_ISSOCK (S_IFREG)
-You lose.
-# endif
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "You lose" >/dev/null 2>&1; then
-  ac_cv_header_stat_broken=yes
-else
-  ac_cv_header_stat_broken=no
-fi
-rm -f conftest*
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
-echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
-if test $ac_cv_header_stat_broken = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STAT_MACROS_BROKEN 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
-echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
-if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_blksize)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_blksize=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_blksize)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_blksize=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_stat_st_blksize=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
-if test $ac_cv_member_struct_stat_st_blksize = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
-echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
-if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_blocks)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_blocks=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_blocks)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_blocks=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_stat_st_blocks=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6
-if test $ac_cv_member_struct_stat_st_blocks = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for struct stat.st_aclcnt" >&5
-echo $ECHO_N "checking for struct stat.st_aclcnt... $ECHO_C" >&6
-if test "${ac_cv_member_struct_stat_st_aclcnt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_aclcnt)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_aclcnt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_aclcnt)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_aclcnt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_stat_st_aclcnt=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_aclcnt" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_aclcnt" >&6
-if test $ac_cv_member_struct_stat_st_aclcnt = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_ACLCNT 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for struct stat.st_flags" >&5
-echo $ECHO_N "checking for struct stat.st_flags... $ECHO_C" >&6
-if test "${ac_cv_member_struct_stat_st_flags+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_flags)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_flags=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_flags)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_flags=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_stat_st_flags=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_flags" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_flags" >&6
-if test $ac_cv_member_struct_stat_st_flags = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_FLAGS 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for struct stat.st_fstype" >&5
-echo $ECHO_N "checking for struct stat.st_fstype... $ECHO_C" >&6
-if test "${ac_cv_member_struct_stat_st_fstype+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_fstype)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_fstype=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_fstype)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_fstype=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_stat_st_fstype=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_fstype" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_fstype" >&6
-if test $ac_cv_member_struct_stat_st_fstype = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_FSTYPE 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for struct stat.st_gen" >&5
-echo $ECHO_N "checking for struct stat.st_gen... $ECHO_C" >&6
-if test "${ac_cv_member_struct_stat_st_gen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_gen)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_gen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_gen)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_gen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_stat_st_gen=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_gen" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_gen" >&6
-if test $ac_cv_member_struct_stat_st_gen = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_GEN 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for struct stat.st_level" >&5
-echo $ECHO_N "checking for struct stat.st_level... $ECHO_C" >&6
-if test "${ac_cv_member_struct_stat_st_level+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_level)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_level=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_level)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_level=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_stat_st_level=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_level" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_level" >&6
-if test $ac_cv_member_struct_stat_st_level = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_LEVEL 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
-echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6
-if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_rdev)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_rdev=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_rdev)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_stat_st_rdev=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_stat_st_rdev=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6
-if test $ac_cv_member_struct_stat_st_rdev = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-_ACEOF
-
-
-fi
-
-echo "$as_me:$LINENO: checking for stat64 in (asm|sys)/stat.h" >&5
-echo $ECHO_N "checking for stat64 in (asm|sys)/stat.h... $ECHO_C" >&6
-if test "${ac_cv_type_stat64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef LINUX
-#include <linux/types.h>
-#include <asm/stat.h>
-#else
-#include <sys/stat.h>
-#endif
-int
-main ()
-{
-struct stat64 st;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_stat64=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_stat64=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-echo "$as_me:$LINENO: result: $ac_cv_type_stat64" >&5
-echo "${ECHO_T}$ac_cv_type_stat64" >&6
-if test "$ac_cv_type_stat64" = yes
-then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STAT64 1
-_ACEOF
-
-fi
-
-
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
-
-int
-main ()
-{
-int i;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_signal=void
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_signal=int
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
-  ac_cv_type_uid_t=yes
-else
-  ac_cv_type_uid_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6
-if test $ac_cv_type_uid_t = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for mode_t" >&5
-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
-if test "${ac_cv_type_mode_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((mode_t *) 0)
-  return 0;
-if (sizeof (mode_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_mode_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_mode_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-echo "${ECHO_T}$ac_cv_type_mode_t" >&6
-if test $ac_cv_type_mode_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define mode_t int
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
-echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
-if test "${ac_cv_type_getgroups+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_type_getgroups=cross
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Thanks to Mike Rendell for this test.  */
-#include <sys/types.h>
-#define NGID 256
-#undef MAX
-#define MAX(x, y) ((x) > (y) ? (x) : (y))
-
-int
-main ()
-{
-  gid_t gidset[NGID];
-  int i, n;
-  union { gid_t gval; long lval; }  val;
-
-  val.lval = -1;
-  for (i = 0; i < NGID; i++)
-    gidset[i] = val.gval;
-  n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
-		 gidset);
-  /* Exit non-zero if getgroups seems to require an array of ints.  This
-     happens when gid_t is short but getgroups modifies an array of ints.  */
-  exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_getgroups=gid_t
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_type_getgroups=int
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-if test $ac_cv_type_getgroups = cross; then
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <unistd.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then
-  ac_cv_type_getgroups=gid_t
-else
-  ac_cv_type_getgroups=int
-fi
-rm -f conftest*
-
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
-echo "${ECHO_T}$ac_cv_type_getgroups" >&6
-
-cat >>confdefs.h <<_ACEOF
-#define GETGROUPS_T $ac_cv_type_getgroups
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking whether sys/types.h defines makedev" >&5
-echo $ECHO_N "checking whether sys/types.h defines makedev... $ECHO_C" >&6
-if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-int
-main ()
-{
-return makedev(0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_sys_types_h_makedev=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_sys_types_h_makedev=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_types_h_makedev" >&5
-echo "${ECHO_T}$ac_cv_header_sys_types_h_makedev" >&6
-
-if test $ac_cv_header_sys_types_h_makedev = no; then
-if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for sys/mkdev.h" >&5
-echo $ECHO_N "checking for sys/mkdev.h... $ECHO_C" >&6
-if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_mkdev_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_mkdev_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking sys/mkdev.h usability" >&5
-echo $ECHO_N "checking sys/mkdev.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <sys/mkdev.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking sys/mkdev.h presence" >&5
-echo $ECHO_N "checking sys/mkdev.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/mkdev.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/mkdev.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/mkdev.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/mkdev.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/mkdev.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/mkdev.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/mkdev.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/mkdev.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/mkdev.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/mkdev.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/mkdev.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/mkdev.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## --------------------------------- ##
-## Report this to the strace lists.  ##
-## --------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for sys/mkdev.h" >&5
-echo $ECHO_N "checking for sys/mkdev.h... $ECHO_C" >&6
-if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_sys_mkdev_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_mkdev_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_mkdev_h" >&6
-
-fi
-if test $ac_cv_header_sys_mkdev_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define MAJOR_IN_MKDEV 1
-_ACEOF
-
-fi
-
-
-
-  if test $ac_cv_header_sys_mkdev_h = no; then
-    if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for sys/sysmacros.h" >&5
-echo $ECHO_N "checking for sys/sysmacros.h... $ECHO_C" >&6
-if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysmacros_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_sysmacros_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking sys/sysmacros.h usability" >&5
-echo $ECHO_N "checking sys/sysmacros.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <sys/sysmacros.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking sys/sysmacros.h presence" >&5
-echo $ECHO_N "checking sys/sysmacros.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/sysmacros.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/sysmacros.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/sysmacros.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/sysmacros.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/sysmacros.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/sysmacros.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/sysmacros.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/sysmacros.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/sysmacros.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/sysmacros.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## --------------------------------- ##
-## Report this to the strace lists.  ##
-## --------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for sys/sysmacros.h" >&5
-echo $ECHO_N "checking for sys/sysmacros.h... $ECHO_C" >&6
-if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_sys_sysmacros_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysmacros_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_sysmacros_h" >&6
-
-fi
-if test $ac_cv_header_sys_sysmacros_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define MAJOR_IN_SYSMACROS 1
-_ACEOF
-
-fi
-
-
-  fi
-fi
-
-echo "$as_me:$LINENO: checking for sig_atomic_t" >&5
-echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
-if test "${ac_cv_type_sig_atomic_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <signal.h>
-
-int
-main ()
-{
-if ((sig_atomic_t *) 0)
-  return 0;
-if (sizeof (sig_atomic_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_sig_atomic_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_sig_atomic_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5
-echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
-if test $ac_cv_type_sig_atomic_t = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SIG_ATOMIC_T 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for siginfo_t" >&5
-echo $ECHO_N "checking for siginfo_t... $ECHO_C" >&6
-if test "${ac_cv_type_siginfo_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <signal.h>
-
-int
-main ()
-{
-if ((siginfo_t *) 0)
-  return 0;
-if (sizeof (siginfo_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_siginfo_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_siginfo_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_siginfo_t" >&5
-echo "${ECHO_T}$ac_cv_type_siginfo_t" >&6
-if test $ac_cv_type_siginfo_t = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SIGINFO_T 1
-_ACEOF
-
-
-fi
-
-echo "$as_me:$LINENO: checking for struct sockaddr_in6.sin6_scope_id" >&5
-echo $ECHO_N "checking for struct sockaddr_in6.sin6_scope_id... $ECHO_C" >&6
-if test "${ac_cv_member_struct_sockaddr_in6_sin6_scope_id+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-int
-main ()
-{
-static struct sockaddr_in6 ac_aggr;
-if (ac_aggr.sin6_scope_id)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-int
-main ()
-{
-static struct sockaddr_in6 ac_aggr;
-if (sizeof ac_aggr.sin6_scope_id)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_sockaddr_in6_sin6_scope_id=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&5
-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&6
-if test $ac_cv_member_struct_sockaddr_in6_sin6_scope_id = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-_ACEOF
-
-
-fi
-
-echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long long *) 0)
-  return 0;
-if (sizeof (long long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6
-if test $ac_cv_type_long_long = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LONG_LONG 1
-_ACEOF
-
-
-fi
-
-echo "$as_me:$LINENO: checking for little endian long long" >&5
-echo $ECHO_N "checking for little endian long long... $ECHO_C" >&6
-if test "${ac_cv_have_little_endian_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Should try to guess here
-ac_cv_have_little_endian_long_long=no
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int main () {
-	union {
-		long long ll;
-		long l [2];
-	} u;
-	u.ll = 0x12345678;
-	if (u.l[0] == 0x12345678)
-		return 0;
-	return 1;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_little_endian_long_long=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_have_little_endian_long_long=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-
-echo "$as_me:$LINENO: result: $ac_cv_have_little_endian_long_long" >&5
-echo "${ECHO_T}$ac_cv_have_little_endian_long_long" >&6
-if test "$ac_cv_have_little_endian_long_long" = yes
-then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LITTLE_ENDIAN_LONG_LONG 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for long long off_t" >&5
-echo $ECHO_N "checking for long long off_t... $ECHO_C" >&6
-if test "${ac_cv_have_long_long_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Should try to guess here
-ac_cv_have_long_long_off_t=no
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-main () {
-	if (sizeof (off_t) == sizeof (long long) &&
-	    sizeof (off_t) > sizeof (long))
-	    return 0;
-	return 1;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_long_long_off_t=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_have_long_long_off_t=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-
-echo "$as_me:$LINENO: result: $ac_cv_have_long_long_off_t" >&5
-echo "${ECHO_T}$ac_cv_have_long_long_off_t" >&6
-if test "$ac_cv_have_long_long_off_t" = yes
-then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_LONG_OFF_T 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for long long rlim_t" >&5
-echo $ECHO_N "checking for long long rlim_t... $ECHO_C" >&6
-if test "${ac_cv_have_long_long_rlim_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Should try to guess here
-ac_cv_have_long_long_rlim_t=no
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-main () {
-	if (sizeof (rlim_t) == sizeof (long long) &&
-	    sizeof (rlim_t) > sizeof (long))
-	    return 0;
-	return 1;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_long_long_rlim_t=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_have_long_long_rlim_t=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-
-echo "$as_me:$LINENO: result: $ac_cv_have_long_long_rlim_t" >&5
-echo "${ECHO_T}$ac_cv_have_long_long_rlim_t" >&6
-if test "$ac_cv_have_long_long_rlim_t" = yes
-then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_LONG_RLIM_T 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for struct opthdr" >&5
-echo $ECHO_N "checking for struct opthdr... $ECHO_C" >&6
-if test "${ac_cv_type_struct_opthdr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/socket.h>
-
-int
-main ()
-{
-if ((struct opthdr *) 0)
-  return 0;
-if (sizeof (struct opthdr))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_struct_opthdr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_struct_opthdr=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_struct_opthdr" >&5
-echo "${ECHO_T}$ac_cv_type_struct_opthdr" >&6
-if test $ac_cv_type_struct_opthdr = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_OPTHDR 1
-_ACEOF
-
-
-fi
-
-echo "$as_me:$LINENO: checking for struct t_opthdr" >&5
-echo $ECHO_N "checking for struct t_opthdr... $ECHO_C" >&6
-if test "${ac_cv_type_struct_t_opthdr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/tiuser.h>
-
-int
-main ()
-{
-if ((struct t_opthdr *) 0)
-  return 0;
-if (sizeof (struct t_opthdr))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_struct_t_opthdr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_struct_t_opthdr=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_struct_t_opthdr" >&5
-echo "${ECHO_T}$ac_cv_type_struct_t_opthdr" >&6
-if test $ac_cv_type_struct_t_opthdr = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_T_OPTHDR 1
-_ACEOF
-
-
-fi
-
-
-if test x$opsys != xlinux; then
-
-echo "$as_me:$LINENO: checking for main in -lnsl" >&5
-echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
-if test $ac_cv_lib_nsl_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNSL 1
-_ACEOF
-
-  LIBS="-lnsl $LIBS"
-
-fi
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl prctl sendmsg inet_ntop if_indextoname
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h  poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h sys/epoll.h libaio.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## --------------------------------- ##
-## Report this to the strace lists.  ##
-## --------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-for ac_header in linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <linux/socket.h>
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in asm/sigcontext.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <signal.h>
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in netinet/tcp.h netinet/udp.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <netinet/in.h>
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-echo "$as_me:$LINENO: checking for MP procfs" >&5
-echo $ECHO_N "checking for MP procfs... $ECHO_C" >&6
-if test "${ac_cv_mp_procfs+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-
-# Guess or punt.
-case "$host_os" in
-svr4.2*|svr5*)
-	ac_cv_mp_procfs=yes
-	;;
-*)
-	ac_cv_mp_procfs=no
-	;;
-esac
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <signal.h>
-#include <sys/procfs.h>
-
-main()
-{
-	int pid;
-	char proc[32];
-	FILE *ctl;
-	FILE *status;
-	int cmd;
-	struct pstatus pstatus;
-
-	if ((pid = fork()) == 0) {
-		pause();
-		exit(0);
-	}
-	sprintf(proc, "/proc/%d/ctl", pid);
-	if ((ctl = fopen(proc, "w")) == NULL)
-		goto fail;
-	sprintf(proc, "/proc/%d/status", pid);
-	if ((status = fopen (proc, "r")) == NULL)
-		goto fail;
-	cmd = PCSTOP;
-	if (write (fileno (ctl), &cmd, sizeof cmd) < 0)
-		goto fail;
-	if (read (fileno (status), &pstatus, sizeof pstatus) < 0)
-		goto fail;
-	kill(pid, SIGKILL);
-	exit(0);
-fail:
-	kill(pid, SIGKILL);
-	exit(1);
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_mp_procfs=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_mp_procfs=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-
-echo "$as_me:$LINENO: result: $ac_cv_mp_procfs" >&5
-echo "${ECHO_T}$ac_cv_mp_procfs" >&6
-if test "$ac_cv_mp_procfs" = yes
-then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MP_PROCFS 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for pollable procfs" >&5
-echo $ECHO_N "checking for pollable procfs... $ECHO_C" >&6
-if test "${ac_cv_pollable_procfs+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-
-# Guess or punt.
-case "$host_os" in
-solaris2*|irix5*|svr4.2uw*|svr5*)
-	ac_cv_pollable_procfs=yes
-	;;
-*)
-	ac_cv_pollable_procfs=no
-	;;
-esac
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <signal.h>
-#include <sys/procfs.h>
-#include <sys/stropts.h>
-#include <poll.h>
-
-#ifdef HAVE_MP_PROCFS
-#define PIOCSTOP	PCSTOP
-#define POLLWANT	POLLWRNORM
-#define PROC		"/proc/%d/ctl"
-#define PROC_MODE	"w"
-int IOCTL (int fd, int cmd, int arg) {
-	return write (fd, &cmd, sizeof cmd);
-}
-#else
-#define POLLWANT	POLLPRI
-#define	PROC		"/proc/%d"
-#define PROC_MODE	"r+"
-#define IOCTL		ioctl
-#endif
-
-main()
-{
-	int pid;
-	char proc[32];
-	FILE *pfp;
-	struct pollfd pfd;
-
-	if ((pid = fork()) == 0) {
-		pause();
-		exit(0);
-	}
-	sprintf(proc, PROC, pid);
-	if ((pfp = fopen(proc, PROC_MODE)) == NULL)
-		goto fail;
-	if (IOCTL(fileno(pfp), PIOCSTOP, NULL) < 0)
-		goto fail;
-	pfd.fd = fileno(pfp);
-	pfd.events = POLLWANT;
-	if (poll(&pfd, 1, 0) < 0)
-		goto fail;
-	if (!(pfd.revents & POLLWANT))
-		goto fail;
-	kill(pid, SIGKILL);
-	exit(0);
-fail:
-	kill(pid, SIGKILL);
-	exit(1);
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_pollable_procfs=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_pollable_procfs=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-
-echo "$as_me:$LINENO: result: $ac_cv_pollable_procfs" >&5
-echo "${ECHO_T}$ac_cv_pollable_procfs" >&6
-if test "$ac_cv_pollable_procfs" = yes
-then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POLLABLE_PROCFS 1
-_ACEOF
-
-fi
-
-
-echo "$as_me:$LINENO: checking for struct msghdr.msg_control" >&5
-echo $ECHO_N "checking for struct msghdr.msg_control... $ECHO_C" >&6
-if test "${ac_cv_member_struct_msghdr_msg_control+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/socket.h>
-
-int
-main ()
-{
-static struct msghdr ac_aggr;
-if (ac_aggr.msg_control)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_msghdr_msg_control=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/socket.h>
-
-int
-main ()
-{
-static struct msghdr ac_aggr;
-if (sizeof ac_aggr.msg_control)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_msghdr_msg_control=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_msghdr_msg_control=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_msghdr_msg_control" >&5
-echo "${ECHO_T}$ac_cv_member_struct_msghdr_msg_control" >&6
-if test $ac_cv_member_struct_msghdr_msg_control = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
-_ACEOF
-
-
-fi
-
-echo "$as_me:$LINENO: checking for pr_syscall in struct prstatus" >&5
-echo $ECHO_N "checking for pr_syscall in struct prstatus... $ECHO_C" >&6
-if test "${ac_cv_struct_pr_syscall+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/procfs.h>
-int
-main ()
-{
-#ifdef HAVE_MP_PROCFS
-pstatus_t s;
-s.pr_lwp.pr_syscall
-#else
-prstatus_t s;
-s.pr_syscall
-#endif
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_struct_pr_syscall=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_struct_pr_syscall=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-echo "$as_me:$LINENO: result: $ac_cv_struct_pr_syscall" >&5
-echo "${ECHO_T}$ac_cv_struct_pr_syscall" >&6
-if test "$ac_cv_struct_pr_syscall" = yes
-then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PR_SYSCALL 1
-_ACEOF
-
-fi
-
-
-echo "$as_me:$LINENO: checking for struct T_conn_res.QUEUE_ptr" >&5
-echo $ECHO_N "checking for struct T_conn_res.QUEUE_ptr... $ECHO_C" >&6
-if test "${ac_cv_member_struct_T_conn_res_QUEUE_ptr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/stream.h>
-#include <sys/tihdr.h>
-
-int
-main ()
-{
-static struct T_conn_res ac_aggr;
-if (ac_aggr.QUEUE_ptr)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_T_conn_res_QUEUE_ptr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/stream.h>
-#include <sys/tihdr.h>
-
-int
-main ()
-{
-static struct T_conn_res ac_aggr;
-if (sizeof ac_aggr.QUEUE_ptr)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_T_conn_res_QUEUE_ptr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_T_conn_res_QUEUE_ptr=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_T_conn_res_QUEUE_ptr" >&5
-echo "${ECHO_T}$ac_cv_member_struct_T_conn_res_QUEUE_ptr" >&6
-if test $ac_cv_member_struct_T_conn_res_QUEUE_ptr = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_T_CONN_RES_QUEUE_PTR 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for struct T_conn_res.ACCEPTOR_id" >&5
-echo $ECHO_N "checking for struct T_conn_res.ACCEPTOR_id... $ECHO_C" >&6
-if test "${ac_cv_member_struct_T_conn_res_ACCEPTOR_id+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/stream.h>
-#include <sys/tihdr.h>
-
-int
-main ()
-{
-static struct T_conn_res ac_aggr;
-if (ac_aggr.ACCEPTOR_id)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_T_conn_res_ACCEPTOR_id=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/stream.h>
-#include <sys/tihdr.h>
-
-int
-main ()
-{
-static struct T_conn_res ac_aggr;
-if (sizeof ac_aggr.ACCEPTOR_id)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_T_conn_res_ACCEPTOR_id=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_T_conn_res_ACCEPTOR_id=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_T_conn_res_ACCEPTOR_id" >&5
-echo "${ECHO_T}$ac_cv_member_struct_T_conn_res_ACCEPTOR_id" >&6
-if test $ac_cv_member_struct_T_conn_res_ACCEPTOR_id = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_T_CONN_RES_ACCEPTOR_ID 1
-_ACEOF
-
-
-fi
-
-
-echo "$as_me:$LINENO: checking for struct __old_kernel_stat" >&5
-echo $ECHO_N "checking for struct __old_kernel_stat... $ECHO_C" >&6
-if test "${ac_cv_type_struct___old_kernel_stat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <asm/stat.h>
-
-int
-main ()
-{
-if ((struct __old_kernel_stat *) 0)
-  return 0;
-if (sizeof (struct __old_kernel_stat))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_struct___old_kernel_stat=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_struct___old_kernel_stat=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_struct___old_kernel_stat" >&5
-echo "${ECHO_T}$ac_cv_type_struct___old_kernel_stat" >&6
-if test $ac_cv_type_struct___old_kernel_stat = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT___OLD_KERNEL_STAT 1
-_ACEOF
-
-
-fi
-
-
-echo "$as_me:$LINENO: checking for struct pt_all_user_regs" >&5
-echo $ECHO_N "checking for struct pt_all_user_regs... $ECHO_C" >&6
-if test "${ac_cv_type_struct_pt_all_user_regs+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/ptrace.h>
-
-int
-main ()
-{
-if ((struct pt_all_user_regs *) 0)
-  return 0;
-if (sizeof (struct pt_all_user_regs))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_struct_pt_all_user_regs=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_struct_pt_all_user_regs=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_struct_pt_all_user_regs" >&5
-echo "${ECHO_T}$ac_cv_type_struct_pt_all_user_regs" >&6
-if test $ac_cv_type_struct_pt_all_user_regs = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_PT_ALL_USER_REGS 1
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking for struct ia64_fpreg" >&5
-echo $ECHO_N "checking for struct ia64_fpreg... $ECHO_C" >&6
-if test "${ac_cv_type_struct_ia64_fpreg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/ptrace.h>
-
-int
-main ()
-{
-if ((struct ia64_fpreg *) 0)
-  return 0;
-if (sizeof (struct ia64_fpreg))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_struct_ia64_fpreg=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_struct_ia64_fpreg=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_struct_ia64_fpreg" >&5
-echo "${ECHO_T}$ac_cv_type_struct_ia64_fpreg" >&6
-if test $ac_cv_type_struct_ia64_fpreg = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_IA64_FPREG 1
-_ACEOF
-
-
-fi
-
-
-echo "$as_me:$LINENO: checking for struct user_desc" >&5
-echo $ECHO_N "checking for struct user_desc... $ECHO_C" >&6
-if test "${ac_cv_type_struct_user_desc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <asm/ldt.h>
-
-int
-main ()
-{
-if ((struct user_desc *) 0)
-  return 0;
-if (sizeof (struct user_desc))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_struct_user_desc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_struct_user_desc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_struct_user_desc" >&5
-echo "${ECHO_T}$ac_cv_type_struct_user_desc" >&6
-if test $ac_cv_type_struct_user_desc = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_USER_DESC 1
-_ACEOF
-
-
-fi
-
-
-echo "$as_me:$LINENO: checking whether sys_errlist is declared" >&5
-echo $ECHO_N "checking whether sys_errlist is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_sys_errlist+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef sys_errlist
-  char *p = (char *) sys_errlist;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl_sys_errlist=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_have_decl_sys_errlist=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_errlist" >&5
-echo "${ECHO_T}$ac_cv_have_decl_sys_errlist" >&6
-if test $ac_cv_have_decl_sys_errlist = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SYS_ERRLIST 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SYS_ERRLIST 0
-_ACEOF
-
-
-fi
-
-
-echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5
-echo $ECHO_N "checking whether sys_siglist is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_sys_siglist+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <signal.h>
-
-int
-main ()
-{
-#ifndef sys_siglist
-  char *p = (char *) sys_siglist;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl_sys_siglist=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_have_decl_sys_siglist=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5
-echo "${ECHO_T}$ac_cv_have_decl_sys_siglist" >&6
-if test $ac_cv_have_decl_sys_siglist = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SYS_SIGLIST 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SYS_SIGLIST 0
-_ACEOF
-
-
-fi
-echo "$as_me:$LINENO: checking whether _sys_siglist is declared" >&5
-echo $ECHO_N "checking whether _sys_siglist is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl__sys_siglist+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <signal.h>
-
-int
-main ()
-{
-#ifndef _sys_siglist
-  char *p = (char *) _sys_siglist;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl__sys_siglist=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_have_decl__sys_siglist=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl__sys_siglist" >&5
-echo "${ECHO_T}$ac_cv_have_decl__sys_siglist" >&6
-if test $ac_cv_have_decl__sys_siglist = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SYS_SIGLIST 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__SYS_SIGLIST 0
-_ACEOF
-
-
-fi
-
-
-
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PERL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-PERL=$ac_cv_path_PERL
-
-if test -n "$PERL"; then
-  echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
-          ac_config_files="$ac_config_files Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${LINUX_TRUE}" && test -z "${LINUX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"LINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"LINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${I386_TRUE}" && test -z "${I386_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"I386\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"I386\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${X86_64_TRUE}" && test -z "${X86_64_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"X86_64\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"X86_64\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${SUNOS4_TRUE}" && test -z "${SUNOS4_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"SUNOS4\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"SUNOS4\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${SVR4_TRUE}" && test -z "${SVR4_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"SVR4\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"SVR4\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${FREEBSD_TRUE}" && test -z "${FREEBSD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"FREEBSD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"FREEBSD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by strace $as_me 4.5.12, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-strace config.status 4.5.12
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS section.
-#
-
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@am__tar@,$am__tar,;t t
-s,@am__untar@,$am__untar,;t t
-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@opsys@,$opsys,;t t
-s,@arch@,$arch,;t t
-s,@LINUX_TRUE@,$LINUX_TRUE,;t t
-s,@LINUX_FALSE@,$LINUX_FALSE,;t t
-s,@I386_TRUE@,$I386_TRUE,;t t
-s,@I386_FALSE@,$I386_FALSE,;t t
-s,@X86_64_TRUE@,$X86_64_TRUE,;t t
-s,@X86_64_FALSE@,$X86_64_FALSE,;t t
-s,@SUNOS4_TRUE@,$SUNOS4_TRUE,;t t
-s,@SUNOS4_FALSE@,$SUNOS4_FALSE,;t t
-s,@SVR4_TRUE@,$SVR4_TRUE,;t t
-s,@SVR4_FALSE@,$SVR4_FALSE,;t t
-s,@FREEBSD_TRUE@,$FREEBSD_TRUE,;t t
-s,@FREEBSD_FALSE@,$FREEBSD_FALSE,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@DEPDIR@,$DEPDIR,;t t
-s,@am__include@,$am__include,;t t
-s,@am__quote@,$am__quote,;t t
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@WARNFLAGS@,$WARNFLAGS,;t t
-s,@CPP@,$CPP,;t t
-s,@EGREP@,$EGREP,;t t
-s,@PERL@,$PERL,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-  esac
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 7b84f75..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,225 +0,0 @@
-dnl Process this file with autoconf to create configure.  Use autoreconf.
-AC_PREREQ(2.57)
-AC_INIT([strace],[4.5.12])
-AC_CONFIG_SRCDIR([strace.c])
-AM_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([foreign check-news dist-bzip2])
-AM_MAINTAINER_MODE
-AC_CANONICAL_HOST
-
-AC_MSG_CHECKING([for supported operating system])
-case "$host_os" in
-linux*)
-	opsys=linux
-	AC_DEFINE([LINUX], 1, [Define for the Linux operating system.])
-	;;
-sunos4*)
-	opsys=sunos4
-	AC_DEFINE([SUNOS4], 1, [Define for the SunOS 4.x operating system.])
-	;;
-solaris2* | sysv[[45]]* | irix[[56]]*)
-	opsys=svr4
-	AC_DEFINE([SVR4], 1, [Define for the System V release 4 operating
-system or a derivative like Solaris 2.x or Irix 5.x.])
-	case "$host_os" in
-	sysv4.2uw*)
-		AC_DEFINE(UNIXWARE, 2, [Define for UnixWare systems.])
-		;;
-	sysv5*)
-		AC_DEFINE(UNIXWARE, 7, [Define for UnixWare systems.])
-		;;
-	esac
-	;;
-freebsd*)
-	opsys=freebsd
-	AC_DEFINE([FREEBSD], 1, [Define for the FreeBSD operating system.])
-	;;
-*)
-	AC_MSG_RESULT([NO!])
-	AC_MSG_ERROR([operating system $host_os is not supported by strace])
-	;;
-esac
-AC_MSG_RESULT($opsys)
-
-AC_MSG_CHECKING([for supported architecture])
-case "$host_cpu" in
-i[[3456]]86|pentium)
-	arch=i386
-	AC_DEFINE([I386], 1, [Define for the i386 architecture.])
-	;;
-ia64)
-	arch=ia64
-	AC_DEFINE([IA64], 1, [Define for the IA64 architecture.])
-	;;
-m68k)
-	arch=m68k
-	AC_DEFINE([M68K], 1, [Define for the m68k architecture.])
-	;;
-sparc64*)
-	arch=sparc64
-	AC_DEFINE([SPARC64], 1, [Define for the SPARC64 architecture.])
-	;;
-sparc*)
-	arch=sparc
-	AC_DEFINE([SPARC], 1, [Define for the SPARC architecture.])
-	;;
-mips*)
-	arch=mips
-	AC_DEFINE([MIPS], 1, [Define for the MIPS architecture.])
-	;;
-alpha*)
-	arch=alpha
-	AC_DEFINE([ALPHA], 1, [Define for the Alpha architecture.])
-	;;
-powerpc*)
-	arch=powerpc
-	AC_DEFINE([POWERPC], 1, [Define for the PowerPC architecture.])
-	;;
-arm*)
-	arch=arm
-	AC_DEFINE([ARM], 1, [Define for the ARM architecture.])
-	;;
-s390)
-	arch=s390
-	AC_DEFINE([S390], 1, [Define for the S390 architecture.])
-	;;
-s390x)
-	arch=s390x
-	AC_DEFINE([S390X], 1, [Define for the S390x architecture.])
-	;;
-hppa*|parisc*)
-	arch=hppa
-	AC_DEFINE([HPPA], 1, [Define for the HPPA architecture.])
-	;;
-sh)
-	arch=sh
-	AC_DEFINE([SH], 1, [Define for the SH architecture.])
-	;;
-sh64)
-	arch=sh64
-	AC_DEFINE([SH64], 1, [Define for the SH64 architecture.])
-	;;
-x86?64*)
-	arch=x86_64
-	AC_DEFINE([X86_64], 1, [Define for the AMD x86-64 architecture.])
-	;;
-*)
-	AC_MSG_RESULT([NO!])
-	AC_MSG_ERROR([architecture $host_cpu is not supported by strace])
-	;;
-esac
-AC_MSG_RESULT($arch)
-
-AC_SUBST(opsys)
-AC_SUBST(arch)
-
-AM_CONDITIONAL([LINUX], [test x$opsys = xlinux])
-AM_CONDITIONAL([I386], [test x$arch = xi386])
-AM_CONDITIONAL([X86_64], [test x$arch = xx86_64])
-AM_CONDITIONAL([SUNOS4], [test x$opsys = xsunos4])
-AM_CONDITIONAL([SVR4], [test x$opsys = xsvr4])
-AM_CONDITIONAL([FREEBSD], [test x$opsys = xfreebsd])
-
-AC_PROG_CC
-AC_GNU_SOURCE
-
-AC_INCLUDEDIR
-
-if test "x$opsys" = "xsunos4" && test "x$arch" = "xsparc"
-then
-	AC_MSG_CHECKING(for valid machine include directory)
-	if test -d "$includedir/sun4"
-	then
-		rm -f machine
-		ln -s $includedir/sun4 machine
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(SUNOS4_KERNEL_ARCH_KLUDGE, 1, [
-Define if you are have a SPARC with SUNOS4 and your want a version
-of strace that will work on sun4, sun4c and sun4m kernel architectures.
-Only useful if you have a symbolic link from machine to /usr/include/sun4
-in the compilation directory.])
-	else
-		AC_MSG_RESULT(no)
-	fi
-fi
-
-AC_WARNFLAGS
-if test "x$opsys" = "xsunos4"
-then
-	if test -n "$GCC"
-	then
-		# SunOS 4.x header files don't declare int functions.
-		WARNFLAGS="$WARNFLAGS -Wno-implicit"
-	fi
-fi
-
-AC_PROG_CPP
-AC_PROG_GCC_TRADITIONAL
-AC_PROG_INSTALL
-AC_C_CONST
-AC_HEADER_STDC
-AC_HEADER_DIRENT
-AC_HEADER_STAT
-AC_CHECK_MEMBERS([struct stat.st_blksize,
-		  struct stat.st_blocks,
-		  struct stat.st_aclcnt,
-		  struct stat.st_flags,
-		  struct stat.st_fstype,
-		  struct stat.st_gen,
-		  struct stat.st_level,
-		  struct stat.st_rdev])
-AC_STAT64
-
-AC_TYPE_SIGNAL
-AC_TYPE_UID_T
-AC_TYPE_MODE_T
-AC_TYPE_GETGROUPS
-AC_HEADER_MAJOR
-AC_CHECK_TYPES([sig_atomic_t, siginfo_t],,, [#include <signal.h>])
-AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,,
-[#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>])
-AC_CHECK_TYPES([long long])
-AC_LITTLE_ENDIAN_LONG_LONG
-AC_OFF_T_IS_LONG_LONG
-AC_RLIM_T_IS_LONG_LONG
-AC_CHECK_TYPES([struct opthdr],,, [#include <sys/socket.h>])
-AC_CHECK_TYPES([struct t_opthdr],,, [#include <sys/tiuser.h>])
-
-if test x$opsys != xlinux; then
-AC_CHECK_LIB(nsl, main)
-fi
-
-AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl prctl sendmsg inet_ntop if_indextoname)
-AC_CHECK_HEADERS([sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h  poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h sys/epoll.h libaio.h], [], [])
-AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
-                 [], [], [#include <linux/socket.h>])
-AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
-AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
-
-AC_MP_PROCFS
-AC_POLLABLE_PROCFS
-
-AC_CHECK_MEMBERS([struct msghdr.msg_control],,, [#include <sys/socket.h>])
-AC_STRUCT_PR_SYSCALL
-
-AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr,
-                  struct T_conn_res.ACCEPTOR_id],,,
-[#include <sys/stream.h>
-#include <sys/tihdr.h>])
-
-AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include <asm/stat.h>])
-
-AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,,
-	       [#include <sys/ptrace.h>])
-
-AC_CHECK_TYPES([struct user_desc],,, [#include <asm/ldt.h>])
-
-AC_CHECK_DECLS([sys_errlist])
-AC_CHECK_DECLS([sys_siglist, _sys_siglist],,, [#include <signal.h>])
-
-AC_PATH_PROG([PERL], [perl])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/count.c b/count.c
new file mode 100644
index 0000000..92f7849
--- /dev/null
+++ b/count.c
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *                     Linux for s390 port by D.J. Barrow
+ *                    <barrow_dj@mail.yahoo.com,djbarrow@de.ibm.com>
+ * Copyright (c) 2004 Roland McGrath <roland@redhat.com>
+ * Copyright (c) 2006 Dmitry V. Levin <ldv@altlinux.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
+#include "defs.h"
+
+struct call_counts {
+	struct timeval time;
+	int calls, errors;
+};
+
+static struct call_counts *countv[SUPPORTED_PERSONALITIES];
+#define counts (countv[current_personality])
+
+static struct timeval shortest = { 1000000, 0 };
+
+int
+count_syscall(struct tcb *tcp, struct timeval *tv)
+{
+	if (tcp->scno < 0 || tcp->scno >= nsyscalls)
+		return 0;
+
+	if (!counts)
+	{
+		counts = calloc(nsyscalls, sizeof(*counts));
+		if (!counts)
+		{
+			fprintf(stderr,
+				"strace: out of memory for call counts\n");
+			exit(1);
+		}
+	}
+
+	counts[tcp->scno].calls++;
+	if (tcp->u_error)
+		counts[tcp->scno].errors++;
+
+	tv_sub(tv, tv, &tcp->etime);
+#ifdef LINUX
+	if (tv_cmp(tv, &tcp->dtime) > 0)
+	{
+		static struct timeval one_tick;
+
+		if (one_tick.tv_usec == 0)
+		{
+			/* Initialize it.  */
+			struct itimerval it;
+
+			memset(&it, 0, sizeof it);
+			it.it_interval.tv_usec = 1;
+			setitimer(ITIMER_REAL, &it, NULL);
+			getitimer(ITIMER_REAL, &it);
+			one_tick = it.it_interval;
+		}
+
+		if (tv_nz(&tcp->dtime))
+			*tv = tcp->dtime;
+		else if (tv_cmp(tv, &one_tick) > 0)
+		{
+			if (tv_cmp(&shortest, &one_tick) < 0)
+				*tv = shortest;
+			else
+				*tv = one_tick;
+		}
+	}
+#endif /* LINUX */
+	if (tv_cmp(tv, &shortest) < 0)
+		shortest = *tv;
+	tv_add(&counts[tcp->scno].time, &counts[tcp->scno].time, tv);
+
+	return 0;
+}
+
+static int
+time_cmp(void *a, void *b)
+{
+	return -tv_cmp(&counts[*((int *) a)].time,
+		       &counts[*((int *) b)].time);
+}
+
+static int
+syscall_cmp(void *a, void *b)
+{
+	return strcmp(sysent[*((int *) a)].sys_name,
+		      sysent[*((int *) b)].sys_name);
+}
+
+static int
+count_cmp(void *a, void *b)
+{
+	int     m = counts[*((int *) a)].calls;
+	int     n = counts[*((int *) b)].calls;
+
+	return (m < n) ? 1 : (m > n) ? -1 : 0;
+}
+
+static int (*sortfun)();
+static struct timeval overhead = { -1, -1 };
+
+void
+set_sortby(const char *sortby)
+{
+	if (strcmp(sortby, "time") == 0)
+		sortfun = time_cmp;
+	else if (strcmp(sortby, "calls") == 0)
+		sortfun = count_cmp;
+	else if (strcmp(sortby, "name") == 0)
+		sortfun = syscall_cmp;
+	else if (strcmp(sortby, "nothing") == 0)
+		sortfun = NULL;
+	else
+	{
+		fprintf(stderr, "invalid sortby: `%s'\n", sortby);
+		exit(1);
+	}
+}
+
+void set_overhead(int n)
+{
+	overhead.tv_sec = n / 1000000;
+	overhead.tv_usec = n % 1000000;
+}
+
+static void
+call_summary_pers(FILE *outf)
+{
+	int     i, j;
+	int     call_cum, error_cum;
+	struct timeval tv_cum, dtv;
+	double  percent;
+	const char *dashes = "-------------------------";
+	char    error_str[16];
+	int    *sorted_count = calloc(sizeof(int), nsyscalls);
+
+	if (!sorted_count)
+	{
+		fprintf(stderr, "strace: out of memory for call summary\n");
+		return;
+	}
+
+	call_cum = error_cum = tv_cum.tv_sec = tv_cum.tv_usec = 0;
+	if (overhead.tv_sec == -1)
+	{
+		tv_mul(&overhead, &shortest, 8);
+		tv_div(&overhead, &overhead, 10);
+	}
+	for (i = 0; i < nsyscalls; i++)
+	{
+		sorted_count[i] = i;
+		if (counts == NULL || counts[i].calls == 0)
+			continue;
+		tv_mul(&dtv, &overhead, counts[i].calls);
+		tv_sub(&counts[i].time, &counts[i].time, &dtv);
+		call_cum += counts[i].calls;
+		error_cum += counts[i].errors;
+		tv_add(&tv_cum, &tv_cum, &counts[i].time);
+	}
+	if (counts && sortfun)
+		qsort((void *) sorted_count, nsyscalls, sizeof(int), sortfun);
+	fprintf(outf, "%6.6s %11.11s %11.11s %9.9s %9.9s %s\n",
+		"% time", "seconds", "usecs/call",
+		"calls", "errors", "syscall");
+	fprintf(outf, "%6.6s %11.11s %11.11s %9.9s %9.9s %-16.16s\n",
+		dashes, dashes, dashes, dashes, dashes, dashes);
+	if (counts)
+	{
+		for (i = 0; i < nsyscalls; i++)
+		{
+			j = sorted_count[i];
+			if (counts[j].calls == 0)
+				continue;
+			tv_div(&dtv, &counts[j].time, counts[j].calls);
+			if (counts[j].errors)
+				sprintf(error_str, "%d", counts[j].errors);
+			else
+				error_str[0] = '\0';
+			percent = (100.0 * tv_float(&counts[j].time)
+				   / tv_float(&tv_cum));
+			fprintf(outf, "%6.2f %11.6f %11ld %9d %9.9s %s\n",
+				percent, tv_float(&counts[j].time),
+				(long) 1000000 * dtv.tv_sec + dtv.tv_usec,
+				counts[j].calls,
+				error_str, sysent[j].sys_name);
+		}
+	}
+	free(sorted_count);
+
+	fprintf(outf, "%6.6s %11.11s %11.11s %9.9s %9.9s %-16.16s\n",
+		dashes, dashes, dashes, dashes, dashes, dashes);
+	if (error_cum)
+		sprintf(error_str, "%d", error_cum);
+	else
+		error_str[0] = '\0';
+	fprintf(outf, "%6.6s %11.6f %11.11s %9d %9.9s %s\n",
+		"100.00", tv_float(&tv_cum), "",
+		call_cum, error_str, "total");
+}
+
+void
+call_summary(FILE *outf)
+{
+	int     i, old_pers = current_personality;
+
+	for (i = 0; i < SUPPORTED_PERSONALITIES; ++i)
+	{
+		if (!countv[i])
+			continue;
+
+		if (current_personality != i)
+			set_personality(i);
+		if (i)
+			fprintf(outf,
+				"System call usage summary for %u bit mode:\n",
+				personality_wordsize[current_personality] * 8);
+		call_summary_pers(outf);
+	}
+
+	if (old_pers != current_personality)
+		set_personality(old_pers);
+}
diff --git a/defs.h b/defs.h
index 2e75fed..8be668a 100644
--- a/defs.h
+++ b/defs.h
@@ -26,13 +26,17 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: defs.h,v 1.59 2005/06/08 20:45:28 roland Exp $
+ *	$Id$
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#ifdef MIPS
+#include <sgidefs.h>
+#endif
+
 #ifdef linux
 #include <features.h>
 #endif
@@ -47,7 +51,7 @@
 /* configuration section */
 #ifndef MAX_QUALS
 #if defined(LINUX) && defined(MIPS)
-#define MAX_QUALS	5000	/* maximum number of syscalls, signals, etc. */
+#define MAX_QUALS	7000	/* maximum number of syscalls, signals, etc. */
 #else
 #define MAX_QUALS	2048	/* maximum number of syscalls, signals, etc. */
 #endif
@@ -60,7 +64,11 @@
 #define DEFAULT_ACOLUMN	40	/* default alignment column for results */
 #endif
 #ifndef MAX_ARGS
-#define MAX_ARGS	32	/* maximum number of args to a syscall */
+# ifdef HPPA
+#  define MAX_ARGS	6	/* maximum number of args to a syscall */
+# else
+#  define MAX_ARGS	32	/* maximum number of args to a syscall */
+# endif
 #endif
 #ifndef DEFAULT_SORTBY
 #define DEFAULT_SORTBY "time"	/* default sorting method for call profiling */
@@ -76,6 +84,10 @@
 #include <sys/time.h>
 #include <errno.h>
 
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#endif
+
 #ifdef STDC_HEADERS
 #include <stddef.h>
 #endif /* STDC_HEADERS */
@@ -88,12 +100,26 @@
 #  if defined(SPARC) || defined(SPARC64)
 #     define LINUXSPARC
 #  endif
-#  if defined(ALPHA)
-#     define LINUX_64BIT
-#  endif
 #  if defined(X86_64)
 #     define LINUX_X86_64
 #  endif
+#  if defined(MIPS) && _MIPS_SIM == _MIPS_SIM_ABI32
+#     define LINUX_MIPSO32
+#  endif
+#  if defined(MIPS) && _MIPS_SIM == _MIPS_SIM_NABI32
+#     define LINUX_MIPSN32
+#     define LINUX_MIPS64
+#  endif
+#  if defined(MIPS) && _MIPS_SIM == _MIPS_SIM_ABI64
+#     define LINUX_MIPSN64
+#     define LINUX_MIPS64
+#  endif
+#  if defined(ARM)
+#     define LINUX_ARM
+#  endif
+#  if defined(AVR32)
+#     define LINUX_AVR32
+#  endif
 #endif
 
 #if defined(SVR4) || defined(FREEBSD)
@@ -120,7 +146,7 @@
 #include <sys/pioctl.h>
 #endif /* FREEBSD */
 #else /* !USE_PROCFS */
-#if (defined(LINUXSPARC) || defined (LINUX_X86_64)) && defined(__GLIBC__)
+#if (defined(LINUXSPARC) || defined(LINUX_X86_64) || defined(LINUX_ARM) || defined(LINUX_AVR32)) && defined(__GLIBC__)
 #include <sys/ptrace.h>
 #else
 /* Work around awkward prototype in ptrace.h. */
@@ -132,15 +158,11 @@
 #include <asm/ptrace.h>
 #undef __KERNEL__
 #endif
-#ifdef __STDC__
 #ifdef LINUX
 extern long ptrace(int, int, char *, long);
 #else /* !LINUX */
 extern int ptrace(int, int, char *, int, ...);
 #endif /* !LINUX */
-#else /* !__STDC__ */
-extern int ptrace();
-#endif /* !__STDC__ */
 #endif /* !LINUXSPARC */
 #endif /* !SVR4 */
 
@@ -192,12 +214,20 @@
 #define DEFAULT_PERSONALITY 0
 
 #ifdef LINUXSPARC
-#include <linux/a.out.h>
-#include <asm/psr.h>
+/* Indexes into the pt_regs.u_reg[] array -- UREG_XX from kernel are all off
+ * by 1 and use Ix instead of Ox.  These work for both 32 and 64 bit Linux. */
+#define U_REG_G1 0
+#define U_REG_O0 7
+#define U_REG_O1 8
+#define PERSONALITY0_WORDSIZE 4
+#define PERSONALITY1_WORDSIZE 4
 #undef  SUPPORTED_PERSONALITIES
 #if defined(SPARC64)
+#include <asm/psrcompat.h>
 #define SUPPORTED_PERSONALITIES 3
+#define PERSONALITY2_WORDSIZE 8
 #else
+#include <asm/psr.h>
 #define SUPPORTED_PERSONALITIES 2
 #endif /* SPARC64 */
 #endif /* LINUXSPARC */
@@ -205,6 +235,22 @@
 #ifdef X86_64
 #undef SUPPORTED_PERSONALITIES
 #define SUPPORTED_PERSONALITIES 2
+#define PERSONALITY0_WORDSIZE 8
+#define PERSONALITY1_WORDSIZE 4
+#endif
+
+#ifdef ARM
+#undef SUPPORTED_PERSONALITIES
+#define SUPPORTED_PERSONALITIES 2
+#define PERSONALITY0_WORDSIZE 4
+#define PERSONALITY1_WORDSIZE 4
+#endif
+
+#ifdef POWERPC64
+#undef SUPPORTED_PERSONALITIES
+#define SUPPORTED_PERSONALITIES 2
+#define PERSONALITY0_WORDSIZE 8
+#define PERSONALITY1_WORDSIZE 4
 #endif
 
 #ifdef SVR4
@@ -262,6 +308,37 @@
 #define PR_FAULTED      S_CORE
 #endif
 
+#ifdef LINUX
+# if !HAVE_DECL_PTRACE_SETOPTIONS
+#  define PTRACE_SETOPTIONS	0x4200
+# endif
+# if !HAVE_DECL_PTRACE_GETEVENTMSG
+#  define PTRACE_GETEVENTMSG	0x4201
+# endif
+# if !HAVE_DECL_PTRACE_GETSIGINFO
+#  define PTRACE_GETSIGINFO	0x4202
+# endif
+# if !HAVE_DECL_PTRACE_O_TRACEFORK
+#  define PTRACE_O_TRACEFORK	0x00000002
+# endif
+# if !HAVE_DECL_PTRACE_O_TRACEVFORK
+#  define PTRACE_O_TRACEVFORK	0x00000004
+# endif
+# if !HAVE_DECL_PTRACE_O_TRACECLONE
+#  define PTRACE_O_TRACECLONE	0x00000008
+# endif
+
+# if !HAVE_DECL_PTRACE_EVENT_FORK
+#  define PTRACE_EVENT_FORK	1
+# endif
+# if !HAVE_DECL_PTRACE_EVENT_VFORK
+#  define PTRACE_EVENT_VFORK	2
+# endif
+# if !HAVE_DECL_PTRACE_EVENT_CLONE
+#  define PTRACE_EVENT_CLONE	3
+# endif
+#endif /* LINUX */
+
 /* Trace Control Block */
 struct tcb {
 	short flags;		/* See below for TCB_ values */
@@ -269,12 +346,16 @@
 	long scno;		/* System call number */
 	int u_nargs;		/* System call arguments */
 	long u_arg[MAX_ARGS];	/* System call arguments */
+#if defined (LINUX_MIPSN32)
+	long long ext_arg[MAX_ARGS];	/* System call arguments */
+#endif
 	int u_error;		/* Error code */
 	long u_rval;		/* (first) return value */
 #ifdef HAVE_LONG_LONG
 	long long u_lrval;	/* long long return value */
 #endif
 	FILE *outf;		/* Output file for this process */
+	int curcol;		/* Output column for this process */
 	const char *auxstr;	/* Auxiliary info from syscall (see RVAL_STR) */
 	struct timeval stime;	/* System time usage as of last process wait */
 	struct timeval dtime;	/* Delta for system time usage */
@@ -286,7 +367,6 @@
 	int nzombies;		/* # of formerly traced children now dead */
 #ifdef LINUX
 	int nclone_threads;	/* # of nchildren with CLONE_THREAD */
-	int nclone_detached;	/* # of nchildren with CLONE_DETACHED */
 	int nclone_waiting;	/* clone threads in wait4 (TCB_SUSPENDED) */
 #endif
 				/* (1st arg of wait4()) */
@@ -302,6 +382,7 @@
 	prstatus_t status;	/* procfs status structure */
 #endif
 #endif
+	int ptrace_errno;
 #ifdef FREEBSD
 	struct procfs_status status;
 	int pfd_reg;
@@ -315,17 +396,22 @@
 #define TCB_INSYSCALL	00004	/* A system call is in progress */
 #define TCB_ATTACHED	00010	/* Process is not our own child */
 #define TCB_EXITING	00020	/* As far as we know, this process is exiting */
-#define TCB_SUSPENDED	00040	/* Process has done a wait(4), that can
-				   not be allowed to complete just now */
+#define TCB_SUSPENDED	00040	/* Process can not be allowed to resume just now */
 #define TCB_BPTSET	00100	/* "Breakpoint" set after fork(2) */
 #define TCB_SIGTRAPPED	00200	/* Process wanted to block SIGTRAP */
 #define TCB_FOLLOWFORK	00400	/* Process should have forks followed */
 #define TCB_REPRINT	01000	/* We should reprint this syscall on exit */
 #ifdef LINUX
-# if defined(ALPHA) || defined(SPARC) || defined(SPARC64) || defined(POWERPC) || defined(IA64) || defined(HPPA) || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) || defined(ARM)
+/* x86 does not need TCB_WAITEXECVE.
+ * It can detect execve's SIGTRAP by looking at eax/rax.
+ * See "stray syscall exit: eax = " message in syscall_fixup().
+ */
+# if defined(ALPHA) || defined(AVR32) || defined(SPARC) || defined(SPARC64) \
+  || defined(POWERPC) || defined(IA64) || defined(HPPA) \
+  || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) \
+  || defined(ARM) || defined(MIPS) || defined(BFIN) || defined(TILE)
 #  define TCB_WAITEXECVE 02000	/* ignore SIGTRAP after exceve */
 # endif
-# define TCB_CLONE_DETACHED 04000 /* CLONE_DETACHED set in creating syscall */
 # define TCB_CLONE_THREAD  010000 /* CLONE_THREAD set in creating syscall */
 # define TCB_GROUP_EXITING 020000 /* TCB_EXITING was exit_group, not _exit */
 # include <sys/syscall.h>
@@ -335,6 +421,8 @@
 #   define __NR_exit_group 405
 #  elif defined I386
 #   define __NR_exit_group 252
+#  elif defined X86_64
+#   define __NR_exit_group 231
 #  elif defined IA64
 #   define __NR_exit_group 1236
 #  elif defined POWERPC
@@ -343,6 +431,8 @@
 #   define __NR_exit_group 248
 #  elif defined SPARC || defined SPARC64
 #   define __NR_exit_group 188
+#  elif defined M68K
+#   define __NR_exit_group 247
 #  endif /* ALPHA et al */
 # endif	/* !__NR_exit_group */
 #endif /* LINUX */
@@ -365,9 +455,14 @@
 
 struct xlat {
 	int val;
-	char *str;
+	const char *str;
 };
 
+extern const struct xlat open_mode_flags[];
+extern const struct xlat addrfams[];
+extern const struct xlat struct_user_offsets[];
+extern const struct xlat open_access_modes[];
+
 /* Format of syscall return values */
 #define RVAL_DECIMAL	000	/* decimal format */
 #define RVAL_HEX	001	/* hex format */
@@ -395,131 +490,154 @@
 #define TRACE_NETWORK	004	/* Trace network-related syscalls. */
 #define TRACE_PROCESS	010	/* Trace process-related syscalls. */
 #define TRACE_SIGNAL	020	/* Trace signal-related syscalls. */
+#define TRACE_DESC	040	/* Trace file descriptor-related syscalls. */
+#define SYSCALL_NEVER_FAILS	0100	/* Syscall is always successful. */
+
+typedef enum {
+	CFLAG_NONE = 0,
+	CFLAG_ONLY_STATS,
+	CFLAG_BOTH
+} cflag_t;
 
 extern struct tcb **tcbtab;
-extern int qual_flags[];
-extern int debug, followfork, followvfork;
-extern int rflag, tflag, dtime, cflag, xflag, qflag;
+extern int *qual_flags;
+extern int debug, followfork;
+extern unsigned int ptrace_setoptions;
+extern int dtime, xflag, qflag;
+extern cflag_t cflag;
 extern int acolumn;
-extern char *outfname;
 extern unsigned int nprocs, tcbtabsize;
 extern int max_strlen;
 extern struct tcb *tcp_last;
 
-#ifdef __STDC__
-#define P(args) args
-#else
-#define P(args) ()
-#endif
+enum bitness_t { BITNESS_CURRENT = 0, BITNESS_32 };
 
-extern int set_personality P((int personality));
-extern char *xlookup P((const struct xlat *, int));
-extern struct tcb *alloctcb P((int));
-extern struct tcb *pid2tcb P((int));
-extern void droptcb P((struct tcb *));
-extern int expand_tcbtab P((void));
+extern int set_personality(int personality);
+extern const char *xlookup(const struct xlat *, int);
+extern struct tcb *alloc_tcb(int, int);
+extern struct tcb *pid2tcb(int);
+extern void droptcb(struct tcb *);
+extern void expand_tcbtab(void);
 
-extern void set_sortby P((char *));
-extern void set_overhead P((int));
-extern void qualify P((char *));
-extern void newoutf P((struct tcb *));
-extern int get_scno P((struct tcb *));
-extern long known_scno P((struct tcb *));
-extern int trace_syscall P((struct tcb *));
-extern void printxval P((const struct xlat *, int, const char *));
-extern int printargs P((struct tcb *));
-extern int addflags P((const struct xlat *, int));
-extern int printflags P((const struct xlat *, int, const char *));
-extern int umoven P((struct tcb *, long, int, char *));
-extern int umovestr P((struct tcb *, long, int, char *));
-extern int upeek P((int, long, long *));
-extern void dumpiov P((struct tcb *, int, long));
-extern void dumpstr P((struct tcb *, long, int));
-extern void printstr P((struct tcb *, long, int));
-extern void printnum P((struct tcb *, long, char *));
-extern void printpath P((struct tcb *, long));
-extern void printpathn P((struct tcb *, long, int));
-extern void printtv P((struct tcb *, long));
+#define alloctcb(pid)	alloc_tcb((pid), 1)
+
+extern void set_sortby(const char *);
+extern void set_overhead(int);
+extern void qualify(const char *);
+extern int get_scno(struct tcb *);
+extern long known_scno(struct tcb *);
+extern long do_ptrace(int request, struct tcb *tcp, void *addr, void *data);
+extern int ptrace_restart(int request, struct tcb *tcp, int sig);
+extern int force_result(struct tcb *, int, long);
+extern int trace_syscall(struct tcb *);
+extern int count_syscall(struct tcb *, struct timeval *);
+extern void printxval(const struct xlat *, int, const char *);
+extern int printargs(struct tcb *);
+extern int addflags(const struct xlat *, int);
+extern int printflags(const struct xlat *, int, const char *);
+extern const char *sprintflags(const char *, const struct xlat *, int);
+extern int umoven(struct tcb *, long, int, char *);
+extern int umovestr(struct tcb *, long, int, char *);
+extern int upeek(struct tcb *, long, long *);
+extern void dumpiov(struct tcb *, int, long);
+extern void dumpstr(struct tcb *, long, int);
+extern void printstr(struct tcb *, long, int);
+extern void printnum(struct tcb *, long, const char *);
+extern void printnum_int(struct tcb *, long, const char *);
+extern void printpath(struct tcb *, long);
+extern void printpathn(struct tcb *, long, int);
+extern void printtv_bitness(struct tcb *, long, enum bitness_t, int);
+extern void sprinttv(struct tcb *, long, enum bitness_t, char *);
+extern void print_timespec(struct tcb *, long);
+extern void sprint_timespec(char *, struct tcb *, long);
 #ifdef HAVE_SIGINFO_T
-extern void printsiginfo P((siginfo_t *, int));
+extern void printsiginfo(siginfo_t *, int);
 #endif
-extern void printsock P((struct tcb *, long, int));
-extern void print_sock_optmgmt P((struct tcb *, long, int));
-extern void printrusage P((struct tcb *, long));
-extern void printuid P((const char *, unsigned long));
-extern int clearbpt P((struct tcb *));
-extern int setbpt P((struct tcb *));
-extern int sigishandled P((struct tcb *, int));
-extern void printcall P((struct tcb *));
-extern const char *signame P((int));
-extern void printsignal P((int));
-extern void printleader P((struct tcb *));
-extern void printtrailer P((struct tcb *));
-extern void tabto P((int));
-extern void call_summary P((FILE *));
-extern void printtv32 P((struct tcb*, long));
-extern void tprint_iov P((struct tcb *, unsigned long, unsigned long));
+extern void printfd(struct tcb *, int);
+extern void printsock(struct tcb *, long, int);
+extern void print_sock_optmgmt(struct tcb *, long, int);
+extern void printrusage(struct tcb *, long);
+extern void printuid(const char *, unsigned long);
+extern int clearbpt(struct tcb *);
+extern int setbpt(struct tcb *);
+extern int sigishandled(struct tcb *, int);
+extern void printcall(struct tcb *);
+extern const char *signame(int);
+extern void print_sigset(struct tcb *, long, int);
+extern void printsignal(int);
+extern void printleader(struct tcb *);
+extern void printtrailer(void);
+extern void tabto(int);
+extern void call_summary(FILE *);
+extern void tprint_iov(struct tcb *, unsigned long, unsigned long);
+extern void tprint_open_modes(mode_t);
+extern const char *sprint_open_modes(mode_t);
+extern int is_restart_error(struct tcb *);
 
+extern int change_syscall(struct tcb *, int);
+extern int internal_fork(struct tcb *);
+extern int internal_exec(struct tcb *);
+extern int internal_wait(struct tcb *, int);
+extern int internal_exit(struct tcb *);
 #ifdef LINUX
-extern int internal_clone P((struct tcb *));
+extern int handle_new_child(struct tcb *, int, int);
 #endif
-extern int internal_fork P((struct tcb *));
-extern int internal_exec P((struct tcb *));
-extern int internal_wait P((struct tcb *, int));
-extern int internal_exit P((struct tcb *));
 
-extern const struct ioctlent *ioctl_lookup P((long));
-extern const struct ioctlent *ioctl_next_match P((const struct ioctlent *));
-extern int ioctl_decode P((struct tcb *, long, long));
-extern int term_ioctl P((struct tcb *, long, long));
-extern int sock_ioctl P((struct tcb *, long, long));
-extern int proc_ioctl P((struct tcb *, int, int));
-extern int stream_ioctl P((struct tcb *, int, int));
+extern const struct ioctlent *ioctl_lookup(long);
+extern const struct ioctlent *ioctl_next_match(const struct ioctlent *);
+extern int ioctl_decode(struct tcb *, long, long);
+extern int term_ioctl(struct tcb *, long, long);
+extern int sock_ioctl(struct tcb *, long, long);
+extern int proc_ioctl(struct tcb *, int, int);
+extern int stream_ioctl(struct tcb *, int, int);
 #ifdef LINUX
-extern int rtc_ioctl P((struct tcb *, long, long));
+extern int rtc_ioctl(struct tcb *, long, long);
+extern int scsi_ioctl(struct tcb *, long, long);
+extern int block_ioctl(struct tcb *, long, long);
 #endif
 
-extern void tv_tv P((struct timeval *, int, int));
-extern int tv_nz P((struct timeval *));
-extern int tv_cmp P((struct timeval *, struct timeval *));
-extern double tv_float P((struct timeval *));
-extern void tv_add P((struct timeval *, struct timeval *, struct timeval *));
-extern void tv_sub P((struct timeval *, struct timeval *, struct timeval *));
-extern void tv_mul P((struct timeval *, struct timeval *, int));
-extern void tv_div P((struct timeval *, struct timeval *, int));
+extern int tv_nz(struct timeval *);
+extern int tv_cmp(struct timeval *, struct timeval *);
+extern double tv_float(struct timeval *);
+extern void tv_add(struct timeval *, struct timeval *, struct timeval *);
+extern void tv_sub(struct timeval *, struct timeval *, struct timeval *);
+extern void tv_mul(struct timeval *, struct timeval *, int);
+extern void tv_div(struct timeval *, struct timeval *, int);
 
 #ifdef SUNOS4
-extern int fixvfork P((struct tcb *));
+extern int fixvfork(struct tcb *);
 #endif
-#if !(defined(LINUX) && !defined(SPARC) && !defined(SPARC64) && !defined(IA64))
-extern long getrval2 P((struct tcb *));
+#if !(defined(LINUX) && !defined(SPARC) && !defined(SPARC64) && !defined(IA64) \
+	&& !defined(SH))
+extern long getrval2(struct tcb *);
 #endif
 #ifdef USE_PROCFS
-extern int proc_open P((struct tcb *tcp, int attaching));
+extern int proc_open(struct tcb *tcp, int attaching);
 #endif
 
 #define umove(pid, addr, objp)	\
 	umoven((pid), (addr), sizeof *(objp), (char *) (objp))
 
-#ifdef __STDC__
-#ifdef __GNUC__
+#define printtv(tcp, addr)	\
+	printtv_bitness((tcp), (addr), BITNESS_CURRENT, 0)
+#define printtv_special(tcp, addr)	\
+	printtv_bitness((tcp), (addr), BITNESS_CURRENT, 1)
+
 extern void tprintf(const char *fmt, ...)
-	__attribute__ ((format (printf, 1, 2)));
-#else
-extern void tprintf(const char *fmt, ...);
+#ifdef __GNUC__
+	__attribute__ ((format (printf, 1, 2)))
 #endif
-#else
-extern void tprintf();
-#endif
+	;
 
 #ifndef HAVE_STRERROR
-const char *strerror P((int));
+const char *strerror(int);
 #endif
 #ifndef HAVE_STRSIGNAL
-const char *strsignal P((int));
+const char *strsignal(int);
 #endif
 
 extern int current_personality;
+extern const int personality_wordsize[];
 
 struct sysent {
 	int	nargs;
@@ -566,20 +684,6 @@
 extern const int nsignals2;
 #endif /* SUPPORTED_PERSONALITIES >= 3 */
 
-#if defined(FREEBSD) || (defined(LINUX) \
-			 && defined(POWERPC) && !defined(__powerpc64__)) \
-  || (defined (LINUX) && defined (MIPS) && !defined(__mips64))
-/* ARRGH!  off_t args are aligned on 64 bit boundaries! */
-#define ALIGN64(tcp,arg)						\
-do {									\
-	if (arg % 2)							\
-	    memmove (&tcp->u_arg[arg], &tcp->u_arg[arg + 1],		\
-		     (tcp->u_nargs - arg - 1) * sizeof tcp->u_arg[0]);	\
-} while (0)
-#else
-#define ALIGN64(tcp,arg) do { } while (0)
-#endif
-
 #if HAVE_LONG_LONG
 
 /* _l refers to the lower numbered u_arg,
@@ -593,6 +697,8 @@
 #define LONG_LONG(_l,_h) \
     ((long long)((unsigned long long)(unsigned)(_h) | ((unsigned long long)(_l)<<32)))
 #endif
+
+extern int printllval(struct tcb *, const char *, int);
 #endif
 
 #ifdef IA64
diff --git a/depcomp b/depcomp
deleted file mode 100755
index 9e5522d..0000000
--- a/depcomp
+++ /dev/null
@@ -1,520 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2003-11-08.23
-
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit 0
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi
-
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir.libs/$base.d"
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/desc.c b/desc.c
index a76078e..790b10b 100644
--- a/desc.c
+++ b/desc.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: desc.c,v 1.22 2005/06/01 19:22:07 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -148,6 +148,18 @@
 #ifdef F_UNSHARE
 	{ F_UNSHARE,	"F_UNSHARE"	},
 #endif
+#ifdef F_SETLEASE
+	{ F_SETLEASE,	"F_SETLEASE"	},
+#endif
+#ifdef F_GETLEASE
+	{ F_GETLEASE,	"F_GETLEASE"	},
+#endif
+#ifdef F_NOTIFY
+	{ F_NOTIFY,	"F_NOTIFY"	},
+#endif
+#ifdef F_DUPFD_CLOEXEC
+	{ F_DUPFD_CLOEXEC,"F_DUPFD_CLOEXEC"},
+#endif
 	{ 0,		NULL		},
 };
 
@@ -183,6 +195,33 @@
 	{ 0,		NULL		},
 };
 
+#ifdef F_NOTIFY
+static const struct xlat notifyflags[] = {
+#ifdef DN_ACCESS
+	{ DN_ACCESS,	"DN_ACCESS"	},
+#endif
+#ifdef DN_MODIFY
+	{ DN_MODIFY,	"DN_MODIFY"	},
+#endif
+#ifdef DN_CREATE
+	{ DN_CREATE,	"DN_CREATE"	},
+#endif
+#ifdef DN_DELETE
+	{ DN_DELETE,	"DN_DELETE"	},
+#endif
+#ifdef DN_RENAME
+	{ DN_RENAME,	"DN_RENAME"	},
+#endif
+#ifdef DN_ATTRIB
+	{ DN_ATTRIB,	"DN_ATTRIB"	},
+#endif
+#ifdef DN_MULTISHOT
+	{ DN_MULTISHOT,	"DN_MULTISHOT"	},
+#endif
+	{ 0,		NULL		},
+};
+#endif
+
 static const struct xlat whence[] = {
 	{ SEEK_SET,	"SEEK_SET"	},
 	{ SEEK_CUR,	"SEEK_CUR"	},
@@ -193,16 +232,43 @@
 #ifndef HAVE_LONG_LONG_OFF_T
 /* fcntl/lockf */
 static void
-printflock(tcp, addr, getlk)
-struct tcb *tcp;
-long addr;
-int getlk;
+printflock(struct tcb *tcp, long addr, int getlk)
 {
 	struct flock fl;
 
-	if (umove(tcp, addr, &fl) < 0) {
-		tprintf("{...}");
-		return;
+#if SUPPORTED_PERSONALITIES > 1
+	if (personality_wordsize[current_personality] != sizeof(fl.l_start)) {
+		if (personality_wordsize[current_personality] == 4) {
+			/* 32-bit x86 app on x86_64 and similar cases */
+			struct {
+				short int l_type;
+				short int l_whence;
+				int32_t l_start; /* off_t */
+				int32_t l_len; /* off_t */
+				int32_t l_pid; /* pid_t */
+			} fl32;
+			if (umove(tcp, addr, &fl32) < 0) {
+				tprintf("{...}");
+				return;
+			}
+			fl.l_type = fl32.l_type;
+			fl.l_whence = fl32.l_whence;
+			fl.l_start = fl32.l_start;
+			fl.l_len = fl32.l_len;
+			fl.l_pid = fl32.l_pid;
+		} else {
+			/* let people know we have a problem here */
+			tprintf("{ <decode error: unsupported wordsize %d> }",
+				personality_wordsize[current_personality]);
+			return;
+		}
+	} else
+#endif
+	{
+		if (umove(tcp, addr, &fl) < 0) {
+			tprintf("{...}");
+			return;
+		}
 	}
 	tprintf("{type=");
 	printxval(lockfcmds, fl.l_type, "F_???");
@@ -219,10 +285,7 @@
 #if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
 /* fcntl/lockf */
 static void
-printflock64(tcp, addr, getlk)
-struct tcb *tcp;
-long addr;
-int getlk;
+printflock64(struct tcb *tcp, long addr, int getlk)
 {
 	struct flock64 fl;
 
@@ -242,38 +305,12 @@
 }
 #endif
 
-static char *
-sprintflags(xlat, flags)
-const struct xlat *xlat;
-int flags;
-{
-	static char outstr[1024];
-	char *sep;
-
-	strcpy(outstr, "flags ");
-	sep = "";
-	for (; xlat->str; xlat++) {
-		if ((flags & xlat->val) == xlat->val) {
-			sprintf(outstr + strlen(outstr),
-				"%s%s", sep, xlat->str);
-			sep = "|";
-			flags &= ~xlat->val;
-		}
-	}
-	if (flags)
-		sprintf(outstr + strlen(outstr),
-			"%s%#x", sep, flags);
-	return outstr;
-}
-
 int
-sys_fcntl(tcp)
-struct tcb *tcp;
+sys_fcntl(struct tcb *tcp)
 {
-	extern const struct xlat openmodes[];
-
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		printxval(fcntlcmds, tcp->u_arg[1], "F_???");
 		switch (tcp->u_arg[1]) {
 		case F_SETFD:
@@ -281,11 +318,14 @@
 			printflags(fdflags, tcp->u_arg[2], "FD_???");
 			break;
 		case F_SETOWN: case F_DUPFD:
+#ifdef F_DUPFD_CLOEXEC
+		case F_DUPFD_CLOEXEC:
+#endif
 			tprintf(", %ld", tcp->u_arg[2]);
 			break;
 		case F_SETFL:
 			tprintf(", ");
-			printflags(openmodes, tcp->u_arg[2] + 1, "O_???");
+			tprint_open_modes(tcp->u_arg[2]);
 			break;
 		case F_SETLK: case F_SETLKW:
 #ifdef F_FREESP
@@ -300,32 +340,55 @@
 #endif
 		/* Linux glibc defines SETLK64 as SETLK,
 		   even though the kernel has different values - as does Solaris. */
-#if defined(F_SETLK64) && F_SETLK64+0!=F_SETLK
+#if defined(F_SETLK64) && F_SETLK64 + 0 != F_SETLK
 		case F_SETLK64:
 #endif
-#if defined(F_SETLKW64) && F_SETLKW64+0!=F_SETLKW
+#if defined(F_SETLKW64) && F_SETLKW64 + 0 != F_SETLKW
 		case F_SETLKW64:
 #endif
 			tprintf(", ");
 			printflock64(tcp, tcp->u_arg[2], 0);
 			break;
 #endif
- 		}
+#ifdef F_NOTIFY
+		case F_NOTIFY:
+			tprintf(", ");
+			printflags(notifyflags, tcp->u_arg[2], "DN_???");
+			break;
+#endif
+#ifdef F_SETLEASE
+		case F_SETLEASE:
+			tprintf(", ");
+			printxval(lockfcmds, tcp->u_arg[2], "F_???");
+			break;
+#endif
+		}
 	}
 	else {
 		switch (tcp->u_arg[1]) {
 		case F_DUPFD:
+#ifdef F_DUPFD_CLOEXEC
+		case F_DUPFD_CLOEXEC:
+#endif
 		case F_SETFD: case F_SETFL:
 		case F_SETLK: case F_SETLKW:
 		case F_SETOWN: case F_GETOWN:
+#ifdef F_NOTIFY
+		case F_NOTIFY:
+#endif
+#ifdef F_SETLEASE
+		case F_SETLEASE:
+#endif
 			break;
 		case F_GETFD:
-			if (tcp->u_rval == 0)
+			if (syserror(tcp) || tcp->u_rval == 0)
 				return 0;
-			tcp->auxstr = sprintflags(fdflags, tcp->u_rval);
+			tcp->auxstr = sprintflags("flags ", fdflags, tcp->u_rval);
 			return RVAL_HEX|RVAL_STR;
 		case F_GETFL:
-			tcp->auxstr = sprintflags(openmodes, tcp->u_rval + 1);
+			if (syserror(tcp))
+				return 0;
+			tcp->auxstr = sprint_open_modes(tcp->u_rval);
 			return RVAL_HEX|RVAL_STR;
 		case F_GETLK:
 			tprintf(", ");
@@ -339,7 +402,14 @@
 			printflock64(tcp, tcp->u_arg[2], 1);
 			break;
 #endif
- 		default:
+#ifdef F_GETLEASE
+		case F_GETLEASE:
+			if (syserror(tcp))
+				return 0;
+			tcp->auxstr = xlookup(lockfcmds, tcp->u_rval);
+			return RVAL_HEX|RVAL_STR;
+#endif
+		default:
 			tprintf(", %#lx", tcp->u_arg[2]);
 			break;
 		}
@@ -350,11 +420,11 @@
 #ifdef LOCK_SH
 
 int
-sys_flock(tcp)
-struct tcb *tcp;
+sys_flock(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		printflags(flockcmds, tcp->u_arg[1], "LOCK_???");
 	}
 	return 0;
@@ -362,61 +432,69 @@
 #endif /* LOCK_SH */
 
 int
-sys_close(tcp)
-struct tcb *tcp;
+sys_close(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
 	}
 	return 0;
 }
 
 int
-sys_dup(tcp)
-struct tcb *tcp;
+sys_dup(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
 	}
 	return 0;
 }
 
-int
-sys_dup2(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		tprintf("%ld, %ld", tcp->u_arg[0], tcp->u_arg[1]);
-	}
-	return 0;
-}
-
-int
-sys_getdtablesize(tcp)
-struct tcb *tcp;
-{
-	return 0;
-}
-
 static int
-decode_select(tcp, args, bitness)
-struct tcb *tcp;
-long *args;
-int bitness;
+do_dup2(struct tcb *tcp, int flags_arg)
+{
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printfd(tcp, tcp->u_arg[1]);
+		if (flags_arg >= 0) {
+			tprintf(", ");
+			printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
+		}
+	}
+	return 0;
+}
+
+int
+sys_dup2(struct tcb *tcp)
+{
+	return do_dup2(tcp, -1);
+}
+
+#ifdef LINUX
+int
+sys_dup3(struct tcb *tcp)
+{
+	return do_dup2(tcp, 2);
+}
+#endif
+
+#if defined(ALPHA) || defined(FREEBSD) || defined(SUNOS4)
+int
+sys_getdtablesize(struct tcb *tcp)
+{
+	return 0;
+}
+#endif /* ALPHA || FREEBSD || SUNOS4 */
+
+static int
+decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
 {
 	int i, j, nfds;
 	unsigned int fdsize = ((((args[0] + 7) / 8) + sizeof(long) - 1)
 			       & -sizeof(long));
 	fd_set *fds;
-	struct timeval tv;
-#ifdef ALPHA
-	struct timeval32 {
-		unsigned tv_sec;
-		unsigned tv_usec;
-	} *tv32;
-#endif
 	static char outstr[1024];
-	char *sep;
+	const char *sep;
 	long arg;
 
 	if (entering(tcp)) {
@@ -442,34 +520,21 @@
 			tprintf(", [");
 			for (j = 0, sep = ""; j < nfds; j++) {
 				if (FD_ISSET(j, fds)) {
-					tprintf("%s%u", sep, j);
+					tprintf("%s", sep);
+					printfd(tcp, j);
 					sep = " ";
 				}
 			}
 			tprintf("]");
 		}
 		free(fds);
-		if (!args[4])
-			tprintf(", NULL");
-		else if (!verbose(tcp))
-			tprintf(", %#lx", args[4]);
-		else if (umove(tcp, args[4], &tv) < 0)
-			tprintf(", {...}");
-		else {
-#ifdef ALPHA
-			if (bitness) {
-				tv32=(struct timeval32*)&tv;
-				tprintf(", {%u, %u}", tv32->tv_sec, tv32->tv_usec);
-			} else
-#endif
-				tprintf(", {%lu, %lu}",
-					(long) tv.tv_sec, (long) tv.tv_usec);
-		}
+		tprintf(", ");
+		printtv_bitness(tcp, args[4], bitness, 0);
 	}
 	else
 	{
 		unsigned int cumlen = 0;
-		char *sep = "";
+		const char *sep = "";
 
 		if (syserror(tcp))
 			return 0;
@@ -486,7 +551,6 @@
 		outstr[0] = '\0';
 		for (i = 0; i < 3; i++) {
 			int first = 1;
-			char str[20];
 
 			tcp->auxstr = outstr;
 			arg = args[i+1];
@@ -495,6 +559,8 @@
 				continue;
 			for (j = 0; j < args[0]; j++) {
 				if (FD_ISSET(j, fds)) {
+					char str[11 + 3 * sizeof(int)];
+
 					if (first) {
 						sprintf(str, "%s%s [%u", sep,
 							i == 0 ? "in" :
@@ -520,22 +586,12 @@
 #ifdef LINUX
 		/* This contains no useful information on SunOS.  */
 		if (args[4]) {
-			char str[64];
+			char str[128];
 
-			if (umove(tcp, args[4], &tv) >= 0) {
-#ifdef ALPHA
-				if (bitness) {
-					tv32=(struct timeval32*)&tv;
-					sprintf(str, "%sleft {%u, %u}", sep,
-						tv32->tv_sec, tv32->tv_usec);
-				} else
-#endif
-					sprintf(str, "%sleft {%lu, %lu}", sep,
-						(long) tv.tv_sec, (long) tv.tv_usec);
-
-				if ((cumlen += strlen(str)) < sizeof(outstr))
-					strcat(outstr, str);
-			}
+			sprintf(str, "%sleft ", sep);
+			sprinttv(tcp, args[4], bitness, str + strlen(str));
+			if ((cumlen += strlen(str)) < sizeof(outstr))
+				strcat(outstr, str);
 		}
 #endif /* LINUX */
 		return RVAL_STR;
@@ -546,8 +602,7 @@
 #ifdef LINUX
 
 int
-sys_oldselect(tcp)
-struct tcb *tcp;
+sys_oldselect(struct tcb *tcp)
 {
 	long args[5];
 
@@ -555,20 +610,19 @@
 		tprintf("[...]");
 		return 0;
 	}
-	return decode_select(tcp, args, 0);
+	return decode_select(tcp, args, BITNESS_CURRENT);
 }
 
 #ifdef ALPHA
 int
-sys_osf_select(tcp)
-struct tcb *tcp;
+sys_osf_select(struct tcb *tcp)
 {
 	long *args = tcp->u_arg;
-	return decode_select(tcp, args, 1);
+	return decode_select(tcp, args, BITNESS_32);
 }
 #endif
 
-static struct xlat epollctls[] = {
+static const struct xlat epollctls[] = {
 #ifdef EPOLL_CTL_ADD
 	{ EPOLL_CTL_ADD,	"EPOLL_CTL_ADD"	},
 #endif
@@ -581,7 +635,7 @@
 	{ 0,			NULL		}
 };
 
-static struct xlat epollevents[] = {
+static const struct xlat epollevents[] = {
 #ifdef EPOLLIN
 	{ EPOLLIN,	"EPOLLIN"	},
 #endif
@@ -622,18 +676,24 @@
 };
 
 int
-sys_epoll_create(tcp)
-struct tcb *tcp;
+sys_epoll_create(struct tcb *tcp)
 {
 	if (entering(tcp))
 		tprintf("%ld", tcp->u_arg[0]);
 	return 0;
 }
 
+int
+sys_epoll_create1(struct tcb *tcp)
+{
+	if (entering(tcp))
+		printflags(open_mode_flags, tcp->u_arg[0], "O_???");
+	return 0;
+}
+
 #ifdef HAVE_SYS_EPOLL_H
 static void
-print_epoll_event(ev)
-struct epoll_event *ev;
+print_epoll_event(struct epoll_event *ev)
 {
 	tprintf("{");
 	printflags(epollevents, ev->events, "EPOLL???");
@@ -645,13 +705,15 @@
 #endif
 
 int
-sys_epoll_ctl(tcp)
-struct tcb *tcp;
+sys_epoll_ctl(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-                printxval(epollctls, tcp->u_arg[1], "EPOLL_CTL_???");
-		tprintf(", %ld, ", tcp->u_arg[2]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printxval(epollctls, tcp->u_arg[1], "EPOLL_CTL_???");
+		tprintf(", ");
+		printfd(tcp, tcp->u_arg[2]);
+		tprintf(", ");
 		if (tcp->u_arg[3] == 0)
 			tprintf("NULL");
 		else {
@@ -667,13 +729,13 @@
 	return 0;
 }
 
-int
-sys_epoll_wait(tcp)
-struct tcb *tcp;
+static void
+epoll_wait_common(struct tcb *tcp)
 {
-	if (entering(tcp))
-		tprintf("%ld, ", tcp->u_arg[0]);
-	else {
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+	} else {
 		if (syserror(tcp))
 			tprintf("%lx", tcp->u_arg[1]);
 		else if (tcp->u_rval == 0)
@@ -706,12 +768,28 @@
 		}
 		tprintf(", %ld, %ld", tcp->u_arg[2], tcp->u_arg[3]);
 	}
+}
+
+int
+sys_epoll_wait(struct tcb *tcp)
+{
+	epoll_wait_common(tcp);
 	return 0;
 }
 
 int
-sys_io_setup(tcp)
-struct tcb *tcp;
+sys_epoll_pwait(struct tcb *tcp)
+{
+	epoll_wait_common(tcp);
+	if (exiting(tcp)) {
+		tprintf(", ");
+		print_sigset(tcp, tcp->u_arg[4], 0);
+	}
+	return 0;
+}
+
+int
+sys_io_setup(struct tcb *tcp)
 {
 	if (entering(tcp))
 		tprintf("%ld, ", tcp->u_arg[0]);
@@ -730,8 +808,7 @@
 }
 
 int
-sys_io_destroy(tcp)
-struct tcb *tcp;
+sys_io_destroy(struct tcb *tcp)
 {
 	if (entering(tcp))
 		tprintf("%lu", tcp->u_arg[0]);
@@ -739,8 +816,7 @@
 }
 
 int
-sys_io_submit(tcp)
-struct tcb *tcp;
+sys_io_submit(struct tcb *tcp)
 {
 	long nr;
 	if (entering(tcp)) {
@@ -782,8 +858,7 @@
 }
 
 int
-sys_io_cancel(tcp)
-struct tcb *tcp;
+sys_io_cancel(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 #ifdef HAVE_LIBAIO_H
@@ -809,7 +884,7 @@
 				tprintf("{%p, %p, %ld, %ld}",
 					event.data, event.obj,
 					event.res, event.res2);
-			else 
+			else
 #endif
 				tprintf("{...}");
 		}
@@ -818,8 +893,7 @@
 }
 
 int
-sys_io_getevents(tcp)
-struct tcb *tcp;
+sys_io_getevents(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%ld, %ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1],
@@ -853,24 +927,64 @@
 #endif
 		}
 
-		if (tcp->u_arg[4] == 0)
-			tprintf("NULL");
-		else {
-			struct timespec to;
-			if (umove(tcp, tcp->u_arg[4], &to) == 0)
-				tprintf("{%lu, %lu}", to.tv_sec, to.tv_nsec);
-			else
-				tprintf("{...}");
-		}
+		print_timespec(tcp, tcp->u_arg[4]);
 	}
 	return 0;
 }
 #endif /* LINUX */
 
 int
-sys_select(tcp)
-struct tcb *tcp;
+sys_select(struct tcb *tcp)
 {
-	long *args = tcp->u_arg;
-	return decode_select(tcp, args, 0);
+	return decode_select(tcp, tcp->u_arg, BITNESS_CURRENT);
 }
+
+#ifdef LINUX
+int
+sys_pselect6(struct tcb *tcp)
+{
+	int rc = decode_select(tcp, tcp->u_arg, BITNESS_CURRENT);
+	if (entering(tcp)) {
+		struct {
+			void *ss;
+			unsigned long len;
+		} data;
+		if (umove(tcp, tcp->u_arg[5], &data) < 0)
+			tprintf(", %#lx", tcp->u_arg[5]);
+		else {
+			tprintf(", {");
+			if (data.len < sizeof(long))
+				tprintf("%#lx", (long)data.ss);
+			else
+				print_sigset(tcp, (long)data.ss, 0);
+			tprintf(", %lu}", data.len);
+		}
+	}
+	return rc;
+}
+
+static int
+do_eventfd(struct tcb *tcp, int flags_arg)
+{
+	if (entering(tcp)) {
+		tprintf("%lu", tcp->u_arg[0]);
+		if (flags_arg >= 0) {
+			tprintf(", ");
+			printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
+		}
+	}
+	return 0;
+}
+
+int
+sys_eventfd(struct tcb *tcp)
+{
+	return do_eventfd(tcp, -1);
+}
+
+int
+sys_eventfd2(struct tcb *tcp)
+{
+	return do_eventfd(tcp, 1);
+}
+#endif
diff --git a/errnoent.sh b/errnoent.sh
deleted file mode 100644
index da8fda0..0000000
--- a/errnoent.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-# Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#	$Id: errnoent.sh,v 1.1.1.1 1999/02/19 00:22:09 wichert Exp $
-
-awk '
-/^#define[ 	]+E[A-Z0-9_]+[ 	]+[0-9]+/ {
-	errno[$3] = $2
-	if ($3 > max)
-		max = $3
-}
-END {
-	for (i = 0; i <= max; i++) {
-		if (!errno[i])
-			errno[i] = "ERRNO_" i
-		printf "\t\"%s\", /* %d */\n", errno[i], i
-	}
-}
-' $*
diff --git a/file.c b/file.c
index b0f9715..92efcfe 100644
--- a/file.c
+++ b/file.c
@@ -1,5 +1,4 @@
 /*
-#ifdef LINUX
  * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
  * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
  * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
@@ -28,20 +27,37 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: file.c,v 1.75 2005/06/08 20:45:28 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
 
 #include <dirent.h>
-#if defined(LINUX)
-#define dirent kernel_dirent
-#ifndef HAVE_ANDROID_OS
-#define dirent64 kernel_dirent64
+
+#ifdef LINUX
+struct kernel_dirent {
+	unsigned long   d_ino;
+	unsigned long   d_off;
+	unsigned short  d_reclen;
+	char            d_name[1];
+};
+#else
+# define kernel_dirent dirent
 #endif
+
 #ifdef HAVE_ANDROID_OS
 #include <linux/fadvise.h>
 
+// ANDROID: From linux/dirent.h
+
+struct dirent64 {
+ __u64 d_ino;
+ __s64 d_off;
+ unsigned short d_reclen;
+ unsigned char d_type;
+ char d_name[256];
+};
+
 // ANDROID: From kernel_headers/asm/statfs.h
 
 /*
@@ -62,18 +78,7 @@
         __u32 f_frsize;
         __u32 f_spare[5];
 } __attribute__ ((packed,aligned(4)));
-
-
-
-
 #endif /* HAVE_ANDROID_OS */
-#include <linux/types.h>
-#include <linux/dirent.h>
-#undef dirent
-#undef dirent64
-#else
-#define kernel_dirent dirent
-#endif
 
 #ifdef LINUX
 #  ifdef LINUXSPARC
@@ -198,6 +203,15 @@
 #include <sys/stat.h>
 #endif
 
+#if _LFS64_LARGEFILE && (defined(LINUX) || defined(SVR4))
+# ifdef HAVE_INTTYPES_H
+#  include <inttypes.h>
+# else
+#  define PRId64 "lld"
+#  define PRIu64 "llu"
+# endif
+#endif
+
 #if HAVE_LONG_LONG_OFF_T
 /*
  * Ugly hacks for systems that have typedef long long off_t
@@ -230,21 +244,23 @@
 #include <ustat.h>
 #endif
 
-/*
- * This is a really dirty trick but it should always work.  Traditional
- * Unix says r/w/rw are 0/1/2, so we make them true flags 1/2/3 by
- * adding 1.  Just remember to add 1 to any arg decoded with openmodes.
- */
-const struct xlat openmodes[] = {
-	{ O_RDWR+1,	"O_RDWR"	},
-	{ O_RDONLY+1,	"O_RDONLY"	},
-	{ O_WRONLY+1,	"O_WRONLY"	},
-	{ O_NONBLOCK,	"O_NONBLOCK"	},
-	{ O_APPEND,	"O_APPEND"	},
+const struct xlat open_access_modes[] = {
+	{ O_RDONLY,	"O_RDONLY"	},
+	{ O_WRONLY,	"O_WRONLY"	},
+	{ O_RDWR,	"O_RDWR"	},
+#ifdef O_ACCMODE
+	{ O_ACCMODE,	"O_ACCMODE"	},
+#endif
+	{ 0,		NULL		},
+};
+
+const struct xlat open_mode_flags[] = {
 	{ O_CREAT,	"O_CREAT"	},
-	{ O_TRUNC,	"O_TRUNC"	},
 	{ O_EXCL,	"O_EXCL"	},
 	{ O_NOCTTY,	"O_NOCTTY"	},
+	{ O_TRUNC,	"O_TRUNC"	},
+	{ O_APPEND,	"O_APPEND"	},
+	{ O_NONBLOCK,	"O_NONBLOCK"	},
 #ifdef O_SYNC
 	{ O_SYNC,	"O_SYNC"	},
 #endif
@@ -257,7 +273,7 @@
 #ifdef O_RSYNC
 	{ O_RSYNC,	"O_RSYNC"	},
 #endif
-#ifdef O_NDELAY
+#if defined(O_NDELAY) && (O_NDELAY != O_NONBLOCK)
 	{ O_NDELAY,	"O_NDELAY"	},
 #endif
 #ifdef O_PRIV
@@ -288,6 +304,9 @@
 #ifdef O_NOATIME
 	{ O_NOATIME, 	"O_NOATIME"	},
 #endif
+#ifdef O_CLOEXEC
+	{ O_CLOEXEC,	"O_CLOEXEC"	},
+#endif
 
 #ifdef FNDELAY
 	{ FNDELAY,	"FNDELAY"	},
@@ -337,23 +356,118 @@
 	{ 0,		NULL		},
 };
 
-int
-sys_open(tcp)
-struct tcb *tcp;
+#ifdef LINUX
+
+#ifndef AT_FDCWD
+# define AT_FDCWD                -100
+#endif
+
+/* The fd is an "int", so when decoding x86 on x86_64, we need to force sign
+ * extension to get the right value.  We do this by declaring fd as int here.
+ */
+static void
+print_dirfd(struct tcb *tcp, int fd)
+{
+	if (fd == AT_FDCWD)
+		tprintf("AT_FDCWD, ");
+	else
+	{
+		printfd(tcp, fd);
+		tprintf(", ");
+	}
+}
+#endif
+
+/*
+ * Pity stpcpy() is not standardized...
+ */
+static char *
+str_append(char *dst, const char *src)
+{
+	while ((*dst = *src++) != '\0')
+		dst++;
+	return dst;
+}
+
+/*
+ * low bits of the open(2) flags define access mode,
+ * other bits are real flags.
+ */
+const char *
+sprint_open_modes(mode_t flags)
+{
+	static char outstr[1024];
+	char *p;
+	char sep = 0;
+	const char *str;
+	const struct xlat *x;
+
+	p = str_append(outstr, "flags ");
+	str = xlookup(open_access_modes, flags & 3);
+	if (str) {
+		p = str_append(p, str);
+		flags &= ~3;
+		if (!flags)
+			return outstr;
+		sep = '|';
+	}
+
+	for (x = open_mode_flags; x->str; x++) {
+		if ((flags & x->val) == x->val) {
+			if (sep)
+				*p++ = sep;
+			p = str_append(p, x->str);
+			flags &= ~x->val;
+			if (!flags)
+				return outstr;
+			sep = '|';
+		}
+	}
+	/* flags is still nonzero */
+	if (sep)
+		*p++ = sep;
+	sprintf(p, "%#x", flags);
+	return outstr;
+}
+
+void
+tprint_open_modes(mode_t flags)
+{
+	tprintf("%s", sprint_open_modes(flags) + sizeof("flags"));
+}
+
+static int
+decode_open(struct tcb *tcp, int offset)
 {
 	if (entering(tcp)) {
-		printpath(tcp, tcp->u_arg[0]);
+		printpath(tcp, tcp->u_arg[offset]);
 		tprintf(", ");
 		/* flags */
-		printflags(openmodes, tcp->u_arg[1] + 1, "O_???");
-		if (tcp->u_arg[1] & O_CREAT) {
+		tprint_open_modes(tcp->u_arg[offset + 1]);
+		if (tcp->u_arg[offset + 1] & O_CREAT) {
 			/* mode */
-			tprintf(", %#lo", tcp->u_arg[2]);
+			tprintf(", %#lo", tcp->u_arg[offset + 2]);
 		}
 	}
 	return 0;
 }
 
+int
+sys_open(struct tcb *tcp)
+{
+	return decode_open(tcp, 0);
+}
+
+#ifdef LINUX
+int
+sys_openat(struct tcb *tcp)
+{
+	if (entering(tcp))
+		print_dirfd(tcp, tcp->u_arg[0]);
+	return decode_open(tcp, 1);
+}
+#endif
+
 #ifdef LINUXSPARC
 static const struct xlat openmodessol[] = {
 	{ 0,		"O_RDWR"	},
@@ -374,8 +488,7 @@
 };
 
 int
-solaris_open(tcp)
-struct tcb *tcp;
+solaris_open(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -393,8 +506,7 @@
 #endif
 
 int
-sys_creat(tcp)
-struct tcb *tcp;
+sys_creat(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -417,21 +529,35 @@
 	{ 0,		NULL		},
 };
 
-int
-sys_access(tcp)
-struct tcb *tcp;
+static int
+decode_access(struct tcb *tcp, int offset)
 {
 	if (entering(tcp)) {
-		printpath(tcp, tcp->u_arg[0]);
+		printpath(tcp, tcp->u_arg[offset]);
 		tprintf(", ");
-		printflags(access_flags, tcp->u_arg[1], "?_OK");
+		printflags(access_flags, tcp->u_arg[offset + 1], "?_OK");
 	}
 	return 0;
 }
 
 int
-sys_umask(tcp)
-struct tcb *tcp;
+sys_access(struct tcb *tcp)
+{
+	return decode_access(tcp, 0);
+}
+
+#ifdef LINUX
+int
+sys_faccessat(struct tcb *tcp)
+{
+	if (entering(tcp))
+		print_dirfd(tcp, tcp->u_arg[0]);
+	return decode_access(tcp, 1);
+}
+#endif
+
+int
+sys_umask(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%#lo", tcp->u_arg[0]);
@@ -447,15 +573,36 @@
 };
 
 #ifndef HAVE_LONG_LONG_OFF_T
+#if defined (LINUX_MIPSN32)
 int
-sys_lseek(tcp)
-struct tcb *tcp;
+sys_lseek(struct tcb *tcp)
+{
+	long long offset;
+	int _whence;
+
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		offset = tcp->ext_arg[1];
+		_whence = tcp->u_arg[2];
+		if (_whence == SEEK_SET)
+			tprintf("%llu, ", offset);
+		else
+			tprintf("%lld, ", offset);
+		printxval(whence, _whence, "SEEK_???");
+	}
+	return RVAL_UDECIMAL;
+}
+#else /* !LINUX_MIPSN32 */
+int
+sys_lseek(struct tcb *tcp)
 {
 	off_t offset;
 	int _whence;
 
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		offset = tcp->u_arg[1];
 		_whence = tcp->u_arg[2];
 		if (_whence == SEEK_SET)
@@ -466,70 +613,67 @@
 	}
 	return RVAL_UDECIMAL;
 }
+#endif /* LINUX_MIPSN32 */
 #endif
 
 #ifdef LINUX
 int
-sys_llseek (tcp)
-struct tcb *tcp;
+sys_llseek(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	/*
-	 * This one call takes explicitly two 32-bit arguments hi, lo,
-	 * rather than one 64-bit argument for which LONG_LONG works
-	 * appropriate for the native byte order.
-	 */
-	if (tcp->u_arg[4] == SEEK_SET)
-	    tprintf("%ld, %llu, ", tcp->u_arg[0],
-		    (((long long int) tcp->u_arg[1]) << 32
-		     | (unsigned long long) (unsigned) tcp->u_arg[2]));
-	else
-	    tprintf("%ld, %lld, ", tcp->u_arg[0],
-		    (((long long int) tcp->u_arg[1]) << 32
-		     | (unsigned long long) (unsigned) tcp->u_arg[2]));
-    }
-    else {
-	long long int off;
-	if (syserror(tcp) || umove(tcp, tcp->u_arg[3], &off) < 0)
-	    tprintf("%#lx, ", tcp->u_arg[3]);
-	else
-	    tprintf("[%llu], ", off);
-	printxval(whence, tcp->u_arg[4], "SEEK_???");
-    }
-    return 0;
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		/*
+		 * This one call takes explicitly two 32-bit arguments hi, lo,
+		 * rather than one 64-bit argument for which LONG_LONG works
+		 * appropriate for the native byte order.
+		 */
+		if (tcp->u_arg[4] == SEEK_SET)
+			tprintf(", %llu, ",
+				((long long int) tcp->u_arg[1]) << 32 |
+				(unsigned long long) (unsigned) tcp->u_arg[2]);
+		else
+			tprintf(", %lld, ",
+				((long long int) tcp->u_arg[1]) << 32 |
+				(unsigned long long) (unsigned) tcp->u_arg[2]);
+	}
+	else {
+		long long int off;
+		if (syserror(tcp) || umove(tcp, tcp->u_arg[3], &off) < 0)
+			tprintf("%#lx, ", tcp->u_arg[3]);
+		else
+			tprintf("[%llu], ", off);
+		printxval(whence, tcp->u_arg[4], "SEEK_???");
+	}
+	return 0;
 }
 
 int
-sys_readahead (tcp)
-struct tcb *tcp;
+sys_readahead(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	tprintf("%ld, %lld, %ld", tcp->u_arg[0],
-# if defined IA64 || defined X86_64 || defined ALPHA
-		(long long int) tcp->u_arg[1], tcp->u_arg[2]
-# else
-		LONG_LONG(tcp->u_arg[1], tcp->u_arg[2]), tcp->u_arg[3]
-# endif
-		);
-    }
-    return 0;
+	if (entering(tcp)) {
+		int argn;
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		argn = printllval(tcp, "%lld", 1);
+		tprintf(", %ld", tcp->u_arg[argn]);
+	}
+	return 0;
 }
 #endif
 
 #if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
 int
-sys_lseek64 (tcp)
-struct tcb *tcp;
+sys_lseek64(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		long long offset;
-		ALIGN64 (tcp, 1);	/* FreeBSD aligns off_t args */
-		offset = LONG_LONG(tcp->u_arg [1], tcp->u_arg[2]);
+		int argn;
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		if (tcp->u_arg[3] == SEEK_SET)
-			tprintf("%ld, %llu, ", tcp->u_arg[0], offset);
+			argn = printllval(tcp, "%llu, ", 1);
 		else
-			tprintf("%ld, %lld, ", tcp->u_arg[0], offset);
-		printxval(whence, tcp->u_arg[3], "SEEK_???");
+			argn = printllval(tcp, "%lld, ", 1);
+		printxval(whence, tcp->u_arg[argn], "SEEK_???");
 	}
 	return RVAL_LUDECIMAL;
 }
@@ -537,8 +681,7 @@
 
 #ifndef HAVE_LONG_LONG_OFF_T
 int
-sys_truncate(tcp)
-struct tcb *tcp;
+sys_truncate(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -550,13 +693,11 @@
 
 #if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
 int
-sys_truncate64(tcp)
-struct tcb *tcp;
+sys_truncate64(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		ALIGN64 (tcp, 1);
 		printpath(tcp, tcp->u_arg[0]);
-		tprintf(", %llu", LONG_LONG(tcp->u_arg[1],tcp->u_arg[2]));
+		printllval(tcp, ", %llu", 1);
 	}
 	return 0;
 }
@@ -564,11 +705,11 @@
 
 #ifndef HAVE_LONG_LONG_OFF_T
 int
-sys_ftruncate(tcp)
-struct tcb *tcp;
+sys_ftruncate(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, %lu", tcp->u_arg[0], tcp->u_arg[1]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", %lu", tcp->u_arg[1]);
 	}
 	return 0;
 }
@@ -576,13 +717,12 @@
 
 #if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
 int
-sys_ftruncate64(tcp)
-struct tcb *tcp;
+sys_ftruncate64(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		ALIGN64 (tcp, 1);
-		tprintf("%ld, %llu", tcp->u_arg[0],
-			LONG_LONG(tcp->u_arg[1] ,tcp->u_arg[2]));
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printllval(tcp, "%llu", 1);
 	}
 	return 0;
 }
@@ -602,8 +742,7 @@
 };
 
 static const char *
-sprintmode(mode)
-int mode;
+sprintmode(int mode)
 {
 	static char buf[64];
 	const char *s;
@@ -626,65 +765,57 @@
 }
 
 static char *
-sprinttime(t)
-time_t t;
+sprinttime(time_t t)
 {
 	struct tm *tmp;
 	static char buf[32];
 
 	if (t == 0) {
-		sprintf(buf, "0");
+		strcpy(buf, "0");
 		return buf;
 	}
-	tmp = localtime(&t);
-	sprintf(buf, "%02d/%02d/%02d-%02d:%02d:%02d",
-		tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
-		tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+	if ((tmp = localtime(&t)))
+		snprintf(buf, sizeof buf, "%02d/%02d/%02d-%02d:%02d:%02d",
+			tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
+			tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+	else
+		snprintf(buf, sizeof buf, "%lu", (unsigned long) t);
+
 	return buf;
 }
 
 #ifdef LINUXSPARC
 typedef struct {
-        int     tv_sec;
-        int     tv_nsec;
+	int     tv_sec;
+	int     tv_nsec;
 } timestruct_t;
 
 struct solstat {
-        unsigned        st_dev;
-        int             st_pad1[3];     /* network id */
-        unsigned        st_ino;
-        unsigned        st_mode;
-        unsigned        st_nlink;
-        unsigned        st_uid;
-        unsigned        st_gid;
-        unsigned        st_rdev;
-        int             st_pad2[2];
-        int             st_size;
-        int             st_pad3;        /* st_size, off_t expansion */
-        timestruct_t    st_atime;
-        timestruct_t    st_mtime;
-        timestruct_t    st_ctime;
-        int             st_blksize;
-        int             st_blocks;
-        char            st_fstype[16];
-        int             st_pad4[8];     /* expansion area */
+	unsigned        st_dev;
+	int             st_pad1[3];     /* network id */
+	unsigned        st_ino;
+	unsigned        st_mode;
+	unsigned        st_nlink;
+	unsigned        st_uid;
+	unsigned        st_gid;
+	unsigned        st_rdev;
+	int             st_pad2[2];
+	int             st_size;
+	int             st_pad3;        /* st_size, off_t expansion */
+	timestruct_t    st_atime;
+	timestruct_t    st_mtime;
+	timestruct_t    st_ctime;
+	int             st_blksize;
+	int             st_blocks;
+	char            st_fstype[16];
+	int             st_pad4[8];     /* expansion area */
 };
 
 static void
-printstatsol(tcp, addr)
-struct tcb *tcp;
-long addr;
+printstatsol(struct tcb *tcp, long addr)
 {
 	struct solstat statbuf;
 
-	if (!addr) {
-		tprintf("NULL");
-		return;
-	}
-	if (syserror(tcp) || !verbose(tcp)) {
-		tprintf("%#lx", addr);
-		return;
-	}
 	if (umove(tcp, addr, &statbuf) < 0) {
 		tprintf("{...}");
 		return;
@@ -715,9 +846,9 @@
 		break;
 	}
 	if (!abbrev(tcp)) {
-		tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
-		tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
-		tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime));
+		tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime.tv_sec));
+		tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime.tv_sec));
+		tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime.tv_sec));
 	}
 	else
 		tprintf("...}");
@@ -725,20 +856,10 @@
 
 #if defined (SPARC64)
 static void
-printstat_sparc64(tcp, addr)
-struct tcb *tcp;
-long addr;
+printstat_sparc64(struct tcb *tcp, long addr)
 {
 	struct stat_sparc64 statbuf;
 
-	if (!addr) {
-		tprintf("NULL");
-		return;
-	}
-	if (syserror(tcp) || !verbose(tcp)) {
-		tprintf("%#lx", addr);
-		return;
-	}
 	if (umove(tcp, addr, &statbuf) < 0) {
 		tprintf("{...}");
 		return;
@@ -783,6 +904,71 @@
 #endif /* SPARC64 */
 #endif /* LINUXSPARC */
 
+#if defined LINUX && defined POWERPC64
+struct stat_powerpc32 {
+	unsigned int	st_dev;
+	unsigned int	st_ino;
+	unsigned int	st_mode;
+	unsigned short	st_nlink;
+	unsigned int	st_uid;
+	unsigned int	st_gid;
+	unsigned int	st_rdev;
+	unsigned int	st_size;
+	unsigned int	st_blksize;
+	unsigned int	st_blocks;
+	unsigned int	st_atime;
+	unsigned int	st_atime_nsec;
+	unsigned int	st_mtime;
+	unsigned int	st_mtime_nsec;
+	unsigned int	st_ctime;
+	unsigned int	st_ctime_nsec;
+	unsigned int	__unused4;
+	unsigned int	__unused5;
+};
+
+static void
+printstat_powerpc32(struct tcb *tcp, long addr)
+{
+	struct stat_powerpc32 statbuf;
+
+	if (umove(tcp, addr, &statbuf) < 0) {
+		tprintf("{...}");
+		return;
+	}
+
+	if (!abbrev(tcp)) {
+		tprintf("{st_dev=makedev(%u, %u), st_ino=%u, st_mode=%s, ",
+			major(statbuf.st_dev), minor(statbuf.st_dev),
+			statbuf.st_ino,
+			sprintmode(statbuf.st_mode));
+		tprintf("st_nlink=%u, st_uid=%u, st_gid=%u, ",
+			statbuf.st_nlink, statbuf.st_uid, statbuf.st_gid);
+		tprintf("st_blksize=%u, ", statbuf.st_blksize);
+		tprintf("st_blocks=%u, ", statbuf.st_blocks);
+	}
+	else
+		tprintf("{st_mode=%s, ", sprintmode(statbuf.st_mode));
+	switch (statbuf.st_mode & S_IFMT) {
+	case S_IFCHR: case S_IFBLK:
+		tprintf("st_rdev=makedev(%lu, %lu), ",
+			(unsigned long) major(statbuf.st_rdev),
+			(unsigned long) minor(statbuf.st_rdev));
+		break;
+	default:
+		tprintf("st_size=%u, ", statbuf.st_size);
+		break;
+	}
+	if (!abbrev(tcp)) {
+		tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
+		tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
+		tprintf("st_ctime=%s", sprinttime(statbuf.st_ctime));
+		tprintf("}");
+	}
+	else
+		tprintf("...}");
+}
+#endif /* LINUX && POWERPC64 */
+
 static const struct xlat fileflags[] = {
 #ifdef FREEBSD
 	{ UF_NODUMP,	"UF_NODUMP"	},
@@ -807,8 +993,7 @@
 
 #ifdef FREEBSD
 int
-sys_chflags(tcp)
-struct tcb *tcp;
+sys_chflags(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -819,8 +1004,7 @@
 }
 
 int
-sys_fchflags(tcp)
-struct tcb *tcp;
+sys_fchflags(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%ld, ", tcp->u_arg[0]);
@@ -832,49 +1016,47 @@
 
 #ifndef HAVE_LONG_LONG_OFF_T
 static void
-realprintstat(tcp, statbuf)
-struct tcb *tcp;
-struct stat *statbuf;
+realprintstat(struct tcb *tcp, struct stat *statbuf)
 {
-    if (!abbrev(tcp)) {
-	    tprintf("{st_dev=makedev(%lu, %lu), st_ino=%lu, st_mode=%s, ",
-		    (unsigned long) major(statbuf->st_dev),
-		    (unsigned long) minor(statbuf->st_dev),
-		    (unsigned long) statbuf->st_ino,
-		    sprintmode(statbuf->st_mode));
-	    tprintf("st_nlink=%lu, st_uid=%lu, st_gid=%lu, ",
-		    (unsigned long) statbuf->st_nlink,
-		    (unsigned long) statbuf->st_uid,
-		    (unsigned long) statbuf->st_gid);
+	if (!abbrev(tcp)) {
+		tprintf("{st_dev=makedev(%lu, %lu), st_ino=%lu, st_mode=%s, ",
+			(unsigned long) major(statbuf->st_dev),
+			(unsigned long) minor(statbuf->st_dev),
+			(unsigned long) statbuf->st_ino,
+			sprintmode(statbuf->st_mode));
+		tprintf("st_nlink=%lu, st_uid=%lu, st_gid=%lu, ",
+			(unsigned long) statbuf->st_nlink,
+			(unsigned long) statbuf->st_uid,
+			(unsigned long) statbuf->st_gid);
 #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
-	    tprintf("st_blksize=%lu, ", (unsigned long) statbuf->st_blksize);
-#endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */
+		tprintf("st_blksize=%lu, ", (unsigned long) statbuf->st_blksize);
+#endif
 #ifdef HAVE_STRUCT_STAT_ST_BLOCKS
-	    tprintf("st_blocks=%lu, ", (unsigned long) statbuf->st_blocks);
-#endif /* HAVE_STRUCT_STAT_ST_BLOCKS */
-    }
-    else
-	    tprintf("{st_mode=%s, ", sprintmode(statbuf->st_mode));
-    switch (statbuf->st_mode & S_IFMT) {
-    case S_IFCHR: case S_IFBLK:
+		tprintf("st_blocks=%lu, ", (unsigned long) statbuf->st_blocks);
+#endif
+	}
+	else
+		tprintf("{st_mode=%s, ", sprintmode(statbuf->st_mode));
+	switch (statbuf->st_mode & S_IFMT) {
+	case S_IFCHR: case S_IFBLK:
 #ifdef HAVE_STRUCT_STAT_ST_RDEV
-	    tprintf("st_rdev=makedev(%lu, %lu), ",
-		    (unsigned long) major(statbuf->st_rdev),
-		    (unsigned long) minor(statbuf->st_rdev));
+		tprintf("st_rdev=makedev(%lu, %lu), ",
+			(unsigned long) major(statbuf->st_rdev),
+			(unsigned long) minor(statbuf->st_rdev));
 #else /* !HAVE_STRUCT_STAT_ST_RDEV */
-	    tprintf("st_size=makedev(%lu, %lu), ",
-		    (unsigned long) major(statbuf->st_size),
-		    (unsigned long) minor(statbuf->st_size));
+		tprintf("st_size=makedev(%lu, %lu), ",
+			(unsigned long) major(statbuf->st_size),
+			(unsigned long) minor(statbuf->st_size));
 #endif /* !HAVE_STRUCT_STAT_ST_RDEV */
-	    break;
-    default:
-	    tprintf("st_size=%lu, ", statbuf->st_size);
-	    break;
-    }
-    if (!abbrev(tcp)) {
-	    tprintf("st_atime=%s, ", sprinttime(statbuf->st_atime));
-	    tprintf("st_mtime=%s, ", sprinttime(statbuf->st_mtime));
-	    tprintf("st_ctime=%s", sprinttime(statbuf->st_ctime));
+		break;
+	default:
+		tprintf("st_size=%lu, ", (unsigned long) statbuf->st_size);
+		break;
+	}
+	if (!abbrev(tcp)) {
+		tprintf("st_atime=%s, ", sprinttime(statbuf->st_atime));
+		tprintf("st_mtime=%s, ", sprinttime(statbuf->st_mtime));
+		tprintf("st_ctime=%s", sprinttime(statbuf->st_ctime));
 #if HAVE_STRUCT_STAT_ST_FLAGS
 		tprintf(", st_flags=");
 		printflags(fileflags, statbuf->st_flags, "UF_???");
@@ -893,32 +1075,17 @@
 		tprintf(", st_gen=%u", statbuf->st_gen);
 #endif
 		tprintf("}");
-    }
-    else
-	    tprintf("...}");
+	}
+	else
+		tprintf("...}");
 }
 
 
 static void
-printstat(tcp, addr)
-struct tcb *tcp;
-long addr;
+printstat(struct tcb *tcp, long addr)
 {
 	struct stat statbuf;
 
-#ifdef LINUXSPARC
- 	if (current_personality == 1) {
- 		printstatsol(tcp, addr);
- 		return;
- 	}
-#ifdef SPARC64
-	else if (current_personality == 2) {
-		printstat_sparc64(tcp, addr);
-		return;
-	}
-#endif
-#endif /* LINUXSPARC */
-
 	if (!addr) {
 		tprintf("NULL");
 		return;
@@ -927,6 +1094,27 @@
 		tprintf("%#lx", addr);
 		return;
 	}
+
+#ifdef LINUXSPARC
+	if (current_personality == 1) {
+		printstatsol(tcp, addr);
+		return;
+	}
+#ifdef SPARC64
+	else if (current_personality == 2) {
+		printstat_sparc64(tcp, addr);
+		return;
+	}
+#endif
+#endif /* LINUXSPARC */
+
+#if defined LINUX && defined POWERPC64
+	if (current_personality == 1) {
+		printstat_powerpc32(tcp, addr);
+		return;
+	}
+#endif
+
 	if (umove(tcp, addr, &statbuf) < 0) {
 		tprintf("{...}");
 		return;
@@ -936,26 +1124,47 @@
 }
 #endif	/* !HAVE_LONG_LONG_OFF_T */
 
+#if !defined HAVE_STAT64 && defined LINUX && defined X86_64
+/*
+ * Linux x86_64 has unified `struct stat' but its i386 biarch needs
+ * `struct stat64'.  Its <asm-i386/stat.h> definition expects 32-bit `long'.
+ * <linux/include/asm-x86_64/ia32.h> is not in the public includes set.
+ * __GNUC__ is needed for the required __attribute__ below.
+ */
+struct stat64 {
+	unsigned long long	st_dev;
+	unsigned char	__pad0[4];
+	unsigned int	__st_ino;
+	unsigned int	st_mode;
+	unsigned int	st_nlink;
+	unsigned int	st_uid;
+	unsigned int	st_gid;
+	unsigned long long	st_rdev;
+	unsigned char	__pad3[4];
+	long long	st_size;
+	unsigned int	st_blksize;
+	unsigned long long	st_blocks;
+	unsigned int	st_atime;
+	unsigned int	st_atime_nsec;
+	unsigned int	st_mtime;
+	unsigned int	st_mtime_nsec;
+	unsigned int	st_ctime;
+	unsigned int	st_ctime_nsec;
+	unsigned long long	st_ino;
+} __attribute__((packed));
+# define HAVE_STAT64	1
+# define STAT64_SIZE	96
+#endif
+
 #ifdef HAVE_STAT64
 static void
-printstat64(tcp, addr)
-struct tcb *tcp;
-long addr;
+printstat64(struct tcb *tcp, long addr)
 {
 	struct stat64 statbuf;
 
-#ifdef LINUXSPARC
- 	if (current_personality == 1) {
- 		printstatsol(tcp, addr);
- 		return;
- 	}
-#ifdef SPARC64
-	else if (current_personality == 2) {
-		printstat_sparc64(tcp, addr);
-		return;
-	}
+#ifdef STAT64_SIZE
+	(void) sizeof(char[sizeof statbuf == STAT64_SIZE ? 1 : -1]);
 #endif
-#endif /* LINUXSPARC */
 
 	if (!addr) {
 		tprintf("NULL");
@@ -965,6 +1174,27 @@
 		tprintf("%#lx", addr);
 		return;
 	}
+
+#ifdef LINUXSPARC
+	if (current_personality == 1) {
+		printstatsol(tcp, addr);
+		return;
+	}
+# ifdef SPARC64
+	else if (current_personality == 2) {
+		printstat_sparc64(tcp, addr);
+		return;
+	}
+# endif
+#endif /* LINUXSPARC */
+
+#if defined LINUX && defined X86_64
+	if (current_personality == 0) {
+		printstat(tcp, addr);
+		return;
+	}
+#endif
+
 	if (umove(tcp, addr, &statbuf) < 0) {
 		tprintf("{...}");
 		return;
@@ -1011,7 +1241,11 @@
 #endif /* !HAVE_STRUCT_STAT_ST_RDEV */
 		break;
 	default:
-		tprintf("st_size=%llu, ", statbuf.st_size);
+#ifdef HAVE_LONG_LONG
+		tprintf("st_size=%llu, ", (unsigned long long) statbuf.st_size);
+#else
+		tprintf("st_size=%lu, ", (unsigned long) statbuf.st_size);
+#endif
 		break;
 	}
 	if (!abbrev(tcp)) {
@@ -1044,41 +1278,30 @@
 
 #if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT)
 static void
-convertoldstat(oldbuf, newbuf)
-const struct __old_kernel_stat *oldbuf;
-struct stat *newbuf;
+convertoldstat(const struct __old_kernel_stat *oldbuf, struct stat *newbuf)
 {
-    newbuf->st_dev=oldbuf->st_dev;
-    newbuf->st_ino=oldbuf->st_ino;
-    newbuf->st_mode=oldbuf->st_mode;
-    newbuf->st_nlink=oldbuf->st_nlink;
-    newbuf->st_uid=oldbuf->st_uid;
-    newbuf->st_gid=oldbuf->st_gid;
-    newbuf->st_rdev=oldbuf->st_rdev;
-    newbuf->st_size=oldbuf->st_size;
-    newbuf->st_atime=oldbuf->st_atime;
-    newbuf->st_mtime=oldbuf->st_mtime;
-    newbuf->st_ctime=oldbuf->st_ctime;
-    newbuf->st_blksize=0;	/* not supported in old_stat */
-    newbuf->st_blocks=0;		/* not supported in old_stat */
+	newbuf->st_dev = oldbuf->st_dev;
+	newbuf->st_ino = oldbuf->st_ino;
+	newbuf->st_mode = oldbuf->st_mode;
+	newbuf->st_nlink = oldbuf->st_nlink;
+	newbuf->st_uid = oldbuf->st_uid;
+	newbuf->st_gid = oldbuf->st_gid;
+	newbuf->st_rdev = oldbuf->st_rdev;
+	newbuf->st_size = oldbuf->st_size;
+	newbuf->st_atime = oldbuf->st_atime;
+	newbuf->st_mtime = oldbuf->st_mtime;
+	newbuf->st_ctime = oldbuf->st_ctime;
+	newbuf->st_blksize = 0; /* not supported in old_stat */
+	newbuf->st_blocks = 0; /* not supported in old_stat */
 }
 
 
 static void
-printoldstat(tcp, addr)
-struct tcb *tcp;
-long addr;
+printoldstat(struct tcb *tcp, long addr)
 {
 	struct __old_kernel_stat statbuf;
 	struct stat newstatbuf;
 
-#ifdef LINUXSPARC
- 	if (current_personality == 1) {
- 		printstatsol(tcp, addr);
- 		return;
- 	}
-#endif /* LINUXSPARC */
-
 	if (!addr) {
 		tprintf("NULL");
 		return;
@@ -1087,6 +1310,14 @@
 		tprintf("%#lx", addr);
 		return;
 	}
+
+#ifdef LINUXSPARC
+	if (current_personality == 1) {
+		printstatsol(tcp, addr);
+		return;
+	}
+#endif /* LINUXSPARC */
+
 	if (umove(tcp, addr, &statbuf) < 0) {
 		tprintf("{...}");
 		return;
@@ -1099,8 +1330,7 @@
 
 #ifndef HAVE_LONG_LONG_OFF_T
 int
-sys_stat(tcp)
-struct tcb *tcp;
+sys_stat(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1113,8 +1343,7 @@
 #endif
 
 int
-sys_stat64(tcp)
-struct tcb *tcp;
+sys_stat64(struct tcb *tcp)
 {
 #ifdef HAVE_STAT64
 	if (entering(tcp)) {
@@ -1129,10 +1358,44 @@
 #endif
 }
 
+#ifdef LINUX
+static const struct xlat fstatatflags[] = {
+#ifndef AT_SYMLINK_NOFOLLOW
+# define AT_SYMLINK_NOFOLLOW     0x100
+#endif
+	{ AT_SYMLINK_NOFOLLOW,	"AT_SYMLINK_NOFOLLOW"	},
+	{ 0,			NULL			},
+};
+#define utimensatflags fstatatflags
+
+int
+sys_newfstatat(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		print_dirfd(tcp, tcp->u_arg[0]);
+		printpath(tcp, tcp->u_arg[1]);
+		tprintf(", ");
+	} else {
+#ifdef POWERPC64
+		if (current_personality == 0)
+			printstat(tcp, tcp->u_arg[2]);
+		else
+			printstat64(tcp, tcp->u_arg[2]);
+#elif defined HAVE_STAT64
+		printstat64(tcp, tcp->u_arg[2]);
+#else
+		printstat(tcp, tcp->u_arg[2]);
+#endif
+		tprintf(", ");
+		printflags(fstatatflags, tcp->u_arg[3], "AT_???");
+	}
+	return 0;
+}
+#endif
+
 #if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT)
 int
-sys_oldstat(tcp)
-struct tcb *tcp;
+sys_oldstat(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1146,12 +1409,12 @@
 
 #ifndef HAVE_LONG_LONG_OFF_T
 int
-sys_fstat(tcp)
-struct tcb *tcp;
+sys_fstat(struct tcb *tcp)
 {
-	if (entering(tcp))
-		tprintf("%ld, ", tcp->u_arg[0]);
-	else {
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+	} else {
 		printstat(tcp, tcp->u_arg[1]);
 	}
 	return 0;
@@ -1159,13 +1422,13 @@
 #endif
 
 int
-sys_fstat64(tcp)
-struct tcb *tcp;
+sys_fstat64(struct tcb *tcp)
 {
 #ifdef HAVE_STAT64
-	if (entering(tcp))
-		tprintf("%ld, ", tcp->u_arg[0]);
-	else {
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+	} else {
 		printstat64(tcp, tcp->u_arg[1]);
 	}
 	return 0;
@@ -1176,12 +1439,12 @@
 
 #if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT)
 int
-sys_oldfstat(tcp)
-struct tcb *tcp;
+sys_oldfstat(struct tcb *tcp)
 {
-	if (entering(tcp))
-		tprintf("%ld, ", tcp->u_arg[0]);
-	else {
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+	} else {
 		printoldstat(tcp, tcp->u_arg[1]);
 	}
 	return 0;
@@ -1190,8 +1453,7 @@
 
 #ifndef HAVE_LONG_LONG_OFF_T
 int
-sys_lstat(tcp)
-struct tcb *tcp;
+sys_lstat(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1204,8 +1466,7 @@
 #endif
 
 int
-sys_lstat64(tcp)
-struct tcb *tcp;
+sys_lstat64(struct tcb *tcp)
 {
 #ifdef HAVE_STAT64
 	if (entering(tcp)) {
@@ -1222,8 +1483,7 @@
 
 #if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT)
 int
-sys_oldlstat(tcp)
-struct tcb *tcp;
+sys_oldlstat(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1239,8 +1499,7 @@
 #if defined(SVR4) || defined(LINUXSPARC)
 
 int
-sys_xstat(tcp)
-struct tcb *tcp;
+sys_xstat(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%ld, ", tcp->u_arg[0]);
@@ -1258,8 +1517,7 @@
 }
 
 int
-sys_fxstat(tcp)
-struct tcb *tcp;
+sys_fxstat(struct tcb *tcp)
 {
 	if (entering(tcp))
 		tprintf("%ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1]);
@@ -1275,8 +1533,7 @@
 }
 
 int
-sys_lxstat(tcp)
-struct tcb *tcp;
+sys_lxstat(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%ld, ", tcp->u_arg[0]);
@@ -1294,8 +1551,7 @@
 }
 
 int
-sys_xmknod(tcp)
-struct tcb *tcp;
+sys_xmknod(struct tcb *tcp)
 {
 	int mode = tcp->u_arg[2];
 
@@ -1349,8 +1605,7 @@
 };
 
 int
-sys_acl(tcp)
-struct tcb *tcp;
+sys_acl(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1371,8 +1626,7 @@
 
 
 int
-sys_facl(tcp)
-struct tcb *tcp;
+sys_facl(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%ld, ", tcp->u_arg[0]);
@@ -1406,8 +1660,7 @@
 
 
 int
-sys_aclipc(tcp)
-struct tcb *tcp;
+sys_aclipc(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printxval(aclipc, tcp->u_arg[0], "???IPC???");
@@ -1426,8 +1679,6 @@
 	return 0;
 }
 
-
-
 #endif /* HAVE_SYS_ACL_H */
 
 #endif /* SVR4 || LINUXSPARC */
@@ -1472,8 +1723,7 @@
 #ifndef SVR4
 
 static const char *
-sprintfstype(magic)
-int magic;
+sprintfstype(int magic)
 {
 	static char buf[32];
 #ifdef LINUX
@@ -1490,9 +1740,7 @@
 }
 
 static void
-printstatfs(tcp, addr)
-struct tcb *tcp;
-long addr;
+printstatfs(struct tcb *tcp, long addr)
 {
 	struct statfs statbuf;
 
@@ -1535,8 +1783,7 @@
 }
 
 int
-sys_statfs(tcp)
-struct tcb *tcp;
+sys_statfs(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1548,22 +1795,20 @@
 }
 
 int
-sys_fstatfs(tcp)
-struct tcb *tcp;
+sys_fstatfs(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%lu, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 	} else {
 		printstatfs(tcp, tcp->u_arg[1]);
 	}
 	return 0;
 }
 
-#ifdef LINUX 
+#if defined LINUX && defined HAVE_STATFS64
 static void
-printstatfs64(tcp, addr)
-struct tcb *tcp;
-long addr;
+printstatfs64(struct tcb *tcp, long addr)
 {
 	struct statfs64 statbuf;
 
@@ -1593,8 +1838,7 @@
 }
 
 int
-sys_statfs64(tcp)
-struct tcb *tcp;
+sys_statfs64(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1609,11 +1853,11 @@
 }
 
 int
-sys_fstatfs64(tcp)
-struct tcb *tcp;
+sys_fstatfs64(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%lu, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", %lu, ", tcp->u_arg[1]);
 	} else {
 		if (tcp->u_arg[1] == sizeof (struct statfs64))
 			printstatfs64(tcp, tcp->u_arg[2]);
@@ -1627,8 +1871,7 @@
 #if defined(LINUX) && defined(__alpha)
 
 int
-osf_statfs(tcp)
-struct tcb *tcp;
+osf_statfs(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1641,8 +1884,7 @@
 }
 
 int
-osf_fstatfs(tcp)
-struct tcb *tcp;
+osf_fstatfs(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%lu, ", tcp->u_arg[0]);
@@ -1657,10 +1899,8 @@
 #endif /* !SVR4 */
 
 #ifdef SUNOS4
-
 int
-sys_ustat(tcp)
-struct tcb *tcp;
+sys_ustat(struct tcb *tcp)
 {
 	struct ustat statbuf;
 
@@ -1687,12 +1927,10 @@
 	}
 	return 0;
 }
-
 #endif /* SUNOS4 */
 
 int
-sys_pivotroot(tcp)
-struct tcb *tcp;
+sys_pivotroot(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1705,8 +1943,42 @@
 
 /* directory */
 int
-sys_chdir(tcp)
-struct tcb *tcp;
+sys_chdir(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		printpath(tcp, tcp->u_arg[0]);
+	}
+	return 0;
+}
+
+static int
+decode_mkdir(struct tcb *tcp, int offset)
+{
+	if (entering(tcp)) {
+		printpath(tcp, tcp->u_arg[offset]);
+		tprintf(", %#lo", tcp->u_arg[offset + 1]);
+	}
+	return 0;
+}
+
+int
+sys_mkdir(struct tcb *tcp)
+{
+	return decode_mkdir(tcp, 0);
+}
+
+#ifdef LINUX
+int
+sys_mkdirat(struct tcb *tcp)
+{
+	if (entering(tcp))
+		print_dirfd(tcp, tcp->u_arg[0]);
+	return decode_mkdir(tcp, 1);
+}
+#endif
+
+int
+sys_rmdir(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1715,19 +1987,16 @@
 }
 
 int
-sys_mkdir(tcp)
-struct tcb *tcp;
+sys_fchdir(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		printpath(tcp, tcp->u_arg[0]);
-		tprintf(", %#lo", tcp->u_arg[1]);
+		printfd(tcp, tcp->u_arg[0]);
 	}
 	return 0;
 }
 
 int
-sys_rmdir(tcp)
-struct tcb *tcp;
+sys_chroot(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1735,39 +2004,19 @@
 	return 0;
 }
 
+#if defined(SUNOS4) || defined(SVR4)
 int
-sys_fchdir(tcp)
-struct tcb *tcp;
+sys_fchroot(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
 	}
 	return 0;
 }
+#endif /* SUNOS4 || SVR4 */
 
 int
-sys_chroot(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		printpath(tcp, tcp->u_arg[0]);
-	}
-	return 0;
-}
-
-int
-sys_fchroot(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		tprintf("%ld", tcp->u_arg[0]);
-	}
-	return 0;
-}
-
-int
-sys_link(tcp)
-struct tcb *tcp;
+sys_link(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1777,9 +2026,25 @@
 	return 0;
 }
 
+#ifdef LINUX
 int
-sys_unlink(tcp)
-struct tcb *tcp;
+sys_linkat(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		print_dirfd(tcp, tcp->u_arg[0]);
+		printpath(tcp, tcp->u_arg[1]);
+		tprintf(", ");
+		print_dirfd(tcp, tcp->u_arg[2]);
+		printpath(tcp, tcp->u_arg[3]);
+		tprintf(", ");
+		printfd(tcp, tcp->u_arg[4]);
+	}
+	return 0;
+}
+#endif
+
+int
+sys_unlink(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1787,9 +2052,30 @@
 	return 0;
 }
 
+#ifdef LINUX
+static const struct xlat unlinkatflags[] = {
+#ifndef AT_REMOVEDIR
+# define AT_REMOVEDIR            0x200
+#endif
+	{ AT_REMOVEDIR,	"AT_REMOVEDIR"	},
+	{ 0,		NULL		},
+};
+
 int
-sys_symlink(tcp)
-struct tcb *tcp;
+sys_unlinkat(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		print_dirfd(tcp, tcp->u_arg[0]);
+		printpath(tcp, tcp->u_arg[1]);
+		tprintf(", ");
+		printflags(unlinkatflags, tcp->u_arg[2], "AT_???");
+	}
+	return 0;
+}
+#endif
+
+int
+sys_symlink(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1799,26 +2085,54 @@
 	return 0;
 }
 
+#ifdef LINUX
 int
-sys_readlink(tcp)
-struct tcb *tcp;
+sys_symlinkat(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
 		tprintf(", ");
+		print_dirfd(tcp, tcp->u_arg[1]);
+		printpath(tcp, tcp->u_arg[2]);
+	}
+	return 0;
+}
+#endif
+
+static int
+decode_readlink(struct tcb *tcp, int offset)
+{
+	if (entering(tcp)) {
+		printpath(tcp, tcp->u_arg[offset]);
+		tprintf(", ");
 	} else {
 		if (syserror(tcp))
-			tprintf("%#lx", tcp->u_arg[1]);
+			tprintf("%#lx", tcp->u_arg[offset + 1]);
 		else
-			printpathn(tcp, tcp->u_arg[1], tcp->u_rval);
-		tprintf(", %lu", tcp->u_arg[2]);
+			printpathn(tcp, tcp->u_arg[offset + 1], tcp->u_rval);
+		tprintf(", %lu", tcp->u_arg[offset + 2]);
 	}
 	return 0;
 }
 
 int
-sys_rename(tcp)
-struct tcb *tcp;
+sys_readlink(struct tcb *tcp)
+{
+	return decode_readlink(tcp, 0);
+}
+
+#ifdef LINUX
+int
+sys_readlinkat(struct tcb *tcp)
+{
+	if (entering(tcp))
+		print_dirfd(tcp, tcp->u_arg[0]);
+	return decode_readlink(tcp, 1);
+}
+#endif
+
+int
+sys_rename(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1828,9 +2142,23 @@
 	return 0;
 }
 
+#ifdef LINUX
 int
-sys_chown(tcp)
-struct tcb *tcp;
+sys_renameat(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		print_dirfd(tcp, tcp->u_arg[0]);
+		printpath(tcp, tcp->u_arg[1]);
+		tprintf(", ");
+		print_dirfd(tcp, tcp->u_arg[2]);
+		printpath(tcp, tcp->u_arg[3]);
+	}
+	return 0;
+}
+#endif
+
+int
+sys_chown(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1840,70 +2168,139 @@
 	return 0;
 }
 
+#ifdef LINUX
 int
-sys_fchown(tcp)
-struct tcb *tcp;
+sys_fchownat(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld", tcp->u_arg[0]);
+		print_dirfd(tcp, tcp->u_arg[0]);
+		printpath(tcp, tcp->u_arg[1]);
+		printuid(", ", tcp->u_arg[2]);
+		printuid(", ", tcp->u_arg[3]);
+		tprintf(", ");
+		printflags(fstatatflags, tcp->u_arg[4], "AT_???");
+	}
+	return 0;
+}
+#endif
+
+int
+sys_fchown(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
 		printuid(", ", tcp->u_arg[1]);
 		printuid(", ", tcp->u_arg[2]);
 	}
 	return 0;
 }
 
-int
-sys_chmod(tcp)
-struct tcb *tcp;
+static int
+decode_chmod(struct tcb *tcp, int offset)
 {
 	if (entering(tcp)) {
-		printpath(tcp, tcp->u_arg[0]);
+		printpath(tcp, tcp->u_arg[offset]);
+		tprintf(", %#lo", tcp->u_arg[offset + 1]);
+	}
+	return 0;
+}
+
+int
+sys_chmod(struct tcb *tcp)
+{
+	return decode_chmod(tcp, 0);
+}
+
+#ifdef LINUX
+int
+sys_fchmodat(struct tcb *tcp)
+{
+	if (entering(tcp))
+		print_dirfd(tcp, tcp->u_arg[0]);
+	return decode_chmod(tcp, 1);
+}
+#endif
+
+int
+sys_fchmod(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
 		tprintf(", %#lo", tcp->u_arg[1]);
 	}
 	return 0;
 }
 
-int
-sys_fchmod(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		tprintf("%ld, %#lo", tcp->u_arg[0], tcp->u_arg[1]);
-	}
-	return 0;
-}
-
 #ifdef ALPHA
 int
-sys_osf_utimes(tcp)
-struct tcb *tcp;
-{
-    if (entering(tcp)) {
-	printpath(tcp, tcp->u_arg[0]);
-	tprintf(", ");
-	printtv32(tcp, tcp->u_arg[1]);
-    }
-    return 0;
-}
-#endif
-
-int
-sys_utimes(tcp)
-struct tcb *tcp;
+sys_osf_utimes(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
 		tprintf(", ");
-		printtv(tcp, tcp->u_arg[1]);
+		printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32,  0);
+	}
+	return 0;
+}
+#endif
+
+static int
+decode_utimes(struct tcb *tcp, int offset, int special)
+{
+	if (entering(tcp)) {
+		printpath(tcp, tcp->u_arg[offset]);
+		tprintf(", ");
+		if (tcp->u_arg[offset + 1] == 0)
+			tprintf("NULL");
+		else {
+			tprintf("{");
+			printtv_bitness(tcp, tcp->u_arg[offset + 1],
+					BITNESS_CURRENT, special);
+			tprintf(", ");
+			printtv_bitness(tcp, tcp->u_arg[offset + 1]
+					+ sizeof (struct timeval),
+					BITNESS_CURRENT, special);
+			tprintf("}");
+		}
 	}
 	return 0;
 }
 
 int
-sys_utime(tcp)
-struct tcb *tcp;
+sys_utimes(struct tcb *tcp)
 {
-	long ut[2];
+	return decode_utimes(tcp, 0, 0);
+}
+
+#ifdef LINUX
+int
+sys_futimesat(struct tcb *tcp)
+{
+	if (entering(tcp))
+		print_dirfd(tcp, tcp->u_arg[0]);
+	return decode_utimes(tcp, 1, 0);
+}
+
+int
+sys_utimensat(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		print_dirfd(tcp, tcp->u_arg[0]);
+		decode_utimes(tcp, 1, 1);
+		tprintf(", ");
+		printflags(utimensatflags, tcp->u_arg[3], "AT_???");
+	}
+	return 0;
+}
+#endif
+
+int
+sys_utime(struct tcb *tcp)
+{
+	union {
+		long utl[2];
+		int uti[2];
+	} u;
 
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1912,38 +2309,46 @@
 			tprintf("NULL");
 		else if (!verbose(tcp))
 			tprintf("%#lx", tcp->u_arg[1]);
-		else if (umoven(tcp, tcp->u_arg[1], sizeof ut,
-		    (char *) ut) < 0)
+		else if (umoven(tcp, tcp->u_arg[1],
+				2 * personality_wordsize[current_personality],
+				(char *) &u) < 0)
 			tprintf("[?, ?]");
-		else {
-			tprintf("[%s,", sprinttime(ut[0]));
-			tprintf(" %s]", sprinttime(ut[1]));
+		else if (personality_wordsize[current_personality]
+			 == sizeof u.utl[0]) {
+			tprintf("[%s,", sprinttime(u.utl[0]));
+			tprintf(" %s]", sprinttime(u.utl[1]));
 		}
+		else if (personality_wordsize[current_personality]
+			 == sizeof u.uti[0]) {
+			tprintf("[%s,", sprinttime(u.uti[0]));
+			tprintf(" %s]", sprinttime(u.uti[1]));
+		}
+		else
+			abort();
 	}
 	return 0;
 }
 
-int
-sys_mknod(tcp)
-struct tcb *tcp;
+static int
+decode_mknod(struct tcb *tcp, int offset)
 {
-	int mode = tcp->u_arg[1];
+	int mode = tcp->u_arg[offset + 1];
 
 	if (entering(tcp)) {
-		printpath(tcp, tcp->u_arg[0]);
+		printpath(tcp, tcp->u_arg[offset]);
 		tprintf(", %s", sprintmode(mode));
 		switch (mode & S_IFMT) {
 		case S_IFCHR: case S_IFBLK:
 #ifdef LINUXSPARC
 			if (current_personality == 1)
 			tprintf(", makedev(%lu, %lu)",
-				(unsigned long) ((tcp->u_arg[2] >> 18) & 0x3fff),
-				(unsigned long) (tcp->u_arg[2] & 0x3ffff));
+				(unsigned long) ((tcp->u_arg[offset + 2] >> 18) & 0x3fff),
+				(unsigned long) (tcp->u_arg[offset + 2] & 0x3ffff));
 			else
 #endif
 			tprintf(", makedev(%lu, %lu)",
-				(unsigned long) major(tcp->u_arg[2]),
-				(unsigned long) minor(tcp->u_arg[2]));
+				(unsigned long) major(tcp->u_arg[offset + 2]),
+				(unsigned long) minor(tcp->u_arg[offset + 2]));
 			break;
 		default:
 			break;
@@ -1953,8 +2358,24 @@
 }
 
 int
-sys_mkfifo(tcp)
-struct tcb *tcp;
+sys_mknod(struct tcb *tcp)
+{
+	return decode_mknod(tcp, 0);
+}
+
+#ifdef LINUX
+int
+sys_mknodat(struct tcb *tcp)
+{
+	if (entering(tcp))
+		print_dirfd(tcp, tcp->u_arg[0]);
+	return decode_mknod(tcp, 1);
+}
+#endif
+
+#ifdef FREEBSD
+int
+sys_mkfifo(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@@ -1962,13 +2383,13 @@
 	}
 	return 0;
 }
+#endif /* FREEBSD */
 
 int
-sys_fsync(tcp)
-struct tcb *tcp;
+sys_fsync(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
 	}
 	return 0;
 }
@@ -1976,9 +2397,7 @@
 #ifdef LINUX
 
 static void
-printdir(tcp, addr)
-struct tcb *tcp;
-long addr;
+printdir(struct tcb *tcp, long addr)
 {
 	struct dirent d;
 
@@ -1997,11 +2416,11 @@
 }
 
 int
-sys_readdir(tcp)
-struct tcb *tcp;
+sys_readdir(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%lu, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 	} else {
 		if (syserror(tcp) || tcp->u_rval == 0 || !verbose(tcp))
 			tprintf("%#lx", tcp->u_arg[1]);
@@ -2033,14 +2452,14 @@
 #endif
 
 int
-sys_getdents(tcp)
-struct tcb *tcp;
+sys_getdents(struct tcb *tcp)
 {
 	int i, len, dents = 0;
 	char *buf;
 
 	if (entering(tcp)) {
-		tprintf("%lu, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		return 0;
 	}
 	if (syserror(tcp) || !verbose(tcp)) {
@@ -2048,7 +2467,8 @@
 		return 0;
 	}
 	len = tcp->u_rval;
-	if ((buf = malloc(len)) == NULL) {
+	buf = len ? malloc(len) : NULL;
+	if (len && !buf) {
 		tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]);
 		fprintf(stderr, "out of memory\n");
 		return 0;
@@ -2117,14 +2537,14 @@
 
 #if _LFS64_LARGEFILE
 int
-sys_getdents64(tcp)
-struct tcb *tcp;
+sys_getdents64(struct tcb *tcp)
 {
 	int i, len, dents = 0;
 	char *buf;
 
 	if (entering(tcp)) {
-		tprintf("%lu, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		return 0;
 	}
 	if (syserror(tcp) || !verbose(tcp)) {
@@ -2132,7 +2552,8 @@
 		return 0;
 	}
 	len = tcp->u_rval;
-	if ((buf = malloc(len)) == NULL) {
+	buf = len ? malloc(len) : NULL;
+	if (len && !buf) {
 		tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]);
 		fprintf(stderr, "out of memory\n");
 		return 0;
@@ -2148,7 +2569,7 @@
 		struct dirent64 *d = (struct dirent64 *) &buf[i];
 #if defined(LINUX) || defined(SVR4)
 		if (!abbrev(tcp)) {
-			tprintf("%s{d_ino=%llu, d_off=%llu, ",
+			tprintf("%s{d_ino=%" PRIu64 ", d_off=%" PRId64 ", ",
 				i ? " " : "",
 				d->d_ino,
 				d->d_off);
@@ -2170,6 +2591,10 @@
 				d->d_namlen, d->d_namlen, d->d_name);
 		}
 #endif /* SUNOS4 */
+		if (!d->d_reclen) {
+			tprintf("/* d_reclen == 0, problem here */");
+			break;
+		}
 		i += d->d_reclen;
 		dents++;
 	}
@@ -2185,15 +2610,15 @@
 
 #ifdef FREEBSD
 int
-sys_getdirentries(tcp)
-struct tcb * tcp;
+sys_getdirentries(struct tcb *tcp)
 {
 	int i, len, dents = 0;
 	long basep;
 	char *buf;
 
 	if (entering(tcp)) {
-		tprintf("%lu, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		return 0;
 	}
 	if (syserror(tcp) || !verbose(tcp)) {
@@ -2222,6 +2647,10 @@
 			tprintf(", d_namlen=%u, d_name=\"%.*s\"}",
 				d->d_namlen, d->d_namlen, d->d_name);
 		}
+		if (!d->d_reclen) {
+			tprintf("/* d_reclen == 0, problem here */");
+			break;
+		}
 		i += d->d_reclen;
 		dents++;
 	}
@@ -2241,41 +2670,38 @@
 
 #ifdef LINUX
 int
-sys_getcwd(tcp)
-struct tcb *tcp;
+sys_getcwd(struct tcb *tcp)
 {
-    if (exiting(tcp)) {
-	if (syserror(tcp))
-	    tprintf("%#lx", tcp->u_arg[0]);
-	else
-	    printpathn(tcp, tcp->u_arg[0], tcp->u_rval - 1);
-	tprintf(", %lu", tcp->u_arg[1]);
-    }
-    return 0;
+	if (exiting(tcp)) {
+		if (syserror(tcp))
+			tprintf("%#lx", tcp->u_arg[0]);
+		else
+			printpathn(tcp, tcp->u_arg[0], tcp->u_rval - 1);
+		tprintf(", %lu", tcp->u_arg[1]);
+	}
+	return 0;
 }
 #endif /* LINUX */
 
 #ifdef FREEBSD
 int
-sys___getcwd(tcp)
-struct tcb *tcp;
+sys___getcwd(struct tcb *tcp)
 {
-    if (exiting(tcp)) {
-	if (syserror(tcp))
-	    tprintf("%#lx", tcp->u_arg[0]);
-	else
-	    printpathn(tcp, tcp->u_arg[0], tcp->u_arg[1]);
-	tprintf(", %lu", tcp->u_arg[1]);
-    }
-    return 0;
+	if (exiting(tcp)) {
+		if (syserror(tcp))
+			tprintf("%#lx", tcp->u_arg[0]);
+		else
+			printpathn(tcp, tcp->u_arg[0], tcp->u_arg[1]);
+		tprintf(", %lu", tcp->u_arg[1]);
+	}
+	return 0;
 }
 #endif
 
 #ifdef HAVE_SYS_ASYNCH_H
 
 int
-sys_aioread(tcp)
-struct tcb *tcp;
+sys_aioread(struct tcb *tcp)
 {
 	struct aio_result_t res;
 
@@ -2299,8 +2725,7 @@
 }
 
 int
-sys_aiowrite(tcp)
-struct tcb *tcp;
+sys_aiowrite(struct tcb *tcp)
 {
 	struct aio_result_t res;
 
@@ -2324,8 +2749,7 @@
 }
 
 int
-sys_aiowait(tcp)
-struct tcb *tcp;
+sys_aiowait(struct tcb *tcp)
 {
 	if (entering(tcp))
 		printtv(tcp, tcp->u_arg[0]);
@@ -2333,8 +2757,7 @@
 }
 
 int
-sys_aiocancel(tcp)
-struct tcb *tcp;
+sys_aiocancel(struct tcb *tcp)
 {
 	struct aio_result_t res;
 
@@ -2362,152 +2785,148 @@
 };
 
 static void
-print_xattr_val(tcp, failed, arg, insize, size)
-struct tcb *tcp;
-int failed;
-unsigned long arg;
-unsigned long insize, size;
+print_xattr_val(struct tcb *tcp, int failed,
+		unsigned long arg,
+		unsigned long insize,
+		unsigned long size)
 {
-    if (!failed) {
-	unsigned long capacity = 4 * size + 1;
-	unsigned char *buf = (capacity < size) ? NULL : malloc(capacity);
-	if (buf == NULL || /* probably a bogus size argument */
-	    umoven(tcp, arg, size, (char *) &buf[3 * size]) < 0) {
-	    failed = 1;
-	}
-	else {
-	    unsigned char *out = buf;
-	    unsigned char *in = &buf[3 * size];
-	    size_t i;
-	    for (i = 0; i < size; ++i)
-		if (isprint(in[i]))
-		    *out++ = in[i];
-		else {
-#define tohex(n) "0123456789abcdef"[n]
-		    *out++ = '\\';
-		    *out++ = 'x';
-		    *out++ = tohex(in[i] / 16);
-		    *out++ = tohex(in[i] % 16);
+	if (!failed) {
+		unsigned long capacity = 4 * size + 1;
+		unsigned char *buf = (capacity < size) ? NULL : malloc(capacity);
+		if (buf == NULL || /* probably a bogus size argument */
+			umoven(tcp, arg, size, (char *) &buf[3 * size]) < 0) {
+			failed = 1;
 		}
-	    /* Don't print terminating NUL if there is one.  */
-	    if (in[i - 1] == '\0')
-		out -= 4;
-	    *out = '\0';
-	    tprintf(", \"%s\", %ld", buf, insize);
+		else {
+			unsigned char *out = buf;
+			unsigned char *in = &buf[3 * size];
+			size_t i;
+			for (i = 0; i < size; ++i) {
+				if (isprint(in[i]))
+					*out++ = in[i];
+				else {
+#define tohex(n) "0123456789abcdef"[n]
+					*out++ = '\\';
+					*out++ = 'x';
+					*out++ = tohex(in[i] / 16);
+					*out++ = tohex(in[i] % 16);
+				}
+			}
+			/* Don't print terminating NUL if there is one.  */
+			if (i > 0 && in[i - 1] == '\0')
+				out -= 4;
+			*out = '\0';
+			tprintf(", \"%s\", %ld", buf, insize);
+		}
+		free(buf);
 	}
-	free(buf);
-    }
-    if (failed)
-	tprintf(", 0x%lx, %ld", arg, insize);
+	if (failed)
+		tprintf(", 0x%lx, %ld", arg, insize);
 }
 
 int
-sys_setxattr(tcp)
-struct tcb *tcp;
+sys_setxattr(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	printpath(tcp, tcp->u_arg[0]);
-	tprintf(", ");
-	printstr(tcp, tcp->u_arg[1], -1);
-	print_xattr_val(tcp, 0, tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[3]);
-	tprintf(", ");
-	printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
-    }
-    return 0;
+	if (entering(tcp)) {
+		printpath(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printstr(tcp, tcp->u_arg[1], -1);
+		print_xattr_val(tcp, 0, tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[3]);
+		tprintf(", ");
+		printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
+	}
+	return 0;
 }
 
 int
-sys_fsetxattr(tcp)
-struct tcb *tcp;
+sys_fsetxattr(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	tprintf("%ld, ", tcp->u_arg[0]);
-	printstr(tcp, tcp->u_arg[1], -1);
-	print_xattr_val(tcp, 0, tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[3]);
-	tprintf(", ");
-	printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
-    }
-    return 0;
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printstr(tcp, tcp->u_arg[1], -1);
+		print_xattr_val(tcp, 0, tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[3]);
+		tprintf(", ");
+		printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
+	}
+	return 0;
 }
 
 int
-sys_getxattr(tcp)
-struct tcb *tcp;
+sys_getxattr(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	printpath(tcp, tcp->u_arg[0]);
-	tprintf(", ");
-	printstr(tcp, tcp->u_arg[1], -1);
-    } else {
-	print_xattr_val(tcp, syserror(tcp), tcp->u_arg[2], tcp->u_arg[3],
-			tcp->u_rval);
-    }
-    return 0;
+	if (entering(tcp)) {
+		printpath(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printstr(tcp, tcp->u_arg[1], -1);
+	} else {
+		print_xattr_val(tcp, syserror(tcp), tcp->u_arg[2], tcp->u_arg[3],
+				tcp->u_rval);
+	}
+	return 0;
 }
 
 int
-sys_fgetxattr(tcp)
-struct tcb *tcp;
+sys_fgetxattr(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	tprintf("%ld, ", tcp->u_arg[0]);
-	printstr(tcp, tcp->u_arg[1], -1);
-    } else {
-	print_xattr_val(tcp, syserror(tcp), tcp->u_arg[2], tcp->u_arg[3],
-			tcp->u_rval);
-    }
-    return 0;
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printstr(tcp, tcp->u_arg[1], -1);
+	} else {
+		print_xattr_val(tcp, syserror(tcp), tcp->u_arg[2], tcp->u_arg[3],
+				tcp->u_rval);
+	}
+	return 0;
 }
 
 int
-sys_listxattr(tcp)
-struct tcb *tcp;
+sys_listxattr(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	printpath(tcp, tcp->u_arg[0]);
-    } else {
-	/* XXX Print value in format */
-	tprintf(", %p, %lu", (void *) tcp->u_arg[1], tcp->u_arg[2]);
-    }
-    return 0;
+	if (entering(tcp)) {
+		printpath(tcp, tcp->u_arg[0]);
+	} else {
+		/* XXX Print value in format */
+		tprintf(", %p, %lu", (void *) tcp->u_arg[1], tcp->u_arg[2]);
+	}
+	return 0;
 }
 
 int
-sys_flistxattr(tcp)
-struct tcb *tcp;
+sys_flistxattr(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	tprintf("%ld", tcp->u_arg[0]);
-    } else {
-	/* XXX Print value in format */
-	tprintf(", %p, %lu", (void *) tcp->u_arg[1], tcp->u_arg[2]);
-    }
-    return 0;
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+	} else {
+		/* XXX Print value in format */
+		tprintf(", %p, %lu", (void *) tcp->u_arg[1], tcp->u_arg[2]);
+	}
+	return 0;
 }
 
 int
-sys_removexattr(tcp)
-struct tcb *tcp;
+sys_removexattr(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	printpath(tcp, tcp->u_arg[0]);
-	tprintf(", ");
-	printstr(tcp, tcp->u_arg[1], -1);
-    }
-    return 0;
+	if (entering(tcp)) {
+		printpath(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printstr(tcp, tcp->u_arg[1], -1);
+	}
+	return 0;
 }
 
 int
-sys_fremovexattr(tcp)
-struct tcb *tcp;
+sys_fremovexattr(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	tprintf("%ld, ", tcp->u_arg[0]);
-	printstr(tcp, tcp->u_arg[1], -1);
-    }
-    return 0;
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printstr(tcp, tcp->u_arg[1], -1);
+	}
+	return 0;
 }
 
+
 static const struct xlat advise[] = {
   { POSIX_FADV_NORMAL,		"POSIX_FADV_NORMAL"	},
   { POSIX_FADV_RANDOM,		"POSIX_FADV_RANDOM"	},
@@ -2521,42 +2940,116 @@
 
 #ifdef LINUX
 int
-sys_fadvise64(tcp)
-struct tcb *tcp;
+sys_fadvise64(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	tprintf("%ld, %lld, %ld, ",
-		tcp->u_arg[0],
-# if defined IA64 || defined X86_64 || defined ALPHA
-		(long long int) tcp->u_arg[1], tcp->u_arg[2]);
-	printxval(advise, tcp->u_arg[3], "POSIX_FADV_???");
-#else
-		LONG_LONG(tcp->u_arg[1], tcp->u_arg[2]), tcp->u_arg[3]);
-	printxval(advise, tcp->u_arg[4], "POSIX_FADV_???");
-#endif
-    }
-    return 0;
+	if (entering(tcp)) {
+		int argn;
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		argn = printllval(tcp, "%lld", 1);
+		tprintf(", %ld, ", tcp->u_arg[argn++]);
+		printxval(advise, tcp->u_arg[argn], "POSIX_FADV_???");
+	}
+	return 0;
 }
 #endif
 
 
 int
-sys_fadvise64_64(tcp)
-struct tcb *tcp;
+sys_fadvise64_64(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	tprintf("%ld, %lld, %lld, ",
-		tcp->u_arg[0],
-# if defined IA64 || defined X86_64 || defined ALPHA
-		(long long int) tcp->u_arg[1], (long long int) tcp->u_arg[2]);
-	printxval(advise, tcp->u_arg[3], "POSIX_FADV_???");
+	if (entering(tcp)) {
+		int argn;
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+#if defined ARM || defined POWERPC
+		argn = printllval(tcp, "%lld, ", 2);
 #else
-		LONG_LONG(tcp->u_arg[1], tcp->u_arg[2]),
-		LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
-	printxval(advise, tcp->u_arg[5], "POSIX_FADV_???");
+		argn = printllval(tcp, "%lld, ", 1);
 #endif
-    }
-    return 0;
+		argn = printllval(tcp, "%lld, ", argn);
+#if defined ARM || defined POWERPC
+		printxval(advise, tcp->u_arg[1], "POSIX_FADV_???");
+#else
+		printxval(advise, tcp->u_arg[argn], "POSIX_FADV_???");
+#endif
+	}
+	return 0;
 }
 
-//#endif /*HAVE_ANDROID_OS */
+#ifdef LINUX
+static const struct xlat inotify_modes[] = {
+	{ 0x00000001,	"IN_ACCESS"	},
+	{ 0x00000002,	"IN_MODIFY"	},
+	{ 0x00000004,	"IN_ATTRIB"	},
+	{ 0x00000008,	"IN_CLOSE_WRITE"},
+	{ 0x00000010,	"IN_CLOSE_NOWRITE"},
+	{ 0x00000020,	"IN_OPEN"	},
+	{ 0x00000040,	"IN_MOVED_FROM"	},
+	{ 0x00000080,	"IN_MOVED_TO"	},
+	{ 0x00000100,	"IN_CREATE"	},
+	{ 0x00000200,	"IN_DELETE"	},
+	{ 0x00000400,	"IN_DELETE_SELF"},
+	{ 0x00000800,	"IN_MOVE_SELF"	},
+	{ 0x00002000,	"IN_UNMOUNT"	},
+	{ 0x00004000,	"IN_Q_OVERFLOW"	},
+	{ 0x00008000,	"IN_IGNORED"	},
+	{ 0x01000000,	"IN_ONLYDIR"	},
+	{ 0x02000000,	"IN_DONT_FOLLOW"},
+	{ 0x20000000,	"IN_MASK_ADD"	},
+	{ 0x40000000,	"IN_ISDIR"	},
+	{ 0x80000000,	"IN_ONESHOT"	},
+	{ 0,		NULL		}
+};
+
+static const struct xlat inotify_init_flags[] = {
+	{ 0x00000800,	"IN_NONBLOCK"	},
+	{ 0x00080000,	"IN_CLOEXEC" 	},
+	{ 0,		NULL 		}
+};
+
+int
+sys_inotify_add_watch(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printpath(tcp, tcp->u_arg[1]);
+		tprintf(", ");
+		printflags(inotify_modes, tcp->u_arg[2], "IN_???");
+	}
+	return 0;
+}
+
+int
+sys_inotify_rm_watch(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", %ld", tcp->u_arg[1]);
+	}
+	return 0;
+}
+
+int
+sys_inotify_init1(struct tcb *tcp)
+{
+	if (entering(tcp))
+		printflags(inotify_init_flags, tcp->u_arg[0], "IN_???");
+	return 0;
+}
+
+int
+sys_fallocate(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		int argn;
+		printfd(tcp, tcp->u_arg[0]);		/* fd */
+		tprintf(", ");
+		tprintf("%#lo, ", tcp->u_arg[1]);	/* mode */
+		argn = printllval(tcp, "%llu, ", 2);	/* offset */
+		printllval(tcp, "%llu", argn);		/* len */
+	}
+	return 0;
+}
+#endif
diff --git a/import-Android.sh b/import-Android.sh
new file mode 100755
index 0000000..eb501dc
--- /dev/null
+++ b/import-Android.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# Assists with importing a new version of Strace for Android.
+# Removes source files from the Strace original distribution that are not
+# needed on Android.
+#
+# Run this script after extracting an Strace distribution into external/strace.
+#
+
+UNNEEDED_SOURCES="\
+  Makefile.am \
+  Makefile.in \
+  README-freebsd \
+  README-sunos4 \
+  README-svr4 \
+  acinclude.m4 \
+  aclocal.m4 \
+  config.guess \
+  config.h.in \
+  config.log \
+  config.status \
+  config.sub \
+  configure \
+  configure.ac \
+  debian \
+  depcomp \
+  errnoent.sh \
+  freebsd \
+  install-sh \
+  linux/alpha \
+  linux/arm/ioctlent.h.in \
+  linux/avr32 \
+  linux/bfin \
+  linux/hppa \
+  linux/i386/ioctlent.h.in \
+  linux/ia64 \
+  linux/ioctlent.h.in \
+  linux/m68k \
+  linux/microblaze \
+  linux/mips/ioctlent.h.in \
+  linux/powerpc \
+  linux/s390 \
+  linux/s390x \
+  linux/sh/ioctlent.h.in \
+  linux/sh64 \
+  linux/sparc \
+  linux/sparc64 \
+  linux/tile \
+  linux/x86_64 \
+  m4 \
+  missing \
+  mkinstalldirs \
+  signalent.sh \
+  sunos4 \
+  svr4 \
+  syscallent.sh \
+  test \
+  tests \
+  xlate.el \
+"
+
+rm -rvf $UNNEEDED_SOURCES
+
diff --git a/install-sh b/install-sh
deleted file mode 100755
index 36f96f3..0000000
--- a/install-sh
+++ /dev/null
@@ -1,276 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd=$cpprog
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd=$stripprog
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "$0: no input file specified" >&2
-	exit 1
-else
-	:
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-
-	if [ -d "$dst" ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f "$src" ] || [ -d "$src" ]
-	then
-		:
-	else
-		echo "$0: $src does not exist" >&2
-		exit 1
-	fi
-
-	if [ x"$dst" = x ]
-	then
-		echo "$0: no destination specified" >&2
-		exit 1
-	else
-		:
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d "$dst" ]
-	then
-		dst=$dst/`basename "$src"`
-	else
-		:
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-$defaultIFS}"
-
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp=$pathcomp$1
-	shift
-
-	if [ ! -d "$pathcomp" ] ;
-        then
-		$mkdirprog "$pathcomp"
-	else
-		:
-	fi
-
-	pathcomp=$pathcomp/
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd "$dst" &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		dstfile=`basename "$dst" $transformbasename |
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		:
-	fi
-
-# Make a couple of temp file names in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-	rmtmp=$dstdir/#rm.$$#
-
-# Trap to clean up temp files at exit.
-
-	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-	trap '(exit $?); exit' 1 2 13 15
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd "$src" "$dsttmp" &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
-
-# Now remove or move aside any old file at destination location.  We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons.  In this case, the final cleanup
-# might fail but the new file should still install successfully.
-
-{
-	if [ -f "$dstdir/$dstfile" ]
-	then
-		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-		{
-		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		  (exit 1); exit
-		}
-	else
-		:
-	fi
-} &&
-
-# Now rename the file to the real destination.
-
-	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-
-fi &&
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-
-{
-	(exit 0); exit
-}
diff --git a/io.c b/io.c
index db86f59..3f8757c 100644
--- a/io.c
+++ b/io.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: io.c,v 1.20 2005/06/01 19:22:08 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -47,11 +47,11 @@
 #endif
 
 int
-sys_read(tcp)
-struct tcb *tcp;
+sys_read(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 	} else {
 		if (syserror(tcp))
 			tprintf("%#lx", tcp->u_arg[1]);
@@ -63,11 +63,11 @@
 }
 
 int
-sys_write(tcp)
-struct tcb *tcp;
+sys_write(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
 		tprintf(", %lu", tcp->u_arg[2]);
 	}
@@ -81,7 +81,26 @@
 unsigned long len;
 unsigned long addr;
 {
+#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
+	union {
+		struct { u_int32_t base; u_int32_t len; } iov32;
+		struct { u_int64_t base; u_int64_t len; } iov64;
+	} iov;
+#define sizeof_iov \
+  (personality_wordsize[current_personality] == 4 \
+   ? sizeof(iov.iov32) : sizeof(iov.iov64))
+#define iov_iov_base \
+  (personality_wordsize[current_personality] == 4 \
+   ? (u_int64_t) iov.iov32.base : iov.iov64.base)
+#define iov_iov_len \
+  (personality_wordsize[current_personality] == 4 \
+   ? (u_int64_t) iov.iov32.len : iov.iov64.len)
+#else
 	struct iovec iov;
+#define sizeof_iov sizeof(iov)
+#define iov_iov_base iov.iov_base
+#define iov_iov_len iov.iov_len
+#endif
 	unsigned long size, cur, end, abbrev_end;
 	int failed = 0;
 
@@ -89,47 +108,50 @@
 		tprintf("[]");
 		return;
 	}
-	size = len * sizeof(iov);
+	size = len * sizeof_iov;
 	end = addr + size;
-	if (!verbose(tcp) || size / sizeof(iov) != len || end < addr) {
+	if (!verbose(tcp) || size / sizeof_iov != len || end < addr) {
 		tprintf("%#lx", addr);
 		return;
 	}
 	if (abbrev(tcp)) {
-		abbrev_end = addr + max_strlen * sizeof(iov);
+		abbrev_end = addr + max_strlen * sizeof_iov;
 		if (abbrev_end < addr)
 			abbrev_end = end;
 	} else {
 		abbrev_end = end;
 	}
 	tprintf("[");
-	for (cur = addr; cur < end; cur += sizeof(iov)) {
+	for (cur = addr; cur < end; cur += sizeof_iov) {
 		if (cur > addr)
 			tprintf(", ");
 		if (cur >= abbrev_end) {
 			tprintf("...");
 			break;
 		}
-		if (umoven(tcp, cur, sizeof iov, (char *) &iov) < 0) {
+		if (umoven(tcp, cur, sizeof_iov, (char *) &iov) < 0) {
 			tprintf("?");
 			failed = 1;
 			break;
 		}
 		tprintf("{");
-		printstr(tcp, (long) iov.iov_base, iov.iov_len);
-		tprintf(", %lu}", (unsigned long)iov.iov_len);
+		printstr(tcp, (long) iov_iov_base, iov_iov_len);
+		tprintf(", %lu}", (unsigned long)iov_iov_len);
 	}
 	tprintf("]");
 	if (failed)
 		tprintf(" %#lx", addr);
+#undef sizeof_iov
+#undef iov_iov_base
+#undef iov_iov_len
 }
 
 int
-sys_readv(tcp)
-struct tcb *tcp;
+sys_readv(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 	} else {
 		if (syserror(tcp)) {
 			tprintf("%#lx, %lu",
@@ -143,11 +165,11 @@
 }
 
 int
-sys_writev(tcp)
-struct tcb *tcp;
+sys_writev(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1]);
 		tprintf(", %lu", tcp->u_arg[2]);
 	}
@@ -158,11 +180,11 @@
 #if defined(SVR4)
 
 int
-sys_pread(tcp)
-struct tcb *tcp;
+sys_pread(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 	} else {
 		if (syserror(tcp))
 			tprintf("%#lx", tcp->u_arg[1]);
@@ -180,11 +202,11 @@
 }
 
 int
-sys_pwrite(tcp)
-struct tcb *tcp;
+sys_pwrite(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
 #if UNIXWARE
 		/* off_t is signed int */
@@ -203,11 +225,13 @@
 #include <sys/socket.h>
 
 int
-sys_sendfile(tcp)
-struct tcb *tcp;
+sys_sendfile(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, %ld, %llu, %lu", tcp->u_arg[0], tcp->u_arg[1],
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printfd(tcp, tcp->u_arg[1]);
+		tprintf(", %llu, %lu",
 			LONG_LONG(tcp->u_arg[2], tcp->u_arg[3]),
 			tcp->u_arg[4]);
 	} else {
@@ -254,45 +278,45 @@
 #endif
 
 int
-sys_pread(tcp)
-struct tcb *tcp;
+sys_pread(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 	} else {
 		if (syserror(tcp))
 			tprintf("%#lx", tcp->u_arg[1]);
 		else
 			printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-		ALIGN64 (tcp, PREAD_OFFSET_ARG); /* PowerPC alignment restriction */
-		tprintf(", %lu, %llu", tcp->u_arg[2],
-			*(unsigned long long *)&tcp->u_arg[PREAD_OFFSET_ARG]);
+		tprintf(", %lu, ", tcp->u_arg[2]);
+		printllval(tcp, "%llu", PREAD_OFFSET_ARG);
 	}
 	return 0;
 }
 
 int
-sys_pwrite(tcp)
-struct tcb *tcp;
+sys_pwrite(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-		ALIGN64 (tcp, PREAD_OFFSET_ARG); /* PowerPC alignment restriction */
-		tprintf(", %lu, %llu", tcp->u_arg[2],
-			*(unsigned long long *)&tcp->u_arg[PREAD_OFFSET_ARG]);
+		tprintf(", %lu, ", tcp->u_arg[2]);
+		printllval(tcp, "%llu", PREAD_OFFSET_ARG);
 	}
 	return 0;
 }
 
 int
-sys_sendfile(tcp)
-struct tcb *tcp;
+sys_sendfile(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		off_t offset;
 
-		tprintf("%ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printfd(tcp, tcp->u_arg[1]);
+		tprintf(", ");
 		if (!tcp->u_arg[2])
 			tprintf("NULL");
 		else if (umove(tcp, tcp->u_arg[2], &offset) < 0)
@@ -305,13 +329,15 @@
 }
 
 int
-sys_sendfile64(tcp)
-struct tcb *tcp;
+sys_sendfile64(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		loff_t offset;
 
-		tprintf("%ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printfd(tcp, tcp->u_arg[1]);
+		tprintf(", ");
 		if (!tcp->u_arg[2])
 			tprintf("NULL");
 		else if (umove(tcp, tcp->u_arg[2], &offset) < 0)
@@ -327,46 +353,44 @@
 
 #if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
 int
-sys_pread64(tcp)
-struct tcb *tcp;
+sys_pread64(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 	} else {
-		ALIGN64 (tcp, 3);
 		if (syserror(tcp))
 			tprintf("%#lx", tcp->u_arg[1]);
 		else
 			printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-		tprintf(", %lu, %#llx", tcp->u_arg[2],
-			LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
+		tprintf(", %lu, ", tcp->u_arg[2]);
+		printllval(tcp, "%#llx", 3);
 	}
 	return 0;
 }
 
 int
-sys_pwrite64(tcp)
-struct tcb *tcp;
+sys_pwrite64(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		ALIGN64 (tcp, 3);
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-		tprintf(", %lu, %#llx", tcp->u_arg[2],
-			LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
+		tprintf(", %lu, ", tcp->u_arg[2]);
+		printllval(tcp, "%#llx", 3);
 	}
 	return 0;
 }
 #endif
 
 int
-sys_ioctl(tcp)
-struct tcb *tcp;
+sys_ioctl(struct tcb *tcp)
 {
 	const struct ioctlent *iop;
 
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
 		iop = ioctl_lookup(tcp->u_arg[1]);
 		if (iop) {
 			tprintf("%s", iop->symbol);
diff --git a/ioctl.c b/ioctl.c
index 4540260..3344fb7 100644
--- a/ioctl.c
+++ b/ioctl.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ioctl.c,v 1.14 2005/02/02 20:32:13 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -152,6 +152,13 @@
 #ifdef LINUX
 	case 'p':
 		return rtc_ioctl(tcp, code, arg);
+	case 0x03:
+	case 0x12:
+		return block_ioctl(tcp, code, arg);
+#ifndef HAVE_ANDROID_OS
+	case 0x22:
+		return scsi_ioctl(tcp, code, arg);
+#endif
 #endif
 	default:
 		break;
diff --git a/ioctlsort.c b/ioctlsort.c
index 1732fbc..7881a91 100644
--- a/ioctlsort.c
+++ b/ioctlsort.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ioctlsort.c,v 1.2 2001/03/17 17:26:34 wichert Exp $
+ *	$Id$
  */
 
 
@@ -36,8 +36,8 @@
 #endif
 
 struct ioctlent {
-	char *doth;
-	char *symbol;
+	const char *doth;
+	const char *symbol;
 	unsigned long code;
 };
 
@@ -56,9 +56,7 @@
 }
 
 int
-main(argc, argv)
-int argc;
-char *argv[];
+main(int argc, const char *argv[])
 {
 	int i;
 
diff --git a/ipc.c b/ipc.c
index dca3914..4995946 100644
--- a/ipc.c
+++ b/ipc.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ipc.c,v 1.10 2005/06/01 19:02:37 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -40,9 +40,15 @@
 
 #include <fcntl.h>
 #include <sys/ipc.h>
+#ifdef HAVE_ANDROID_OS
+#include <linux/sem.h>
+#include <linux/msg.h>
+#include <linux/shm.h>
+#else
 #include <sys/sem.h>
 #include <sys/msg.h>
 #include <sys/shm.h>
+#endif
 
 #ifndef MSG_STAT
 #define MSG_STAT 11
@@ -67,7 +73,6 @@
 # define IPC_64 0x100
 #endif
 
-extern const struct xlat openmodes[];
 extern void printsigevent(struct tcb *tcp, long arg);
 
 static const struct xlat msgctl_flags[] = {
@@ -153,12 +158,18 @@
 	{ 0,		NULL		},
 };
 
+static const struct xlat semop_flags[] = {
+	{ SEM_UNDO,	"SEM_UNDO"	},
+	{ IPC_NOWAIT,	"IPC_NOWAIT"	},
+	{ 0,		NULL		},
+};
+
 int sys_msgget(tcp)
 struct tcb *tcp;
 {
 	if (entering(tcp)) {
 		if (tcp->u_arg[0])
-			tprintf("%lu", tcp->u_arg[0]);
+			tprintf("%#lx", tcp->u_arg[0]);
 		else
 			tprintf("IPC_PRIVATE");
 		tprintf(", ");
@@ -177,112 +188,179 @@
 # define PRINTCTL printxval
 #endif
 
+static int
+indirect_ipccall(tcp)
+struct tcb *tcp;
+{
+#ifdef LINUX
+#ifdef X86_64
+	return current_personality > 0;
+#endif
+#if defined IA64
+	return tcp->scno < 1024; /* ia32 emulation syscalls are low */
+#endif
+#if !defined MIPS && !defined HPPA
+	return 1;
+#endif
+#endif	/* LINUX */
+	return 0;
+}
+
 int sys_msgctl(tcp)
 struct tcb *tcp;
 {
 	if (entering(tcp)) {
 		tprintf("%lu, ", tcp->u_arg[0]);
 		PRINTCTL(msgctl_flags, tcp->u_arg[1], "MSG_???");
-#ifdef LINUX
-		tprintf(", %#lx", tcp->u_arg[3]);
-#else /* !LINUX */
-		tprintf(", %#lx", tcp->u_arg[2]);
-#endif /* !LINUX */
+		tprintf(", %#lx", tcp->u_arg[indirect_ipccall(tcp) ? 3 : 2]);
 	}
 	return 0;
 }
 
-int sys_msgsnd(tcp)
-struct tcb *tcp;
+static void
+tprint_msgsnd(struct tcb *tcp, long addr, unsigned long count,
+	      unsigned long flags)
 {
 	long mtype;
 
+	if (umove(tcp, addr, &mtype) < 0) {
+		tprintf("%#lx", addr);
+	} else {
+		tprintf("{%lu, ", mtype);
+		printstr(tcp, addr + sizeof(mtype), count);
+		tprintf("}");
+	}
+	tprintf(", %lu, ", count);
+	printflags(msg_flags, flags, "MSG_???");
+}
+
+int sys_msgsnd(struct tcb *tcp)
+{
 	if (entering(tcp)) {
-		tprintf("%lu", tcp->u_arg[0]);
-#ifdef LINUX
-		umove(tcp, tcp->u_arg[3], &mtype);
-		tprintf(", {%lu, ", mtype);
-		printstr(tcp, tcp->u_arg[3] + sizeof(long),
-			tcp->u_arg[1]);
-		tprintf("}, %lu", tcp->u_arg[1]);
-		tprintf(", ");
-		printflags(msg_flags, tcp->u_arg[2], "MSG_???");
-#else /* !LINUX */
-		umove(tcp, tcp->u_arg[1], &mtype);
-		tprintf(", {%lu, ", mtype);
-		printstr(tcp, tcp->u_arg[1] + sizeof(long),
-			tcp->u_arg[2]);
-		tprintf("}, %lu", tcp->u_arg[2]);
-		tprintf(", ");
-		printflags(msg_flags, tcp->u_arg[3], "MSG_???");
-#endif /* !LINUX */
+		tprintf("%d, ", (int) tcp->u_arg[0]);
+		if (indirect_ipccall(tcp)) {
+			tprint_msgsnd(tcp, tcp->u_arg[3], tcp->u_arg[1],
+				      tcp->u_arg[2]);
+		} else {
+			tprint_msgsnd(tcp, tcp->u_arg[1], tcp->u_arg[2],
+				      tcp->u_arg[3]);
+		}
 	}
 	return 0;
 }
 
-int sys_msgrcv(tcp)
-struct tcb *tcp;
+static void
+tprint_msgrcv(struct tcb *tcp, long addr, unsigned long count, long msgtyp)
 {
 	long mtype;
-#ifdef LINUX
-	struct ipc_wrapper {
-		struct msgbuf *msgp;
-		long msgtyp;
-	} tmp;
-#endif
 
+	if (syserror(tcp) || umove(tcp, addr, &mtype) < 0) {
+		tprintf("%#lx", addr);
+	} else {
+		tprintf("{%lu, ", mtype);
+		printstr(tcp, addr + sizeof(mtype), count);
+		tprintf("}");
+	}
+	tprintf(", %lu, %ld, ", count, msgtyp);
+}
 
-	if (exiting(tcp)) {
-		tprintf("%lu", tcp->u_arg[0]);
-#ifdef LINUX
-		umove(tcp, tcp->u_arg[3], &tmp);
-		umove(tcp, (long) tmp.msgp, &mtype);
-		tprintf(", {%lu, ", mtype);
-		printstr(tcp, (long) (tmp.msgp) + sizeof(long),
-			tcp->u_arg[1]);
-		tprintf("}, %lu", tcp->u_arg[1]);
-		tprintf(", %ld", tmp.msgtyp);
-		tprintf(", ");
-		printflags(msg_flags, tcp->u_arg[2], "MSG_???");
-#else /* !LINUX */
-		umove(tcp, tcp->u_arg[1], &mtype);
-		tprintf(", {%lu, ", mtype);
-		printstr(tcp, tcp->u_arg[1] + sizeof(long),
-			tcp->u_arg[2]);
-		tprintf("}, %lu", tcp->u_arg[2]);
-		tprintf(", %ld", tcp->u_arg[3]);
-		tprintf(", ");
-		printflags(msg_flags, tcp->u_arg[4], "MSG_???");
-#endif /* !LINUX */
+int sys_msgrcv(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		tprintf("%d, ", (int) tcp->u_arg[0]);
+	} else {
+		if (indirect_ipccall(tcp)) {
+			struct ipc_wrapper {
+				struct msgbuf *msgp;
+				long msgtyp;
+			} tmp;
+
+			if (umove(tcp, tcp->u_arg[3], &tmp) < 0) {
+				tprintf("%#lx, %lu, ",
+					tcp->u_arg[3], tcp->u_arg[1]);
+			} else {
+				tprint_msgrcv(tcp, (long) tmp.msgp,
+					tcp->u_arg[1], tmp.msgtyp);
+			}
+			printflags(msg_flags, tcp->u_arg[2], "MSG_???");
+		} else {
+			tprint_msgrcv(tcp, tcp->u_arg[1],
+				tcp->u_arg[2], tcp->u_arg[3]);
+			printflags(msg_flags, tcp->u_arg[4], "MSG_???");
+		}
 	}
 	return 0;
 }
 
-int sys_semop(tcp)
-struct tcb *tcp;
+static void
+tprint_sembuf(struct tcb *tcp, long addr, unsigned long count)
+{
+	unsigned long i, max_count;
+
+	if (abbrev(tcp))
+		max_count = (max_strlen < count) ? max_strlen : count;
+	else
+		max_count = count;
+
+	if (!max_count) {
+		tprintf("%#lx, %lu", addr, count);
+		return;
+	}
+
+	for(i = 0; i < max_count; ++i) {
+		struct sembuf sb;
+		if (i)
+			tprintf(", ");
+		if (umove(tcp, addr + i * sizeof(struct sembuf), &sb) < 0) {
+			if (i) {
+				tprintf("{???}");
+				break;
+			} else {
+				tprintf("%#lx, %lu", addr, count);
+				return;
+			}
+		} else {
+			if (!i)
+				tprintf("{");
+			tprintf("{%u, %d, ", sb.sem_num, sb.sem_op);
+			printflags(semop_flags, sb.sem_flg, "SEM_???");
+			tprintf("}");
+		}
+	}
+
+	if (i < max_count || max_count < count)
+		tprintf(", ...");
+
+	tprintf("}, %lu", count);
+}
+
+int sys_semop(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%lu", tcp->u_arg[0]);
-#ifdef LINUX
-		tprintf(", %#lx", tcp->u_arg[3]);
-		tprintf(", %lu", tcp->u_arg[1]);
-#else /* !LINUX */
-		tprintf(", %#lx", tcp->u_arg[1]);
-		tprintf(", %lu", tcp->u_arg[2]);
-#endif /* !LINUX */
+		tprintf("%lu, ", tcp->u_arg[0]);
+		if (indirect_ipccall(tcp)) {
+			tprint_sembuf(tcp, tcp->u_arg[3], tcp->u_arg[1]);
+		} else {
+			tprint_sembuf(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+		}
 	}
 	return 0;
 }
 
 #ifdef LINUX
-int sys_semtimedop(tcp)
-struct tcb *tcp;
+int sys_semtimedop(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%lu", tcp->u_arg[0]);
-		tprintf(", %#lx", tcp->u_arg[3]);
-		tprintf(", %lu, ", tcp->u_arg[1]);
-		printtv(tcp, tcp->u_arg[5]);
+		tprintf("%lu, ", tcp->u_arg[0]);
+		if (indirect_ipccall(tcp)) {
+			tprint_sembuf(tcp, tcp->u_arg[3], tcp->u_arg[1]);
+			tprintf(", ");
+			printtv(tcp, tcp->u_arg[5]);
+		} else {
+			tprint_sembuf(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+			tprintf(", ");
+			printtv(tcp, tcp->u_arg[3]);
+		}
 	}
 	return 0;
 }
@@ -293,7 +371,7 @@
 {
 	if (entering(tcp)) {
 		if (tcp->u_arg[0])
-			tprintf("%lu", tcp->u_arg[0]);
+			tprintf("%#lx", tcp->u_arg[0]);
 		else
 			tprintf("IPC_PRIVATE");
 		tprintf(", %lu", tcp->u_arg[1]);
@@ -322,7 +400,7 @@
 {
 	if (entering(tcp)) {
 		if (tcp->u_arg[0])
-			tprintf("%lu", tcp->u_arg[0]);
+			tprintf("%#lx", tcp->u_arg[0]);
 		else
 			tprintf("IPC_PRIVATE");
 		tprintf(", %lu", tcp->u_arg[1]);
@@ -340,11 +418,11 @@
 	if (entering(tcp)) {
 		tprintf("%lu, ", tcp->u_arg[0]);
 		PRINTCTL(shmctl_flags, tcp->u_arg[1], "SHM_???");
-#ifdef LINUX
-		tprintf(", %#lx", tcp->u_arg[3]);
-#else /* !LINUX */
-		tprintf(", %#lx", tcp->u_arg[2]);
-#endif /* !LINUX */
+		if (indirect_ipccall(tcp)) {
+			tprintf(", %#lx", tcp->u_arg[3]);
+		} else {
+			tprintf(", %#lx", tcp->u_arg[2]);
+		}
 	}
 	return 0;
 }
@@ -358,18 +436,19 @@
 
 	if (exiting(tcp)) {
 		tprintf("%lu", tcp->u_arg[0]);
-#ifdef LINUX
-		tprintf(", %#lx", tcp->u_arg[3]);
-		tprintf(", ");
-		printflags(shm_flags, tcp->u_arg[1], "SHM_???");
-#else /* !LINUX */
-		tprintf(", %#lx", tcp->u_arg[1]);
-		tprintf(", ");
-		printflags(shm_flags, tcp->u_arg[2], "SHM_???");
-#endif /* !LINUX */
+		if (indirect_ipccall(tcp)) {
+			tprintf(", %#lx", tcp->u_arg[3]);
+			tprintf(", ");
+			printflags(shm_flags, tcp->u_arg[1], "SHM_???");
+		} else {
+			tprintf(", %#lx", tcp->u_arg[1]);
+			tprintf(", ");
+			printflags(shm_flags, tcp->u_arg[2], "SHM_???");
+		}
 		if (syserror(tcp))
 			return 0;
-#ifdef LINUX
+/* HPPA does not use an IPC multiplexer on Linux.  */
+#if defined(LINUX) && !defined(HPPA)
 		if (umove(tcp, tcp->u_arg[2], &raddr) < 0)
 			return RVAL_NONE;
 		tcp->u_rval = raddr;
@@ -382,26 +461,27 @@
 int sys_shmdt(tcp)
 struct tcb *tcp;
 {
-	if (entering(tcp))
-#ifdef LINUX
-		tprintf("%#lx", tcp->u_arg[3]);
-#else /* !LINUX */
-		tprintf("%#lx", tcp->u_arg[0]);
-#endif /* !LINUX */
+	if (entering(tcp)) {
+		if (indirect_ipccall(tcp)) {
+			tprintf("%#lx", tcp->u_arg[3]);
+		} else {
+			tprintf("%#lx", tcp->u_arg[0]);
+		}
+	}
 	return 0;
 }
 
 #endif /* defined(LINUX) || defined(SUNOS4) || defined(FREEBSD) */
 
 #ifdef LINUX
-int sys_mq_open(tcp)
-struct tcb *tcp;
+int
+sys_mq_open(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
 		tprintf(", ");
 		/* flags */
-		printflags(openmodes, tcp->u_arg[1] + 1, "O_???");
+		tprint_open_modes(tcp->u_arg[1]);
 		if (tcp->u_arg[1] & O_CREAT) {
 # ifndef HAVE_MQUEUE_H
 			tprintf(", %lx", tcp->u_arg[2]);
@@ -420,8 +500,8 @@
 	return 0;
 }
 
-int sys_mq_timedsend(tcp)
-struct tcb *tcp;
+int
+sys_mq_timedsend(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%ld, ", tcp->u_arg[0]);
@@ -432,8 +512,8 @@
 	return 0;
 }
 
-int sys_mq_timedreceive(tcp)
-struct tcb *tcp;
+int
+sys_mq_timedreceive(struct tcb *tcp)
 {
 	if (entering(tcp))
 		tprintf("%ld, ", tcp->u_arg[0]);
@@ -445,8 +525,8 @@
 	return 0;
 }
 
-int sys_mq_notify(tcp)
-struct tcb *tcp;
+int
+sys_mq_notify(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%ld, ", tcp->u_arg[0]);
@@ -455,9 +535,8 @@
 	return 0;
 }
 
-static void printmqattr(tcp, addr)
-struct tcb *tcp;
-long addr;
+static void
+printmqattr(struct tcb *tcp, long addr)
 {
 	if (addr == 0)
 		tprintf("NULL");
@@ -471,15 +550,15 @@
 			return;
 		}
 		tprintf("{mq_flags=");
-		printflags(openmodes, attr.mq_flags + 1, "O_???");
+		tprint_open_modes(attr.mq_flags);
 		tprintf(", mq_maxmsg=%ld, mq_msgsize=%ld, mq_curmsg=%ld}",
 			attr.mq_maxmsg, attr.mq_msgsize, attr.mq_curmsgs);
 # endif
 	}
 }
 
-int sys_mq_getsetattr(tcp)
-struct tcb *tcp;
+int
+sys_mq_getsetattr(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%ld, ", tcp->u_arg[0]);
diff --git a/strace/linux/x86_64/errnoent1.h b/linux/arm/errnoent1.h
similarity index 100%
rename from strace/linux/x86_64/errnoent1.h
rename to linux/arm/errnoent1.h
diff --git a/strace/linux/x86_64/ioctlent1.h b/linux/arm/ioctlent1.h
similarity index 63%
rename from strace/linux/x86_64/ioctlent1.h
rename to linux/arm/ioctlent1.h
index a44b0ae..1f92feb 100644
--- a/strace/linux/x86_64/ioctlent1.h
+++ b/linux/arm/ioctlent1.h
@@ -1,2 +1,2 @@
 /* Our second set comes from the i386 files.  */
-#include "../ioctlent.h"
+#include "linux/ioctlent.h"
diff --git a/strace/linux/x86_64/signalent1.h b/linux/arm/signalent1.h
similarity index 100%
rename from strace/linux/x86_64/signalent1.h
rename to linux/arm/signalent1.h
diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
new file mode 100644
index 0000000..b914ca0
--- /dev/null
+++ b/linux/arm/syscallent.h
@@ -0,0 +1,487 @@
+/*
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
+	{ 0,	0,	sys_restart_syscall,	"restart_syscall"}, /* 0 */
+	{ 1,	TP,	sys_exit,		"exit"		}, /* 1 */
+	{ 0,	TP,	sys_fork,		"fork"		}, /* 2 */
+	{ 3,	0,	sys_read,		"read"		}, /* 3 */
+	{ 3,	0,	sys_write,		"write"		}, /* 4 */
+	{ 3,	TF,	sys_open,		"open"		}, /* 5 */
+	{ 1,	0,	sys_close,		"close"		}, /* 6 */
+	{ 3,	TP,	sys_waitpid,		"waitpid"	}, /* 7 */
+	{ 2,	TF,	sys_creat,		"creat"		}, /* 8 */
+	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
+	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
+	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 11 */
+	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
+	{ 1,	0,	sys_time,		"time"		}, /* 13 */
+	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
+	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
+	{ 3,	TF,	sys_chown,		"lchown"	}, /* 16 */
+	{ 0,	0,	sys_break,		"break"		}, /* 17 */
+	{ 2,	TF,	sys_oldstat,		"oldstat"	}, /* 18 */
+	{ 3,	0,	sys_lseek,		"lseek"		}, /* 19 */
+	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
+	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
+	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
+	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
+	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
+	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
+	{ 2,	0,	sys_oldfstat,		"oldfstat"	}, /* 28 */
+	{ 0,	TS,	sys_pause,		"pause"		}, /* 29 */
+	{ 2,	TF,	sys_utime,		"utime"		}, /* 30 */
+	{ 2,	0,	sys_stty,		"stty"		}, /* 31 */
+	{ 2,	0,	sys_gtty,		"gtty"		}, /* 32 */
+	{ 2,	TF,	sys_access,		"access"	}, /* 33 */
+	{ 1,	0,	sys_nice,		"nice"		}, /* 34 */
+	{ 0,	0,	sys_ftime,		"ftime"		}, /* 35 */
+	{ 0,	0,	sys_sync,		"sync"		}, /* 36 */
+	{ 2,	TS,	sys_kill,		"kill"		}, /* 37 */
+	{ 2,	TF,	sys_rename,		"rename"	}, /* 38 */
+	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 39 */
+	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 40 */
+	{ 1,	0,	sys_dup,		"dup"		}, /* 41 */
+	{ 1,	0,	sys_pipe,		"pipe"		}, /* 42 */
+	{ 1,	0,	sys_times,		"times"		}, /* 43 */
+	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
+	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
+	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 47 */
+	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
+	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
+	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
+	{ 3,	0,	sys_ioctl,		"ioctl"		}, /* 54 */
+	{ 3,	0,	sys_fcntl,		"fcntl"		}, /* 55 */
+	{ 0,	0,	sys_mpx,		"mpx"		}, /* 56 */
+	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 57 */
+	{ 2,	0,	sys_ulimit,		"ulimit"	}, /* 58 */
+	{ 1,	0,	sys_oldolduname,	"oldolduname"	}, /* 59 */
+	{ 1,	0,	sys_umask,		"umask"		}, /* 60 */
+	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 61 */
+	{ 2,	0,	sys_ustat,		"ustat"		}, /* 62 */
+	{ 2,	0,	sys_dup2,		"dup2"		}, /* 63 */
+	{ 0,	0,	sys_getppid,		"getppid"	}, /* 64 */
+	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
+	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
+	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
+	{ 0,	TS,	sys_siggetmask,		"siggetmask"	}, /* 68 */
+	{ 1,	TS,	sys_sigsetmask,		"sigsetmask"	}, /* 69 */
+	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
+	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
+	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
+	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
+	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
+	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 75 */
+	{ 2,	0,	sys_getrlimit,		"old_getrlimit"	}, /* 76 */
+	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 77 */
+	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 78 */
+	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 79 */
+	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 80 */
+	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 81 */
+	{ 1,	0,	sys_oldselect,		"oldselect"	}, /* 82 */
+	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 83 */
+	{ 2,	TF,	sys_oldlstat,		"oldlstat"	}, /* 84 */
+	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
+	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
+	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
+	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
+	{ 3,	0,	sys_readdir,		"readdir"	}, /* 89 */
+	{ 6,	TD,	sys_old_mmap,		"old_mmap"	}, /* 90 */
+	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
+	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
+	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 93 */
+	{ 2,	0,	sys_fchmod,		"fchmod"	}, /* 94 */
+	{ 3,	0,	sys_fchown,		"fchown"	}, /* 95 */
+	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
+	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
+	{ 4,	0,	sys_profil,		"profil"	}, /* 98 */
+	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
+	{ 2,	0,	sys_fstatfs,		"fstatfs"	}, /* 100 */
+	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
+	{ 2,	0,	sys_socketcall,		"socketcall"	}, /* 102 */
+	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
+	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
+	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
+	{ 2,	TF,	sys_stat,		"stat"		}, /* 106 */
+	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 107 */
+	{ 2,	0,	sys_fstat,		"fstat"		}, /* 108 */
+	{ 1,	0,	sys_olduname,		"olduname"	}, /* 109 */
+	{ 1,	0,	sys_iopl,		"iopl"		}, /* 110 */
+	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
+	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
+	{ 5,	0,	printargs,		"syscall"	}, /* 113 */
+	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 114 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 115 */
+	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
+	{ 6,	0,	sys_ipc,		"ipc"		}, /* 117 */
+	{ 1,	0,	sys_fsync,		"fsync"		}, /* 118 */
+	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
+	{ 5,	TP,	sys_clone,		"clone"		}, /* 120 */
+	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
+	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
+	{ 3,	0,	sys_modify_ldt,		"modify_ldt"	}, /* 123 */
+	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 124 */
+	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 125 */
+	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
+	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
+	{ 3,	0,	sys_init_module,	"init_module"	}, /* 128 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
+	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
+	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
+	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
+	{ 1,	0,	sys_fchdir,		"fchdir"	}, /* 133 */
+	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
+	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
+	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
+	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 138 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 139 */
+	{ 5,	0,	sys_llseek,		"_llseek"	}, /* 140 */
+	{ 3,	0,	sys_getdents,		"getdents"	}, /* 141 */
+	{ 5,	0,	sys_select,		"select"	}, /* 142 */
+	{ 2,	0,	sys_flock,		"flock"		}, /* 143 */
+	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
+	{ 3,	0,	sys_readv,		"readv"		}, /* 145 */
+	{ 3,	0,	sys_writev,		"writev"	}, /* 146 */
+	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
+	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 148 */
+	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
+	{ 2,	0,	sys_mlock,		"mlock"		}, /* 150 */
+	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
+	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
+	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
+	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
+	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
+	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 156 */
+	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 157 */
+	{ 0,	0,	sys_sched_yield,	"sched_yield"}, /* 158 */
+	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
+	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
+	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
+	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 163 */
+	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
+	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
+	{ 5,	0,	printargs,		"vm86"		}, /* 166 */
+	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
+	{ 3,	0,	sys_poll,		"poll"		}, /* 168 */
+	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
+	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
+	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
+	{ 5,	0,	sys_prctl,		"prctl"		}, /* 172 */
+	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 173 */
+	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"  }, /* 174 */
+	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
+	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
+	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
+	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
+	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
+
+	{ 5,	TF,	sys_pread,		"pread"		}, /* 180 */
+	{ 5,	TF,	sys_pwrite,		"pwrite"	}, /* 181 */
+	{ 3,	TF,	sys_chown,		"chown"		}, /* 182 */
+	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
+	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
+	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */
+	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	}, /* 186 */
+	{ 4,	TD|TN,	sys_sendfile,		"sendfile"	}, /* 187 */
+	{ 5,	0,	sys_getpmsg,		"getpmsg"	}, /* 188 */
+	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 189 */
+	{ 0,	TP,	sys_vfork,		"vfork"		}, /* 190 */
+	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 191 */
+	{ 6,	TD,	sys_mmap,		"mmap2"		}, /* 192 */
+	{ 3,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
+	{ 3,	TF,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
+	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
+	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
+	{ 2,	TF,	sys_fstat64,		"fstat64"	}, /* 197 */
+	{ 3,	TF,	sys_chown,		"lchown32"	}, /* 198 */
+	{ 0,	NF,	sys_getuid,		"getuid32"	}, /* 199 */
+
+	{ 0,	NF,	sys_getgid,		"getgid32"	}, /* 200 */
+	{ 0,	NF,	sys_geteuid,		"geteuid32"	}, /* 201 */
+	{ 0,	NF,	sys_geteuid,		"getegid32"	}, /* 202 */
+	{ 2,	0,	sys_setreuid,		"setreuid32"	}, /* 203 */
+	{ 2,	0,	sys_setregid,		"setregid32"	}, /* 204 */
+	{ 2,	0,	sys_getgroups32,	"getgroups32"	}, /* 205 */
+	{ 2,	0,	sys_setgroups32,	"setgroups32"	}, /* 206 */
+	{ 3,	0,	sys_fchown,		"fchown32"	}, /* 207 */
+	{ 3,	0,	sys_setresuid,		"setresuid32"	}, /* 208 */
+	{ 3,	0,	sys_getresuid,		"getresuid32"	}, /* 209 */
+	{ 3,	0,	sys_setresgid,		"setresgid32"	}, /* 210 */
+	{ 3,	0,	sys_getresgid,		"getresgid32"	}, /* 211 */
+	{ 3,	TF,	sys_chown,		"chown32"	}, /* 212 */
+	{ 1,	0,	sys_setuid,		"setuid32"	}, /* 213 */
+	{ 1,	0,	sys_setgid,		"setgid32"	}, /* 214 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
+	{ 3,    0,      sys_getdents64,         "getdents64"    }, /* 217 */
+	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 218 */
+	{ 3,	0,	printargs,		"mincore"	}, /* 219 */
+	{ 3,	0,	sys_madvise,		"madvise"	}, /* 220 */
+	{ 3,	0,	sys_fcntl,		"fcntl64"	}, /* 221 */
+	{ 5,	0,	printargs,		"SYS_222"	}, /* 222 */
+	{ 5,	0,	printargs,		"SYS_223"	}, /* 223 */
+	{ 0,	0,	printargs,		"gettid"	}, /* 224 */
+	{ 4,	0,	sys_readahead,		"readahead"	}, /* 225 */
+	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 226 */
+	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 227 */
+	{ 5,	0,	sys_fsetxattr,		"fsetxattr"	}, /* 228 */
+	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 229 */
+	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 230 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 231 */
+	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 232 */
+	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 233 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 234 */
+	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 235 */
+	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 236 */
+	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 237 */
+	{ 2,	TS,	sys_kill,		"tkill"		}, /* 238 */
+	{ 4,	TD|TN,	sys_sendfile64,		"sendfile64"	}, /* 239 */
+	{ 6,	0,	sys_futex,		"futex"		}, /* 240 */
+	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 241 */
+	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 242 */
+	{ 2,	0,	printargs,		"io_setup"	}, /* 243 */
+	{ 1,	0,	printargs,		"io_destroy"	}, /* 244 */
+	{ 5,	0,	printargs,		"io_getevents"	}, /* 245 */
+	{ 3,	0,	printargs,		"io_submit"	}, /* 246 */
+	{ 3,	0,	printargs,		"io_cancel"	}, /* 247 */
+	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 248 */
+	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 249 */
+	{ 1,	TD,	printargs,		"epoll_create"	}, /* 250 */
+	{ 4,	0,	printargs,		"epoll_ctl"	}, /* 251 */
+	{ 4,	0,	printargs,		"epoll_wait"	}, /* 252 */
+	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 253 */
+	{ 5,	0,	printargs,		"SYS_254"	}, /* 254 */
+	{ 5,	0,	printargs,		"SYS_255"	}, /* 255 */
+	{ 1,	0,	printargs,		"set_tid_address"}, /* 256 */
+	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 257 */
+	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 258 */
+	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 259 */
+	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"}, /* 260 */
+	{ 1,	0,	sys_timer_delete,	"timer_delete"	}, /* 261 */
+	{ 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 262 */
+	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 263 */
+	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 264 */
+	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"}, /* 265 */
+	{ 3,	TF,	sys_statfs64,		"statfs64"	}, /* 266 */
+	{ 3,	0,	sys_fstatfs64,		"fstatfs64"	}, /* 267 */
+	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 268 */
+	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 269 */
+	{ 6,	TD,	sys_fadvise64_64,	"fadvise64_64"	}, /* 270 */
+	{ 5,	0,	printargs,		"pciconfig_iobase"	}, /* 271 */
+	{ 5,	0,	printargs,		"pciconfig_read"	}, /* 272 */
+	{ 5,	0,	printargs,		"pciconfig_write"	}, /* 273 */
+	{ 4,	0,	sys_mq_open,		"mq_open"	}, /* 274 */
+	{ 1,	0,	sys_mq_unlink,		"mq_unlink"	}, /* 275 */
+	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"	}, /* 276 */
+	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 277 */
+	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 278 */
+	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 279 */
+	{ 5,	TP,	sys_waitid,		"waitid"	}, /* 280 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 281 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 282 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 283 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 284 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 285 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 286 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 287 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 288 */
+	{ 4,	TN,	sys_send,		"send"		}, /* 289 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 290 */
+	{ 4,	TN,	sys_recv,		"recv"		}, /* 291 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 292 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 293 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 294 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 295 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"	}, /* 296 */
+	{ 3,	TN,	sys_recvmsg,		"recvmsg"	}, /* 297 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 298 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 299 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 300 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 301 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 302 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 303 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 304 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 305 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 306 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 307 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 308 */
+	{ 5,	0,	printargs,		"add_key"	}, /* 309 */
+	{ 4,	0,	printargs,		"request_key"	}, /* 310 */
+	{ 5,	0,	printargs,		"keyctl"	}, /* 311 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 312 */
+	{ 5,	0,	printargs,		"vserver"	}, /* 313 */
+	{ 3,	0,	printargs,		"ioprio_set"	}, /* 314 */
+	{ 2,	0,	printargs,		"ioprio_get"	}, /* 315 */
+	{ 0,	TD,	printargs,		"inotify_init"	}, /* 316 */
+	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch" }, /* 317 */
+	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch" }, /* 318 */
+	{ 6,	0,	sys_mbind,		"mbind"		}, /* 319 */
+	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"	}, /* 320 */
+	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"	}, /* 321 */
+	{ 4,	TD|TF,	sys_openat,		"openat"	}, /* 322 */
+	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"	}, /* 323 */
+	{ 4,	TD|TF,	sys_mknodat,		"mknodat"	}, /* 324 */
+	{ 5,	TD|TF,	sys_fchownat,		"fchownat"	}, /* 325 */
+	{ 3,	TD|TF,	sys_futimesat,		"futimesat"	}, /* 326 */
+	{ 4,	TD|TF,	sys_newfstatat,		"newfstatat"	}, /* 327 */
+	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"	}, /* 328 */
+	{ 4,	TD|TF,	sys_renameat,		"renameat"	}, /* 329 */
+	{ 5,	TD|TF,	sys_linkat,		"linkat"	}, /* 330 */
+	{ 3,	TD|TF,	sys_symlinkat,		"symlinkat"	}, /* 331 */
+	{ 4,	TD|TF,	sys_readlinkat,		"readlinkat"	}, /* 332 */
+	{ 3,	TD|TF,	sys_fchmodat,		"fchmodat"	}, /* 333 */
+	{ 3,	TD|TF,	sys_faccessat,		"faccessat"	}, /* 334 */
+	{ 6,	TD,	sys_pselect6,		"pselect6"	}, /* 335 */
+	{ 5,	TD,	sys_ppoll,		"ppoll"		}, /* 336 */
+	{ 1,	TP,	sys_unshare,		"unshare"	}, /* 337 */
+	{ 2,	0,	printargs,		"set_robust_list" }, /* 338 */
+	{ 3,	0,	printargs,		"get_robust_list" }, /* 339 */
+	{ 6,	TD,	printargs,		"splice"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 4,	TD,	printargs,		"tee"		}, /* 342 */
+	{ 4,	TD,	printargs,		"vmsplice"	}, /* 343 */
+	{ 6,	0,	sys_move_pages,		"move_pages"	}, /* 344 */
+	{ 3,	0,	sys_getcpu,		"getcpu"	}, /* 345 */
+	{ 5,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 346 */
+	{ 5,	0,	printargs,		"kexec_load"	}, /* 347 */
+	{ 4,	TD|TF,	sys_utimensat,		"utimensat"	}, /* 348 */
+	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 349 */
+	{ 4,	TD,	sys_timerfd,		"timerfd"	}, /* 350 */
+	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 351 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"	}, /* 352 */
+	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"}, /* 353 */
+	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"}, /* 354 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"	}, /* 355 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"	}, /* 356 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"	}, /* 357 */
+	{ 3,	TD,	sys_dup3,		"dup3"		}, /* 358 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"		}, /* 359 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"	}, /* 360 */
+	{ 5,	TD,	printargs,		"preadv"	}, /* 361 */
+	{ 5,	TD,	printargs,		"pwritev"	}, /* 362 */
+	{ 4,	TP|TS,	printargs,		"rt_tgsigqueueinfo"}, /* 363 */
+	{ 5,	TD,	printargs,		"perf_event_open"}, /* 364 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 365 */
+	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 366 */
+	{ 2,	TD,	printargs,		"fanotify_init"	}, /* 367 */
+	{ 5,	TD|TF,	printargs,		"fanotify_mark"	}, /* 368 */
+	{ 4,	0,	printargs,		"prlimit64"	}, /* 369 */
+	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
+	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
+	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
+	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
+	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
+	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
+	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
+	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
+	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
+	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
+	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
+	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
+	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
+	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
+	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
+	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
+	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
+	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
+	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
+	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
+	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
+	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
+	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
+	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
+	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
+	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
+	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
+	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
+	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
+	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
+
+#ifndef __ARM_EABI__
+#if SYS_socket_subcall != 400
+ #error fix me
+#endif
+	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 404 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 405 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 406 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 407 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
+	{ 4,	TN,	sys_send,		"send"		}, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv"		}, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 412 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
+	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 418 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 419 */
+
+#if SYS_ipc_subcall != 420
+ #error fix me
+#endif
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 420 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 421 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 422 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 423 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 429 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 430 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 431 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 432 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 433 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 439 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 440 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 441 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 442 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 443 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 444 */
+#endif
diff --git a/linux/arm/syscallent1.h b/linux/arm/syscallent1.h
new file mode 100644
index 0000000..0978e9f
--- /dev/null
+++ b/linux/arm/syscallent1.h
@@ -0,0 +1,7 @@
+/* ARM specific syscalls */
+	{ 5,	0,	printargs,		"SYS_0"			}, /* 0 */
+	{ 5,	0,	printargs,		"breakpoint"		}, /* 1 */
+	{ 5,	0,	printargs,		"cacheflush"		}, /* 2 */
+	{ 5,	0,	printargs,		"usr26"			}, /* 3 */
+	{ 5,	0,	printargs,		"usr32"			}, /* 4 */
+	{ 5,	0,	printargs,		"set_tls"		}, /* 5 */
diff --git a/linux/dummy.h b/linux/dummy.h
index 5178fad..3b8bff0 100644
--- a/linux/dummy.h
+++ b/linux/dummy.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: dummy.h,v 1.17 2004/04/16 21:48:44 roland Exp $
+ *	$Id$
  */
 
 /* still unfinished */
@@ -41,9 +41,11 @@
 /* machine-specific */
 #ifndef I386
 #define	sys_modify_ldt		printargs
+#ifndef M68K
 #define sys_get_thread_area	printargs
 #define sys_set_thread_area	printargs
 #endif
+#endif
 
 #define sys_sched_yield		printargs
 #define sys_sched_get_priority_max sys_sched_get_priority_min
@@ -54,11 +56,12 @@
 #define	sys_umount		sys_chdir
 #define	sys_swapon		sys_chdir
 #define	sys_swapoff		sys_chdir
-#define	sys_delete_module	sys_chdir
+#define	sys_delete_module	sys_open
 #define	sys_fchdir		sys_close
-#define	sys_setfsuid		sys_setuid
-#define	sys_setfsgid		sys_setgid
-#define sys_nanosleep		sys_adjtime
+#define	sys_getgid		sys_getuid
+#define	sys_getegid		sys_getuid
+#define	sys_geteuid		sys_getuid
+#define	sys_setfsgid		sys_setfsuid
 #define	sys_acct		sys_chdir
 #define sys_fdatasync		sys_close
 #define sys_mlock		sys_munmap
@@ -69,12 +72,8 @@
 /* printargs does the right thing */
 #define	sys_setup		printargs
 #define	sys_getpid		printargs
-#define	sys_getuid		printargs
 #define	sys_pause		printargs
 #define	sys_sync		printargs
-#define	sys_getgid		printargs
-#define	sys_geteuid		printargs
-#define	sys_getegid		printargs
 #define	sys_getppid		printargs
 #define	sys_getpgrp		printargs
 #define	sys_setsid		printargs
@@ -224,25 +223,3 @@
 #define sys_mlockall		printargs
 #define	sys_reboot		printargs
 #endif
-
-
-#ifdef HAVE_ANDROID_OS
-
-#define sys_mq_open printargs
-#define sys_mq_timedsend printargs
-#define sys_mq_timedreceive printargs
-#define sys_mq_notify printargs
-#define sys_mq_getsetattr printargs
-#define sys_semop printargs
-#define sys_semget printargs
-#define sys_semctl printargs
-#define sys_semtimedop printargs
-#define sys_msgsnd printargs
-#define sys_msgrcv printargs
-#define sys_msgget printargs
-#define sys_msgctl printargs
-#define sys_shmat printargs
-#define sys_shmdt printargs
-#define sys_shmget printargs
-#define sys_shmctl printargs
-#endif
diff --git a/linux/errnoent.h b/linux/errnoent.h
index 68b2adc..c52d1d0 100644
--- a/linux/errnoent.h
+++ b/linux/errnoent.h
@@ -56,7 +56,11 @@
 	"ENOANO", /* 55 */
 	"EBADRQC", /* 56 */
 	"EBADSLT", /* 57 */
+#ifdef POWERPC
+	"EDEADLOCK", /* 58 */
+#else
 	"ERRNO_58", /* 58 */
+#endif
 	"EBFONT", /* 59 */
 	"ENOSTR", /* 60 */
 	"ENODATA", /* 61 */
@@ -123,14 +127,14 @@
 	"EDQUOT", /* 122 */
 	"ENOMEDIUM", /* 123 */
 	"EMEDIUMTYPE", /* 124 */
-	"ERRNO_125", /* 125 */
-	"ERRNO_126", /* 126 */
-	"ERRNO_127", /* 127 */
-	"ERRNO_128", /* 128 */
-	"ERRNO_129", /* 129 */
-	"ERRNO_130", /* 130 */
-	"ERRNO_131", /* 131 */
-	"ERRNO_132", /* 132 */
+	"ECANCELED", /* 125 */
+	"ENOKEY", /* 126 */
+	"EKEYEXPIRED", /* 127 */
+	"EKEYREVOKED", /* 128 */
+	"EKEYREJECTED", /* 129 */
+	"EOWNERDEAD", /* 130 */
+	"ENOTRECOVERABLE", /* 131 */
+	"ERFKILL", /* 132 */
 	"ERRNO_133", /* 133 */
 	"ERRNO_134", /* 134 */
 	"ERRNO_135", /* 135 */
@@ -514,7 +518,7 @@
 	"ERESTARTNOINTR", /* 513 */
 	"ERESTARTNOHAND", /* 514 */
 	"ENOIOCTLCMD", /* 515 */
-	"ERRNO_516", /* 516 */
+	"ERESTART_RESTARTBLOCK", /* 516 */
 	"ERRNO_517", /* 517 */
 	"ERRNO_518", /* 518 */
 	"ERRNO_519", /* 519 */
@@ -527,3 +531,5 @@
 	"ESERVERFAULT", /* 526 */
 	"EBADTYPE", /* 527 */
 	"EJUKEBOX", /* 528 */
+	"EIOCBQUEUED", /* 529 */
+	"EIOCBRETRY", /* 530 */
diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h
new file mode 100644
index 0000000..6e2d466
--- /dev/null
+++ b/linux/i386/syscallent.h
@@ -0,0 +1,485 @@
+/*
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
+	{ 0,	0,	sys_restart_syscall,	"restart_syscall" }, /* 0 */
+	{ 1,	TP,	sys_exit,		"_exit", SYS_exit }, /* 1 */
+	{ 0,	TP,	sys_fork,		"fork", SYS_fork }, /* 2 */
+	{ 3,	TD,	sys_read,		"read", SYS_read }, /* 3 */
+	{ 3,	TD,	sys_write,		"write", SYS_write }, /* 4 */
+	{ 3,	TD|TF,	sys_open,		"open"		}, /* 5 */
+	{ 1,	TD,	sys_close,		"close"		}, /* 6 */
+	{ 3,	TP,	sys_waitpid,		"waitpid", SYS_wait4 }, /* 7 */
+	{ 2,	TD|TF,	sys_creat,		"creat"		}, /* 8 */
+	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
+	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
+	{ 3,	TF|TP,	sys_execve,		"execve", SYS_execve }, /* 11 */
+	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
+	{ 1,	0,	sys_time,		"time"		}, /* 13 */
+	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
+	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
+	{ 3,	TF,	sys_chown,		"lchown"	}, /* 16 */
+	{ 0,	0,	sys_break,		"break"		}, /* 17 */
+	{ 2,	TF,	sys_oldstat,		"oldstat"	}, /* 18 */
+	{ 3,	TD,	sys_lseek,		"lseek"		}, /* 19 */
+	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
+	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
+	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
+	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
+	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
+	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
+	{ 2,	TD,	sys_oldfstat,		"oldfstat"	}, /* 28 */
+	{ 0,	TS,	sys_pause,		"pause"		}, /* 29 */
+	{ 2,	TF,	sys_utime,		"utime"		}, /* 30 */
+	{ 2,	0,	sys_stty,		"stty"		}, /* 31 */
+	{ 2,	0,	sys_gtty,		"gtty"		}, /* 32 */
+	{ 2,	TF,	sys_access,		"access"	}, /* 33 */
+	{ 1,	0,	sys_nice,		"nice"		}, /* 34 */
+	{ 0,	0,	sys_ftime,		"ftime"		}, /* 35 */
+	{ 0,	0,	sys_sync,		"sync"		}, /* 36 */
+	{ 2,	TS,	sys_kill,		"kill"		}, /* 37 */
+	{ 2,	TF,	sys_rename,		"rename"	}, /* 38 */
+	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 39 */
+	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 40 */
+	{ 1,	TD,	sys_dup,		"dup"		}, /* 41 */
+	{ 1,	TD,	sys_pipe,		"pipe"		}, /* 42 */
+	{ 1,	0,	sys_times,		"times"		}, /* 43 */
+	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
+	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
+	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 47 */
+	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
+	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
+	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
+	{ 3,	TD,	sys_ioctl,		"ioctl"		}, /* 54 */
+	{ 3,	TD,	sys_fcntl,		"fcntl"		}, /* 55 */
+	{ 0,	0,	sys_mpx,		"mpx"		}, /* 56 */
+	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 57 */
+	{ 2,	0,	sys_ulimit,		"ulimit"	}, /* 58 */
+	{ 1,	0,	sys_oldolduname,	"oldolduname"	}, /* 59 */
+	{ 1,	0,	sys_umask,		"umask"		}, /* 60 */
+	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 61 */
+	{ 2,	0,	sys_ustat,		"ustat"		}, /* 62 */
+	{ 2,	TD,	sys_dup2,		"dup2"		}, /* 63 */
+	{ 0,	0,	sys_getppid,		"getppid"	}, /* 64 */
+	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
+	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
+	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
+	{ 0,	TS,	sys_siggetmask,		"siggetmask"	}, /* 68 */
+	{ 1,	TS,	sys_sigsetmask,		"sigsetmask"	}, /* 69 */
+	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
+	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
+	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
+	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
+	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
+	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 75 */
+	{ 2,	0,	sys_getrlimit,		"old_getrlimit"	}, /* 76 */
+	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 77 */
+	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 78 */
+	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 79 */
+	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 80 */
+	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 81 */
+	{ 1,	TD,	sys_oldselect,		"oldselect"	}, /* 82 */
+	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 83 */
+	{ 2,	TF,	sys_oldlstat,		"oldlstat"	}, /* 84 */
+	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
+	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
+	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
+	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
+	{ 3,	TD,	sys_readdir,		"readdir"	}, /* 89 */
+	{ 6,	TD,	sys_old_mmap,		"old_mmap"	}, /* 90 */
+	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
+	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
+	{ 2,	TD,	sys_ftruncate,		"ftruncate"	}, /* 93 */
+	{ 2,	TD,	sys_fchmod,		"fchmod"	}, /* 94 */
+	{ 3,	TD,	sys_fchown,		"fchown"	}, /* 95 */
+	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
+	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
+	{ 4,	0,	sys_profil,		"profil"	}, /* 98 */
+	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
+	{ 2,	TD,	sys_fstatfs,		"fstatfs"	}, /* 100 */
+	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
+	{ 2,	TD,	sys_socketcall,		"socketcall", SYS_socketcall }, /* 102 */
+	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
+	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
+	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
+	{ 2,	TF,	sys_stat,		"stat"		}, /* 106 */
+	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 107 */
+	{ 2,	TD,	sys_fstat,		"fstat"		}, /* 108 */
+	{ 1,	0,	sys_olduname,		"olduname"	}, /* 109 */
+	{ 1,	0,	sys_iopl,		"iopl"		}, /* 110 */
+	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
+	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
+	{ 1,	0,	sys_vm86old,		"vm86old"	}, /* 113 */
+	{ 4,	TP,	sys_wait4,		"wait4", SYS_wait4 }, /* 114 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 115 */
+	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
+	{ 6,	0,	sys_ipc,		"ipc", SYS_ipc }, /* 117 */
+	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
+	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
+	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */
+	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
+	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
+	{ 3,	0,	sys_modify_ldt,		"modify_ldt"	}, /* 123 */
+	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 124 */
+	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 125 */
+	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
+	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
+	{ 3,	0,	sys_init_module,	"init_module"	}, /* 128 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
+	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
+	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
+	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
+	{ 1,	TD,	sys_fchdir,		"fchdir"	}, /* 133 */
+	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
+	{ 3,	0,	sys_sysfs,		"sysfs", SYS_sysfs }, /* 135 */
+	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
+	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 138 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 139 */
+	{ 5,	TD,	sys_llseek,		"_llseek"	}, /* 140 */
+	{ 3,	TD,	sys_getdents,		"getdents"	}, /* 141 */
+	{ 5,	TD,	sys_select,		"select"	}, /* 142 */
+	{ 2,	TD,	sys_flock,		"flock"		}, /* 143 */
+	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
+	{ 3,	TD,	sys_readv,		"readv", SYS_readv }, /* 145 */
+	{ 3,	TD,	sys_writev,		"writev", SYS_writev }, /* 146 */
+	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
+	{ 1,	TD,	sys_fdatasync,		"fdatasync"	}, /* 148 */
+	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
+	{ 2,	0,	sys_mlock,		"mlock"		}, /* 150 */
+	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
+	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
+	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
+	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
+	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
+	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 156 */
+	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 157 */
+	{ 0,	0,	sys_sched_yield,	"sched_yield"}, /* 158 */
+	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
+	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
+	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
+	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 163 */
+	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
+	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
+	{ 5,	0,	printargs,		"vm86"		}, /* 166 */
+	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
+	{ 3,	TD,	sys_poll,		"poll"		}, /* 168 */
+	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
+	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
+	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
+	{ 5,	0,	sys_prctl,		"prctl"		}, /* 172 */
+	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 173 */
+	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"  }, /* 174 */
+	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
+	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
+	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
+	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
+	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
+
+	{ 5,	TD,	sys_pread,		"pread64", SYS_read }, /* 180 */
+	{ 5,	TD,	sys_pwrite,		"pwrite64", SYS_write }, /* 181 */
+	{ 3,	TF,	sys_chown,		"chown"		}, /* 182 */
+	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
+	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
+	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */
+	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	}, /* 186 */
+	{ 4,	TD|TN,	sys_sendfile,		"sendfile"	}, /* 187 */
+	{ 5,	0,	sys_getpmsg,		"getpmsg"	}, /* 188 */
+	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 189 */
+	{ 0,	TP,	sys_vfork,		"vfork", SYS_vfork }, /* 190 */
+	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 191 */
+	{ 6,	TD,	sys_mmap,		"mmap2"		}, /* 192 */
+	{ 3,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
+	{ 3,	TD,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
+	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
+	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
+	{ 2,	TD,	sys_fstat64,		"fstat64"	}, /* 197 */
+	{ 3,	TF,	sys_chown,		"lchown32"	}, /* 198 */
+	{ 0,	NF,	sys_getuid,		"getuid32"	}, /* 199 */
+
+	{ 0,	NF,	sys_getgid,		"getgid32"	}, /* 200 */
+	{ 0,	NF,	sys_geteuid,		"geteuid32"	}, /* 201 */
+	{ 0,	NF,	sys_getegid,		"getegid32"	}, /* 202 */
+	{ 2,	0,	sys_setreuid,		"setreuid32"	}, /* 203 */
+	{ 2,	0,	sys_setregid,		"setregid32"	}, /* 204 */
+	{ 2,	0,	sys_getgroups32,	"getgroups32"	}, /* 205 */
+	{ 2,	0,	sys_setgroups32,	"setgroups32"	}, /* 206 */
+	{ 3,	TD,	sys_fchown,		"fchown32"	}, /* 207 */
+	{ 3,	0,	sys_setresuid,		"setresuid32"	}, /* 208 */
+	{ 3,	0,	sys_getresuid,		"getresuid32"	}, /* 209 */
+	{ 3,	0,	sys_setresgid,		"setresgid32"	}, /* 210 */
+	{ 3,	0,	sys_getresgid,		"getresgid32"	}, /* 211 */
+	{ 3,	TF,	sys_chown,		"chown32"	}, /* 212 */
+	{ 1,	0,	sys_setuid,		"setuid32"	}, /* 213 */
+	{ 1,	0,	sys_setgid,		"setgid32"	}, /* 214 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
+	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
+	{ 3,	0,	sys_mincore,		"mincore"	}, /* 218 */
+	{ 3,	0,	sys_madvise,		"madvise"	}, /* 219 */
+	{ 3,	TD,	sys_getdents64,		"getdents64"	}, /* 220 */
+	{ 3,	TD,	sys_fcntl,		"fcntl64"	}, /* 221 */
+	{ 4,	0,	printargs,		"SYS_222"	}, /* 222 */
+/*TODO*/{ 5,	0,	printargs,		"security"	}, /* 223 */
+	{ 0,	0,	printargs,		"gettid"	}, /* 224 */
+	{ 4,	TD,	sys_readahead,		"readahead"	}, /* 225 */
+	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 226 */
+	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 227 */
+	{ 5,	TD,	sys_fsetxattr,		"fsetxattr"	}, /* 228 */
+	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 229 */
+	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 230 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 231 */
+	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 232 */
+	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 233 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 234 */
+	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 235 */
+	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 236 */
+	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 237 */
+	{ 2,	TS,	sys_kill,		"tkill"		}, /* 238 */
+	{ 4,	TD|TN,	sys_sendfile64,		"sendfile64"	}, /* 239 */
+	{ 6,	0,	sys_futex,		"futex"		}, /* 240 */
+	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 241 */
+	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 242 */
+	{ 1,	0,	sys_set_thread_area,	"set_thread_area" }, /* 243 */
+	{ 1,	0,	sys_get_thread_area,	"get_thread_area" }, /* 244 */
+	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 245 */
+	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 246 */
+	{ 5,	0,	sys_io_getevents,	"io_getevents"	}, /* 247 */
+	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 248 */
+	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
+	{ 5,	TD,	sys_fadvise64,		"fadvise64"	}, /* 250 */
+	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */
+	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 252 */
+	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 253 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"	}, /* 254 */
+	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
+	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"	}, /* 256 */
+	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 257 */
+	{ 1,	0,	printargs,		"set_tid_address"}, /* 258 */
+	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 259 */
+	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 260 */
+	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 261 */
+	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"}, /* 262 */
+	{ 1,	0,	sys_timer_delete,	"timer_delete"	}, /* 263 */
+	{ 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 264 */
+	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 265 */
+	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 266 */
+	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"}, /* 267 */
+	{ 3,	TF,	sys_statfs64,		"statfs64"	}, /* 268 */
+	{ 3,	TD,	sys_fstatfs64,		"fstatfs64"	}, /* 269 */
+	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 270 */
+	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 271 */
+	{ 6,	TD,	sys_fadvise64_64,	"fadvise64_64"	}, /* 272 */
+	{ 5,	0,	printargs,		"vserver"	}, /* 273 */
+	{ 6,	0,	sys_mbind,		"mbind"		}, /* 274 */
+	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"	}, /* 275 */
+	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"	}, /* 276 */
+	{ 4,	0,	sys_mq_open,		"mq_open"	}, /* 277 */
+	{ 1,	0,	sys_mq_unlink,		"mq_unlink"	}, /* 278 */
+	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"	}, /* 279 */
+	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 280 */
+	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 281 */
+	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 282 */
+	{ 5,	0,	printargs,		"kexec_load"	}, /* 283 */
+	{ 5,	TP,	sys_waitid,		"waitid", SYS_waitid }, /* 284 */
+	{ 5,	0,	printargs,		"SYS_285"	}, /* 285 */
+	{ 5,	0,	printargs,		"add_key"	}, /* 286 */
+	{ 4,	0,	printargs,		"request_key"	}, /* 287 */
+	{ 5,	0,	printargs,		"keyctl"	}, /* 288 */
+	{ 3,	0,	printargs,		"ioprio_set"	}, /* 289 */
+	{ 2,	0,	printargs,		"ioprio_get"	}, /* 290 */
+	{ 0,	TD,	printargs,		"inotify_init"	}, /* 291 */
+	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch" }, /* 292 */
+	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch" }, /* 293 */
+	{ 4,	0,	printargs,		"migrate_pages"	}, /* 294 */
+	{ 4,	TD|TF,	sys_openat,		"openat"	}, /* 295 */
+	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"	}, /* 296 */
+	{ 4,	TD|TF,	sys_mknodat,		"mknodat"	}, /* 297 */
+	{ 5,	TD|TF,	sys_fchownat,		"fchownat"	}, /* 298 */
+	{ 3,	TD|TF,	sys_futimesat,		"futimesat"	}, /* 299 */
+	{ 4,	TD|TF,	sys_newfstatat,		"fstatat64"	}, /* 300 */
+	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"	}, /* 301 */
+	{ 4,	TD|TF,	sys_renameat,		"renameat"	}, /* 302 */
+	{ 5,	TD|TF,	sys_linkat,		"linkat"	}, /* 303 */
+	{ 3,	TD|TF,	sys_symlinkat,		"symlinkat"	}, /* 304 */
+	{ 4,	TD|TF,	sys_readlinkat,		"readlinkat"	}, /* 305 */
+	{ 3,	TD|TF,	sys_fchmodat,		"fchmodat"	}, /* 306 */
+	{ 3,	TD|TF,	sys_faccessat,		"faccessat"	}, /* 307 */
+	{ 6,	TD,	sys_pselect6,		"pselect6"	}, /* 308 */
+	{ 5,	TD,	sys_ppoll,		"ppoll"		}, /* 309 */
+	{ 1,	TP,	sys_unshare,		"unshare"	}, /* 310 */
+	{ 2,	0,	printargs,		"set_robust_list" }, /* 311 */
+	{ 3,	0,	printargs,		"get_robust_list" }, /* 312 */
+	{ 6,	TD,	printargs,		"splice"	}, /* 313 */
+	{ 4,	TD,	printargs,		"sync_file_range" }, /* 314 */
+	{ 4,	TD,	printargs,		"tee"		}, /* 315 */
+	{ 4,	TD,	printargs,		"vmsplice"	}, /* 316 */
+	{ 6,	0,	sys_move_pages,		"move_pages"	}, /* 317 */
+	{ 3,	0,	sys_getcpu,		"getcpu"	}, /* 318 */
+	{ 5,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 319 */
+	{ 4,	TD|TF,	sys_utimensat,		"utimensat"	}, /* 320 */
+	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 321 */
+	{ 2,	TD,	sys_timerfd_create,	"timerfd_create"}, /* 322 */
+	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 323 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"	}, /* 324 */
+	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"}, /* 325 */
+	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"}, /* 326 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"	}, /* 327 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"	}, /* 328 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"	}, /* 329 */
+	{ 3,	TD,	sys_dup3,		"dup3"		}, /* 330 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"		}, /* 331 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"	}, /* 332 */
+	{ 5,	TD,	printargs,		"preadv"	}, /* 333 */
+	{ 5,	TD,	printargs,		"pwritev"	}, /* 334 */
+	{ 4,	TP|TS,	printargs,		"rt_tgsigqueueinfo"}, /* 335 */
+	{ 5,	TD,	printargs,		"perf_event_open"}, /* 336 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 337 */
+	{ 2,	TD,	printargs,		"fanotify_init"	}, /* 338 */
+	{ 5,	TD|TF,	printargs,		"fanotify_mark"	}, /* 339 */
+	{ 4,	0,	printargs,		"prlimit64"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
+	{ 5,	0,	printargs,		"SYS_350"	}, /* 350 */
+	{ 5,	0,	printargs,		"SYS_351"	}, /* 351 */
+	{ 5,	0,	printargs,		"SYS_352"	}, /* 352 */
+	{ 5,	0,	printargs,		"SYS_353"	}, /* 353 */
+	{ 5,	0,	printargs,		"SYS_354"	}, /* 354 */
+	{ 5,	0,	printargs,		"SYS_355"	}, /* 355 */
+	{ 5,	0,	printargs,		"SYS_356"	}, /* 356 */
+	{ 5,	0,	printargs,		"SYS_357"	}, /* 357 */
+	{ 5,	0,	printargs,		"SYS_358"	}, /* 358 */
+	{ 5,	0,	printargs,		"SYS_359"	}, /* 359 */
+	{ 5,	0,	printargs,		"SYS_360"	}, /* 360 */
+	{ 5,	0,	printargs,		"SYS_361"	}, /* 361 */
+	{ 5,	0,	printargs,		"SYS_362"	}, /* 362 */
+	{ 5,	0,	printargs,		"SYS_363"	}, /* 363 */
+	{ 5,	0,	printargs,		"SYS_364"	}, /* 364 */
+	{ 5,	0,	printargs,		"SYS_365"	}, /* 365 */
+	{ 5,	0,	printargs,		"SYS_366"	}, /* 366 */
+	{ 5,	0,	printargs,		"SYS_367"	}, /* 367 */
+	{ 5,	0,	printargs,		"SYS_368"	}, /* 368 */
+	{ 5,	0,	printargs,		"SYS_369"	}, /* 369 */
+	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
+	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
+	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
+	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
+	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
+	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
+	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
+	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
+	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
+	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
+	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
+	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
+	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
+	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
+	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
+	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
+	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
+	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
+	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
+	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
+	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
+	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
+	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
+	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
+	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
+	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
+	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
+	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
+	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
+	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
+
+#if SYS_socket_subcall != 400
+ #error fix me
+#endif
+	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 404 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 405 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 406 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 407 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
+	{ 4,	TN,	sys_send,		"send", SYS_sub_send }, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv }, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto }, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom }, /* 412 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
+	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 418 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 419 */
+
+#if SYS_ipc_subcall != 420
+ #error fix me
+#endif
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 420 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 421 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 422 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 423 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 429 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 430 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 431 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 432 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 433 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 439 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 440 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 441 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 442 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 443 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 444 */
diff --git a/linux/ioctlent.sh b/linux/ioctlent.sh
index 8f3d74b..65b005d 100644
--- a/linux/ioctlent.sh
+++ b/linux/ioctlent.sh
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id: ioctlent.sh,v 1.12 2004/10/06 22:31:38 roland Exp $
+#	$Id$
 #
 
 # Validate arg count.
@@ -51,39 +51,109 @@
 
 	# Build the list of all ioctls
 	regexp='^[[:space:]]*#[[:space:]]*define[[:space:]]\+[A-Z][A-Z0-9_]*[[:space:]]\+0x'"$type"'..\>'
-	(cd "$dir" ; grep "$regexp" "$@" /dev/null 2>/dev/null ) |
+	(cd "$dir" && grep "$regexp" "$@" /dev/null 2>/dev/null) |
 		sed -ne "s,$asm/,asm/,g"'
 s/^\(.*\):[[:space:]]*#[[:space:]]*define[[:space:]]*\([A-Z0-9_]*\)[[:space:]]*\(0x'"$type"'..\).*/	{ "\1",	"\2",	\3	},/p' \
 		>> ioctls.h
 }
 
-: > ioctls.h
+
+> ioctls.h
+
+lookup_ioctls 03 linux/hdreg.h
 lookup_ioctls 22 scsi/sg.h
 lookup_ioctls 46 linux/fb.h
 lookup_ioctls 4B linux/kd.h
+lookup_ioctls 4C linux/loop.h
 lookup_ioctls 53 linux/cdrom.h scsi/scsi.h scsi/scsi_ioctl.h
-lookup_ioctls 54 $asm/ioctls.h
+lookup_ioctls 54 $asm/ioctls.h asm-generic/ioctls.h
 lookup_ioctls 56 linux/vt.h
 lookup_ioctls '7[12]' linux/videotext.h
-lookup_ioctls 89 $asm/sockios.h linux/sockios.h
+lookup_ioctls 89 $asm/sockios.h asm-generic/sockios.h linux/sockios.h
 lookup_ioctls 8B linux/wireless.h
 
-files="linux/* $asm/* scsi/* sound/*"
+if [ -e $dir/Kbuild ]; then
+	# kernel has exported user space headers, so query only them
+	files=$(
+		cd $dir || exit
+		find . -mindepth 2 -name Kbuild | \
+			sed -e 's:^\./::' -e 's:/Kbuild:/*:' | \
+			grep -v '^asm-'
+		echo "$asm/* asm-generic/*"
+	)
+	# special case: some headers aren't exported directly
+	files="${files} media/* net/bluetooth/* pcmcia/*"
+else
+	# older kernel so just assume some headers
+	files="linux/* $asm/* asm-generic/* scsi/* sound/*"
+fi
 
 # Build the list of all ioctls
+# Example output:
+# { "asm/ioctls.h",	"TIOCSWINSZ",	0x5414  },
+# { "asm/mce.h",	"MCE_GETCLEAR_FLAGS",	_IOC(_IOC_NONE,'M',3,0) },
 regexp='^[[:space:]]*#[[:space:]]*define[[:space:]]\+[A-Z][A-Z0-9_]*[[:space:]]\+_S\?\(IO\|IOW\|IOR\|IOWR\)\>'
-(cd $dir ; grep $regexp $files 2>/dev/null ) | \
-	sed -ne "s,$asm/,asm/,g"'
-s/^\(.*\):[[:space:]]*#[[:space:]]*define[[:space:]]*\([A-Z0-9_]*\)[[:space:]]*_S\?I.*(\([^[,]*\)[[:space:]]*,[[:space:]]*\([^,)]*\).*/	{ "\1",	"\2",	_IOC(_IOC_NONE,\3,\4,0)	},/p' \
+(cd $dir && grep $regexp $files 2>/dev/null) | \
+	sed -n \
+	-e "s,$asm/,asm/,g" \
+	-e 's/^\(.*\):[[:space:]]*#[[:space:]]*define[[:space:]]*\([A-Z0-9_]*\)[[:space:]]*_S\?I.*(\([^[,]*\)[[:space:]]*,[[:space:]]*\([^,)]*\).*/	{ "\1",	"\2",	_IOC(_IOC_NONE,\3,\4,0)	},/p' \
 	>> ioctls.h
 
-# Some use a special base to offset their ioctls on. Extract that as well.
-: > ioctldefs.h
+# Sort and drop dups?
+# sort -u <ioctls.h >ioctls1.h && mv ioctls1.h ioctls.h
 
-bases=$(sed -ne 's/.*_IOC_NONE.*,[[:space:]]*\([A-Z][A-Z0-9_]\+\)[[:space:]+,].*/\1/p' ioctls.h | uniq | sort)
-for base in $bases ; do
+
+> ioctldefs.h
+
+# Collect potential ioctl names. ('bases' is a bad name. Sigh)
+# Some use a special base to offset their ioctls on. Extract that as well.
+# Some use 2 defines: _IOC(_IOC_NONE,DM_IOCTL,DM_LIST_DEVICES_CMD,....)
+bases=$(sed -n \
+       -e 's/.*_IOC_NONE.*,[[:space:]]*\([A-Z][A-Z0-9_]\+\)[[:space:]]*,[[:space:]]*\([A-Z][A-Z0-9_]\+\)[[:space:]+,].*/\1\n\2/p' \
+       -e 's/.*_IOC_NONE.*,[[:space:]]*\([A-Z][A-Z0-9_]\+\)[[:space:]+,].*/\1/p' \
+       ioctls.h | sort -u)
+
+for base in $bases; do
 	echo "Looking for $base"
 	regexp="^[[:space:]]*#[[:space:]]*define[[:space:]]\+$base"
-	(cd $dir ; grep -h $regexp 2>/dev/null $files ) | \
-		grep -v '\<_IO' >> ioctldefs.h
+	line=$( (cd $dir && grep -h $regexp 2>/dev/null $files) | grep -v '\<_IO')
+	if [ x"$line" != x ]; then
+		echo "$base is a #define" # "($line)"
+		echo "$line" >> ioctldefs.h
+	fi
+
+	if ! grep "\<$base\>" ioctldefs.h >/dev/null 2>/dev/null; then
+		# Not all ioctl's are defines ... some (like the DM_* stuff)
+		# are enums, so we have to extract that crap ourself
+		(
+		cd $dir || exit
+		# -P: inhibit generation of linemarkers
+		${CPP:-cpp} -P $(grep -l $base $files 2>/dev/null) | sed '/^$/d' | \
+		awk -v base="$base" '{
+			if ($1 == "enum") {
+				val = 0
+				while ($NF != "};") {
+					if (!getline)
+						exit
+					gsub(/,/, "")
+					if ($0 ~ /=/)
+						val = $NF
+					if ($1 == base) {
+						print "#define " base " (" val ")"
+						exit
+					}
+					val++
+				}
+			}
+		}'
+		) >> ioctldefs.h
+		if ! grep "\<$base\>" ioctldefs.h >/dev/null 2>/dev/null; then
+			echo "Can't find the definition for $base"
+		else
+			echo "$base is an enum"
+		fi
+	fi
 done
+
+# Sort and drop dups?
+# sort -u <ioctldefs.h >ioctldefs1.h && mv ioctldefs1.h ioctldefs.h
diff --git a/linux/ioctlsort.c b/linux/ioctlsort.c
index f544d84..6ee6c07 100644
--- a/linux/ioctlsort.c
+++ b/linux/ioctlsort.c
@@ -35,17 +35,17 @@
 int main(int argc, char** argv) {
 	int i;
 
-#ifdef POWERPC			/* unspeakable kludge */
+	/* ioctl_lookup() only looks at the NR and TYPE bits atm. */
 	for (i = 0; i < nioctls; i++)
-		ioctls[i].code &= ~_IOC_DIRMASK;
-#endif
+		ioctls[i].code &= (_IOC_NRMASK << _IOC_NRSHIFT) |
+				  (_IOC_TYPEMASK << _IOC_TYPESHIFT);
 
 	qsort(ioctls, nioctls, sizeof(ioctls[0]), compare);
 	puts ("\t/* Generated by ioctlsort */");
 	for (i = 0; i < nioctls; i++)
 		if (i == 0 || ioctls[i].code != ioctls[i-1].code ||
 		    strcmp (ioctls[i].name, ioctls[i-1].name))
-			printf("\t{\"%s\",\t\"%s\",\t%#lx},\n",
+			printf("\t{\"%s\",\t\"%s\",\t%#06lx},\n",
 				ioctls[i].header, ioctls[i].name, ioctls[i].code);
 
 	return 0;
diff --git a/strace/linux/mips/errnoent.h b/linux/mips/errnoent.h
similarity index 100%
rename from strace/linux/mips/errnoent.h
rename to linux/mips/errnoent.h
diff --git a/strace/linux/mips/ioctlent.sh b/linux/mips/ioctlent.sh
old mode 100644
new mode 100755
similarity index 98%
rename from strace/linux/mips/ioctlent.sh
rename to linux/mips/ioctlent.sh
index b79d2c7..dd5fd9d
--- a/strace/linux/mips/ioctlent.sh
+++ b/linux/mips/ioctlent.sh
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id: ioctlent.sh,v 1.1 1999/11/01 00:46:49 wichert Exp $
+#	$Id$
 
 # Files to find.
 file_find='asm/*.h linux/*.h scsi/*.h'
diff --git a/strace/linux/mips/signalent.h b/linux/mips/signalent.h
similarity index 100%
rename from strace/linux/mips/signalent.h
rename to linux/mips/signalent.h
diff --git a/strace/linux/mips/syscallent.h b/linux/mips/syscallent.h
similarity index 60%
rename from strace/linux/mips/syscallent.h
rename to linux/mips/syscallent.h
index a9edc62..913d3d9 100644
--- a/strace/linux/mips/syscallent.h
+++ b/linux/mips/syscallent.h
@@ -1,3 +1,5 @@
+#include "dummy.h"
+
 	{ 0,	0,	printargs,		"svr4_syscall"	}, /*  000 */
 	{ 0,	0,	printargs,		"svr4_exit"	}, /*  001 */
 	{ 0,	0,	printargs,		"svr4_fork"	}, /*  002 */
@@ -3998,15 +4000,17 @@
 	{ 0,	0,	printargs,		"SYS_3997"	}, /* 3997 */
 	{ 0,	0,	printargs,		"SYS_3998"	}, /* 3998 */
 	{ 0,	0,	printargs,		"SYS_3999"	}, /* 3999 */ /* end of POSIX */
+#if !defined (LINUX_MIPSN32) && !defined (LINUX_MIPSN64)
+	/* For an O32 strace, decode the o32 syscalls.  */
 	{ 8,	0,	printargs,		"syscall"	}, /* 4000 */ /* start of Linux o32 */
 	{ 1,	TP,	sys_exit,		"exit"		}, /* 4001 */
 	{ 0,	TP,	sys_fork,		"fork"		}, /* 4002 */
-	{ 3,	TF,	sys_read,		"read"		}, /* 4003 */
-	{ 3,	TF,	sys_write,		"write"		}, /* 4004 */
-	{ 3,	TF,	sys_open,		"open"		}, /* 4005 */
-	{ 1,	0,	sys_close,		"close"		}, /* 4006 */
+	{ 3,	TD,	sys_read,		"read"		}, /* 4003 */
+	{ 3,	TD,	sys_write,		"write"		}, /* 4004 */
+	{ 3,	TD|TF,	sys_open,		"open"		}, /* 4005 */
+	{ 1,	TD,	sys_close,		"close"		}, /* 4006 */
 	{ 3,	TP,	sys_waitpid,		"waitpid"	}, /* 4007 */
-	{ 2,	TF,	sys_creat,		"creat"		}, /* 4008 */
+	{ 2,	TD|TF,	sys_creat,		"creat"		}, /* 4008 */
 	{ 2,	TF,	sys_link,		"link"		}, /* 4009 */
 	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 4010 */
 	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 4011 */
@@ -4017,12 +4021,12 @@
 	{ 3,	TF,	sys_chown,		"lchown"	}, /* 4016 */
 	{ 0,	0,	sys_break,		"break"		}, /* 4017 */
 	{ 2,	TF,	sys_oldstat,		"oldstat"	}, /* 4018 */
-	{ 3,	0,	sys_lseek,		"lseek"		}, /* 4019 */
+	{ 3,	TD,	sys_lseek,		"lseek"		}, /* 4019 */
 	{ 0,	0,	sys_getpid,		"getpid"	}, /* 4020 */
 	{ 5,	TF,	sys_mount,		"mount"		}, /* 4021 */
 	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 4022 */
 	{ 1,	0,	sys_setuid,		"setuid"	}, /* 4023 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 4024 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 4024 */
 	{ 1,	0,	sys_stime,		"stime"		}, /* 4025 */
 	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 4026 */
 	{ 1,	0,	sys_alarm,		"alarm"		}, /* 4027 */
@@ -4039,21 +4043,21 @@
 	{ 2,	TF,	sys_rename,		"rename"	}, /* 4038 */
 	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 4039 */
 	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 4040 */
-	{ 1,	0,	sys_dup,		"dup"		}, /* 4041 */
-	{ 1,	0,	sys_pipe,		"pipe"		}, /* 4042 */
+	{ 1,	TD,	sys_dup,		"dup"		}, /* 4041 */
+	{ 1,	TD,	sys_pipe,		"pipe"		}, /* 4042 */
 	{ 1,	0,	sys_times,		"times"		}, /* 4043 */
 	{ 0,	0,	sys_prof,		"prof"		}, /* 4044 */
 	{ 1,	0,	sys_brk,		"brk"		}, /* 4045 */
 	{ 1,	0,	sys_setgid,		"setgid"	}, /* 4046 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 4047 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 4047 */
 	{ 1,	TS,	sys_signal,		"signal"	}, /* 4048 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 4049 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 4050 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 4049 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 4050 */
 	{ 1,	TF,	sys_acct,		"acct"		}, /* 4051 */
 	{ 2,	TF,	sys_umount2,		"umount"	}, /* 4052 */
 	{ 0,	0,	sys_lock,		"lock"		}, /* 4053 */
-	{ 3,	0,	sys_ioctl,		"ioctl"		}, /* 4054 */
-	{ 3,	0,	sys_fcntl,		"fcntl"		}, /* 4055 */
+	{ 3,	TD,	sys_ioctl,		"ioctl"		}, /* 4054 */
+	{ 3,	TD,	sys_fcntl,		"fcntl"		}, /* 4055 */
 	{ 0,	0,	sys_mpx,		"mpx"		}, /* 4056 */
 	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 4057 */
 	{ 0,	0,	sys_ulimit,		"ulimit"	}, /* 4058 */
@@ -4061,7 +4065,7 @@
 	{ 1,	0,	sys_umask,		"umask"		}, /* 4060 */
 	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 4061 */
 	{ 2,	0,	sys_ustat,		"ustat"		}, /* 4062 */
-	{ 2,	0,	sys_dup2,		"dup2"		}, /* 4063 */
+	{ 2,	TD,	sys_dup2,		"dup2"		}, /* 4063 */
 	{ 0,	0,	sys_getppid,		"getppid"	}, /* 4064 */
 	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 4065 */
 	{ 0,	0,	sys_setsid,		"setsid"	}, /* 4066 */
@@ -4087,36 +4091,36 @@
 	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 4086 */
 	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 4087 */
 	{ 3,	0,	sys_reboot,		"reboot"	}, /* 4088 */
-	{ 3,	0,	sys_readdir,		"readdir"	}, /* 4089 */
-	{ 6,	0,	sys_mmap,		"old_mmap"	}, /* 4090 */
+	{ 3,	TD,	sys_readdir,		"readdir"	}, /* 4089 */
+	{ 6,	TD,	sys_mmap,		"old_mmap"	}, /* 4090 */
 	{ 2,	0,	sys_munmap,		"munmap"	}, /* 4091 */
 	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 4092 */
-	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 4093 */
-	{ 2,	0,	sys_fchmod,		"fchmod"	}, /* 4094 */
-	{ 3,	0,	sys_fchown,		"fchown"	}, /* 4095 */
+	{ 2,	TD,	sys_ftruncate,		"ftruncate"	}, /* 4093 */
+	{ 2,	TD,	sys_fchmod,		"fchmod"	}, /* 4094 */
+	{ 3,	TD,	sys_fchown,		"fchown"	}, /* 4095 */
 	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 4096 */
 	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 4097 */
 	{ 0,	0,	sys_profil,		"profil"	}, /* 4098 */
 	{ 3,	TF,	sys_statfs,		"statfs"	}, /* 4099 */
-	{ 3,	TF,	sys_fstatfs,		"fstatfs"	}, /* 4100 */
+	{ 3,	TD,	sys_fstatfs,		"fstatfs"	}, /* 4100 */
 	{ 0,	0,	sys_ioperm,		"ioperm"	}, /* 4101 */
-	{ 2,	0,	sys_socketcall,		"socketcall"	}, /* 4102 */
+	{ 2,	TD,	sys_socketcall,		"socketcall"	}, /* 4102 */
 	{ 3,	0,	sys_syslog,		"syslog"	}, /* 4103 */
 	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 4104 */
 	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 4105 */
 	{ 2,	TF,	sys_stat,		"stat"		}, /* 4106 */
 	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 4107 */
-	{ 2,	TF,	sys_fstat,		"fstat"		}, /* 4108 */
+	{ 2,	TD,	sys_fstat,		"fstat"		}, /* 4108 */
 	{ 1,	0,	sys_olduname,		"olduname"	}, /* 4109 */
 	{ 0,	0,	sys_iopl,		"iopl"		}, /* 4110 */
 	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 4111 */
 	{ 0,	0,	sys_idle,		"idle"		}, /* 4112 */
 	{ 5,	0,	sys_vm86old,		"vm86"		}, /* 4113 */
 	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 4114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 4115 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 4115 */
 	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 4116 */
 	{ 6,	0,	sys_ipc,		"ipc"		}, /* 4117 */
-	{ 1,	0,	sys_fsync,		"fsync"		}, /* 4118 */
+	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 4118 */
 	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 4119 */
 	{ 5,	TP,	sys_clone,		"clone"		}, /* 4120 */
 	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 4121 */
@@ -4127,7 +4131,7 @@
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 4126 */
 	{ 2,	0,	sys_create_module,	"create_module"	}, /* 4127 */
 	{ 3,	0,	sys_init_module,	"init_module"	}, /* 4128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 4129 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 4129 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 4130 */
 	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 4131 */
 	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 4132 */
@@ -4136,21 +4140,21 @@
 	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 4135 */
 	{ 1,	0,	sys_personality,	"personality"	}, /* 4136 */
 	{ 0,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 4137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 4138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 4139 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 4138 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 4139 */
 	{ 5,	TF,	sys_llseek,		"_llseek"	}, /* 4140 */
-	{ 3,	0,	sys_getdents,		"getdents"	}, /* 4141 */
-	{ 5,	0,	sys_select,		"_newselect"	}, /* 4142 */
-	{ 2,	0,	sys_flock,		"flock"		}, /* 4143 */
+	{ 3,	TD,	sys_getdents,		"getdents"	}, /* 4141 */
+	{ 5,	TD,	sys_select,		"_newselect"	}, /* 4142 */
+	{ 2,	TD,	sys_flock,		"flock"		}, /* 4143 */
 	{ 3,	0,	sys_msync,		"msync"		}, /* 4144 */
-	{ 3,	0,	sys_readv,		"readv"		}, /* 4145 */
-	{ 3,	0,	sys_writev,		"writev"	}, /* 4146 */
+	{ 3,	TD,	sys_readv,		"readv"		}, /* 4145 */
+	{ 3,	TD,	sys_writev,		"writev"	}, /* 4146 */
 	{ 3,	0,	printargs,		"cacheflush"	}, /* 4147 */
 	{ 3,	0,	printargs,		"cachectl"	}, /* 4148 */
 	{ 4,	0,	sys_sysmips,		"sysmips"	}, /* 4149 */
 	{ 0,	0,	sys_setup,		"setup"		}, /* 4150 */
 	{ 1,	0,	sys_getsid,		"getsid"	}, /* 4151 */
-	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 4152 */
+	{ 1,	TD,	sys_fdatasync,		"fdatasync"	}, /* 4152 */
 	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 4153 */
 	{ 2,	0,	sys_mlock,		"mlock"		}, /* 4154 */
 	{ 2,	0,	sys_munlock,		"munlock"	}, /* 4155 */
@@ -4161,11 +4165,11 @@
 	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 4160 */
 	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 4161 */
 	{ 0,	0,	sys_sched_yield,	"sched_yield"	}, /* 4162 */
-	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"								}, /* 4163 */
-	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"								}, /* 4164 */
+	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 4163 */
+	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 4164 */
 	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 4165 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 4166 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 4167 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 4167 */
 	{ 3,	TN,	sys_accept,		"accept"	}, /* 4168 */
 	{ 3,	TN,	sys_bind,		"bind"		}, /* 4169 */
 	{ 3,	TN,	sys_connect,		"connect"	}, /* 4170 */
@@ -4186,7 +4190,7 @@
 	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 4185 */
 	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 4186 */
 	{ 5,	0,	sys_query_module,	"query_module"	}, /* 4187 */
-	{ 3,	0,	sys_poll,		"poll"		}, /* 4188 */
+	{ 3,	TD,	sys_poll,		"poll"		}, /* 4188 */
 	{ 3,	0,	printargs,		"nfsservctl"	}, /* 4189 */
 	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 4190 */
 	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 4191 */
@@ -4198,44 +4202,44 @@
 	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"},/* 4197 */
 	{ 3,	TS,	sys_rt_sigqueueinfo,	"rt_sigqueueinfo"},/* 4198 */
 	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 4199 */
-	{ 6,	TF,	sys_pread,		"pread"		}, /* 4200 */
-	{ 6,	TF,	sys_pwrite,		"pwrite"	}, /* 4201 */
+	{ 6,	TD,	sys_pread,		"pread"		}, /* 4200 */
+	{ 6,	TD,	sys_pwrite,		"pwrite"	}, /* 4201 */
 	{ 3,	TF,	sys_chown,		"chown"		}, /* 4202 */
 	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 4203 */
 	{ 2,	0,	sys_capget,		"capget"	}, /* 4204 */
 	{ 2,	0,	sys_capset,		"capset"	}, /* 4205 */
 	{ 2,	TS,	sys_sigaltstack,	"sigaltstatck"	}, /* 4206 */
-	{ 4,	TF,	sys_sendfile,		"sendfile"	}, /* 4207 */
+	{ 4,	TD|TN,	sys_sendfile,		"sendfile"	}, /* 4207 */
 	{ 0,	0,	printargs,		"SYS_4208"	}, /* 4208 */
 	{ 0,	0,	printargs,		"SYS_4209"	}, /* 4209 */
-	{ 6,	0,	sys_mmap,		"mmap"		}, /* 4210 */
+	{ 6,	TD,	sys_mmap,		"mmap"		}, /* 4210 */
 	{ 4,	TF,	sys_truncate64,		"truncate64"	}, /* 4211 */
-	{ 4,	TF,	sys_ftruncate64,	"ftruncate64"	}, /* 4212 */
-	{ 2,	TF,	printargs,		"stat64"	}, /* 4213 */
+	{ 4,	TD,	sys_ftruncate64,	"ftruncate64"	}, /* 4212 */
+	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 4213 */
 	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 4214 */
-	{ 2,	TF,	sys_fstat64,		"fstat64"	}, /* 4215 */
+	{ 2,	TD,	sys_fstat64,		"fstat64"	}, /* 4215 */
 	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 4216 */
 	{ 3,	0,	printargs,		"mincore"	}, /* 4217 */
 	{ 3,	0,	sys_madvise,		"madvise"	}, /* 4218 */
 	{ 3,	TF,	sys_getdents64,		"getdents64"	}, /* 4219 */
-	{ 3,	0,	sys_fcntl,		"fcntl64"	}, /* 4220 */
+	{ 3,	TD,	sys_fcntl,		"fcntl64"	}, /* 4220 */
 	{ 0,	0,	printargs,		"SYS_4221"	}, /* 4221 */
 	{ 0,	0,	printargs,		"gettid"	}, /* 4222 */
-	{ 5,	0,	sys_readahead,		"readahead"	}, /* 4223 */
+	{ 5,	TD,	sys_readahead,		"readahead"	}, /* 4223 */
 	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 4224 */
 	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 4225 */
-	{ 5,	0,	sys_fsetxattr,		"fsetxattr"	}, /* 4226 */
+	{ 5,	TD,	sys_fsetxattr,		"fsetxattr"	}, /* 4226 */
 	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 4227 */
 	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 4228 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"	}, /* 4229 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 4229 */
 	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 4230 */
 	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 4231 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"	}, /* 4232 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 4232 */
 	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 4233 */
 	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 4234 */
-	{ 2,	0,	sys_fremovexattr,	"fremovexattr"	}, /* 4235 */
+	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 4235 */
 	{ 2,	TS,	sys_kill,		"tkill"		}, /* 4236 */
-	{ 5,	TF,	sys_sendfile64,		"sendfile64"	}, /* 4237 */
+	{ 5,	TD|TN,	sys_sendfile64,		"sendfile64"	}, /* 4237 */
 	{ 6,	0,	sys_futex,		"futex"		}, /* 4238 */
 	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity"}, /* 4239 */
 	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity"}, /* 4240 */
@@ -4245,16 +4249,16 @@
 	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 4244 */
 	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 4245 */
 	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 4246 */
-	{ 3,	0,	printargs,		"lookup_dcookie"}, /* 4247 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 4248 */
-	{ 4,	0,	sys_epoll_ctl,		"epoll_ctl"	}, /* 4249 */
-	{ 3,	0,	sys_epoll_wait,		"epoll_wait"	}, /* 4250 */
+	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 4247 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"	}, /* 4248 */
+	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 4249 */
+	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"	}, /* 4250 */
 	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 4251 */
 	{ 1,	0,	printargs,		"set_tid_address"}, /* 4252 */
-	{ 0,	0,	printargs,		"restart_syscall"}, /* 4253 */
-	{ 7,	TF,	sys_fadvise64_64,	"fadvise64_64"	}, /* 4254 */
+	{ 0,	0,	sys_restart_syscall,	"restart_syscall"}, /* 4253 */
+	{ 6,	TD,	sys_fadvise64_64,	"fadvise64_64"	}, /* 4254 */
 	{ 3,	TF,	sys_statfs64,		"statfs64"	}, /* 4255 */
-	{ 2,	TF,	sys_fstatfs64,		"fstatfs64"	}, /* 4256 */
+	{ 2,	TD,	sys_fstatfs64,		"fstatfs64"	}, /* 4256 */
 	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 4257 */
 	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 4258 */
 	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 4259 */
@@ -4281,59 +4285,403 @@
 	{ 5,	0,	printargs,		"add_key"	}, /* 4280 */
 	{ 4,	0,	printargs,		"request_key"	}, /* 4281 */
 	{ 5,	0,	printargs,		"keyctl"	}, /* 4282 */
-	{ 0,	0,	printargs,		"SYS_4283"	}, /* 4283 */
-	{ 0,	0,	printargs,		"SYS_4284"	}, /* 4284 */
-	{ 0,	0,	printargs,		"SYS_4285"	}, /* 4285 */
-	{ 0,	0,	printargs,		"SYS_4286"	}, /* 4286 */
-	{ 0,	0,	printargs,		"SYS_4287"	}, /* 4287 */
-	{ 0,	0,	printargs,		"SYS_4288"	}, /* 4288 */
-	{ 0,	0,	printargs,		"SYS_4289"	}, /* 4289 */
-	{ 0,	0,	printargs,		"SYS_4290"	}, /* 4290 */
-	{ 0,	0,	printargs,		"SYS_4291"	}, /* 4291 */
-	{ 0,	0,	printargs,		"SYS_4292"	}, /* 4292 */
-	{ 0,	0,	printargs,		"SYS_4293"	}, /* 4293 */
-	{ 0,	0,	printargs,		"SYS_4294"	}, /* 4294 */
-	{ 0,	0,	printargs,		"SYS_4295"	}, /* 4295 */
-	{ 0,	0,	printargs,		"SYS_4296"	}, /* 4296 */
-	{ 0,	0,	printargs,		"SYS_4297"	}, /* 4297 */
-	{ 0,	0,	printargs,		"SYS_4298"	}, /* 4298 */
-	{ 0,	0,	printargs,		"SYS_4299"	}, /* 4299 */
-	{ 0,	0,	printargs,		"SYS_4300"	}, /* 4300 */
-	{ 0,	0,	printargs,		"SYS_4301"	}, /* 4301 */
-	{ 0,	0,	printargs,		"SYS_4302"	}, /* 4302 */
-	{ 0,	0,	printargs,		"SYS_4303"	}, /* 4303 */
-	{ 0,	0,	printargs,		"SYS_4304"	}, /* 4304 */
-	{ 0,	0,	printargs,		"SYS_4305"	}, /* 4305 */
-	{ 0,	0,	printargs,		"SYS_4306"	}, /* 4306 */
-	{ 0,	0,	printargs,		"SYS_4307"	}, /* 4307 */
-	{ 0,	0,	printargs,		"SYS_4308"	}, /* 4308 */
-	{ 0,	0,	printargs,		"SYS_4309"	}, /* 4309 */
-	{ 0,	0,	printargs,		"SYS_4310"	}, /* 4310 */
-	{ 0,	0,	printargs,		"SYS_4311"	}, /* 4311 */
-	{ 0,	0,	printargs,		"SYS_4312"	}, /* 4312 */
-	{ 0,	0,	printargs,		"SYS_4313"	}, /* 4313 */
-	{ 0,	0,	printargs,		"SYS_4314"	}, /* 4314 */
-	{ 0,	0,	printargs,		"SYS_4315"	}, /* 4315 */
-	{ 0,	0,	printargs,		"SYS_4316"	}, /* 4316 */
-	{ 0,	0,	printargs,		"SYS_4317"	}, /* 4317 */
-	{ 0,	0,	printargs,		"SYS_4318"	}, /* 4318 */
-	{ 0,	0,	printargs,		"SYS_4319"	}, /* 4319 */
-	{ 0,	0,	printargs,		"SYS_4320"	}, /* 4320 */
-	{ 0,	0,	printargs,		"SYS_4321"	}, /* 4321 */
-	{ 0,	0,	printargs,		"SYS_4322"	}, /* 4322 */
-	{ 0,	0,	printargs,		"SYS_4323"	}, /* 4323 */
-	{ 0,	0,	printargs,		"SYS_4324"	}, /* 4324 */
-	{ 0,	0,	printargs,		"SYS_4325"	}, /* 4325 */
-	{ 0,	0,	printargs,		"SYS_4326"	}, /* 4326 */
-	{ 0,	0,	printargs,		"SYS_4327"	}, /* 4327 */
-	{ 0,	0,	printargs,		"SYS_4328"	}, /* 4328 */
-	{ 0,	0,	printargs,		"SYS_4329"	}, /* 4329 */
-	{ 0,	0,	printargs,		"SYS_4330"	}, /* 4330 */
-	{ 0,	0,	printargs,		"SYS_4331"	}, /* 4331 */
-	{ 0,	0,	printargs,		"SYS_4332"	}, /* 4332 */
-	{ 0,	0,	printargs,		"SYS_4333"	}, /* 4333 */
-	{ 0,	0,	printargs,		"SYS_4334"	}, /* 4334 */
-	{ 0,	0,	printargs,		"SYS_4335"	}, /* 4335 */
+	{ 1,	0,	sys_set_thread_area,	"set_thread_area" }, /* 4283 */
+	{ 0,	TD,	printargs,		"inotify_init"	}, /* 4284 */
+	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch" }, /* 4285 */
+	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch" }, /* 4286 */
+	{ 4,	0,	printargs,		"migrate_pages"	}, /* 4287 */
+	{ 4,	TD|TF,	sys_openat,		"openat"	}, /* 4288 */
+	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"	}, /* 4289 */
+	{ 4,	TD|TF,	sys_mknodat,		"mknodat"	}, /* 4290 */
+	{ 5,	TD|TF,	sys_fchownat,		"fchownat"	}, /* 4291 */
+	{ 3,	TD|TF,	sys_futimesat,		"futimesat"	}, /* 4292 */
+	{ 4,	TD|TF,	sys_newfstatat,		"newfstatat"	}, /* 4293 */
+	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"	}, /* 4294 */
+	{ 4,	TD|TF,	sys_renameat,		"renameat"	}, /* 4295 */
+	{ 5,	TD|TF,	sys_linkat,		"linkat"	}, /* 4296 */
+	{ 3,	TD|TF,	sys_symlinkat,		"symlinkat"	}, /* 4297 */
+	{ 4,	TD|TF,	sys_readlinkat,		"readlinkat"	}, /* 4298 */
+	{ 3,	TD|TF,	sys_fchmodat,		"fchmodat"	}, /* 4299 */
+	{ 3,	TD|TF,	sys_faccessat,		"faccessat"	}, /* 4300 */
+	{ 6,	TD,	sys_pselect6,		"pselect6"	}, /* 4301 */
+	{ 5,	TD,	sys_ppoll,		"ppoll"		}, /* 4302 */
+	{ 1,	TP,	sys_unshare,		"unshare"	}, /* 4303 */
+	{ 6,	TD,	printargs,		"splice"	}, /* 4304 */
+	{ 4,	TD,	printargs,		"sync_file_range" }, /* 4305 */
+	{ 4,	TD,	printargs,		"tee"		}, /* 4306 */
+	{ 4,	TD,	printargs,		"vmsplice"	}, /* 4307 */
+	{ 6,	0,	sys_move_pages,		"move_pages"	}, /* 4308 */
+	{ 2,	0,	printargs,		"set_robust_list" }, /* 4309 */
+	{ 3,	0,	printargs,		"get_robust_list" }, /* 4310 */
+	{ 4,	0,	printargs,		"kexec_load"	}, /* 4311 */
+	{ 3,	0,	sys_getcpu,		"getcpu"	}, /* 4312 */
+	{ 5,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 4313 */
+	{ 3,	0,	printargs,		"ioprio_set"	}, /* 4314 */
+	{ 2,	0,	printargs,		"ioprio_get"	}, /* 4315 */
+	{ 4,	0,	printargs,		"utimensat"	}, /* 4316 */
+	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 4317 */
+	{ 4,	TD,	sys_timerfd,		"timerfd"	}, /* 4318 */
+	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 4319 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"	}, /* 4320 */
+	{ 2,	TD,	sys_timerfd_create,	"timerfd_create" }, /* 4321 */
+	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime" }, /* 4322 */
+	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime" }, /* 4323 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"	}, /* 4324 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"	}, /* 4325 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"	}, /* 4326 */
+	{ 3,	TD,	sys_dup3,		"dup3"		}, /* 4327 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"		}, /* 4328 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"	}, /* 4329 */
+	{ 6,	TD,	printargs,		"preadv"	}, /* 4330 */
+	{ 6,	TD,	printargs,		"pwritev"	}, /* 4331 */
+	{ 4,	TP|TS,	printargs,		"rt_tgsigqueueinfo" }, /* 4332 */
+	{ 5,	TD,	printargs,		"perf_event_open" }, /* 4333 */
+	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 4334 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 4335 */
+	{ 2,	TD,	printargs,		"fanotify_init"	}, /* 4336 */
+	{ 5,	TD|TF,	printargs,		"fanotify_mark"	}, /* 4337 */
+	{ 4,	0,	printargs,		"prlimit64"	}, /* 4338 */
+#else
+	{ 0,	0,	printargs,		"o32_syscall"	}, /* 4000 */
+	{ 0,	0,	printargs,		"o32_exit"		}, /* 4001 */
+	{ 0,	0,	printargs,		"o32_fork"		}, /* 4002 */
+	{ 0,	0,	printargs,		"o32_read"		}, /* 4003 */
+	{ 0,	0,	printargs,		"o32_write"		}, /* 4004 */
+	{ 0,	0,	printargs,		"o32_open"		}, /* 4005 */
+	{ 0,	0,	printargs,		"o32_close"		}, /* 4006 */
+	{ 0,	0,	printargs,		"o32_waitpid"	}, /* 4007 */
+	{ 0,	0,	printargs,		"o32_creat"		}, /* 4008 */
+	{ 0,	0,	printargs,		"o32_link"		}, /* 4009 */
+	{ 0,	0,	printargs,		"o32_unlink"	}, /* 4010 */
+	{ 0,	0,	printargs,		"o32_execve"	}, /* 4011 */
+	{ 0,	0,	printargs,		"o32_chdir"		}, /* 4012 */
+	{ 0,	0,	printargs,		"o32_time"		}, /* 4013 */
+	{ 0,	0,	printargs,		"o32_mknod"		}, /* 4014 */
+	{ 0,	0,	printargs,		"o32_chmod"		}, /* 4015 */
+	{ 0,	0,	printargs,		"o32_lchown"	}, /* 4016 */
+	{ 0,	0,	printargs,		"o32_break"		}, /* 4017 */
+	{ 0,	0,	printargs,		"o32_oldstat"	}, /* 4018 */
+	{ 0,	0,	printargs,		"o32_lseek"		}, /* 4019 */
+	{ 0,	0,	printargs,		"o32_getpid"	}, /* 4020 */
+	{ 0,	0,	printargs,		"o32_mount"		}, /* 4021 */
+	{ 0,	0,	printargs,		"o32_oldumount"	}, /* 4022 */
+	{ 0,	0,	printargs,		"o32_setuid"	}, /* 4023 */
+	{ 0,	0,	printargs,		"o32_getuid"	}, /* 4024 */
+	{ 0,	0,	printargs,		"o32_stime"		}, /* 4025 */
+	{ 0,	0,	printargs,		"o32_ptrace"	}, /* 4026 */
+	{ 0,	0,	printargs,		"o32_alarm"		}, /* 4027 */
+	{ 0,	0,	printargs,		"o32_oldfstat"	}, /* 4028 */
+	{ 0,	0,	printargs,		"o32_pause"		}, /* 4029 */
+	{ 0,	0,	printargs,		"o32_utime"		}, /* 4030 */
+	{ 0,	0,	printargs,		"o32_stty"		}, /* 4031 */
+	{ 0,	0,	printargs,		"o32_gtty"		}, /* 4032 */
+	{ 0,	0,	printargs,		"o32_access"	}, /* 4033 */
+	{ 0,	0,	printargs,		"o32_nice"		}, /* 4034 */
+	{ 0,	0,	printargs,		"o32_ftime"		}, /* 4035 */
+	{ 0,	0,	printargs,		"o32_sync"		}, /* 4036 */
+	{ 0,	0,	printargs,		"o32_kill"		}, /* 4037 */
+	{ 0,	0,	printargs,		"o32_rename"	}, /* 4038 */
+	{ 0,	0,	printargs,		"o32_mkdir"		}, /* 4039 */
+	{ 0,	0,	printargs,		"o32_rmdir"		}, /* 4040 */
+	{ 0,	0,	printargs,		"o32_dup"		}, /* 4041 */
+	{ 0,	0,	printargs,		"o32_pipe"		}, /* 4042 */
+	{ 0,	0,	printargs,		"o32_times"		}, /* 4043 */
+	{ 0,	0,	printargs,		"o32_prof"		}, /* 4044 */
+	{ 0,	0,	printargs,		"o32_brk"		}, /* 4045 */
+	{ 0,	0,	printargs,		"o32_setgid"	}, /* 4046 */
+	{ 0,	0,	printargs,		"o32_getgid"	}, /* 4047 */
+	{ 0,	0,	printargs,		"o32_signal"	}, /* 4048 */
+	{ 0,	0,	printargs,		"o32_geteuid"	}, /* 4049 */
+	{ 0,	0,	printargs,		"o32_getegid"	}, /* 4050 */
+	{ 0,	0,	printargs,		"o32_acct"		}, /* 4051 */
+	{ 0,	0,	printargs,		"o32_umount"	}, /* 4052 */
+	{ 0,	0,	printargs,		"o32_lock"		}, /* 4053 */
+	{ 0,	0,	printargs,		"o32_ioctl"		}, /* 4054 */
+	{ 0,	0,	printargs,		"o32_fcntl"		}, /* 4055 */
+	{ 0,	0,	printargs,		"o32_mpx"		}, /* 4056 */
+	{ 0,	0,	printargs,		"o32_setpgid"	}, /* 4057 */
+	{ 0,	0,	printargs,		"o32_ulimit"	}, /* 4058 */
+	{ 0,	0,	printargs,		"o32_oldolduname"	}, /* 4059 */
+	{ 0,	0,	printargs,		"o32_umask"		}, /* 4060 */
+	{ 0,	0,	printargs,		"o32_chroot"	}, /* 4061 */
+	{ 0,	0,	printargs,		"o32_ustat"		}, /* 4062 */
+	{ 0,	0,	printargs,		"o32_dup2"		}, /* 4063 */
+	{ 0,	0,	printargs,		"o32_getppid"	}, /* 4064 */
+	{ 0,	0,	printargs,		"o32_getpgrp"	}, /* 4065 */
+	{ 0,	0,	printargs,		"o32_setsid"	}, /* 4066 */
+	{ 0,	0,	printargs,		"o32_sigaction"	}, /* 4067 */
+	{ 0,	0,	printargs,		"o32_siggetmask"	}, /* 4068 */
+	{ 0,	0,	printargs,		"o32_sigsetmask"	}, /* 4069 */
+	{ 0,	0,	printargs,		"o32_setreuid"	}, /* 4070 */
+	{ 0,	0,	printargs,		"o32_setregid"	}, /* 4071 */
+	{ 0,	0,	printargs,		"o32_sigsuspend"	}, /* 4072 */
+	{ 0,	0,	printargs,		"o32_sigpending"	}, /* 4073 */
+	{ 0,	0,	printargs,		"o32_sethostname"	}, /* 4074 */
+	{ 0,	0,	printargs,		"o32_setrlimit"	}, /* 4075 */
+	{ 0,	0,	printargs,		"o32_getrlimit"	}, /* 4076 */
+	{ 0,	0,	printargs,		"o32_getrusage"	}, /* 4077 */
+	{ 0,	0,	printargs,		"o32_gettimeofday"	}, /* 4078 */
+	{ 0,	0,	printargs,		"o32_settimeofday"	}, /* 4079 */
+	{ 0,	0,	printargs,		"o32_getgroups"	}, /* 4080 */
+	{ 0,	0,	printargs,		"o32_setgroups"	}, /* 4081 */
+	{ 0,	0,	printargs,		"o32_reserved82"	}, /* 4082 */
+	{ 0,	0,	printargs,		"o32_symlink"	}, /* 4083 */
+	{ 0,	0,	printargs,		"o32_oldlstat"	}, /* 4084 */
+	{ 0,	0,	printargs,		"o32_readlink"	}, /* 4085 */
+	{ 0,	0,	printargs,		"o32_uselib"	}, /* 4086 */
+	{ 0,	0,	printargs,		"o32_swapon"	}, /* 4087 */
+	{ 0,	0,	printargs,		"o32_reboot"	}, /* 4088 */
+	{ 0,	0,	printargs,		"o32_readdir"	}, /* 4089 */
+	{ 0,	0,	printargs,		"o32_old_mmap"	}, /* 4090 */
+	{ 0,	0,	printargs,		"o32_munmap"	}, /* 4091 */
+	{ 0,	0,	printargs,		"o32_truncate"	}, /* 4092 */
+	{ 0,	0,	printargs,		"o32_ftruncate"	}, /* 4093 */
+	{ 0,	0,	printargs,		"o32_fchmod"	}, /* 4094 */
+	{ 0,	0,	printargs,		"o32_fchown"	}, /* 4095 */
+	{ 0,	0,	printargs,		"o32_getpriority"	}, /* 4096 */
+	{ 0,	0,	printargs,		"o32_setpriority"	}, /* 4097 */
+	{ 0,	0,	printargs,		"o32_profil"	}, /* 4098 */
+	{ 0,	0,	printargs,		"o32_statfs"	}, /* 4099 */
+	{ 0,	0,	printargs,		"o32_fstatfs"	}, /* 4100 */
+	{ 0,	0,	printargs,		"o32_ioperm"	}, /* 4101 */
+	{ 0,	0,	printargs,		"o32_socketcall"	}, /* 4102 */
+	{ 0,	0,	printargs,		"o32_syslog"	}, /* 4103 */
+	{ 0,	0,	printargs,		"o32_setitimer"	}, /* 4104 */
+	{ 0,	0,	printargs,		"o32_getitimer"	}, /* 4105 */
+	{ 0,	0,	printargs,		"o32_stat"		}, /* 4106 */
+	{ 0,	0,	printargs,		"o32_lstat"		}, /* 4107 */
+	{ 0,	0,	printargs,		"o32_fstat"		}, /* 4108 */
+	{ 0,	0,	printargs,		"o32_olduname"	}, /* 4109 */
+	{ 0,	0,	printargs,		"o32_iopl"		}, /* 4110 */
+	{ 0,	0,	printargs,		"o32_vhangup"	}, /* 4111 */
+	{ 0,	0,	printargs,		"o32_idle"		}, /* 4112 */
+	{ 0,	0,	printargs,		"o32_vm86"		}, /* 4113 */
+	{ 0,	0,	printargs,		"o32_wait4"		}, /* 4114 */
+	{ 0,	0,	printargs,		"o32_swapoff"	}, /* 4115 */
+	{ 0,	0,	printargs,		"o32_sysinfo"	}, /* 4116 */
+	{ 0,	0,	printargs,		"o32_ipc"		}, /* 4117 */
+	{ 0,	0,	printargs,		"o32_fsync"		}, /* 4118 */
+	{ 0,	0,	printargs,		"o32_sigreturn"	}, /* 4119 */
+	{ 0,	0,	printargs,		"o32_clone"		}, /* 4120 */
+	{ 0,	0,	printargs,		"o32_setdomainname"	}, /* 4121 */
+	{ 0,	0,	printargs,		"o32_uname"		}, /* 4122 */
+	{ 0,	0,	printargs,		"o32_modify_ldt"	}, /* 4123 */
+	{ 0,	0,	printargs,		"o32_adjtimex"	}, /* 4124 */
+	{ 0,	0,	printargs,		"o32_mprotect"	}, /* 4125 */
+	{ 0,	0,	printargs,		"o32_sigprocmask"	}, /* 4126 */
+	{ 0,	0,	printargs,		"o32_create_module"	}, /* 4127 */
+	{ 0,	0,	printargs,		"o32_init_module"	}, /* 4128 */
+	{ 0,	0,	printargs,		"o32_delete_module"	}, /* 4129 */
+	{ 0,	0,	printargs,		"o32_get_kernel_syms"}, /* 4130 */
+	{ 0,	0,	printargs,		"o32_quotactl"	}, /* 4131 */
+	{ 0,	0,	printargs,		"o32_getpgid"	}, /* 4132 */
+	{ 0,	0,	printargs,		"o32_fchdir"	}, /* 4133 */
+	{ 0,	0,	printargs,		"o32_bdflush"	}, /* 4134 */
+	{ 0,	0,	printargs,		"o32_sysfs"		}, /* 4135 */
+	{ 0,	0,	printargs,		"o32_personality"	}, /* 4136 */
+	{ 0,	0,	printargs,		"o32_afs_syscall"	}, /* 4137 */
+	{ 0,	0,	printargs,		"o32_setfsuid"	}, /* 4138 */
+	{ 0,	0,	printargs,		"o32_setfsgid"	}, /* 4139 */
+	{ 0,	0,	printargs,		"o32__llseek"	}, /* 4140 */
+	{ 0,	0,	printargs,		"o32_getdents"	}, /* 4141 */
+	{ 0,	0,	printargs,		"o32__newselect"	}, /* 4142 */
+	{ 0,	0,	printargs,		"o32_flock"		}, /* 4143 */
+	{ 0,	0,	printargs,		"o32_msync"		}, /* 4144 */
+	{ 0,	0,	printargs,		"o32_readv"		}, /* 4145 */
+	{ 0,	0,	printargs,		"o32_writev"	}, /* 4146 */
+	{ 0,	0,	printargs,		"o32_cacheflush"	}, /* 4147 */
+	{ 0,	0,	printargs,		"o32_cachectl"	}, /* 4148 */
+	{ 0,	0,	printargs,		"o32_sysmips"	}, /* 4149 */
+	{ 0,	0,	printargs,		"o32_setup"		}, /* 4150 */
+	{ 0,	0,	printargs,		"o32_getsid"	}, /* 4151 */
+	{ 0,	0,	printargs,		"o32_fdatasync"	}, /* 4152 */
+	{ 0,	0,	printargs,		"o32__sysctl"	}, /* 4153 */
+	{ 0,	0,	printargs,		"o32_mlock"		}, /* 4154 */
+	{ 0,	0,	printargs,		"o32_munlock"	}, /* 4155 */
+	{ 0,	0,	printargs,		"o32_mlockall"	}, /* 4156 */
+	{ 0,	0,	printargs,		"o32_munlockall"	}, /* 4157 */
+	{ 0,	0,	printargs,		"o32_sched_setparam"}, /* 4158 */
+	{ 0,	0,	printargs,		"o32_sched_getparam"}, /* 4159 */
+	{ 0,	0,	printargs,		"o32_sched_setscheduler"}, /* 4160 */
+	{ 0,	0,	printargs,		"o32_sched_getscheduler"}, /* 4161 */
+	{ 0,	0,	printargs,		"o32_sched_yield"	}, /* 4162 */
+	{ 0,	0,	printargs,		"o32_sched_get_priority_max"}, /* 4163 */
+	{ 0,	0,	printargs,		"o32_sched_get_priority_min"},/* 4164 */
+	{ 0,	0,	printargs,		"o32_sched_rr_get_interval"}, /* 4165 */
+	{ 0,	0,	printargs,		"o32_nanosleep"	}, /* 4166 */
+	{ 0,	0,	printargs,		"o32_mremap"	}, /* 4167 */
+	{ 0,	0,	printargs,		"o32_accept"	}, /* 4168 */
+	{ 0,	0,	printargs,		"o32_bind"		}, /* 4169 */
+	{ 0,	0,	printargs,		"o32_connect"	}, /* 4170 */
+	{ 0,	0,	printargs,		"o32_getpeername"	}, /* 4171 */
+	{ 0,	0,	printargs,		"o32_getsockname"	}, /* 4172 */
+	{ 0,	0,	printargs,		"o32_getsockopt"	}, /* 4173 */
+	{ 0,	0,	printargs,		"o32_listen"	}, /* 4174 */
+	{ 0,	0,	printargs,		"o32_recv"		}, /* 4175 */
+	{ 0,	0,	printargs,		"o32_recvfrom"	}, /* 4176 */
+	{ 0,	0,	printargs,		"o32_recvmsg"	}, /* 4177 */
+	{ 0,	0,	printargs,		"o32_send"		}, /* 4178 */
+	{ 0,	0,	printargs,		"o32_sendmsg"	}, /* 4179 */
+	{ 0,	0,	printargs,		"o32_sendto"	}, /* 4180 */
+	{ 0,	0,	printargs,		"o32_setsockopt"	}, /* 4181 */
+	{ 0,	0,	printargs,		"o32_shutdown"	}, /* 4182 */
+	{ 0,	0,	printargs,		"o32_socket"	}, /* 4183 */
+	{ 0,	0,	printargs,		"o32_socketpair"	}, /* 4184 */
+	{ 0,	0,	printargs,		"o32_setresuid"	}, /* 4185 */
+	{ 0,	0,	printargs,		"o32_getresuid"	}, /* 4186 */
+	{ 0,	0,	printargs,		"o32_query_module"	}, /* 4187 */
+	{ 0,	0,	printargs,		"o32_poll"		}, /* 4188 */
+	{ 0,	0,	printargs,		"o32_nfsservctl"	}, /* 4189 */
+	{ 0,	0,	printargs,		"o32_setresgid"	}, /* 4190 */
+	{ 0,	0,	printargs,		"o32_getresgid"	}, /* 4191 */
+	{ 0,	0,	printargs,		"o32_prctl"		}, /* 4192 */
+	{ 0,	0,	printargs,		"o32_rt_sigreturn"	}, /* 4193 */
+	{ 0,	0,	printargs,		"o32_rt_sigaction"	}, /* 4194 */
+	{ 0,	0,	printargs,		"o32_rt_sigprocmask"}, /* 4195 */
+	{ 0,	0,	printargs,		"o32_rt_sigpending"	}, /* 4196 */
+	{ 0,	0,	printargs,		"o32_rt_sigtimedwait"},/* 4197 */
+	{ 0,	0,	printargs,		"o32_rt_sigqueueinfo"},/* 4198 */
+	{ 0,	0,	printargs,		"o32_rt_siguspend"	}, /* 4199 */
+	{ 0,	0,	printargs,		"o32_pread"		}, /* 4200 */
+	{ 0,	0,	printargs,		"o32_pwrite"	}, /* 4201 */
+	{ 0,	0,	printargs,		"o32_chown"		}, /* 4202 */
+	{ 0,	0,	printargs,		"o32_getcwd"	}, /* 4203 */
+	{ 0,	0,	printargs,		"o32_capget"	}, /* 4204 */
+	{ 0,	0,	printargs,		"o32_capset"	}, /* 4205 */
+	{ 0,	0,	printargs,		"o32_sigaltstatck"	}, /* 4206 */
+	{ 0,	0,	printargs,		"o32_sendfile"	}, /* 4207 */
+	{ 0,	0,	printargs,		"SYS_4208"	}, /* 4208 */
+	{ 0,	0,	printargs,		"SYS_4209"	}, /* 4209 */
+	{ 0,	0,	printargs,		"o32_mmap"		}, /* 4210 */
+	{ 0,	0,	printargs,		"o32_truncate64"	}, /* 4211 */
+	{ 0,	0,	printargs,		"o32_ftruncate64"	}, /* 4212 */
+	{ 0,	0,	printargs,		"o32_stat64"	}, /* 4213 */
+	{ 0,	0,	printargs,		"o32_lstat64"	}, /* 4214 */
+	{ 0,	0,	printargs,		"o32_fstat64"	}, /* 4215 */
+	{ 0,	0,	printargs,		"o32_pivot_root"	}, /* 4216 */
+	{ 0,	0,	printargs,		"o32_mincore"	}, /* 4217 */
+	{ 0,	0,	printargs,		"o32_madvise"	}, /* 4218 */
+	{ 0,	0,	printargs,		"o32_getdents64"	}, /* 4219 */
+	{ 0,	0,	printargs,		"o32_fcntl64"	}, /* 4220 */
+	{ 0,	0,	printargs,		"SYS_4221"	}, /* 4221 */
+	{ 0,	0,	printargs,		"o32_gettid"	}, /* 4222 */
+	{ 5,	TD,	printargs,		"o32_readahead"	}, /* 4223 */
+	{ 5,	TF,	printargs,		"o32_setxattr"	}, /* 4224 */
+	{ 5,	TF,	printargs,		"o32_lsetxattr"	}, /* 4225 */
+	{ 5,	TD,	printargs,		"o32_fsetxattr"	}, /* 4226 */
+	{ 4,	TF,	printargs,		"o32_getxattr"	}, /* 4227 */
+	{ 4,	TF,	printargs,		"o32_lgetxattr"	}, /* 4228 */
+	{ 4,	TD,	printargs,		"o32_fgetxattr"	}, /* 4229 */
+	{ 3,	TF,	printargs,		"o32_listxattr"	}, /* 4230 */
+	{ 3,	TF,	printargs,		"o32_llistxattr"	}, /* 4231 */
+	{ 3,	TD,	printargs,		"o32_flistxattr"	}, /* 4232 */
+	{ 2,	TF,	printargs,		"o32_removexattr"	}, /* 4233 */
+	{ 2,	TF,	printargs,		"o32_lremovexattr"	}, /* 4234 */
+	{ 2,	TD,	printargs,		"o32_fremovexattr"	}, /* 4235 */
+	{ 2,	TS,	printargs,		"o32_tkill"		}, /* 4236 */
+	{ 5,	TD|TN,	printargs,		"o32_sendfile64"	}, /* 4237 */
+	{ 6,	0,	printargs,		"o32_futex"		}, /* 4238 */
+	{ 3,	0,	printargs,		"o32_sched_setaffinity"}, /* 4239 */
+	{ 3,	0,	printargs,		"o32_sched_getaffinity"}, /* 4240 */
+	{ 2,	0,	printargs,		"o32_io_setup"	}, /* 4241 */
+	{ 1,	0,	printargs,		"o32_io_destroy"	}, /* 4242 */
+	{ 5,	0,	printargs,		"o32_io_getevents"	}, /* 4243 */
+	{ 3,	0,	printargs,		"o32_io_submit"	}, /* 4244 */
+	{ 3,	0,	printargs,		"o32_io_cancel"	}, /* 4245 */
+	{ 1,	TP,	printargs,		"o32_exit_group"	}, /* 4246 */
+	{ 3,	0,	printargs,		"o32_lookup_dcookie"}, /* 4247 */
+	{ 1,	TD,	printargs,		"o32_epoll_create"	}, /* 4248 */
+	{ 4,	TD,	printargs,		"o32_epoll_ctl"	}, /* 4249 */
+	{ 4,	TD,	printargs,		"o32_epoll_wait"	}, /* 4250 */
+	{ 5,	0,	printargs,		"o32_remap_file_pages"}, /* 4251 */
+	{ 1,	0,	printargs,		"o32_set_tid_address"}, /* 4252 */
+	{ 0,	0,	printargs,		"o32_restart_syscall"}, /* 4253 */
+	{ 7,	0,	printargs,		"o32_fadvise64_64"	}, /* 4254 */
+	{ 3,	TF,	printargs,		"o32_statfs64"	}, /* 4255 */
+	{ 2,	TD,	printargs,		"o32_fstatfs64"	}, /* 4256 */
+	{ 3,	0,	printargs,		"o32_timer_create"	}, /* 4257 */
+	{ 4,	0,	printargs,		"o32_timer_settime"	}, /* 4258 */
+	{ 2,	0,	printargs,		"o32_timer_gettime"	}, /* 4259 */
+	{ 1,	0,	printargs,		"o32_timer_getoverrun"}, /* 4260 */
+	{ 1,	0,	printargs,		"o32_timer_delete"	}, /* 4261 */
+	{ 2,	0,	printargs,		"o32_clock_settime"	}, /* 4262 */
+	{ 2,	0,	printargs,		"o32_clock_gettime"	}, /* 4263 */
+	{ 2,	0,	printargs,		"o32_clock_getres"	}, /* 4264 */
+	{ 4,	0,	printargs,		"o32_clock_nanosleep"}, /* 4265 */
+	{ 3,	TS,	printargs,		"o32_tgkill"	}, /* 4266 */
+	{ 2,	TF,	printargs,		"o32_utimes"	}, /* 4267 */
+	{ 4,	0,	printargs,		"o32_mbind"		}, /* 4268 */
+	{ 0,	0,	printargs,		"o32_SYS_4269"	}, /* 4269 */
+	{ 0,	0,	printargs,		"o32_SYS_4270"	}, /* 4270 */
+	{ 4,	0,	printargs,		"o32_mq_open"	}, /* 4271 */
+	{ 1,	0,	printargs,		"o32_mq_unlink"	}, /* 4272 */
+	{ 5,	0,	printargs,		"o32_mq_timedsend"	}, /* 4273 */
+	{ 5,	0,	printargs,		"o32_mq_timedreceive"}, /* 4274 */
+	{ 2,	0,	printargs,		"o32_mq_notify"	}, /* 4275 */
+	{ 3,	0,	printargs,		"o32_mq_getsetattr"	}, /* 4276 */
+	{ 0,	0,	printargs,		"o32_SYS_4277"	}, /* 4277 */
+	{ 5,	TP,	printargs,		"o32_waitid"	}, /* 4278 */
+	{ 0,	0,	printargs,		"o32_SYS_4279"	}, /* 4279 */
+	{ 5,	0,	printargs,		"o32_add_key"	}, /* 4280 */
+	{ 4,	0,	printargs,		"o32_request_key"	}, /* 4281 */
+	{ 5,	0,	printargs,		"o32_keyctl"	}, /* 4282 */
+	{ 1,	0,	printargs,		"o32_set_thread_area" }, /* 4283 */
+	{ 0,	TD,	printargs,		"o32_inotify_init"	}, /* 4284 */
+	{ 3,	TD,	printargs,		"o32_inotify_add_watch" }, /* 4285 */
+	{ 2,	TD,	printargs,		"o32_inotify_rm_watch" }, /* 4286 */
+	{ 4,	0,	printargs,		"o32_migrate_pages"	}, /* 4287 */
+	{ 4,	TD|TF,	printargs,		"o32_openat"	}, /* 4288 */
+	{ 3,	TD|TF,	printargs,		"o32_mkdirat"	}, /* 4289 */
+	{ 4,	TD|TF,	printargs,		"o32_mknodat"	}, /* 4290 */
+	{ 5,	TD|TF,	printargs,		"o32_fchownat"	}, /* 4291 */
+	{ 3,	TD|TF,	printargs,		"o32_futimesat"	}, /* 4292 */
+	{ 4,	TD|TF,	printargs,		"o32_newfstatat"	}, /* 4293 */
+	{ 3,	TD|TF,	printargs,		"o32_unlinkat"	}, /* 4294 */
+	{ 4,	TD|TF,	printargs,		"o32_renameat"	}, /* 4295 */
+	{ 5,	TD|TF,	printargs,		"o32_linkat"	}, /* 4296 */
+	{ 3,	TD|TF,	printargs,		"o32_symlinkat"	}, /* 4297 */
+	{ 4,	TD|TF,	printargs,		"o32_readlinkat"	}, /* 4298 */
+	{ 3,	TD|TF,	printargs,		"o32_fchmodat"	}, /* 4299 */
+	{ 3,	TD|TF,	printargs,		"o32_faccessat"	}, /* 4300 */
+	{ 6,	TD,	printargs,		"o32_pselect6"	}, /* 4301 */
+	{ 5,	TD,	printargs,		"o32_ppoll"		}, /* 4302 */
+	{ 1,	TP,	printargs,		"o32_unshare"	}, /* 4303 */
+	{ 6,	TD,	printargs,		"o32_splice"	}, /* 4304 */
+	{ 4,	TD,	printargs,		"o32_sync_file_range" }, /* 4305 */
+	{ 4,	TD,	printargs,		"o32_tee"	}, /* 4306 */
+	{ 4,	TD,	printargs,		"o32_vmsplice"	}, /* 4307 */
+	{ 6,	0,	printargs,		"o32_move_pages"	}, /* 4308 */
+	{ 2,	0,	printargs,		"o32_set_robust_list" }, /* 4309 */
+	{ 3,	0,	printargs,		"o32_get_robust_list" }, /* 4310 */
+	{ 4,	0,	printargs,		"o32_kexec_load" }, /* 4311 */
+	{ 3,	0,	printargs,		"o32_getcpu"	}, /* 4312 */
+	{ 5,	TD,	printargs,		"o32_epoll_pwait"	}, /* 4313 */
+	{ 3,	0,	printargs,		"o32_ioprio_set" }, /* 4314 */
+	{ 2,	0,	printargs,		"o32_ioprio_get" }, /* 4315 */
+	{ 4,	0,	printargs,		"o32_utimensat"	}, /* 4316 */
+	{ 3,	TD|TS,	printargs,		"o32_signalfd"	}, /* 4317 */
+	{ 4,	TD,	printargs,		"o32_timerfd"	}, /* 4318 */
+	{ 1,	TD,	printargs,		"o32_eventfd"	}, /* 4319 */
+	{ 6,	TD,	printargs,		"o32_fallocate"	}, /* 4320 */
+	{ 2,	TD,	printargs,		"o32_timerfd_create" }, /* 4321 */
+	{ 2,	TD,	printargs,		"o32_timerfd_gettime" }, /* 4322 */
+	{ 4,	TD,	printargs,		"o32_timerfd_settime" }, /* 4323 */
+	{ 4,	TD|TS,	printargs,		"o32_signalfd4"	}, /* 4324 */
+	{ 2,	TD,	printargs,		"o32_eventfd2"	}, /* 4325 */
+	{ 1,	TD,	printargs,		"o32_epoll_create1" }, /* 4326 */
+	{ 3,	TD,	printargs,		"o32_dup3"	}, /* 4327 */
+	{ 2,	TD,	printargs,		"o32_pipe2"	}, /* 4328 */
+	{ 1,	TD,	printargs,		"o32_inotify_init1" }, /* 4329 */
+	{ 6,	TD,	printargs,		"o32_preadv"	}, /* 4330 */
+	{ 6,	TD,	printargs,		"o32_pwritev"	}, /* 4331 */
+	{ 4,	TP|TS,	printargs,		"o32_rt_tgsigqueueinfo" }, /* 4332 */
+	{ 5,	TD,	printargs,		"o32_perf_event_open" }, /* 4333 */
+	{ 4,	TN,	printargs,		"o32_accept4"	}, /* 4334 */
+	{ 5,	TN,	printargs,		"o32_recvmmsg"	}, /* 4335 */
+	{ 2,	0,	printargs,		"o32_fanotify_init"	}, /* 4336 */
+	{ 5,	0,	printargs,		"o32_fanotify_mark"	}, /* 4337 */
+	{ 4,	0,	printargs,		"o32_prlimit64"	}, /* 4338 */
+#endif
 	{ 0,	0,	printargs,		"SYS_4336"	}, /* 4336 */
 	{ 0,	0,	printargs,		"SYS_4337"	}, /* 4337 */
 	{ 0,	0,	printargs,		"SYS_4338"	}, /* 4338 */
@@ -4998,3 +5346,2620 @@
 	{ 0,	0,	printargs,		"SYS_4997"	}, /* 4997 */
 	{ 0,	0,	printargs,		"SYS_4998"	}, /* 4998 */
 	{ 0,	0,	printargs,		"SYS_4999"	}, /* 4999 */ /* end of Linux o32 */
+#if defined (LINUX_MIPSN64)
+	/* For an N64 strace decode the N64 64-bit syscalls.  */
+	{ 3,	TF,	sys_read,		"read"		}, /* 5000 */ /* start of Linux N64 */
+	{ 3,	TF,	sys_write,		"write"		}, /* 5001 */
+	{ 3,	TF,	sys_open,		"open"		}, /* 5002 */
+	{ 1,	0,	sys_close,		"close"		}, /* 5003 */
+	{ 2,	TF,	sys_stat,		"stat"		}, /* 5004 */
+	{ 2,	0,	sys_fstat,		"fstat"		}, /* 5005 */
+	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 5006 */
+	{ 3,	0,	sys_poll,		"poll"		}, /* 5007 */
+	{ 3,	0,	sys_lseek,		"lseek"		}, /* 5008 */
+	{ 6,	TD,	sys_mmap,		"mmap"		}, /* 5009 */
+	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 5010 */
+	{ 2,	0,	sys_munmap,		"munmap"	}, /* 5011 */
+	{ 1,	0,	sys_brk,		"brk"		}, /* 5012 */
+	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 5013 */
+	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 5014 */
+	{ 3,	0,	sys_ioctl,		"ioctl"		}, /* 5015 */
+	{ 6,	TF,	sys_pread64,		"pread"		}, /* 5016 */
+	{ 6,	TF,	sys_pwrite64,		"pwrite"	}, /* 5017 */
+	{ 3,	0,	sys_readv,		"readv"		}, /* 5018 */
+	{ 3,	0,	sys_writev,		"writev"	}, /* 5019 */
+	{ 2,	TF,	sys_access,		"access"	}, /* 5020 */
+	{ 1,	0,	sys_pipe,		"pipe"		}, /* 5021 */
+	{ 5,	0,	sys_select,		"_newselect"	}, /* 5022 */
+	{ 0,	0,	sys_sched_yield,	"sched_yield"	}, /* 5023 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 5024 */
+	{ 3,	0,	sys_msync,		"msync"		}, /* 5025 */
+	{ 3,	0,	printargs,		"mincore"	}, /* 5026 */
+	{ 3,	0,	sys_madvise,		"madvise"	}, /* 5027 */
+	{ 3,	TI,	sys_shmget,		"shmget"	}, /* 5028 */
+	{ 3,	TI,	sys_shmat,		"shmgat"	}, /* 5029 */
+	{ 3,	TI,	sys_shmctl,		"shmctl"	}, /* 5030 */
+	{ 1,	0,	sys_dup,		"dup"		}, /* 5031 */
+	{ 2,	0,	sys_dup2,		"dup2"		}, /* 5032 */
+	{ 0,	TS,	sys_pause,		"pause"		}, /* 5033 */
+	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 5034 */
+	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 5035 */
+	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 5036 */
+	{ 1,	0,	sys_alarm,		"alarm"		}, /* 5037 */
+	{ 0,	0,	sys_getpid,		"getpid"	}, /* 5038 */
+	{ 4,	TD|TN,	sys_sendfile,		"sendfile"	}, /* 5039 */
+	{ 2,	0,	sys_socketcall,		"socketcall"	}, /* 5040 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 5041 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 5042 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 5043 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 5044 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"	}, /* 5045 */
+	{ 3,	TN,	sys_recvmsg,		"recvmsg"	}, /* 5046 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 5047 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 5048 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 5049 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 5050 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 5051 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 5052 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 5053 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 5054 */
+	{ 2,	TP,	sys_clone,		"clone"		}, /* 5055 */
+	{ 0,	TP,	sys_fork,		"fork"		}, /* 5056 */
+	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 5057 */
+	{ 1,	TP,	sys_exit,		"exit"		}, /* 5058 */
+	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 5059 */
+	{ 2,	TS,	sys_kill,		"kill"		}, /* 5060 */
+	{ 1,	0,	sys_uname,		"uname"		}, /* 5061 */
+	{ 3,	TI,	sys_semget,		"semget"	}, /* 5062 */
+	{ 3,	TI,	printargs,		"semop"		}, /* 5063 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 5064 */
+	{ 1,	TI,	sys_shmdt,		"shmdt"		}, /* 5065 */
+	{ 2,	TI,	sys_msgget,		"msgget"	}, /* 5066 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 5067 */
+	{ 5,	TI,	sys_msgrcv,		"msgrcv"	}, /* 5068 */
+	{ 3,	TI,	sys_msgctl,		"msgctl"	}, /* 5069 */
+	{ 3,	0,	sys_fcntl,		"fcntl"		}, /* 5070 */
+	{ 2,	0,	sys_flock,		"flock"		}, /* 5071 */
+	{ 1,	0,	sys_fsync,		"fsync"		}, /* 5072 */
+	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 5073 */
+	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 5074 */
+	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 5075 */
+	{ 3,	0,	sys_getdents,		"getdents"	}, /* 5076 */
+	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 5077 */
+	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 5078 */
+	{ 1,	TF,	sys_fchdir,		"fchdir"	}, /* 5079 */
+	{ 2,	TF,	sys_rename,		"rename"	}, /* 5080 */
+	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 5081 */
+	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 5082 */
+	{ 2,	TF,	sys_creat,		"creat"		}, /* 5083 */
+	{ 2,	TF,	sys_link,		"link"		}, /* 5084 */
+	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 5085 */
+	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 5086 */
+	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 5087 */
+	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 5088 */
+	{ 2,	0,	sys_fchmod,		"fchmod"	}, /* 5089 */
+	{ 3,	TF,	sys_chown,		"chown"		}, /* 5090 */
+	{ 3,	0,	sys_fchown,		"fchown"	}, /* 5091 */
+	{ 3,	TF,	sys_chown,		"lchown"	}, /* 5092 */
+	{ 1,	0,	sys_umask,		"umask"		}, /* 5093 */
+	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 5094 */
+	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 5095 */
+	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 5096 */
+	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 5097 */
+	{ 1,	0,	sys_times,		"times"		}, /* 5098 */
+	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 5099 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 5100 */
+	{ 3,	0,	sys_syslog,		"syslog"	}, /* 5101 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 5102 */
+	{ 1,	0,	sys_setuid,		"setuid"	}, /* 5103 */
+	{ 1,	0,	sys_setgid,		"setgid"	}, /* 5104 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 5105 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 5106 */
+	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 5107 */
+	{ 0,	0,	sys_getppid,		"getppid"	}, /* 5108 */
+	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 5109 */
+	{ 0,	0,	sys_setsid,		"setsid"	}, /* 5110 */
+	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 5111 */
+	{ 2,	0,	sys_setregid,		"setregid"	}, /* 5112 */
+	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 5113 */
+	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 5114 */
+	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 5115 */
+	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 5116 */
+	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 5117 */
+	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 5118 */
+	{ 0,	0,	sys_getpgid,		"getpgid"	}, /* 5119 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 5120 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 5121 */
+	{ 1,	0,	sys_getsid,		"getsid"	}, /* 5122 */
+	{ 2,	0,	sys_capget,		"capget"	}, /* 5123 */
+	{ 2,	0,	sys_capset,		"capset"	}, /* 5124 */
+	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 5125 */
+	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"},/* 5126 */
+	{ 3,	TS,	sys_rt_sigqueueinfo,	"rt_sigqueueinfo"},/* 5127 */
+	{ 2,	TS,	sys_rt_sigsuspend,	"rt_siguspend"	}, /* 5128 */
+	{ 2,	TS,	sys_sigaltstack,	"sigaltstatck"	}, /* 5129 */
+	{ 2,	TF,	sys_utime,		"utime"		}, /* 5130 */
+	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 5131 */
+	{ 1,	0,	sys_personality,	"personality"	}, /* 5132 */
+	{ 2,	0,	sys_ustat,		"ustat"		}, /* 5133 */
+	{ 3,	0,	sys_statfs,		"statfs"	}, /* 5134 */
+	{ 3,	0,	sys_fstatfs,		"fstatfs"	}, /* 5135 */
+	{ 5,	0,	sys_sysfs,		"sysfs"		}, /* 5136 */
+	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 5137 */
+	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 5138 */
+	{ 2,	0,	sys_sched_setparam,	"sched_setparam"}, /* 5139 */
+	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 5140 */
+	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 5141 */
+	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 5142 */
+	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 5143 */
+	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 5144 */
+	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 5145 */
+	{ 2,	0,	sys_mlock,		"mlock"		}, /* 5146 */
+	{ 2,	0,	sys_munlock,		"munlock"	}, /* 5147 */
+	{ 1,	0,	sys_mlockall,		"mlockall"	}, /* 5148 */
+	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 5149 */
+	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 5150 */
+	{ 2,	0,	sys_pivotroot,		"pivot_root"	}, /* 5151 */
+	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 5152 */
+	{ 5,	0,	printargs,		"prctl"		}, /* 5153 */
+	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 5154 */
+	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 5155 */
+	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 5156 */
+	{ 0,	0,	sys_sync,		"sync"		}, /* 5157 */
+	{ 1,	TF,	sys_acct,		"acct"		}, /* 5158 */
+	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 5159 */
+	{ 5,	TF,	sys_mount,		"mount"		}, /* 5160 */
+	{ 2,	TF,	sys_umount2,		"umount"	}, /* 5161 */
+	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 5162 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 5163 */
+	{ 3,	0,	sys_reboot,		"reboot"	}, /* 5164 */
+	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 5165 */
+	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 5166 */
+	{ 2,	0,	sys_create_module,	"create_module"	}, /* 5167 */
+	{ 4,	0,	sys_init_module,	"init_module"	}, /* 5168 */
+	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 5169 */
+	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 5170 */
+	{ 5,	0,	sys_query_module,	"query_module"	}, /* 5171 */
+	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 5172 */
+	{ 3,	0,	printargs,		"nfsservctl"	}, /* 5173 */
+	{ 5,	TN,	printargs,		"getpmsg"	}, /* 5174 */
+	{ 5,	TN,	printargs,		"putpmsg"	}, /* 5175 */
+	{ 0,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 5176 */
+	{ 0,	0,	printargs,		"reserved177"	}, /* 5177 */
+	{ 0,	0,	printargs,		"gettid"	}, /* 5178 */
+	{ 3,	0,	sys_readahead,		"readahead"	}, /* 5179 */
+	{ 5,	0,	sys_setxattr,		"setxattr"	}, /* 5180 */
+	{ 5,	0,	sys_setxattr,		"lsetxattr"	}, /* 5181 */
+	{ 5,	0,	sys_fsetxattr,		"fsetxattr"	}, /* 5182 */
+	{ 4,	0,	sys_getxattr,		"getxattr"	}, /* 5183 */
+	{ 4,	0,	sys_getxattr,		"lgetxattr"	}, /* 5184 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 5185 */
+	{ 3,	0,	sys_listxattr,		"listxattr"	}, /* 5186 */
+	{ 3,	0,	sys_listxattr,		"llistxattr"	}, /* 5187 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 5188 */
+	{ 2,	0,	sys_removexattr,	"removexattr"	}, /* 5189 */
+	{ 2,	0,	sys_removexattr,	"lremovexattr"	}, /* 5190 */
+	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 5191 */
+	{ 2,	0,	sys_kill,		"tkill"		}, /* 5192 */
+	{ 1,	0,	sys_time,		"time"		}, /* 5193 */
+	{ 6,	0,	sys_futex,		"futex"		}, /* 5194 */
+	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity"}, /* 5195 */
+	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity"}, /* 5196 */
+	{ 3,	0,	printargs,		"cacheflush"	}, /* 5197 */
+	{ 3,	0,	printargs,		"cachectl"	}, /* 5198 */
+	{ 4,	0,	sys_sysmips,		"sysmips"	}, /* 5199 */
+	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 5200 */
+	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 5201 */
+	{ 5,	0,	sys_io_getevents,	"io_getevents"	}, /* 5202 */
+	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 5203 */
+	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 5204 */
+	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 5205 */
+	{ 3,	0,	printargs,		"lookup_dcookie" }, /* 5206 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"	}, /* 5207 */
+	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 5208 */
+	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"	}, /* 5209 */
+	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages" }, /* 5210 */
+	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 5211 */
+	{ 1,	0,	printargs,		"set_tid_address" }, /* 5212 */
+	{ 0,	0,	sys_restart_syscall,	"restart_syscall" }, /* 5213 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 5214 */
+	{ 4,	TD,	sys_fadvise64_64,	"fadvise64_64"	}, /* 5215 */
+	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 5216 */
+	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 5217 */
+	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 5218 */
+	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"}, /* 5219 */
+	{ 1,	0,	sys_timer_delete,	"timer_delete"	}, /* 5220 */
+	{ 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 5221 */
+	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 5222 */
+	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 5223 */
+	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"}, /* 5224 */
+	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 5225 */
+	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 5226 */
+	{ 6,	0,	sys_mbind,		"mbind"		}, /* 5227 */
+	{ 0,	0,	printargs,		"SYS_5228"	}, /* 5228 */
+	{ 0,	0,	printargs,		"SYS_5228"	}, /* 5229 */
+	{ 4,	0,	sys_mq_open,		"mq_open"	}, /* 5230 */
+	{ 1,	0,	sys_mq_unlink,		"mq_unlink"	}, /* 5231 */
+	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"	}, /* 5232 */
+	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 5233 */
+	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 5234 */
+	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 5235 */
+	{ 0,	0,	printargs,		"SYS_5236"	}, /* 5236 */
+	{ 5,	TP,	sys_waitid,		"waitid"	}, /* 5237 */
+	{ 0,	0,	printargs,		"SYS_5238"	}, /* 5238 */
+	{ 5,	0,	printargs,		"add_key"	}, /* 5239 */
+	{ 4,	0,	printargs,		"request_key"	}, /* 5230 */
+	{ 5,	0,	printargs,		"keyctl"	}, /* 5241 */
+	{ 1,	0,	sys_set_thread_area,	"set_thread_area" }, /* 5242 */
+	{ 0,	TD,	printargs,		"inotify_init"	}, /* 5243 */
+	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch" }, /* 5244 */
+	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch" }, /* 5245 */
+	{ 4,	0,	printargs,		"migrate_pages"	}, /* 5246 */
+	{ 4,	TD|TF,	sys_openat,		"openat"	}, /* 5247 */
+	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"	}, /* 5248 */
+	{ 4,	TD|TF,	sys_mknodat,		"mknodat"	}, /* 5249 */
+	{ 5,	TD|TF,	sys_fchownat,		"fchownat"	}, /* 5250 */
+	{ 3,	TD|TF,	sys_futimesat,		"futimesat"	}, /* 5251 */
+	{ 4,	TD|TF,	sys_newfstatat,		"newfstatat"	}, /* 5252 */
+	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"	}, /* 5253 */
+	{ 4,	TD|TF,	sys_renameat,		"renameat"	}, /* 5254 */
+	{ 5,	TD|TF,	sys_linkat,		"linkat"	}, /* 5255 */
+	{ 3,	TD|TF,	sys_symlinkat,		"symlinkat"	}, /* 5256 */
+	{ 4,	TD|TF,	sys_readlinkat,		"readlinkat"	}, /* 5257 */
+	{ 3,	TD|TF,	sys_fchmodat,		"fchmodat"	}, /* 5258 */
+	{ 3,	TD|TF,	sys_faccessat,		"faccessat"	}, /* 5259 */
+	{ 6,	TD,	sys_pselect6,		"pselect6"	}, /* 5260 */
+	{ 5,	TD,	sys_ppoll,		"ppoll"		}, /* 5261 */
+	{ 1,	TP,	sys_unshare,		"unshare"	}, /* 5262 */
+	{ 6,	TD,	printargs,		"splice"	}, /* 5263 */
+	{ 4,	TD,	printargs,		"sync_file_range" }, /* 5264 */
+	{ 4,	TD,	printargs,		"tee"		}, /* 5265 */
+	{ 4,	TD,	printargs,		"vmsplice"	}, /* 5266 */
+	{ 6,	0,	printargs,		"move_pages"	}, /* 5267 */
+	{ 2,	0,	printargs,		"set_robust_list" }, /* 5268 */
+	{ 3,	0,	printargs,		"get_robust_list" }, /* 5269 */
+	{ 5,	0,	printargs,		"kexec_load"	}, /* 5270 */
+	{ 3,	0,	sys_getcpu,		"getcpu"	}, /* 5271 */
+	{ 5,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 5272 */
+	{ 3,	0,	printargs,		"ioprio_set"	}, /* 5273 */
+	{ 2,	0,	printargs,		"ioprio_get"	}, /* 5274 */
+	{ 4,	TD|TF,	sys_utimensat,		"utimensat"	}, /* 5275 */
+	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 5276 */
+	{ 0,	0,	printargs,		"SYS_5277"	}, /* 5277 */
+	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 5278 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"	}, /* 5279 */
+	{ 2,	TD,	sys_timerfd_create,	"timerfd_create" }, /* 5280 */
+	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime" }, /* 5281 */
+	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime" }, /* 5282 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"	}, /* 5283 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"	}, /* 5284 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"	}, /* 5285 */
+	{ 3,	TD,	sys_dup3,		"dup3"		}, /* 5286 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"		}, /* 5287 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"	}, /* 5288 */
+	{ 5,	TD,	printargs,		"preadv"	}, /* 5289 */
+	{ 5,	TD,	printargs,		"pwritev"	}, /* 5290 */
+	{ 4,	TP|TS,	printargs,		"rt_tgsigqueueinfo" }, /* 5291 */
+	{ 5,	TD,	printargs,		"perf_event_open" }, /* 5292 */
+	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 5293 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 5294 */
+	{ 2,	TD,	printargs,		"fanotify_init"	}, /* 5295 */
+	{ 5,	TD|TF,	printargs,		"fanotify_mark"	}, /* 5296 */
+	{ 4,	0,	printargs,		"prlimit64"	}, /* 5297 */
+#else
+	{ 0,	0,	printargs,		"n64_read"		}, /* 5000 */
+	{ 0,	0,	printargs,		"n64_write"		}, /* 5001 */
+	{ 0,	0,	printargs,		"n64_open"		}, /* 5002 */
+	{ 0,	0,	printargs,		"n64_close"		}, /* 5003 */
+	{ 0,	0,	printargs,		"n64_stat"		}, /* 5004 */
+	{ 0,	0,	printargs,		"n64_fstat"		}, /* 5005 */
+	{ 0,	0,	printargs,		"n64_lstat"		}, /* 5006 */
+	{ 0,	0,	printargs,		"n64_poll"		}, /* 5007 */
+	{ 0,	0,	printargs,		"n64_lseek"		}, /* 5008 */
+	{ 0,	0,	printargs,		"n64_mmap"		}, /* 5009 */
+	{ 0,	0,	printargs,		"n64_mprotect"		}, /* 5010 */
+	{ 0,	0,	printargs,		"n64_munmap"		}, /* 5011 */
+	{ 0,	0,	printargs,		"n64_brk"		}, /* 5012 */
+	{ 0,	0,	printargs,		"n64_rt_sigaction"	}, /* 5013 */
+	{ 0,	0,	printargs,		"n64_rt_sigprocmask"	}, /* 5014 */
+	{ 0,	0,	printargs,		"n64_ioctl"		}, /* 5015 */
+	{ 0,	0,	printargs,		"n64_pread"		}, /* 5016 */
+	{ 0,	0,	printargs,		"n64_pwrite"		}, /* 5017 */
+	{ 0,	0,	printargs,		"n64_readv"		}, /* 5018 */
+	{ 0,	0,	printargs,		"n64_writev"		}, /* 5019 */
+	{ 0,	0,	printargs,		"n64_access"		}, /* 5020 */
+	{ 0,	0,	printargs,		"n64_pipe"		}, /* 5021 */
+	{ 0,	0,	printargs,		"n64__newselect"	}, /* 5022 */
+	{ 0,	0,	printargs,		"n64_sched_yield"	}, /* 5023 */
+	{ 0,	0,	printargs,		"n64_mremap"		}, /* 5024 */
+	{ 0,	0,	printargs,		"n64_msync"		}, /* 5025 */
+	{ 0,	0,	printargs,		"n64_mincore"		}, /* 5026 */
+	{ 0,	0,	printargs,		"n64_madvise"		}, /* 5027 */
+	{ 0,	0,	printargs,		"n64_shmget"		}, /* 5028 */
+	{ 0,	0,	printargs,		"n64_shmgat"		}, /* 5029 */
+	{ 0,	0,	printargs,		"n64_shmctl"		}, /* 5030 */
+	{ 0,	0,	printargs,		"n64_dup"		}, /* 5031 */
+	{ 0,	0,	printargs,		"n64_dup2"		}, /* 5032 */
+	{ 0,	0,	printargs,		"n64_pause"		}, /* 5033 */
+	{ 0,	0,	printargs,		"n64_nanosleep"		}, /* 5034 */
+	{ 0,	0,	printargs,		"n64_getitimer"		}, /* 5035 */
+	{ 0,	0,	printargs,		"n64_setitimer"		}, /* 5036 */
+	{ 0,	0,	printargs,		"n64_alarm"		}, /* 5037 */
+	{ 0,	0,	printargs,		"n64_getpid"		}, /* 5038 */
+	{ 0,	0,	printargs,		"n64_sendfile"		}, /* 5039 */
+	{ 0,	0,	printargs,		"n64_socketcall"	}, /* 5040 */
+	{ 0,	0,	printargs,		"n64_connect"		}, /* 5041 */
+	{ 0,	0,	printargs,		"n64_accept"		}, /* 5042 */
+	{ 0,	0,	printargs,		"n64_sendto"		}, /* 5043 */
+	{ 0,	0,	printargs,		"n64_recvfrom"		}, /* 5044 */
+	{ 0,	0,	printargs,		"n64_sendmsg"		}, /* 5045 */
+	{ 0,	0,	printargs,		"n64_recvmsg"		}, /* 5046 */
+	{ 0,	0,	printargs,		"n64_shutdown"		}, /* 5047 */
+	{ 0,	0,	printargs,		"n64_bind"		}, /* 5048 */
+	{ 0,	0,	printargs,		"n64_listen"		}, /* 5049 */
+	{ 0,	0,	printargs,		"n64_getsockname"	}, /* 5050 */
+	{ 0,	0,	printargs,		"n64_getpeername"	}, /* 5051 */
+	{ 0,	0,	printargs,		"n64_socketpair"	}, /* 5052 */
+	{ 0,	0,	printargs,		"n64_setsockopt"	}, /* 5053 */
+	{ 0,	0,	printargs,		"n64_getsockopt"	}, /* 5054 */
+	{ 0,	0,	printargs,		"n64_clone"		}, /* 5055 */
+	{ 0,	0,	printargs,		"n64_fork"		}, /* 5056 */
+	{ 0,	0,	printargs,		"n64_execve"		}, /* 5057 */
+	{ 0,	0,	printargs,		"n64_exit"		}, /* 5058 */
+	{ 0,	0,	printargs,		"n64_wait4"		}, /* 5059 */
+	{ 0,	0,	printargs,		"n64_kill"		}, /* 5060 */
+	{ 0,	0,	printargs,		"n64_uname"		}, /* 5061 */
+	{ 0,	0,	printargs,		"n64_semget"		}, /* 5062 */
+	{ 0,	0,	printargs,		"n64_semop"		}, /* 5063 */
+	{ 0,	0,	printargs,		"n64_semctl"		}, /* 5064 */
+	{ 0,	0,	printargs,		"n64_shmdt"		}, /* 5065 */
+	{ 0,	0,	printargs,		"n64_msgget"		}, /* 5066 */
+	{ 0,	0,	printargs,		"n64_msgsnd"		}, /* 5067 */
+	{ 0,	0,	printargs,		"n64_msgrcv"		}, /* 5068 */
+	{ 0,	0,	printargs,		"n64_msgctl"		}, /* 5069 */
+	{ 0,	0,	printargs,		"n64_fcntl"		}, /* 5070 */
+	{ 0,	0,	printargs,		"n64_flock"		}, /* 5071 */
+	{ 0,	0,	printargs,		"n64_fsync"		}, /* 5072 */
+	{ 0,	0,	printargs,		"n64_fdatasync"		}, /* 5073 */
+	{ 0,	0,	printargs,		"n64_truncate"		}, /* 5074 */
+	{ 0,	0,	printargs,		"n64_ftruncate"		}, /* 5075 */
+	{ 0,	0,	printargs,		"n64_getdents"		}, /* 5076 */
+	{ 0,	0,	printargs,		"n64_getcwd"		}, /* 5077 */
+	{ 0,	0,	printargs,		"n64_chdir"		}, /* 5078 */
+	{ 0,	0,	printargs,		"n64_fchdir"		}, /* 5079 */
+	{ 0,	0,	printargs,		"n64_rename"		}, /* 5080 */
+	{ 0,	0,	printargs,		"n64_mkdir"		}, /* 5081 */
+	{ 0,	0,	printargs,		"n64_rmdir"		}, /* 5082 */
+	{ 0,	0,	printargs,		"n64_creat"		}, /* 5083 */
+	{ 0,	0,	printargs,		"n64_link"		}, /* 5084 */
+	{ 0,	0,	printargs,		"n64_unlink"		}, /* 5085 */
+	{ 0,	0,	printargs,		"n64_symlink"		}, /* 5086 */
+	{ 0,	0,	printargs,		"n64_readlink"		}, /* 5087 */
+	{ 0,	0,	printargs,		"n64_chmod"		}, /* 5088 */
+	{ 0,	0,	printargs,		"n64_fchmod"		}, /* 5089 */
+	{ 0,	0,	printargs,		"n64_chown"		}, /* 5090 */
+	{ 0,	0,	printargs,		"n64_fchown"		}, /* 5091 */
+	{ 0,	0,	printargs,		"n64_lchown"		}, /* 5092 */
+	{ 0,	0,	printargs,		"n64_umask"		}, /* 5093 */
+	{ 0,	0,	printargs,		"n64_gettimeofday"	}, /* 5094 */
+	{ 0,	0,	printargs,		"n64_getrlimit"		}, /* 5095 */
+	{ 0,	0,	printargs,		"n64_getrusage"		}, /* 5096 */
+	{ 0,	0,	printargs,		"n64_sysinfo"		}, /* 5097 */
+	{ 0,	0,	printargs,		"n64_times"		}, /* 5098 */
+	{ 0,	0,	printargs,		"n64_ptrace"		}, /* 5099 */
+	{ 0,	0,	printargs,		"n64_getuid"		}, /* 5100 */
+	{ 0,	0,	printargs,		"n64_syslog"		}, /* 5101 */
+	{ 0,	0,	printargs,		"n64_getgid"		}, /* 5102 */
+	{ 0,	0,	printargs,		"n64_setuid"		}, /* 5103 */
+	{ 0,	0,	printargs,		"n64_setgid"		}, /* 5104 */
+	{ 0,	0,	printargs,		"n64_geteuid"		}, /* 5105 */
+	{ 0,	0,	printargs,		"n64_getegid"		}, /* 5106 */
+	{ 0,	0,	printargs,		"n64_setpgid"		}, /* 5107 */
+	{ 0,	0,	printargs,		"n64_getppid"		}, /* 5108 */
+	{ 0,	0,	printargs,		"n64_getpgrp"		}, /* 5109 */
+	{ 0,	0,	printargs,		"n64_setsid"		}, /* 5110 */
+	{ 0,	0,	printargs,		"n64_setreuid"		}, /* 5111 */
+	{ 0,	0,	printargs,		"n64_setregid"		}, /* 5112 */
+	{ 0,	0,	printargs,		"n64_getgroups"		}, /* 5113 */
+	{ 0,	0,	printargs,		"n64_setgroups"		}, /* 5114 */
+	{ 0,	0,	printargs,		"n64_setresuid"		}, /* 5115 */
+	{ 0,	0,	printargs,		"n64_getresuid"		}, /* 5116 */
+	{ 0,	0,	printargs,		"n64_setresgid"		}, /* 5117 */
+	{ 0,	0,	printargs,		"n64_getresgid"		}, /* 5118 */
+	{ 0,	0,	printargs,		"n64_getpgid"		}, /* 5119 */
+	{ 0,	0,	printargs,		"n64_setfsuid"		}, /* 5120 */
+	{ 0,	0,	printargs,		"n64_setfsgid"		}, /* 5121 */
+	{ 0,	0,	printargs,		"n64_getsid"		}, /* 5122 */
+	{ 0,	0,	printargs,		"n64_capget"		}, /* 5123 */
+	{ 0,	0,	printargs,		"n64_capset"		}, /* 5124 */
+	{ 0,	0,	printargs,		"n64_rt_sigpending"	}, /* 5125 */
+	{ 0,	0,	printargs,		"n64_rt_sigtimedwait"	}, /* 5126 */
+	{ 0,	0,	printargs,		"n64_rt_sigqueueinfo"	}, /* 5127 */
+	{ 0,	0,	printargs,		"n64_rt_siguspend"	}, /* 5128 */
+	{ 0,	0,	printargs,		"n64_sigaltstatck"	}, /* 5129 */
+	{ 0,	0,	printargs,		"n64_utime"		}, /* 5130 */
+	{ 0,	0,	printargs,		"n64_mknod"		}, /* 5131 */
+	{ 0,	0,	printargs,		"n64_personality"	}, /* 5132 */
+	{ 0,	0,	printargs,		"n64_ustat"		}, /* 5133 */
+	{ 0,	0,	printargs,		"n64_statfs"		}, /* 5134 */
+	{ 0,	0,	printargs,		"n64_fstatfs"		}, /* 5135 */
+	{ 0,	0,	printargs,		"n64_sysfs"		}, /* 5136 */
+	{ 0,	0,	printargs,		"n64_getpriority"	}, /* 5137 */
+	{ 0,	0,	printargs,		"n64_setpriority"	}, /* 5138 */
+	{ 0,	0,	printargs,		"n64_sched_setparam"	}, /* 5139 */
+	{ 0,	0,	printargs,		"n64_sched_getparam"	}, /* 5140 */
+	{ 0,	0,	printargs,		"n64_sched_setscheduler"}, /* 5141 */
+	{ 0,	0,	printargs,		"n64_sched_getscheduler"}, /* 5142 */
+	{ 0,	0,	printargs,		"n64_sched_get_priority_max"}, /* 5143 */
+	{ 0,	0,	printargs,		"n64_sched_get_priority_min"}, /* 5144 */
+	{ 0,	0,	printargs,		"n64_sched_rr_get_interval"}, /* 5145 */
+	{ 0,	0,	printargs,		"n64_mlock"		}, /* 5146 */
+	{ 0,	0,	printargs,		"n64_munlock"		}, /* 5147 */
+	{ 0,	0,	printargs,		"n64_mlockall"		}, /* 5148 */
+	{ 0,	0,	printargs,		"n64_munlockall"	}, /* 5149 */
+	{ 0,	0,	printargs,		"n64_vhangup"		}, /* 5150 */
+	{ 0,	0,	printargs,		"n64_pivot_root"	}, /* 5151 */
+	{ 0,	0,	printargs,		"n64__sysctl"		}, /* 5152 */
+	{ 0,	0,	printargs,		"n64_prctl"		}, /* 5153 */
+	{ 0,	0,	printargs,		"n64_adjtimex"		}, /* 5154 */
+	{ 0,	0,	printargs,		"n64_setrlimit"		}, /* 5155 */
+	{ 0,	0,	printargs,		"n64_chroot"		}, /* 5156 */
+	{ 0,	0,	printargs,		"n64_sync"		}, /* 5157 */
+	{ 0,	0,	printargs,		"n64_acct"		}, /* 5158 */
+	{ 0,	0,	printargs,		"n64_settimeofday"	}, /* 5159 */
+	{ 0,	0,	printargs,		"n64_mount"		}, /* 5160 */
+	{ 0,	0,	printargs,		"n64_umount"		}, /* 5161 */
+	{ 0,	0,	printargs,		"n64_swapon"		}, /* 5162 */
+	{ 0,	0,	printargs,		"n64_swapoff"		}, /* 5163 */
+	{ 0,	0,	printargs,		"n64_reboot"		}, /* 5164 */
+	{ 0,	0,	printargs,		"n64_sethostname"	}, /* 5165 */
+	{ 0,	0,	printargs,		"n64_setdomainname"	}, /* 5166 */
+	{ 0,	0,	printargs,		"n64_create_module"	}, /* 5167 */
+	{ 0,	0,	printargs,		"n64_init_module"	}, /* 5168 */
+	{ 0,	0,	printargs,		"n64_delete_module"	}, /* 5169 */
+	{ 0,	0,	printargs,		"n64_get_kernel_syms"	}, /* 5170 */
+	{ 0,	0,	printargs,		"n64_query_module"	}, /* 5171 */
+	{ 0,	0,	printargs,		"n64_quotactl"		}, /* 5172 */
+	{ 0,	0,	printargs,		"n64_nfsservctl"	}, /* 5173 */
+	{ 0,	0,	printargs,		"n64_getpmsg"		}, /* 5174 */
+	{ 0,	0,	printargs,		"n64_putpmsg"		}, /* 5175 */
+	{ 0,	0,	printargs,		"n64_afs_syscall"	}, /* 5176 */
+	{ 0,	0,	printargs,		"n64_reserved177"	}, /* 5177 */
+	{ 0,	0,	printargs,		"n64_gettid"		}, /* 5178 */
+	{ 0,	0,	printargs,		"n64_readahead"		}, /* 5179 */
+	{ 0,	0,	printargs,		"n64_setxattr"		}, /* 5180 */
+	{ 0,	0,	printargs,		"n64_lsetxattr"		}, /* 5181 */
+	{ 0,	0,	printargs,		"n64_fsetxattr"		}, /* 5182 */
+	{ 0,	0,	printargs,		"n64_getxattr"		}, /* 5183 */
+	{ 0,	0,	printargs,		"n64_lgetxattr"		}, /* 5184 */
+	{ 0,	0,	printargs,		"n64_fgetxattr"		}, /* 5185 */
+	{ 0,	0,	printargs,		"n64_listxattr"		}, /* 5186 */
+	{ 0,	0,	printargs,		"n64_llistxattr"	}, /* 5187 */
+	{ 0,	0,	printargs,		"n64_flistxattr"	}, /* 5188 */
+	{ 0,	0,	printargs,		"n64_removexattr"	}, /* 5189 */
+	{ 0,	0,	printargs,		"n64_lremovexattr"	}, /* 5190 */
+	{ 0,	0,	printargs,		"n64_fremovexattr"	}, /* 5191 */
+	{ 0,	0,	printargs,		"n64_tkill"		}, /* 5192 */
+	{ 0,	0,	printargs,		"n64_time"		}, /* 5193 */
+	{ 0,	0,	printargs,		"n64_futex"		}, /* 5194 */
+	{ 0,	0,	printargs,		"n64_sched_setaffinity"	}, /* 5195 */
+	{ 0,	0,	printargs,		"n64_sched_getaffinity"	}, /* 5196 */
+	{ 0,	0,	printargs,		"n64_cacheflush"	}, /* 5197 */
+	{ 0,	0,	printargs,		"n64_cachectl"		}, /* 5198 */
+	{ 0,	0,	printargs,		"n64_sysmips"		}, /* 5199 */
+	{ 0,	0,	printargs,		"n64_io_setup"		}, /* 5200 */
+	{ 0,	0,	printargs,		"n64_io_destroy"	}, /* 5201 */
+	{ 0,	0,	printargs,		"n64_io_getevents"	}, /* 5202 */
+	{ 0,	0,	printargs,		"n64_io_submit"		}, /* 5203 */
+	{ 0,	0,	printargs,		"n64_io_cancel"		}, /* 5204 */
+	{ 1,	TP,	printargs,		"n64_exit_group"	}, /* 5205 */
+	{ 0,	0,	printargs,		"n64_lookup_dcookie"	}, /* 5206 */
+	{ 0,	0,	printargs,		"n64_epoll_create"	}, /* 5207 */
+	{ 0,	0,	printargs,		"n64_epoll_ctl"		}, /* 5208 */
+	{ 0,	0,	printargs,		"n64_epoll_wait"	}, /* 5209 */
+	{ 0,	0,	printargs,		"n64_remap_file_pages"	}, /* 5210 */
+	{ 0,	0,	printargs,		"n64_rt_sigreturn"	}, /* 5211 */
+	{ 1,	0,	printargs,		"n64_set_tid_address"	}, /* 5212 */
+	{ 0,	0,	printargs,		"n64_restart_syscall"	}, /* 5213 */
+	{ 5,	TI,	printargs,		"n64_semtimedop"	}, /* 5214 */
+	{ 0,	0,	printargs,		"n64_fadvise64_64"	}, /* 5215 */
+	{ 0,	0,	printargs,		"n64_timer_create"	}, /* 5216 */
+	{ 0,	0,	printargs,		"n64_timer_settime"	}, /* 5217 */
+	{ 0,	0,	printargs,		"n64_timer_gettime"	}, /* 5218 */
+	{ 0,	0,	printargs,		"n64_timer_getoverrun"	}, /* 5219 */
+	{ 0,	0,	printargs,		"n64_timer_delete"	}, /* 5220 */
+	{ 0,	0,	printargs,		"n64_clock_settime"	}, /* 5221 */
+	{ 0,	0,	printargs,		"n64_clock_gettime"	}, /* 5222 */
+	{ 0,	0,	printargs,		"n64_clock_getres"	}, /* 5223 */
+	{ 0,	0,	printargs,		"n64_clock_nanosleep"	}, /* 5224 */
+	{ 0,	0,	printargs,		"n64_tgkill"		}, /* 5225 */
+	{ 0,	0,	printargs,		"n64_utimes"		}, /* 5226 */
+	{ 0,	0,	printargs,		"n64_mbind"		}, /* 5227 */
+	{ 0,	0,	printargs,		"n64_SYS_5228"		}, /* 5228 */
+	{ 0,	0,	printargs,		"n64_SYS_5228"		}, /* 5229 */
+	{ 0,	0,	printargs,		"n64_mq_open"		}, /* 5230 */
+	{ 0,	0,	printargs,		"n64_mq_unlink"		}, /* 5231 */
+	{ 0,	0,	printargs,		"n64_mq_timedsend"	}, /* 5232 */
+	{ 0,	0,	printargs,		"n64_mq_timedreceive"	}, /* 5233 */
+	{ 0,	0,	printargs,		"n64_mq_notify"		}, /* 5234 */
+	{ 0,	0,	printargs,		"n64_mq_getsetattr"	}, /* 5235 */
+	{ 0,	0,	printargs,		"n64_SYS_5236"		}, /* 5236 */
+	{ 0,	0,	printargs,		"n64_waitid"		}, /* 5237 */
+	{ 0,	0,	printargs,		"n64_SYS_5238"		}, /* 5238 */
+	{ 0,	0,	printargs,		"n64_add_key"		}, /* 5239 */
+	{ 0,	0,	printargs,		"n64_request_key"	}, /* 5230 */
+	{ 0,	0,	printargs,		"n64_keyctl"		}, /* 5241 */
+	{ 0,	0,	printargs,		"n64_set_thread_area"	}, /* 5242 */
+	{ 0,	0,	printargs,		"n64_inotify_init"	}, /* 5243 */
+	{ 0,	0,	printargs,		"n64_inotify_add_watch" }, /* 5244 */
+	{ 0,	0,	printargs,		"n64_inotify_rm_watch"	}, /* 5245 */
+	{ 0,	0,	printargs,		"n64_migrate_pages"	}, /* 5246 */
+	{ 0,	0,	printargs,		"n64_openat"		}, /* 5247 */
+	{ 0,	0,	printargs,		"n64_mkdirat"		}, /* 5248 */
+	{ 0,	0,	printargs,		"n64_mknodat"		}, /* 5249 */
+	{ 0,	0,	printargs,		"n64_fchownat"		}, /* 5250 */
+	{ 0,	0,	printargs,		"n64_futimesat"		}, /* 5251 */
+	{ 0,	0,	printargs,		"n64_newfstatat"	}, /* 5252 */
+	{ 0,	0,	printargs,		"n64_unlinkat"		}, /* 5253 */
+	{ 0,	0,	printargs,		"n64_renameat"		}, /* 5254 */
+	{ 0,	0,	printargs,		"n64_linkat"		}, /* 5255 */
+	{ 0,	0,	printargs,		"n64_symlinkat"		}, /* 5256 */
+	{ 0,	0,	printargs,		"n64_readlinkat"	}, /* 5257 */
+	{ 0,	0,	printargs,		"n64_fchmodat"		}, /* 5258 */
+	{ 0,	0,	printargs,		"n64_faccessat"		}, /* 5259 */
+	{ 0,	0,	printargs,		"n64_pselect6"		}, /* 5260 */
+	{ 0,	0,	printargs,		"n64_ppoll"		}, /* 5261 */
+	{ 0,	0,	printargs,		"n64_unshare"		}, /* 5262 */
+	{ 0,	0,	printargs,		"n64_splice"		}, /* 5263 */
+	{ 0,	0,	printargs,		"n64_sync_file_range"	}, /* 5264 */
+	{ 0,	0,	printargs,		"n64_tee"		}, /* 5265 */
+	{ 0,	0,	printargs,		"n64_vmsplice"		}, /* 5266 */
+	{ 0,	0,	printargs,		"n64_move_pages"	}, /* 5267 */
+	{ 0,	0,	printargs,		"n64_set_robust_list"	}, /* 5268 */
+	{ 0,	0,	printargs,		"n64_get_robust_list"	}, /* 5269 */
+	{ 0,	0,	printargs,		"n64_kexec_load"	}, /* 5270 */
+	{ 0,	0,	printargs,		"n64_getcpu"		}, /* 5271 */
+	{ 0,	0,	printargs,		"n64_epoll_pwait"	}, /* 5272 */
+	{ 0,	0,	printargs,		"n64_ioprio_set"	}, /* 5273 */
+	{ 0,	0,	printargs,		"n64_ioprio_get"	}, /* 5274 */
+	{ 0,	0,	printargs,		"n64_utimensat"		}, /* 5275 */
+	{ 0,	0,	printargs,		"n64_signalfd"		}, /* 5276 */
+	{ 0,	0,	printargs,		"n64_SYS_5277"		}, /* 5277 */
+	{ 0,	0,	printargs,		"n64_eventfd"		}, /* 5278 */
+	{ 0,	0,	printargs,		"n64_fallocate"		}, /* 5279 */
+	{ 0,	0,	printargs,		"n64_timerfd_create"	}, /* 5280 */
+	{ 0,	0,	printargs,		"n64_timerfd_gettime"	}, /* 5281 */
+	{ 0,	0,	printargs,		"n64_timerfd_settime"	}, /* 5282 */
+	{ 0,	0,	printargs,		"n64_signalfd4"		}, /* 5283 */
+	{ 0,	0,	printargs,		"n64_eventfd2"		}, /* 5284 */
+	{ 0,	0,	printargs,		"n64_epoll_create1"	}, /* 5285 */
+	{ 0,	0,	printargs,		"n64_dup3"		}, /* 5286 */
+	{ 0,	0,	printargs,		"n64_pipe2"		}, /* 5287 */
+	{ 0,	0,	printargs,		"n64_inotify_init1"	}, /* 5288 */
+	{ 0,	0,	printargs,		"n64_preadv"		}, /* 5289 */
+	{ 0,	0,	printargs,		"n64_pwritev"		}, /* 5290 */
+	{ 0,	0,	printargs,		"n64_rt_tgsigqueueinfo" }, /* 5291 */
+	{ 0,	0,	printargs,		"n64_perf_event_open"	}, /* 5292 */
+	{ 0,	0,	printargs,		"n64_accept4"		}, /* 5293 */
+	{ 0,	0,	printargs,		"n64_recvmmsg"		}, /* 5294 */
+	{ 2,	0,	printargs,		"n64_fanotify_init"	}, /* 5295 */
+	{ 5,	0,	printargs,		"n64_fanotify_mark"	}, /* 5296 */
+	{ 4,	0,	printargs,		"n64_prlimit64"		}, /* 5297 */
+#endif
+	{ 0,	0,	printargs,		"SYS_5295"	}, /* 5295 */
+	{ 0,	0,	printargs,		"SYS_5296"	}, /* 5296 */
+	{ 0,	0,	printargs,		"SYS_5297"	}, /* 5297 */
+	{ 0,	0,	printargs,		"SYS_5298"	}, /* 5298 */
+	{ 0,	0,	printargs,		"SYS_5299"	}, /* 5299 */
+	{ 0,	0,	printargs,		"SYS_5300"	}, /* 5300 */
+	{ 0,	0,	printargs,		"SYS_5301"	}, /* 5301 */
+	{ 0,	0,	printargs,		"SYS_5302"	}, /* 5302 */
+	{ 0,	0,	printargs,		"SYS_5303"	}, /* 5303 */
+	{ 0,	0,	printargs,		"SYS_5304"	}, /* 5304 */
+	{ 0,	0,	printargs,		"SYS_5305"	}, /* 5305 */
+	{ 0,	0,	printargs,		"SYS_5306"	}, /* 5306 */
+	{ 0,	0,	printargs,		"SYS_5307"	}, /* 5307 */
+	{ 0,	0,	printargs,		"SYS_5308"	}, /* 5308 */
+	{ 0,	0,	printargs,		"SYS_5309"	}, /* 5309 */
+	{ 0,	0,	printargs,		"SYS_5310"	}, /* 5310 */
+	{ 0,	0,	printargs,		"SYS_5311"	}, /* 5311 */
+	{ 0,	0,	printargs,		"SYS_5312"	}, /* 5312 */
+	{ 0,	0,	printargs,		"SYS_5313"	}, /* 5313 */
+	{ 0,	0,	printargs,		"SYS_5314"	}, /* 5314 */
+	{ 0,	0,	printargs,		"SYS_5315"	}, /* 5315 */
+	{ 0,	0,	printargs,		"SYS_5316"	}, /* 5316 */
+	{ 0,	0,	printargs,		"SYS_5317"	}, /* 5317 */
+	{ 0,	0,	printargs,		"SYS_5318"	}, /* 5318 */
+	{ 0,	0,	printargs,		"SYS_5319"	}, /* 5319 */
+	{ 0,	0,	printargs,		"SYS_5320"	}, /* 5320 */
+	{ 0,	0,	printargs,		"SYS_5321"	}, /* 5321 */
+	{ 0,	0,	printargs,		"SYS_5322"	}, /* 5322 */
+	{ 0,	0,	printargs,		"SYS_5323"	}, /* 5323 */
+	{ 0,	0,	printargs,		"SYS_5324"	}, /* 5324 */
+	{ 0,	0,	printargs,		"SYS_5325"	}, /* 5325 */
+	{ 0,	0,	printargs,		"SYS_5326"	}, /* 5326 */
+	{ 0,	0,	printargs,		"SYS_5327"	}, /* 5327 */
+	{ 0,	0,	printargs,		"SYS_5328"	}, /* 5328 */
+	{ 0,	0,	printargs,		"SYS_5329"	}, /* 5329 */
+	{ 0,	0,	printargs,		"SYS_5330"	}, /* 5330 */
+	{ 0,	0,	printargs,		"SYS_5331"	}, /* 5331 */
+	{ 0,	0,	printargs,		"SYS_5332"	}, /* 5332 */
+	{ 0,	0,	printargs,		"SYS_5333"	}, /* 5333 */
+	{ 0,	0,	printargs,		"SYS_5334"	}, /* 5334 */
+	{ 0,	0,	printargs,		"SYS_5335"	}, /* 5335 */
+	{ 0,	0,	printargs,		"SYS_5336"	}, /* 5336 */
+	{ 0,	0,	printargs,		"SYS_5337"	}, /* 5337 */
+	{ 0,	0,	printargs,		"SYS_5338"	}, /* 5338 */
+	{ 0,	0,	printargs,		"SYS_5339"	}, /* 5339 */
+	{ 0,	0,	printargs,		"SYS_5340"	}, /* 5340 */
+	{ 0,	0,	printargs,		"SYS_5341"	}, /* 5341 */
+	{ 0,	0,	printargs,		"SYS_5342"	}, /* 5342 */
+	{ 0,	0,	printargs,		"SYS_5343"	}, /* 5343 */
+	{ 0,	0,	printargs,		"SYS_5344"	}, /* 5344 */
+	{ 0,	0,	printargs,		"SYS_5345"	}, /* 5345 */
+	{ 0,	0,	printargs,		"SYS_5346"	}, /* 5346 */
+	{ 0,	0,	printargs,		"SYS_5347"	}, /* 5347 */
+	{ 0,	0,	printargs,		"SYS_5348"	}, /* 5348 */
+	{ 0,	0,	printargs,		"SYS_5349"	}, /* 5349 */
+	{ 0,	0,	printargs,		"SYS_5350"	}, /* 5350 */
+	{ 0,	0,	printargs,		"SYS_5351"	}, /* 5351 */
+	{ 0,	0,	printargs,		"SYS_5352"	}, /* 5352 */
+	{ 0,	0,	printargs,		"SYS_5353"	}, /* 5353 */
+	{ 0,	0,	printargs,		"SYS_5354"	}, /* 5354 */
+	{ 0,	0,	printargs,		"SYS_5355"	}, /* 5355 */
+	{ 0,	0,	printargs,		"SYS_5356"	}, /* 5356 */
+	{ 0,	0,	printargs,		"SYS_5357"	}, /* 5357 */
+	{ 0,	0,	printargs,		"SYS_5358"	}, /* 5358 */
+	{ 0,	0,	printargs,		"SYS_5359"	}, /* 5359 */
+	{ 0,	0,	printargs,		"SYS_5360"	}, /* 5360 */
+	{ 0,	0,	printargs,		"SYS_5361"	}, /* 5361 */
+	{ 0,	0,	printargs,		"SYS_5362"	}, /* 5362 */
+	{ 0,	0,	printargs,		"SYS_5363"	}, /* 5363 */
+	{ 0,	0,	printargs,		"SYS_5364"	}, /* 5364 */
+	{ 0,	0,	printargs,		"SYS_5365"	}, /* 5365 */
+	{ 0,	0,	printargs,		"SYS_5366"	}, /* 5366 */
+	{ 0,	0,	printargs,		"SYS_5367"	}, /* 5367 */
+	{ 0,	0,	printargs,		"SYS_5368"	}, /* 5368 */
+	{ 0,	0,	printargs,		"SYS_5369"	}, /* 5369 */
+	{ 0,	0,	printargs,		"SYS_5370"	}, /* 5370 */
+	{ 0,	0,	printargs,		"SYS_5371"	}, /* 5371 */
+	{ 0,	0,	printargs,		"SYS_5372"	}, /* 5372 */
+	{ 0,	0,	printargs,		"SYS_5373"	}, /* 5373 */
+	{ 0,	0,	printargs,		"SYS_5374"	}, /* 5374 */
+	{ 0,	0,	printargs,		"SYS_5375"	}, /* 5375 */
+	{ 0,	0,	printargs,		"SYS_5376"	}, /* 5376 */
+	{ 0,	0,	printargs,		"SYS_5377"	}, /* 5377 */
+	{ 0,	0,	printargs,		"SYS_5378"	}, /* 5378 */
+	{ 0,	0,	printargs,		"SYS_5379"	}, /* 5379 */
+	{ 0,	0,	printargs,		"SYS_5380"	}, /* 5380 */
+	{ 0,	0,	printargs,		"SYS_5381"	}, /* 5381 */
+	{ 0,	0,	printargs,		"SYS_5382"	}, /* 5382 */
+	{ 0,	0,	printargs,		"SYS_5383"	}, /* 5383 */
+	{ 0,	0,	printargs,		"SYS_5384"	}, /* 5384 */
+	{ 0,	0,	printargs,		"SYS_5385"	}, /* 5385 */
+	{ 0,	0,	printargs,		"SYS_5386"	}, /* 5386 */
+	{ 0,	0,	printargs,		"SYS_5387"	}, /* 5387 */
+	{ 0,	0,	printargs,		"SYS_5388"	}, /* 5388 */
+	{ 0,	0,	printargs,		"SYS_5389"	}, /* 5389 */
+	{ 0,	0,	printargs,		"SYS_5390"	}, /* 5390 */
+	{ 0,	0,	printargs,		"SYS_5391"	}, /* 5391 */
+	{ 0,	0,	printargs,		"SYS_5392"	}, /* 5392 */
+	{ 0,	0,	printargs,		"SYS_5393"	}, /* 5393 */
+	{ 0,	0,	printargs,		"SYS_5394"	}, /* 5394 */
+	{ 0,	0,	printargs,		"SYS_5395"	}, /* 5395 */
+	{ 0,	0,	printargs,		"SYS_5396"	}, /* 5396 */
+	{ 0,	0,	printargs,		"SYS_5397"	}, /* 5397 */
+	{ 0,	0,	printargs,		"SYS_5398"	}, /* 5398 */
+	{ 0,	0,	printargs,		"SYS_5399"	}, /* 5399 */
+	{ 0,	0,	printargs,		"SYS_5400"	}, /* 5400 */
+	{ 0,	0,	printargs,		"SYS_5401"	}, /* 5401 */
+	{ 0,	0,	printargs,		"SYS_5402"	}, /* 5402 */
+	{ 0,	0,	printargs,		"SYS_5403"	}, /* 5403 */
+	{ 0,	0,	printargs,		"SYS_5404"	}, /* 5404 */
+	{ 0,	0,	printargs,		"SYS_5405"	}, /* 5405 */
+	{ 0,	0,	printargs,		"SYS_5406"	}, /* 5406 */
+	{ 0,	0,	printargs,		"SYS_5407"	}, /* 5407 */
+	{ 0,	0,	printargs,		"SYS_5408"	}, /* 5408 */
+	{ 0,	0,	printargs,		"SYS_5409"	}, /* 5409 */
+	{ 0,	0,	printargs,		"SYS_5410"	}, /* 5410 */
+	{ 0,	0,	printargs,		"SYS_5411"	}, /* 5411 */
+	{ 0,	0,	printargs,		"SYS_5412"	}, /* 5412 */
+	{ 0,	0,	printargs,		"SYS_5413"	}, /* 5413 */
+	{ 0,	0,	printargs,		"SYS_5414"	}, /* 5414 */
+	{ 0,	0,	printargs,		"SYS_5415"	}, /* 5415 */
+	{ 0,	0,	printargs,		"SYS_5416"	}, /* 5416 */
+	{ 0,	0,	printargs,		"SYS_5417"	}, /* 5417 */
+	{ 0,	0,	printargs,		"SYS_5418"	}, /* 5418 */
+	{ 0,	0,	printargs,		"SYS_5419"	}, /* 5419 */
+	{ 0,	0,	printargs,		"SYS_5420"	}, /* 5420 */
+	{ 0,	0,	printargs,		"SYS_5421"	}, /* 5421 */
+	{ 0,	0,	printargs,		"SYS_5422"	}, /* 5422 */
+	{ 0,	0,	printargs,		"SYS_5423"	}, /* 5423 */
+	{ 0,	0,	printargs,		"SYS_5424"	}, /* 5424 */
+	{ 0,	0,	printargs,		"SYS_5425"	}, /* 5425 */
+	{ 0,	0,	printargs,		"SYS_5426"	}, /* 5426 */
+	{ 0,	0,	printargs,		"SYS_5427"	}, /* 5427 */
+	{ 0,	0,	printargs,		"SYS_5428"	}, /* 5428 */
+	{ 0,	0,	printargs,		"SYS_5429"	}, /* 5429 */
+	{ 0,	0,	printargs,		"SYS_5430"	}, /* 5430 */
+	{ 0,	0,	printargs,		"SYS_5431"	}, /* 5431 */
+	{ 0,	0,	printargs,		"SYS_5432"	}, /* 5432 */
+	{ 0,	0,	printargs,		"SYS_5433"	}, /* 5433 */
+	{ 0,	0,	printargs,		"SYS_5434"	}, /* 5434 */
+	{ 0,	0,	printargs,		"SYS_5435"	}, /* 5435 */
+	{ 0,	0,	printargs,		"SYS_5436"	}, /* 5436 */
+	{ 0,	0,	printargs,		"SYS_5437"	}, /* 5437 */
+	{ 0,	0,	printargs,		"SYS_5438"	}, /* 5438 */
+	{ 0,	0,	printargs,		"SYS_5439"	}, /* 5439 */
+	{ 0,	0,	printargs,		"SYS_5440"	}, /* 5440 */
+	{ 0,	0,	printargs,		"SYS_5441"	}, /* 5441 */
+	{ 0,	0,	printargs,		"SYS_5442"	}, /* 5442 */
+	{ 0,	0,	printargs,		"SYS_5443"	}, /* 5443 */
+	{ 0,	0,	printargs,		"SYS_5444"	}, /* 5444 */
+	{ 0,	0,	printargs,		"SYS_5445"	}, /* 5445 */
+	{ 0,	0,	printargs,		"SYS_5446"	}, /* 5446 */
+	{ 0,	0,	printargs,		"SYS_5447"	}, /* 5447 */
+	{ 0,	0,	printargs,		"SYS_5448"	}, /* 5448 */
+	{ 0,	0,	printargs,		"SYS_5449"	}, /* 5449 */
+	{ 0,	0,	printargs,		"SYS_5450"	}, /* 5450 */
+	{ 0,	0,	printargs,		"SYS_5451"	}, /* 5451 */
+	{ 0,	0,	printargs,		"SYS_5452"	}, /* 5452 */
+	{ 0,	0,	printargs,		"SYS_5453"	}, /* 5453 */
+	{ 0,	0,	printargs,		"SYS_5454"	}, /* 5454 */
+	{ 0,	0,	printargs,		"SYS_5455"	}, /* 5455 */
+	{ 0,	0,	printargs,		"SYS_5456"	}, /* 5456 */
+	{ 0,	0,	printargs,		"SYS_5457"	}, /* 5457 */
+	{ 0,	0,	printargs,		"SYS_5458"	}, /* 5458 */
+	{ 0,	0,	printargs,		"SYS_5459"	}, /* 5459 */
+	{ 0,	0,	printargs,		"SYS_5460"	}, /* 5460 */
+	{ 0,	0,	printargs,		"SYS_5461"	}, /* 5461 */
+	{ 0,	0,	printargs,		"SYS_5462"	}, /* 5462 */
+	{ 0,	0,	printargs,		"SYS_5463"	}, /* 5463 */
+	{ 0,	0,	printargs,		"SYS_5464"	}, /* 5464 */
+	{ 0,	0,	printargs,		"SYS_5465"	}, /* 5465 */
+	{ 0,	0,	printargs,		"SYS_5466"	}, /* 5466 */
+	{ 0,	0,	printargs,		"SYS_5467"	}, /* 5467 */
+	{ 0,	0,	printargs,		"SYS_5468"	}, /* 5468 */
+	{ 0,	0,	printargs,		"SYS_5469"	}, /* 5469 */
+	{ 0,	0,	printargs,		"SYS_5470"	}, /* 5470 */
+	{ 0,	0,	printargs,		"SYS_5471"	}, /* 5471 */
+	{ 0,	0,	printargs,		"SYS_5472"	}, /* 5472 */
+	{ 0,	0,	printargs,		"SYS_5473"	}, /* 5473 */
+	{ 0,	0,	printargs,		"SYS_5474"	}, /* 5474 */
+	{ 0,	0,	printargs,		"SYS_5475"	}, /* 5475 */
+	{ 0,	0,	printargs,		"SYS_5476"	}, /* 5476 */
+	{ 0,	0,	printargs,		"SYS_5477"	}, /* 5477 */
+	{ 0,	0,	printargs,		"SYS_5478"	}, /* 5478 */
+	{ 0,	0,	printargs,		"SYS_5479"	}, /* 5479 */
+	{ 0,	0,	printargs,		"SYS_5480"	}, /* 5480 */
+	{ 0,	0,	printargs,		"SYS_5481"	}, /* 5481 */
+	{ 0,	0,	printargs,		"SYS_5482"	}, /* 5482 */
+	{ 0,	0,	printargs,		"SYS_5483"	}, /* 5483 */
+	{ 0,	0,	printargs,		"SYS_5484"	}, /* 5484 */
+	{ 0,	0,	printargs,		"SYS_5485"	}, /* 5485 */
+	{ 0,	0,	printargs,		"SYS_5486"	}, /* 5486 */
+	{ 0,	0,	printargs,		"SYS_5487"	}, /* 5487 */
+	{ 0,	0,	printargs,		"SYS_5488"	}, /* 5488 */
+	{ 0,	0,	printargs,		"SYS_5489"	}, /* 5489 */
+	{ 0,	0,	printargs,		"SYS_5490"	}, /* 5490 */
+	{ 0,	0,	printargs,		"SYS_5491"	}, /* 5491 */
+	{ 0,	0,	printargs,		"SYS_5492"	}, /* 5492 */
+	{ 0,	0,	printargs,		"SYS_5493"	}, /* 5493 */
+	{ 0,	0,	printargs,		"SYS_5494"	}, /* 5494 */
+	{ 0,	0,	printargs,		"SYS_5495"	}, /* 5495 */
+	{ 0,	0,	printargs,		"SYS_5496"	}, /* 5496 */
+	{ 0,	0,	printargs,		"SYS_5497"	}, /* 5497 */
+	{ 0,	0,	printargs,		"SYS_5498"	}, /* 5498 */
+	{ 0,	0,	printargs,		"SYS_5499"	}, /* 5499 */
+	{ 0,	0,	printargs,		"SYS_5500"	}, /* 5500 */
+	{ 0,	0,	printargs,		"SYS_5501"	}, /* 5501 */
+	{ 0,	0,	printargs,		"SYS_5502"	}, /* 5502 */
+	{ 0,	0,	printargs,		"SYS_5503"	}, /* 5503 */
+	{ 0,	0,	printargs,		"SYS_5504"	}, /* 5504 */
+	{ 0,	0,	printargs,		"SYS_5505"	}, /* 5505 */
+	{ 0,	0,	printargs,		"SYS_5506"	}, /* 5506 */
+	{ 0,	0,	printargs,		"SYS_5507"	}, /* 5507 */
+	{ 0,	0,	printargs,		"SYS_5508"	}, /* 5508 */
+	{ 0,	0,	printargs,		"SYS_5509"	}, /* 5509 */
+	{ 0,	0,	printargs,		"SYS_5510"	}, /* 5510 */
+	{ 0,	0,	printargs,		"SYS_5511"	}, /* 5511 */
+	{ 0,	0,	printargs,		"SYS_5512"	}, /* 5512 */
+	{ 0,	0,	printargs,		"SYS_5513"	}, /* 5513 */
+	{ 0,	0,	printargs,		"SYS_5514"	}, /* 5514 */
+	{ 0,	0,	printargs,		"SYS_5515"	}, /* 5515 */
+	{ 0,	0,	printargs,		"SYS_5516"	}, /* 5516 */
+	{ 0,	0,	printargs,		"SYS_5517"	}, /* 5517 */
+	{ 0,	0,	printargs,		"SYS_5518"	}, /* 5518 */
+	{ 0,	0,	printargs,		"SYS_5519"	}, /* 5519 */
+	{ 0,	0,	printargs,		"SYS_5520"	}, /* 5520 */
+	{ 0,	0,	printargs,		"SYS_5521"	}, /* 5521 */
+	{ 0,	0,	printargs,		"SYS_5522"	}, /* 5522 */
+	{ 0,	0,	printargs,		"SYS_5523"	}, /* 5523 */
+	{ 0,	0,	printargs,		"SYS_5524"	}, /* 5524 */
+	{ 0,	0,	printargs,		"SYS_5525"	}, /* 5525 */
+	{ 0,	0,	printargs,		"SYS_5526"	}, /* 5526 */
+	{ 0,	0,	printargs,		"SYS_5527"	}, /* 5527 */
+	{ 0,	0,	printargs,		"SYS_5528"	}, /* 5528 */
+	{ 0,	0,	printargs,		"SYS_5529"	}, /* 5529 */
+	{ 0,	0,	printargs,		"SYS_5530"	}, /* 5530 */
+	{ 0,	0,	printargs,		"SYS_5531"	}, /* 5531 */
+	{ 0,	0,	printargs,		"SYS_5532"	}, /* 5532 */
+	{ 0,	0,	printargs,		"SYS_5533"	}, /* 5533 */
+	{ 0,	0,	printargs,		"SYS_5534"	}, /* 5534 */
+	{ 0,	0,	printargs,		"SYS_5535"	}, /* 5535 */
+	{ 0,	0,	printargs,		"SYS_5536"	}, /* 5536 */
+	{ 0,	0,	printargs,		"SYS_5537"	}, /* 5537 */
+	{ 0,	0,	printargs,		"SYS_5538"	}, /* 5538 */
+	{ 0,	0,	printargs,		"SYS_5539"	}, /* 5539 */
+	{ 0,	0,	printargs,		"SYS_5540"	}, /* 5540 */
+	{ 0,	0,	printargs,		"SYS_5541"	}, /* 5541 */
+	{ 0,	0,	printargs,		"SYS_5542"	}, /* 5542 */
+	{ 0,	0,	printargs,		"SYS_5543"	}, /* 5543 */
+	{ 0,	0,	printargs,		"SYS_5544"	}, /* 5544 */
+	{ 0,	0,	printargs,		"SYS_5545"	}, /* 5545 */
+	{ 0,	0,	printargs,		"SYS_5546"	}, /* 5546 */
+	{ 0,	0,	printargs,		"SYS_5547"	}, /* 5547 */
+	{ 0,	0,	printargs,		"SYS_5548"	}, /* 5548 */
+	{ 0,	0,	printargs,		"SYS_5549"	}, /* 5549 */
+	{ 0,	0,	printargs,		"SYS_5550"	}, /* 5550 */
+	{ 0,	0,	printargs,		"SYS_5551"	}, /* 5551 */
+	{ 0,	0,	printargs,		"SYS_5552"	}, /* 5552 */
+	{ 0,	0,	printargs,		"SYS_5553"	}, /* 5553 */
+	{ 0,	0,	printargs,		"SYS_5554"	}, /* 5554 */
+	{ 0,	0,	printargs,		"SYS_5555"	}, /* 5555 */
+	{ 0,	0,	printargs,		"SYS_5556"	}, /* 5556 */
+	{ 0,	0,	printargs,		"SYS_5557"	}, /* 5557 */
+	{ 0,	0,	printargs,		"SYS_5558"	}, /* 5558 */
+	{ 0,	0,	printargs,		"SYS_5559"	}, /* 5559 */
+	{ 0,	0,	printargs,		"SYS_5560"	}, /* 5560 */
+	{ 0,	0,	printargs,		"SYS_5561"	}, /* 5561 */
+	{ 0,	0,	printargs,		"SYS_5562"	}, /* 5562 */
+	{ 0,	0,	printargs,		"SYS_5563"	}, /* 5563 */
+	{ 0,	0,	printargs,		"SYS_5564"	}, /* 5564 */
+	{ 0,	0,	printargs,		"SYS_5565"	}, /* 5565 */
+	{ 0,	0,	printargs,		"SYS_5566"	}, /* 5566 */
+	{ 0,	0,	printargs,		"SYS_5567"	}, /* 5567 */
+	{ 0,	0,	printargs,		"SYS_5568"	}, /* 5568 */
+	{ 0,	0,	printargs,		"SYS_5569"	}, /* 5569 */
+	{ 0,	0,	printargs,		"SYS_5570"	}, /* 5570 */
+	{ 0,	0,	printargs,		"SYS_5571"	}, /* 5571 */
+	{ 0,	0,	printargs,		"SYS_5572"	}, /* 5572 */
+	{ 0,	0,	printargs,		"SYS_5573"	}, /* 5573 */
+	{ 0,	0,	printargs,		"SYS_5574"	}, /* 5574 */
+	{ 0,	0,	printargs,		"SYS_5575"	}, /* 5575 */
+	{ 0,	0,	printargs,		"SYS_5576"	}, /* 5576 */
+	{ 0,	0,	printargs,		"SYS_5577"	}, /* 5577 */
+	{ 0,	0,	printargs,		"SYS_5578"	}, /* 5578 */
+	{ 0,	0,	printargs,		"SYS_5579"	}, /* 5579 */
+	{ 0,	0,	printargs,		"SYS_5580"	}, /* 5580 */
+	{ 0,	0,	printargs,		"SYS_5581"	}, /* 5581 */
+	{ 0,	0,	printargs,		"SYS_5582"	}, /* 5582 */
+	{ 0,	0,	printargs,		"SYS_5583"	}, /* 5583 */
+	{ 0,	0,	printargs,		"SYS_5584"	}, /* 5584 */
+	{ 0,	0,	printargs,		"SYS_5585"	}, /* 5585 */
+	{ 0,	0,	printargs,		"SYS_5586"	}, /* 5586 */
+	{ 0,	0,	printargs,		"SYS_5587"	}, /* 5587 */
+	{ 0,	0,	printargs,		"SYS_5588"	}, /* 5588 */
+	{ 0,	0,	printargs,		"SYS_5589"	}, /* 5589 */
+	{ 0,	0,	printargs,		"SYS_5590"	}, /* 5590 */
+	{ 0,	0,	printargs,		"SYS_5591"	}, /* 5591 */
+	{ 0,	0,	printargs,		"SYS_5592"	}, /* 5592 */
+	{ 0,	0,	printargs,		"SYS_5593"	}, /* 5593 */
+	{ 0,	0,	printargs,		"SYS_5594"	}, /* 5594 */
+	{ 0,	0,	printargs,		"SYS_5595"	}, /* 5595 */
+	{ 0,	0,	printargs,		"SYS_5596"	}, /* 5596 */
+	{ 0,	0,	printargs,		"SYS_5597"	}, /* 5597 */
+	{ 0,	0,	printargs,		"SYS_5598"	}, /* 5598 */
+	{ 0,	0,	printargs,		"SYS_5599"	}, /* 5599 */
+	{ 0,	0,	printargs,		"SYS_5600"	}, /* 5600 */
+	{ 0,	0,	printargs,		"SYS_5601"	}, /* 5601 */
+	{ 0,	0,	printargs,		"SYS_5602"	}, /* 5602 */
+	{ 0,	0,	printargs,		"SYS_5603"	}, /* 5603 */
+	{ 0,	0,	printargs,		"SYS_5604"	}, /* 5604 */
+	{ 0,	0,	printargs,		"SYS_5605"	}, /* 5605 */
+	{ 0,	0,	printargs,		"SYS_5606"	}, /* 5606 */
+	{ 0,	0,	printargs,		"SYS_5607"	}, /* 5607 */
+	{ 0,	0,	printargs,		"SYS_5608"	}, /* 5608 */
+	{ 0,	0,	printargs,		"SYS_5609"	}, /* 5609 */
+	{ 0,	0,	printargs,		"SYS_5610"	}, /* 5610 */
+	{ 0,	0,	printargs,		"SYS_5611"	}, /* 5611 */
+	{ 0,	0,	printargs,		"SYS_5612"	}, /* 5612 */
+	{ 0,	0,	printargs,		"SYS_5613"	}, /* 5613 */
+	{ 0,	0,	printargs,		"SYS_5614"	}, /* 5614 */
+	{ 0,	0,	printargs,		"SYS_5615"	}, /* 5615 */
+	{ 0,	0,	printargs,		"SYS_5616"	}, /* 5616 */
+	{ 0,	0,	printargs,		"SYS_5617"	}, /* 5617 */
+	{ 0,	0,	printargs,		"SYS_5618"	}, /* 5618 */
+	{ 0,	0,	printargs,		"SYS_5619"	}, /* 5619 */
+	{ 0,	0,	printargs,		"SYS_5620"	}, /* 5620 */
+	{ 0,	0,	printargs,		"SYS_5621"	}, /* 5621 */
+	{ 0,	0,	printargs,		"SYS_5622"	}, /* 5622 */
+	{ 0,	0,	printargs,		"SYS_5623"	}, /* 5623 */
+	{ 0,	0,	printargs,		"SYS_5624"	}, /* 5624 */
+	{ 0,	0,	printargs,		"SYS_5625"	}, /* 5625 */
+	{ 0,	0,	printargs,		"SYS_5626"	}, /* 5626 */
+	{ 0,	0,	printargs,		"SYS_5627"	}, /* 5627 */
+	{ 0,	0,	printargs,		"SYS_5628"	}, /* 5628 */
+	{ 0,	0,	printargs,		"SYS_5629"	}, /* 5629 */
+	{ 0,	0,	printargs,		"SYS_5630"	}, /* 5630 */
+	{ 0,	0,	printargs,		"SYS_5631"	}, /* 5631 */
+	{ 0,	0,	printargs,		"SYS_5632"	}, /* 5632 */
+	{ 0,	0,	printargs,		"SYS_5633"	}, /* 5633 */
+	{ 0,	0,	printargs,		"SYS_5634"	}, /* 5634 */
+	{ 0,	0,	printargs,		"SYS_5635"	}, /* 5635 */
+	{ 0,	0,	printargs,		"SYS_5636"	}, /* 5636 */
+	{ 0,	0,	printargs,		"SYS_5637"	}, /* 5637 */
+	{ 0,	0,	printargs,		"SYS_5638"	}, /* 5638 */
+	{ 0,	0,	printargs,		"SYS_5639"	}, /* 5639 */
+	{ 0,	0,	printargs,		"SYS_5640"	}, /* 5640 */
+	{ 0,	0,	printargs,		"SYS_5641"	}, /* 5641 */
+	{ 0,	0,	printargs,		"SYS_5642"	}, /* 5642 */
+	{ 0,	0,	printargs,		"SYS_5643"	}, /* 5643 */
+	{ 0,	0,	printargs,		"SYS_5644"	}, /* 5644 */
+	{ 0,	0,	printargs,		"SYS_5645"	}, /* 5645 */
+	{ 0,	0,	printargs,		"SYS_5646"	}, /* 5646 */
+	{ 0,	0,	printargs,		"SYS_5647"	}, /* 5647 */
+	{ 0,	0,	printargs,		"SYS_5648"	}, /* 5648 */
+	{ 0,	0,	printargs,		"SYS_5649"	}, /* 5649 */
+	{ 0,	0,	printargs,		"SYS_5650"	}, /* 5650 */
+	{ 0,	0,	printargs,		"SYS_5651"	}, /* 5651 */
+	{ 0,	0,	printargs,		"SYS_5652"	}, /* 5652 */
+	{ 0,	0,	printargs,		"SYS_5653"	}, /* 5653 */
+	{ 0,	0,	printargs,		"SYS_5654"	}, /* 5654 */
+	{ 0,	0,	printargs,		"SYS_5655"	}, /* 5655 */
+	{ 0,	0,	printargs,		"SYS_5656"	}, /* 5656 */
+	{ 0,	0,	printargs,		"SYS_5657"	}, /* 5657 */
+	{ 0,	0,	printargs,		"SYS_5658"	}, /* 5658 */
+	{ 0,	0,	printargs,		"SYS_5659"	}, /* 5659 */
+	{ 0,	0,	printargs,		"SYS_5660"	}, /* 5660 */
+	{ 0,	0,	printargs,		"SYS_5661"	}, /* 5661 */
+	{ 0,	0,	printargs,		"SYS_5662"	}, /* 5662 */
+	{ 0,	0,	printargs,		"SYS_5663"	}, /* 5663 */
+	{ 0,	0,	printargs,		"SYS_5664"	}, /* 5664 */
+	{ 0,	0,	printargs,		"SYS_5665"	}, /* 5665 */
+	{ 0,	0,	printargs,		"SYS_5666"	}, /* 5666 */
+	{ 0,	0,	printargs,		"SYS_5667"	}, /* 5667 */
+	{ 0,	0,	printargs,		"SYS_5668"	}, /* 5668 */
+	{ 0,	0,	printargs,		"SYS_5669"	}, /* 5669 */
+	{ 0,	0,	printargs,		"SYS_5670"	}, /* 5670 */
+	{ 0,	0,	printargs,		"SYS_5671"	}, /* 5671 */
+	{ 0,	0,	printargs,		"SYS_5672"	}, /* 5672 */
+	{ 0,	0,	printargs,		"SYS_5673"	}, /* 5673 */
+	{ 0,	0,	printargs,		"SYS_5674"	}, /* 5674 */
+	{ 0,	0,	printargs,		"SYS_5675"	}, /* 5675 */
+	{ 0,	0,	printargs,		"SYS_5676"	}, /* 5676 */
+	{ 0,	0,	printargs,		"SYS_5677"	}, /* 5677 */
+	{ 0,	0,	printargs,		"SYS_5678"	}, /* 5678 */
+	{ 0,	0,	printargs,		"SYS_5679"	}, /* 5679 */
+	{ 0,	0,	printargs,		"SYS_5680"	}, /* 5680 */
+	{ 0,	0,	printargs,		"SYS_5681"	}, /* 5681 */
+	{ 0,	0,	printargs,		"SYS_5682"	}, /* 5682 */
+	{ 0,	0,	printargs,		"SYS_5683"	}, /* 5683 */
+	{ 0,	0,	printargs,		"SYS_5684"	}, /* 5684 */
+	{ 0,	0,	printargs,		"SYS_5685"	}, /* 5685 */
+	{ 0,	0,	printargs,		"SYS_5686"	}, /* 5686 */
+	{ 0,	0,	printargs,		"SYS_5687"	}, /* 5687 */
+	{ 0,	0,	printargs,		"SYS_5688"	}, /* 5688 */
+	{ 0,	0,	printargs,		"SYS_5689"	}, /* 5689 */
+	{ 0,	0,	printargs,		"SYS_5690"	}, /* 5690 */
+	{ 0,	0,	printargs,		"SYS_5691"	}, /* 5691 */
+	{ 0,	0,	printargs,		"SYS_5692"	}, /* 5692 */
+	{ 0,	0,	printargs,		"SYS_5693"	}, /* 5693 */
+	{ 0,	0,	printargs,		"SYS_5694"	}, /* 5694 */
+	{ 0,	0,	printargs,		"SYS_5695"	}, /* 5695 */
+	{ 0,	0,	printargs,		"SYS_5696"	}, /* 5696 */
+	{ 0,	0,	printargs,		"SYS_5697"	}, /* 5697 */
+	{ 0,	0,	printargs,		"SYS_5698"	}, /* 5698 */
+	{ 0,	0,	printargs,		"SYS_5699"	}, /* 5699 */
+	{ 0,	0,	printargs,		"SYS_5700"	}, /* 5700 */
+	{ 0,	0,	printargs,		"SYS_5701"	}, /* 5701 */
+	{ 0,	0,	printargs,		"SYS_5702"	}, /* 5702 */
+	{ 0,	0,	printargs,		"SYS_5703"	}, /* 5703 */
+	{ 0,	0,	printargs,		"SYS_5704"	}, /* 5704 */
+	{ 0,	0,	printargs,		"SYS_5705"	}, /* 5705 */
+	{ 0,	0,	printargs,		"SYS_5706"	}, /* 5706 */
+	{ 0,	0,	printargs,		"SYS_5707"	}, /* 5707 */
+	{ 0,	0,	printargs,		"SYS_5708"	}, /* 5708 */
+	{ 0,	0,	printargs,		"SYS_5709"	}, /* 5709 */
+	{ 0,	0,	printargs,		"SYS_5710"	}, /* 5710 */
+	{ 0,	0,	printargs,		"SYS_5711"	}, /* 5711 */
+	{ 0,	0,	printargs,		"SYS_5712"	}, /* 5712 */
+	{ 0,	0,	printargs,		"SYS_5713"	}, /* 5713 */
+	{ 0,	0,	printargs,		"SYS_5714"	}, /* 5714 */
+	{ 0,	0,	printargs,		"SYS_5715"	}, /* 5715 */
+	{ 0,	0,	printargs,		"SYS_5716"	}, /* 5716 */
+	{ 0,	0,	printargs,		"SYS_5717"	}, /* 5717 */
+	{ 0,	0,	printargs,		"SYS_5718"	}, /* 5718 */
+	{ 0,	0,	printargs,		"SYS_5719"	}, /* 5719 */
+	{ 0,	0,	printargs,		"SYS_5720"	}, /* 5720 */
+	{ 0,	0,	printargs,		"SYS_5721"	}, /* 5721 */
+	{ 0,	0,	printargs,		"SYS_5722"	}, /* 5722 */
+	{ 0,	0,	printargs,		"SYS_5723"	}, /* 5723 */
+	{ 0,	0,	printargs,		"SYS_5724"	}, /* 5724 */
+	{ 0,	0,	printargs,		"SYS_5725"	}, /* 5725 */
+	{ 0,	0,	printargs,		"SYS_5726"	}, /* 5726 */
+	{ 0,	0,	printargs,		"SYS_5727"	}, /* 5727 */
+	{ 0,	0,	printargs,		"SYS_5728"	}, /* 5728 */
+	{ 0,	0,	printargs,		"SYS_5729"	}, /* 5729 */
+	{ 0,	0,	printargs,		"SYS_5730"	}, /* 5730 */
+	{ 0,	0,	printargs,		"SYS_5731"	}, /* 5731 */
+	{ 0,	0,	printargs,		"SYS_5732"	}, /* 5732 */
+	{ 0,	0,	printargs,		"SYS_5733"	}, /* 5733 */
+	{ 0,	0,	printargs,		"SYS_5734"	}, /* 5734 */
+	{ 0,	0,	printargs,		"SYS_5735"	}, /* 5735 */
+	{ 0,	0,	printargs,		"SYS_5736"	}, /* 5736 */
+	{ 0,	0,	printargs,		"SYS_5737"	}, /* 5737 */
+	{ 0,	0,	printargs,		"SYS_5738"	}, /* 5738 */
+	{ 0,	0,	printargs,		"SYS_5739"	}, /* 5739 */
+	{ 0,	0,	printargs,		"SYS_5740"	}, /* 5740 */
+	{ 0,	0,	printargs,		"SYS_5741"	}, /* 5741 */
+	{ 0,	0,	printargs,		"SYS_5742"	}, /* 5742 */
+	{ 0,	0,	printargs,		"SYS_5743"	}, /* 5743 */
+	{ 0,	0,	printargs,		"SYS_5744"	}, /* 5744 */
+	{ 0,	0,	printargs,		"SYS_5745"	}, /* 5745 */
+	{ 0,	0,	printargs,		"SYS_5746"	}, /* 5746 */
+	{ 0,	0,	printargs,		"SYS_5747"	}, /* 5747 */
+	{ 0,	0,	printargs,		"SYS_5748"	}, /* 5748 */
+	{ 0,	0,	printargs,		"SYS_5749"	}, /* 5749 */
+	{ 0,	0,	printargs,		"SYS_5750"	}, /* 5750 */
+	{ 0,	0,	printargs,		"SYS_5751"	}, /* 5751 */
+	{ 0,	0,	printargs,		"SYS_5752"	}, /* 5752 */
+	{ 0,	0,	printargs,		"SYS_5753"	}, /* 5753 */
+	{ 0,	0,	printargs,		"SYS_5754"	}, /* 5754 */
+	{ 0,	0,	printargs,		"SYS_5755"	}, /* 5755 */
+	{ 0,	0,	printargs,		"SYS_5756"	}, /* 5756 */
+	{ 0,	0,	printargs,		"SYS_5757"	}, /* 5757 */
+	{ 0,	0,	printargs,		"SYS_5758"	}, /* 5758 */
+	{ 0,	0,	printargs,		"SYS_5759"	}, /* 5759 */
+	{ 0,	0,	printargs,		"SYS_5760"	}, /* 5760 */
+	{ 0,	0,	printargs,		"SYS_5761"	}, /* 5761 */
+	{ 0,	0,	printargs,		"SYS_5762"	}, /* 5762 */
+	{ 0,	0,	printargs,		"SYS_5763"	}, /* 5763 */
+	{ 0,	0,	printargs,		"SYS_5764"	}, /* 5764 */
+	{ 0,	0,	printargs,		"SYS_5765"	}, /* 5765 */
+	{ 0,	0,	printargs,		"SYS_5766"	}, /* 5766 */
+	{ 0,	0,	printargs,		"SYS_5767"	}, /* 5767 */
+	{ 0,	0,	printargs,		"SYS_5768"	}, /* 5768 */
+	{ 0,	0,	printargs,		"SYS_5769"	}, /* 5769 */
+	{ 0,	0,	printargs,		"SYS_5770"	}, /* 5770 */
+	{ 0,	0,	printargs,		"SYS_5771"	}, /* 5771 */
+	{ 0,	0,	printargs,		"SYS_5772"	}, /* 5772 */
+	{ 0,	0,	printargs,		"SYS_5773"	}, /* 5773 */
+	{ 0,	0,	printargs,		"SYS_5774"	}, /* 5774 */
+	{ 0,	0,	printargs,		"SYS_5775"	}, /* 5775 */
+	{ 0,	0,	printargs,		"SYS_5776"	}, /* 5776 */
+	{ 0,	0,	printargs,		"SYS_5777"	}, /* 5777 */
+	{ 0,	0,	printargs,		"SYS_5778"	}, /* 5778 */
+	{ 0,	0,	printargs,		"SYS_5779"	}, /* 5779 */
+	{ 0,	0,	printargs,		"SYS_5780"	}, /* 5780 */
+	{ 0,	0,	printargs,		"SYS_5781"	}, /* 5781 */
+	{ 0,	0,	printargs,		"SYS_5782"	}, /* 5782 */
+	{ 0,	0,	printargs,		"SYS_5783"	}, /* 5783 */
+	{ 0,	0,	printargs,		"SYS_5784"	}, /* 5784 */
+	{ 0,	0,	printargs,		"SYS_5785"	}, /* 5785 */
+	{ 0,	0,	printargs,		"SYS_5786"	}, /* 5786 */
+	{ 0,	0,	printargs,		"SYS_5787"	}, /* 5787 */
+	{ 0,	0,	printargs,		"SYS_5788"	}, /* 5788 */
+	{ 0,	0,	printargs,		"SYS_5789"	}, /* 5789 */
+	{ 0,	0,	printargs,		"SYS_5790"	}, /* 5790 */
+	{ 0,	0,	printargs,		"SYS_5791"	}, /* 5791 */
+	{ 0,	0,	printargs,		"SYS_5792"	}, /* 5792 */
+	{ 0,	0,	printargs,		"SYS_5793"	}, /* 5793 */
+	{ 0,	0,	printargs,		"SYS_5794"	}, /* 5794 */
+	{ 0,	0,	printargs,		"SYS_5795"	}, /* 5795 */
+	{ 0,	0,	printargs,		"SYS_5796"	}, /* 5796 */
+	{ 0,	0,	printargs,		"SYS_5797"	}, /* 5797 */
+	{ 0,	0,	printargs,		"SYS_5798"	}, /* 5798 */
+	{ 0,	0,	printargs,		"SYS_5799"	}, /* 5799 */
+	{ 0,	0,	printargs,		"SYS_5800"	}, /* 5800 */
+	{ 0,	0,	printargs,		"SYS_5801"	}, /* 5801 */
+	{ 0,	0,	printargs,		"SYS_5802"	}, /* 5802 */
+	{ 0,	0,	printargs,		"SYS_5803"	}, /* 5803 */
+	{ 0,	0,	printargs,		"SYS_5804"	}, /* 5804 */
+	{ 0,	0,	printargs,		"SYS_5805"	}, /* 5805 */
+	{ 0,	0,	printargs,		"SYS_5806"	}, /* 5806 */
+	{ 0,	0,	printargs,		"SYS_5807"	}, /* 5807 */
+	{ 0,	0,	printargs,		"SYS_5808"	}, /* 5808 */
+	{ 0,	0,	printargs,		"SYS_5809"	}, /* 5809 */
+	{ 0,	0,	printargs,		"SYS_5810"	}, /* 5810 */
+	{ 0,	0,	printargs,		"SYS_5811"	}, /* 5811 */
+	{ 0,	0,	printargs,		"SYS_5812"	}, /* 5812 */
+	{ 0,	0,	printargs,		"SYS_5813"	}, /* 5813 */
+	{ 0,	0,	printargs,		"SYS_5814"	}, /* 5814 */
+	{ 0,	0,	printargs,		"SYS_5815"	}, /* 5815 */
+	{ 0,	0,	printargs,		"SYS_5816"	}, /* 5816 */
+	{ 0,	0,	printargs,		"SYS_5817"	}, /* 5817 */
+	{ 0,	0,	printargs,		"SYS_5818"	}, /* 5818 */
+	{ 0,	0,	printargs,		"SYS_5819"	}, /* 5819 */
+	{ 0,	0,	printargs,		"SYS_5820"	}, /* 5820 */
+	{ 0,	0,	printargs,		"SYS_5821"	}, /* 5821 */
+	{ 0,	0,	printargs,		"SYS_5822"	}, /* 5822 */
+	{ 0,	0,	printargs,		"SYS_5823"	}, /* 5823 */
+	{ 0,	0,	printargs,		"SYS_5824"	}, /* 5824 */
+	{ 0,	0,	printargs,		"SYS_5825"	}, /* 5825 */
+	{ 0,	0,	printargs,		"SYS_5826"	}, /* 5826 */
+	{ 0,	0,	printargs,		"SYS_5827"	}, /* 5827 */
+	{ 0,	0,	printargs,		"SYS_5828"	}, /* 5828 */
+	{ 0,	0,	printargs,		"SYS_5829"	}, /* 5829 */
+	{ 0,	0,	printargs,		"SYS_5830"	}, /* 5830 */
+	{ 0,	0,	printargs,		"SYS_5831"	}, /* 5831 */
+	{ 0,	0,	printargs,		"SYS_5832"	}, /* 5832 */
+	{ 0,	0,	printargs,		"SYS_5833"	}, /* 5833 */
+	{ 0,	0,	printargs,		"SYS_5834"	}, /* 5834 */
+	{ 0,	0,	printargs,		"SYS_5835"	}, /* 5835 */
+	{ 0,	0,	printargs,		"SYS_5836"	}, /* 5836 */
+	{ 0,	0,	printargs,		"SYS_5837"	}, /* 5837 */
+	{ 0,	0,	printargs,		"SYS_5838"	}, /* 5838 */
+	{ 0,	0,	printargs,		"SYS_5839"	}, /* 5839 */
+	{ 0,	0,	printargs,		"SYS_5840"	}, /* 5840 */
+	{ 0,	0,	printargs,		"SYS_5841"	}, /* 5841 */
+	{ 0,	0,	printargs,		"SYS_5842"	}, /* 5842 */
+	{ 0,	0,	printargs,		"SYS_5843"	}, /* 5843 */
+	{ 0,	0,	printargs,		"SYS_5844"	}, /* 5844 */
+	{ 0,	0,	printargs,		"SYS_5845"	}, /* 5845 */
+	{ 0,	0,	printargs,		"SYS_5846"	}, /* 5846 */
+	{ 0,	0,	printargs,		"SYS_5847"	}, /* 5847 */
+	{ 0,	0,	printargs,		"SYS_5848"	}, /* 5848 */
+	{ 0,	0,	printargs,		"SYS_5849"	}, /* 5849 */
+	{ 0,	0,	printargs,		"SYS_5850"	}, /* 5850 */
+	{ 0,	0,	printargs,		"SYS_5851"	}, /* 5851 */
+	{ 0,	0,	printargs,		"SYS_5852"	}, /* 5852 */
+	{ 0,	0,	printargs,		"SYS_5853"	}, /* 5853 */
+	{ 0,	0,	printargs,		"SYS_5854"	}, /* 5854 */
+	{ 0,	0,	printargs,		"SYS_5855"	}, /* 5855 */
+	{ 0,	0,	printargs,		"SYS_5856"	}, /* 5856 */
+	{ 0,	0,	printargs,		"SYS_5857"	}, /* 5857 */
+	{ 0,	0,	printargs,		"SYS_5858"	}, /* 5858 */
+	{ 0,	0,	printargs,		"SYS_5859"	}, /* 5859 */
+	{ 0,	0,	printargs,		"SYS_5860"	}, /* 5860 */
+	{ 0,	0,	printargs,		"SYS_5861"	}, /* 5861 */
+	{ 0,	0,	printargs,		"SYS_5862"	}, /* 5862 */
+	{ 0,	0,	printargs,		"SYS_5863"	}, /* 5863 */
+	{ 0,	0,	printargs,		"SYS_5864"	}, /* 5864 */
+	{ 0,	0,	printargs,		"SYS_5865"	}, /* 5865 */
+	{ 0,	0,	printargs,		"SYS_5866"	}, /* 5866 */
+	{ 0,	0,	printargs,		"SYS_5867"	}, /* 5867 */
+	{ 0,	0,	printargs,		"SYS_5868"	}, /* 5868 */
+	{ 0,	0,	printargs,		"SYS_5869"	}, /* 5869 */
+	{ 0,	0,	printargs,		"SYS_5870"	}, /* 5870 */
+	{ 0,	0,	printargs,		"SYS_5871"	}, /* 5871 */
+	{ 0,	0,	printargs,		"SYS_5872"	}, /* 5872 */
+	{ 0,	0,	printargs,		"SYS_5873"	}, /* 5873 */
+	{ 0,	0,	printargs,		"SYS_5874"	}, /* 5874 */
+	{ 0,	0,	printargs,		"SYS_5875"	}, /* 5875 */
+	{ 0,	0,	printargs,		"SYS_5876"	}, /* 5876 */
+	{ 0,	0,	printargs,		"SYS_5877"	}, /* 5877 */
+	{ 0,	0,	printargs,		"SYS_5878"	}, /* 5878 */
+	{ 0,	0,	printargs,		"SYS_5879"	}, /* 5879 */
+	{ 0,	0,	printargs,		"SYS_5880"	}, /* 5880 */
+	{ 0,	0,	printargs,		"SYS_5881"	}, /* 5881 */
+	{ 0,	0,	printargs,		"SYS_5882"	}, /* 5882 */
+	{ 0,	0,	printargs,		"SYS_5883"	}, /* 5883 */
+	{ 0,	0,	printargs,		"SYS_5884"	}, /* 5884 */
+	{ 0,	0,	printargs,		"SYS_5885"	}, /* 5885 */
+	{ 0,	0,	printargs,		"SYS_5886"	}, /* 5886 */
+	{ 0,	0,	printargs,		"SYS_5887"	}, /* 5887 */
+	{ 0,	0,	printargs,		"SYS_5888"	}, /* 5888 */
+	{ 0,	0,	printargs,		"SYS_5889"	}, /* 5889 */
+	{ 0,	0,	printargs,		"SYS_5890"	}, /* 5890 */
+	{ 0,	0,	printargs,		"SYS_5891"	}, /* 5891 */
+	{ 0,	0,	printargs,		"SYS_5892"	}, /* 5892 */
+	{ 0,	0,	printargs,		"SYS_5893"	}, /* 5893 */
+	{ 0,	0,	printargs,		"SYS_5894"	}, /* 5894 */
+	{ 0,	0,	printargs,		"SYS_5895"	}, /* 5895 */
+	{ 0,	0,	printargs,		"SYS_5896"	}, /* 5896 */
+	{ 0,	0,	printargs,		"SYS_5897"	}, /* 5897 */
+	{ 0,	0,	printargs,		"SYS_5898"	}, /* 5898 */
+	{ 0,	0,	printargs,		"SYS_5899"	}, /* 5899 */
+	{ 0,	0,	printargs,		"SYS_5900"	}, /* 5900 */
+	{ 0,	0,	printargs,		"SYS_5901"	}, /* 5901 */
+	{ 0,	0,	printargs,		"SYS_5902"	}, /* 5902 */
+	{ 0,	0,	printargs,		"SYS_5903"	}, /* 5903 */
+	{ 0,	0,	printargs,		"SYS_5904"	}, /* 5904 */
+	{ 0,	0,	printargs,		"SYS_5905"	}, /* 5905 */
+	{ 0,	0,	printargs,		"SYS_5906"	}, /* 5906 */
+	{ 0,	0,	printargs,		"SYS_5907"	}, /* 5907 */
+	{ 0,	0,	printargs,		"SYS_5908"	}, /* 5908 */
+	{ 0,	0,	printargs,		"SYS_5909"	}, /* 5909 */
+	{ 0,	0,	printargs,		"SYS_5910"	}, /* 5910 */
+	{ 0,	0,	printargs,		"SYS_5911"	}, /* 5911 */
+	{ 0,	0,	printargs,		"SYS_5912"	}, /* 5912 */
+	{ 0,	0,	printargs,		"SYS_5913"	}, /* 5913 */
+	{ 0,	0,	printargs,		"SYS_5914"	}, /* 5914 */
+	{ 0,	0,	printargs,		"SYS_5915"	}, /* 5915 */
+	{ 0,	0,	printargs,		"SYS_5916"	}, /* 5916 */
+	{ 0,	0,	printargs,		"SYS_5917"	}, /* 5917 */
+	{ 0,	0,	printargs,		"SYS_5918"	}, /* 5918 */
+	{ 0,	0,	printargs,		"SYS_5919"	}, /* 5919 */
+	{ 0,	0,	printargs,		"SYS_5920"	}, /* 5920 */
+	{ 0,	0,	printargs,		"SYS_5921"	}, /* 5921 */
+	{ 0,	0,	printargs,		"SYS_5922"	}, /* 5922 */
+	{ 0,	0,	printargs,		"SYS_5923"	}, /* 5923 */
+	{ 0,	0,	printargs,		"SYS_5924"	}, /* 5924 */
+	{ 0,	0,	printargs,		"SYS_5925"	}, /* 5925 */
+	{ 0,	0,	printargs,		"SYS_5926"	}, /* 5926 */
+	{ 0,	0,	printargs,		"SYS_5927"	}, /* 5927 */
+	{ 0,	0,	printargs,		"SYS_5928"	}, /* 5928 */
+	{ 0,	0,	printargs,		"SYS_5929"	}, /* 5929 */
+	{ 0,	0,	printargs,		"SYS_5930"	}, /* 5930 */
+	{ 0,	0,	printargs,		"SYS_5931"	}, /* 5931 */
+	{ 0,	0,	printargs,		"SYS_5932"	}, /* 5932 */
+	{ 0,	0,	printargs,		"SYS_5933"	}, /* 5933 */
+	{ 0,	0,	printargs,		"SYS_5934"	}, /* 5934 */
+	{ 0,	0,	printargs,		"SYS_5935"	}, /* 5935 */
+	{ 0,	0,	printargs,		"SYS_5936"	}, /* 5936 */
+	{ 0,	0,	printargs,		"SYS_5937"	}, /* 5937 */
+	{ 0,	0,	printargs,		"SYS_5938"	}, /* 5938 */
+	{ 0,	0,	printargs,		"SYS_5939"	}, /* 5939 */
+	{ 0,	0,	printargs,		"SYS_5940"	}, /* 5940 */
+	{ 0,	0,	printargs,		"SYS_5941"	}, /* 5941 */
+	{ 0,	0,	printargs,		"SYS_5942"	}, /* 5942 */
+	{ 0,	0,	printargs,		"SYS_5943"	}, /* 5943 */
+	{ 0,	0,	printargs,		"SYS_5944"	}, /* 5944 */
+	{ 0,	0,	printargs,		"SYS_5945"	}, /* 5945 */
+	{ 0,	0,	printargs,		"SYS_5946"	}, /* 5946 */
+	{ 0,	0,	printargs,		"SYS_5947"	}, /* 5947 */
+	{ 0,	0,	printargs,		"SYS_5948"	}, /* 5948 */
+	{ 0,	0,	printargs,		"SYS_5949"	}, /* 5949 */
+	{ 0,	0,	printargs,		"SYS_5950"	}, /* 5950 */
+	{ 0,	0,	printargs,		"SYS_5951"	}, /* 5951 */
+	{ 0,	0,	printargs,		"SYS_5952"	}, /* 5952 */
+	{ 0,	0,	printargs,		"SYS_5953"	}, /* 5953 */
+	{ 0,	0,	printargs,		"SYS_5954"	}, /* 5954 */
+	{ 0,	0,	printargs,		"SYS_5955"	}, /* 5955 */
+	{ 0,	0,	printargs,		"SYS_5956"	}, /* 5956 */
+	{ 0,	0,	printargs,		"SYS_5957"	}, /* 5957 */
+	{ 0,	0,	printargs,		"SYS_5958"	}, /* 5958 */
+	{ 0,	0,	printargs,		"SYS_5959"	}, /* 5959 */
+	{ 0,	0,	printargs,		"SYS_5960"	}, /* 5960 */
+	{ 0,	0,	printargs,		"SYS_5961"	}, /* 5961 */
+	{ 0,	0,	printargs,		"SYS_5962"	}, /* 5962 */
+	{ 0,	0,	printargs,		"SYS_5963"	}, /* 5963 */
+	{ 0,	0,	printargs,		"SYS_5964"	}, /* 5964 */
+	{ 0,	0,	printargs,		"SYS_5965"	}, /* 5965 */
+	{ 0,	0,	printargs,		"SYS_5966"	}, /* 5966 */
+	{ 0,	0,	printargs,		"SYS_5967"	}, /* 5967 */
+	{ 0,	0,	printargs,		"SYS_5968"	}, /* 5968 */
+	{ 0,	0,	printargs,		"SYS_5969"	}, /* 5969 */
+	{ 0,	0,	printargs,		"SYS_5970"	}, /* 5970 */
+	{ 0,	0,	printargs,		"SYS_5971"	}, /* 5971 */
+	{ 0,	0,	printargs,		"SYS_5972"	}, /* 5972 */
+	{ 0,	0,	printargs,		"SYS_5973"	}, /* 5973 */
+	{ 0,	0,	printargs,		"SYS_5974"	}, /* 5974 */
+	{ 0,	0,	printargs,		"SYS_5975"	}, /* 5975 */
+	{ 0,	0,	printargs,		"SYS_5976"	}, /* 5976 */
+	{ 0,	0,	printargs,		"SYS_5977"	}, /* 5977 */
+	{ 0,	0,	printargs,		"SYS_5978"	}, /* 5978 */
+	{ 0,	0,	printargs,		"SYS_5979"	}, /* 5979 */
+	{ 0,	0,	printargs,		"SYS_5980"	}, /* 5980 */
+	{ 0,	0,	printargs,		"SYS_5981"	}, /* 5981 */
+	{ 0,	0,	printargs,		"SYS_5982"	}, /* 5982 */
+	{ 0,	0,	printargs,		"SYS_5983"	}, /* 5983 */
+	{ 0,	0,	printargs,		"SYS_5984"	}, /* 5984 */
+	{ 0,	0,	printargs,		"SYS_5985"	}, /* 5985 */
+	{ 0,	0,	printargs,		"SYS_5986"	}, /* 5986 */
+	{ 0,	0,	printargs,		"SYS_5987"	}, /* 5987 */
+	{ 0,	0,	printargs,		"SYS_5988"	}, /* 5988 */
+	{ 0,	0,	printargs,		"SYS_5989"	}, /* 5989 */
+	{ 0,	0,	printargs,		"SYS_5990"	}, /* 5990 */
+	{ 0,	0,	printargs,		"SYS_5991"	}, /* 5991 */
+	{ 0,	0,	printargs,		"SYS_5992"	}, /* 5992 */
+	{ 0,	0,	printargs,		"SYS_5993"	}, /* 5993 */
+	{ 0,	0,	printargs,		"SYS_5994"	}, /* 5994 */
+	{ 0,	0,	printargs,		"SYS_5995"	}, /* 5995 */
+	{ 0,	0,	printargs,		"SYS_5996"	}, /* 5996 */
+	{ 0,	0,	printargs,		"SYS_5997"	}, /* 5997 */
+	{ 0,	0,	printargs,		"SYS_5998"	}, /* 5998 */
+	{ 0,	0,	printargs,		"SYS_5999"	}, /* 5999 */ /* end of Linux N64 */
+
+#if defined (LINUX_MIPSN32)
+	/* For an N32 strace decode the N32 64-bit syscalls.  */
+	{ 3,	TF,	sys_read,		"read"		}, /* 6000 */ /* start of Linux N32 */
+	{ 3,	TF,	sys_write,		"write"		}, /* 6001 */
+	{ 3,	TF,	sys_open,		"open"		}, /* 6002 */
+	{ 1,	0,	sys_close,		"close"		}, /* 6003 */
+	{ 2,	TF,	sys_stat64,		"stat"		}, /* 6004 */
+	{ 2,	0,	sys_fstat64,		"fstat"		}, /* 6005 */
+	{ 2,	TF,	sys_lstat64,		"lstat"		}, /* 6006 */
+	{ 3,	0,	sys_poll,		"poll"		}, /* 6007 */
+	{ 3,	0,	sys_lseek,		"lseek"		}, /* 6008 */
+	{ 6,	TD,	sys_mmap,		"mmap"		}, /* 6009 */
+	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 6010 */
+	{ 2,	0,	sys_munmap,		"munmap"	}, /* 6011 */
+	{ 1,	0,	sys_brk,		"brk"		}, /* 6012 */
+	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 6013 */
+	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 6014 */
+	{ 3,	0,	sys_ioctl,		"ioctl"		}, /* 6015 */
+	{ 6,	TF,	sys_pread64,		"pread"		}, /* 6016 */
+	{ 6,	TF,	sys_pwrite64,		"pwrite"	}, /* 6017 */
+	{ 3,	0,	sys_readv,		"readv"		}, /* 6018 */
+	{ 3,	0,	sys_writev,		"writev"	}, /* 6019 */
+	{ 2,	TF,	sys_access,		"access"	}, /* 6020 */
+	{ 1,	0,	sys_pipe,		"pipe"		}, /* 6021 */
+	{ 5,	0,	sys_select,		"_newselect"	}, /* 6022 */
+	{ 0,	0,	sys_sched_yield,	"sched_yield"	}, /* 6023 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 6024 */
+	{ 3,	0,	sys_msync,		"msync"		}, /* 6025 */
+	{ 3,	0,	printargs,		"mincore"	}, /* 6026 */
+	{ 3,	0,	sys_madvise,		"madvise"	}, /* 6027 */
+	{ 3,	TI,	sys_shmget,		"shmget"	}, /* 6028 */
+	{ 3,	TI,	sys_shmat,		"shmgat"	}, /* 6029 */
+	{ 3,	TI,	sys_shmctl,		"shmctl"	}, /* 6030 */
+	{ 1,	0,	sys_dup,		"dup"		}, /* 6031 */
+	{ 2,	0,	sys_dup2,		"dup2"		}, /* 6032 */
+	{ 0,	TS,	sys_pause,		"pause"		}, /* 6033 */
+	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 6034 */
+	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 6035 */
+	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 6036 */
+	{ 1,	0,	sys_alarm,		"alarm"		}, /* 6037 */
+	{ 0,	0,	sys_getpid,		"getpid"	}, /* 6038 */
+	{ 4,	TD|TN,	sys_sendfile,		"sendfile"	}, /* 6039 */
+	{ 2,	0,	sys_socketcall,		"socketcall"	}, /* 6040 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 6041 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 6042 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 6043 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 6044 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"	}, /* 6045 */
+	{ 3,	TN,	sys_recvmsg,		"recvmsg"	}, /* 6046 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 6047 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 6048 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 6049 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 6050 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 6051 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 6052 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 6053 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 6054 */
+	{ 2,	TP,	sys_clone,		"clone"		}, /* 6055 */
+	{ 0,	TP,	sys_fork,		"fork"		}, /* 6056 */
+	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 6057 */
+	{ 1,	TP,	sys_exit,		"exit"		}, /* 6058 */
+	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 6059 */
+	{ 2,	TS,	sys_kill,		"kill"		}, /* 6060 */
+	{ 1,	0,	sys_uname,		"uname"		}, /* 6061 */
+	{ 3,	TI,	sys_semget,		"semget"	}, /* 6062 */
+	{ 3,	TI,	printargs,		"semop"		}, /* 6063 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 6064 */
+	{ 1,	TI,	sys_shmdt,		"shmdt"		}, /* 6065 */
+	{ 2,	TI,	sys_msgget,		"msgget"	}, /* 6066 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 6067 */
+	{ 5,	TI,	sys_msgrcv,		"msgrcv"	}, /* 6068 */
+	{ 3,	TI,	sys_msgctl,		"msgctl"	}, /* 6069 */
+	{ 3,	0,	sys_fcntl,		"fcntl"		}, /* 6070 */
+	{ 2,	0,	sys_flock,		"flock"		}, /* 6071 */
+	{ 1,	0,	sys_fsync,		"fsync"		}, /* 6072 */
+	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 6073 */
+	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 6074 */
+	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 6075 */
+	{ 3,	0,	sys_getdents,		"getdents"	}, /* 6076 */
+	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 6077 */
+	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 6078 */
+	{ 1,	TF,	sys_fchdir,		"fchdir"	}, /* 6079 */
+	{ 2,	TF,	sys_rename,		"rename"	}, /* 6080 */
+	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 6081 */
+	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 6082 */
+	{ 2,	TF,	sys_creat,		"creat"		}, /* 6083 */
+	{ 2,	TF,	sys_link,		"link"		}, /* 6084 */
+	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 6085 */
+	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 6086 */
+	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 6087 */
+	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 6088 */
+	{ 2,	0,	sys_fchmod,		"fchmod"	}, /* 6089 */
+	{ 3,	TF,	sys_chown,		"chown"		}, /* 6090 */
+	{ 3,	0,	sys_fchown,		"fchown"	}, /* 6091 */
+	{ 3,	TF,	sys_chown,		"lchown"	}, /* 6092 */
+	{ 1,	0,	sys_umask,		"umask"		}, /* 6093 */
+	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 6094 */
+	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 6095 */
+	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 6096 */
+	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 6097 */
+	{ 1,	0,	sys_times,		"times"		}, /* 6098 */
+	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 6099 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 6100 */
+	{ 3,	0,	sys_syslog,		"syslog"	}, /* 6101 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 6102 */
+	{ 1,	0,	sys_setuid,		"setuid"	}, /* 6103 */
+	{ 1,	0,	sys_setgid,		"setgid"	}, /* 6104 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 6105 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 6106 */
+	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 6107 */
+	{ 0,	0,	sys_getppid,		"getppid"	}, /* 6108 */
+	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 6109 */
+	{ 0,	0,	sys_setsid,		"setsid"	}, /* 6110 */
+	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 6111 */
+	{ 2,	0,	sys_setregid,		"setregid"	}, /* 6112 */
+	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 6113 */
+	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 6114 */
+	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 6115 */
+	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 6116 */
+	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 6117 */
+	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 6118 */
+	{ 0,	0,	sys_getpgid,		"getpgid"	}, /* 6119 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 6120 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 6121 */
+	{ 1,	0,	sys_getsid,		"getsid"	}, /* 6122 */
+	{ 2,	0,	sys_capget,		"capget"	}, /* 6123 */
+	{ 2,	0,	sys_capset,		"capset"	}, /* 6124 */
+	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 6125 */
+	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"},/* 6126 */
+	{ 3,	TS,	sys_rt_sigqueueinfo,	"rt_sigqueueinfo"},/* 6127 */
+	{ 2,	TS,	sys_rt_sigsuspend,	"rt_siguspend"	}, /* 6128 */
+	{ 2,	TS,	sys_sigaltstack,	"sigaltstatck"	}, /* 6129 */
+	{ 2,	TF,	sys_utime,		"utime"		}, /* 6130 */
+	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 6131 */
+	{ 1,	0,	sys_personality,	"personality"	}, /* 6132 */
+	{ 2,	0,	sys_ustat,		"ustat"		}, /* 6133 */
+	{ 3,	0,	sys_statfs,		"statfs"	}, /* 6134 */
+	{ 3,	0,	sys_fstatfs,		"fstatfs"	}, /* 6135 */
+	{ 5,	0,	sys_sysfs,		"sysfs"		}, /* 6136 */
+	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 6137 */
+	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 6138 */
+	{ 2,	0,	sys_sched_setparam,	"sched_setparam"}, /* 6139 */
+	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 6140 */
+	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 6141 */
+	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 6142 */
+	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 6143 */
+	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 6144 */
+	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 6145 */
+	{ 2,	0,	sys_mlock,		"mlock"		}, /* 6146 */
+	{ 2,	0,	sys_munlock,		"munlock"	}, /* 6147 */
+	{ 1,	0,	sys_mlockall,		"mlockall"	}, /* 6148 */
+	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 6149 */
+	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 6150 */
+	{ 2,	0,	sys_pivotroot,		"pivot_root"	}, /* 6151 */
+	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 6152 */
+	{ 5,	0,	printargs,		"prctl"		}, /* 6153 */
+	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 6154 */
+	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 6155 */
+	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 6156 */
+	{ 0,	0,	sys_sync,		"sync"		}, /* 6157 */
+	{ 1,	TF,	sys_acct,		"acct"		}, /* 6158 */
+	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 6159 */
+	{ 5,	TF,	sys_mount,		"mount"		}, /* 6160 */
+	{ 2,	TF,	sys_umount2,		"umount"	}, /* 6161 */
+	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 6162 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 6163 */
+	{ 3,	0,	sys_reboot,		"reboot"	}, /* 6164 */
+	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 6165 */
+	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 6166 */
+	{ 2,	0,	sys_create_module,	"create_module"	}, /* 6167 */
+	{ 4,	0,	sys_init_module,	"init_module"	}, /* 6168 */
+	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 6169 */
+	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 6170 */
+	{ 5,	0,	sys_query_module,	"query_module"	}, /* 6171 */
+	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 6172 */
+	{ 3,	0,	printargs,		"nfsservctl"	}, /* 6173 */
+	{ 5,	TN,	printargs,		"getpmsg"	}, /* 6174 */
+	{ 5,	TN,	printargs,		"putpmsg"	}, /* 6175 */
+	{ 0,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 6176 */
+	{ 0,	0,	printargs,		"reserved177"	}, /* 6177 */
+	{ 0,	0,	printargs,		"gettid"	}, /* 6178 */
+	{ 3,	0,	sys_readahead,		"readahead"	}, /* 6179 */
+	{ 5,	0,	sys_setxattr,		"setxattr"	}, /* 6180 */
+	{ 5,	0,	sys_setxattr,		"lsetxattr"	}, /* 6181 */
+	{ 5,	0,	sys_fsetxattr,		"fsetxattr"	}, /* 6182 */
+	{ 4,	0,	sys_getxattr,		"getxattr"	}, /* 6183 */
+	{ 4,	0,	sys_getxattr,		"lgetxattr"	}, /* 6184 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 6185 */
+	{ 3,	0,	sys_listxattr,		"listxattr"	}, /* 6186 */
+	{ 3,	0,	sys_listxattr,		"llistxattr"	}, /* 6187 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 6188 */
+	{ 2,	0,	sys_removexattr,	"removexattr"	}, /* 6189 */
+	{ 2,	0,	sys_removexattr,	"lremovexattr"	}, /* 6190 */
+	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 6191 */
+	{ 2,	0,	sys_kill,		"tkill"		}, /* 6192 */
+	{ 1,	0,	sys_time,		"time"		}, /* 6193 */
+	{ 6,	0,	sys_futex,		"futex"		}, /* 6194 */
+	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity"}, /* 6195 */
+	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity"}, /* 6196 */
+	{ 3,	0,	printargs,		"cacheflush"	}, /* 6197 */
+	{ 3,	0,	printargs,		"cachectl"	}, /* 6198 */
+	{ 4,	0,	sys_sysmips,		"sysmips"	}, /* 6199 */
+	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 6200 */
+	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 6201 */
+	{ 5,	0,	sys_io_getevents,	"io_getevents"	}, /* 6202 */
+	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 6203 */
+	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 6204 */
+	{ 1,	TP,	sys_exit,		"exit_group"}, /* 6205 */
+	{ 3,	0,	printargs,		"lookup_dcookie"	}, /* 6206 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"	}, /* 6207 */
+	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 6208 */
+	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"	}, /* 6209 */
+	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"	}, /* 6210 */
+	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 6211 */
+	{ 3,	0,	sys_fcntl,		"fcntl64"	}, /* 6212 */
+	{ 1,	0,	printargs,		"set_tid_address" }, /* 6213 */
+	{ 0,	0,	sys_restart_syscall,	"restart_syscall" }, /* 6214 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 6215 */
+	{ 5,	TD,	sys_fadvise64,		"fadvise64"	}, /* 6216 */
+	{ 3,	TF,	sys_statfs64,		"statfs64"	}, /* 6217 */
+	{ 3,	TD,	sys_fstatfs64,		"fstatfs64"	}, /* 6218 */
+	{ 4,	TD|TN,	sys_sendfile64,		"sendfile64"	}, /* 6219 */
+	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 6220 */
+	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 6221 */
+	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 6222 */
+	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"	}, /* 6223 */
+	{ 1,	0,	sys_timer_delete,	"timer_delete"	}, /* 6224 */
+	{ 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 6225 */
+	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 6226 */
+	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 6227 */
+	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep" }, /* 6228 */
+	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 6229 */
+	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 6230 */
+	{ 0,	0,	printargs,		"SYS_6231"	}, /* 6231 */
+	{ 0,	0,	printargs,		"SYS_6232"	}, /* 6232 */
+	{ 0,	0,	printargs,		"SYS_6233"	}, /* 6233 */
+	{ 4,	0,	sys_mq_open,		"mq_open"	}, /* 6234 */
+	{ 1,	0,	sys_mq_unlink,		"mq_unlink"	}, /* 6235 */
+	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"	}, /* 6236 */
+	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 6237 */
+	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 6238 */
+	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 6239 */
+	{ 0,	0,	printargs,		"SYS_6240"	}, /* 6240 */
+	{ 5,	TP,	sys_waitid,		"waitid"	}, /* 6241 */
+	{ 0,	0,	printargs,		"SYS_6242"	}, /* 6242 */
+	{ 5,	0,	printargs,		"add_key"	}, /* 6243 */
+	{ 4,	0,	printargs,		"request_key"	}, /* 6244 */
+	{ 5,	0,	printargs,		"keyctl"	}, /* 6245 */
+	{ 1,	0,	sys_set_thread_area,	"set_thread_area" }, /* 6246 */
+	{ 0,	TD,	printargs,		"inotify_init"	}, /* 6247 */
+	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch" }, /* 6248 */
+	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch" }, /* 6249 */
+	{ 4,	0,	printargs,		"migrate_pages"	}, /* 6250 */
+	{ 4,	TD|TF,	sys_openat,		"openat"	}, /* 6251 */
+	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"	}, /* 6252 */
+	{ 4,	TD|TF,	sys_mknodat,		"mknodat"	}, /* 6253 */
+	{ 5,	TD|TF,	sys_fchownat,		"fchownat"	}, /* 6254 */
+	{ 3,	TD|TF,	sys_futimesat,		"futimesat"	}, /* 6255 */
+	{ 4,	TD|TF,	sys_newfstatat,		"newfstatat"	}, /* 6256 */
+	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"	}, /* 6257 */
+	{ 4,	TD|TF,	sys_renameat,		"renameat"	}, /* 6258 */
+	{ 5,	TD|TF,	sys_linkat,		"linkat"	}, /* 6259 */
+	{ 3,	TD|TF,	sys_symlinkat,		"symlinkat"	}, /* 6260 */
+	{ 4,	TD|TF,	sys_readlinkat,		"readlinkat"	}, /* 6261 */
+	{ 3,	TD|TF,	sys_fchmodat,		"fchmodat"	}, /* 6262 */
+	{ 3,	TD|TF,	sys_faccessat,		"faccessat"	}, /* 6263 */
+	{ 6,	TD,	sys_pselect6,		"pselect6"	}, /* 6264 */
+	{ 5,	TD,	sys_ppoll,		"ppoll"		}, /* 6265 */
+	{ 1,	TP,	sys_unshare,		"unshare"	}, /* 6266 */
+	{ 6,	TD,	printargs,		"splice"	}, /* 6267 */
+	{ 4,	TD,	printargs,		"sync_file_range" }, /* 6268 */
+	{ 4,	TD,	printargs,		"tee"		}, /* 6269 */
+	{ 4,	TD,	printargs,		"vmsplice"	}, /* 6270 */
+	{ 6,	0,	printargs,		"move_pages"	}, /* 6271 */
+	{ 2,	0,	printargs,		"set_robust_list" }, /* 6272 */
+	{ 3,	0,	printargs,		"get_robust_list" }, /* 6273 */
+	{ 5,	0,	printargs,		"kexec_load"	}, /* 6274 */
+	{ 3,	0,	sys_getcpu,		"getcpu"	}, /* 6275 */
+	{ 5,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 6276 */
+	{ 3,	0,	printargs,		"ioprio_set"	}, /* 6277 */
+	{ 2,	0,	printargs,		"ioprio_get"	}, /* 6278 */
+	{ 4,	TD|TF,	sys_utimensat,		"utimensat"	}, /* 6279 */
+	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 6280 */
+	{ 0,	0,	printargs,		"SYS_6281"	}, /* 6281 */
+	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 6282 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"	}, /* 6283 */
+	{ 2,	TD,	sys_timerfd_create,	"timerfd_create" }, /* 6284 */
+	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime" }, /* 6285 */
+	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime" }, /* 6286 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"	}, /* 6287 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"	}, /* 6288 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"	}, /* 6289 */
+	{ 3,	TD,	sys_dup3,		"dup3"		}, /* 6290 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"		}, /* 6291 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"	}, /* 6292 */
+	{ 5,	TD,	printargs,		"preadv"	}, /* 6293 */
+	{ 5,	TD,	printargs,		"pwritev"	}, /* 6294 */
+	{ 4,	TP|TS,	printargs,		"rt_tgsigqueueinfo" }, /* 6295 */
+	{ 5,	TD,	printargs,		"perf_event_open" }, /* 6296 */
+	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 6297 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 6298 */
+	{ 3,	TD,	sys_getdents,		"getdents"	}, /* 6299 */
+	{ 2,	TD,	printargs,		"fanotify_init"	}, /* 6300 */
+	{ 5,	TD|TF,	printargs,		"fanotify_mark"	}, /* 6301 */
+	{ 4,	0,	printargs,		"prlimit64"	}, /* 6302 */
+
+#else
+	{ 0,	0,	printargs,		"n32_read"		}, /* 6000 */
+	{ 0,	0,	printargs,		"n32_write"		}, /* 6001 */
+	{ 0,	0,	printargs,		"n32_open"		}, /* 6002 */
+	{ 0,	0,	printargs,		"n32_close"		}, /* 6003 */
+	{ 0,	0,	printargs,		"n32_stat"		}, /* 6004 */
+	{ 0,	0,	printargs,		"n32_fstat"		}, /* 6005 */
+	{ 0,	0,	printargs,		"n32_lstat"		}, /* 6006 */
+	{ 0,	0,	printargs,		"n32_poll"		}, /* 6007 */
+	{ 0,	0,	printargs,		"n32_lseek"		}, /* 6008 */
+	{ 0,	0,	printargs,		"n32_mmap"		}, /* 6009 */
+	{ 0,	0,	printargs,		"n32_mprotect"		}, /* 6010 */
+	{ 0,	0,	printargs,		"n32_munmap"		}, /* 6011 */
+	{ 0,	0,	printargs,		"n32_brk"		}, /* 6012 */
+	{ 0,	0,	printargs,		"n32_rt_sigaction"	}, /* 6013 */
+	{ 0,	0,	printargs,		"n32_rt_sigprocmask"	}, /* 6014 */
+	{ 0,	0,	printargs,		"n32_ioctl"		}, /* 6015 */
+	{ 0,	0,	printargs,		"n32_pread"		}, /* 6016 */
+	{ 0,	0,	printargs,		"n32_pwrite"		}, /* 6017 */
+	{ 0,	0,	printargs,		"n32_readv"		}, /* 6018 */
+	{ 0,	0,	printargs,		"n32_writev"		}, /* 6019 */
+	{ 0,	0,	printargs,		"n32_access"		}, /* 6020 */
+	{ 0,	0,	printargs,		"n32_pipe"		}, /* 6021 */
+	{ 0,	0,	printargs,		"n32__newselect"	}, /* 6022 */
+	{ 0,	0,	printargs,		"n32_sched_yield"	}, /* 6023 */
+	{ 0,	0,	printargs,		"n32_mremap"		}, /* 6024 */
+	{ 0,	0,	printargs,		"n32_msync"		}, /* 6025 */
+	{ 0,	0,	printargs,		"n32_mincore"		}, /* 6026 */
+	{ 0,	0,	printargs,		"n32_madvise"		}, /* 6027 */
+	{ 0,	0,	printargs,		"n32_shmget"		}, /* 6028 */
+	{ 0,	0,	printargs,		"n32_shmgat"		}, /* 6029 */
+	{ 0,	0,	printargs,		"n32_shmctl"		}, /* 6030 */
+	{ 0,	0,	printargs,		"n32_dup"		}, /* 6031 */
+	{ 0,	0,	printargs,		"n32_dup2"		}, /* 6032 */
+	{ 0,	0,	printargs,		"n32_pause"		}, /* 6033 */
+	{ 0,	0,	printargs,		"n32_nanosleep"		}, /* 6034 */
+	{ 0,	0,	printargs,		"n32_getitimer"		}, /* 6035 */
+	{ 0,	0,	printargs,		"n32_setitimer"		}, /* 6036 */
+	{ 0,	0,	printargs,		"n32_alarm"		}, /* 6037 */
+	{ 0,	0,	printargs,		"n32_getpid"		}, /* 6038 */
+	{ 0,	0,	printargs,		"n32_sendfile"		}, /* 6039 */
+	{ 0,	0,	printargs,		"n32_socketcall"	}, /* 6040 */
+	{ 0,	0,	printargs,		"n32_connect"		}, /* 6041 */
+	{ 0,	0,	printargs,		"n32_accept"		}, /* 6042 */
+	{ 0,	0,	printargs,		"n32_sendto"		}, /* 6043 */
+	{ 0,	0,	printargs,		"n32_recvfrom"		}, /* 6044 */
+	{ 0,	0,	printargs,		"n32_sendmsg"		}, /* 6045 */
+	{ 0,	0,	printargs,		"n32_recvmsg"		}, /* 6046 */
+	{ 0,	0,	printargs,		"n32_shutdown"		}, /* 6047 */
+	{ 0,	0,	printargs,		"n32_bind"		}, /* 6048 */
+	{ 0,	0,	printargs,		"n32_listen"		}, /* 6049 */
+	{ 0,	0,	printargs,		"n32_getsockname"	}, /* 6050 */
+	{ 0,	0,	printargs,		"n32_getpeername"	}, /* 6051 */
+	{ 0,	0,	printargs,		"n32_socketpair"	}, /* 6052 */
+	{ 0,	0,	printargs,		"n32_setsockopt"	}, /* 6053 */
+	{ 0,	0,	printargs,		"n32_getsockopt"	}, /* 6054 */
+	{ 0,	0,	printargs,		"n32_clone"		}, /* 6055 */
+	{ 0,	0,	printargs,		"n32_fork"		}, /* 6056 */
+	{ 0,	0,	printargs,		"n32_execve"		}, /* 6057 */
+	{ 0,	0,	printargs,		"n32_exit"		}, /* 6058 */
+	{ 0,	0,	printargs,		"n32_wait4"		}, /* 6059 */
+	{ 0,	0,	printargs,		"n32_kill"		}, /* 6060 */
+	{ 0,	0,	printargs,		"n32_uname"		}, /* 6061 */
+	{ 0,	0,	printargs,		"n32_semget"		}, /* 6062 */
+	{ 0,	0,	printargs,		"n32_semop"		}, /* 6063 */
+	{ 0,	0,	printargs,		"n32_semctl"		}, /* 6064 */
+	{ 0,	0,	printargs,		"n32_shmdt"		}, /* 6065 */
+	{ 0,	0,	printargs,		"n32_msgget"		}, /* 6066 */
+	{ 0,	0,	printargs,		"n32_msgsnd"		}, /* 6067 */
+	{ 0,	0,	printargs,		"n32_msgrcv"		}, /* 6068 */
+	{ 0,	0,	printargs,		"n32_msgctl"		}, /* 6069 */
+	{ 0,	0,	printargs,		"n32_fcntl"		}, /* 6070 */
+	{ 0,	0,	printargs,		"n32_flock"		}, /* 6071 */
+	{ 0,	0,	printargs,		"n32_fsync"		}, /* 6072 */
+	{ 0,	0,	printargs,		"n32_fdatasync"		}, /* 6073 */
+	{ 0,	0,	printargs,		"n32_truncate"		}, /* 6074 */
+	{ 0,	0,	printargs,		"n32_ftruncate"		}, /* 6075 */
+	{ 0,	0,	printargs,		"n32_getdents"		}, /* 6076 */
+	{ 0,	0,	printargs,		"n32_getcwd"		}, /* 6077 */
+	{ 0,	0,	printargs,		"n32_chdir"		}, /* 6078 */
+	{ 0,	0,	printargs,		"n32_fchdir"		}, /* 6079 */
+	{ 0,	0,	printargs,		"n32_rename"		}, /* 6080 */
+	{ 0,	0,	printargs,		"n32_mkdir"		}, /* 6081 */
+	{ 0,	0,	printargs,		"n32_rmdir"		}, /* 6082 */
+	{ 0,	0,	printargs,		"n32_creat"		}, /* 6083 */
+	{ 0,	0,	printargs,		"n32_link"		}, /* 6084 */
+	{ 0,	0,	printargs,		"n32_unlink"		}, /* 6085 */
+	{ 0,	0,	printargs,		"n32_symlink"		}, /* 6086 */
+	{ 0,	0,	printargs,		"n32_readlink"		}, /* 6087 */
+	{ 0,	0,	printargs,		"n32_chmod"		}, /* 6088 */
+	{ 0,	0,	printargs,		"n32_fchmod"		}, /* 6089 */
+	{ 0,	0,	printargs,		"n32_chown"		}, /* 6090 */
+	{ 0,	0,	printargs,		"n32_fchown"		}, /* 6091 */
+	{ 0,	0,	printargs,		"n32_lchown"		}, /* 6092 */
+	{ 0,	0,	printargs,		"n32_umask"		}, /* 6093 */
+	{ 0,	0,	printargs,		"n32_gettimeofday"	}, /* 6094 */
+	{ 0,	0,	printargs,		"n32_getrlimit"		}, /* 6095 */
+	{ 0,	0,	printargs,		"n32_getrusage"		}, /* 6096 */
+	{ 0,	0,	printargs,		"n32_sysinfo"		}, /* 6097 */
+	{ 0,	0,	printargs,		"n32_times"		}, /* 6098 */
+	{ 0,	0,	printargs,		"n32_ptrace"		}, /* 6099 */
+	{ 0,	0,	printargs,		"n32_getuid"		}, /* 6100 */
+	{ 0,	0,	printargs,		"n32_syslog"		}, /* 6101 */
+	{ 0,	0,	printargs,		"n32_getgid"		}, /* 6102 */
+	{ 0,	0,	printargs,		"n32_setuid"		}, /* 6103 */
+	{ 0,	0,	printargs,		"n32_setgid"		}, /* 6104 */
+	{ 0,	0,	printargs,		"n32_geteuid"		}, /* 6105 */
+	{ 0,	0,	printargs,		"n32_getegid"		}, /* 6106 */
+	{ 0,	0,	printargs,		"n32_setpgid"		}, /* 6107 */
+	{ 0,	0,	printargs,		"n32_getppid"		}, /* 6108 */
+	{ 0,	0,	printargs,		"n32_getpgrp"		}, /* 6109 */
+	{ 0,	0,	printargs,		"n32_setsid"		}, /* 6110 */
+	{ 0,	0,	printargs,		"n32_setreuid"		}, /* 6111 */
+	{ 0,	0,	printargs,		"n32_setregid"		}, /* 6112 */
+	{ 0,	0,	printargs,		"n32_getgroups"		}, /* 6113 */
+	{ 0,	0,	printargs,		"n32_setgroups"		}, /* 6114 */
+	{ 0,	0,	printargs,		"n32_setresuid"		}, /* 6115 */
+	{ 0,	0,	printargs,		"n32_getresuid"		}, /* 6116 */
+	{ 0,	0,	printargs,		"n32_setresgid"		}, /* 6117 */
+	{ 0,	0,	printargs,		"n32_getresgid"		}, /* 6118 */
+	{ 0,	0,	printargs,		"n32_getpgid"		}, /* 6119 */
+	{ 0,	0,	printargs,		"n32_setfsuid"		}, /* 6120 */
+	{ 0,	0,	printargs,		"n32_setfsgid"		}, /* 6121 */
+	{ 0,	0,	printargs,		"n32_getsid"		}, /* 6122 */
+	{ 0,	0,	printargs,		"n32_capget"		}, /* 6123 */
+	{ 0,	0,	printargs,		"n32_capset"		}, /* 6124 */
+	{ 0,	0,	printargs,		"n32_rt_sigpending"	}, /* 6125 */
+	{ 0,	0,	printargs,		"n32_rt_sigtimedwait"	}, /* 6126 */
+	{ 0,	0,	printargs,		"n32_rt_sigqueueinfo"	}, /* 6127 */
+	{ 0,	0,	printargs,		"n32_rt_siguspend"	}, /* 6128 */
+	{ 0,	0,	printargs,		"n32_sigaltstatck"	}, /* 6129 */
+	{ 0,	0,	printargs,		"n32_utime"		}, /* 6130 */
+	{ 0,	0,	printargs,		"n32_mknod"		}, /* 6131 */
+	{ 0,	0,	printargs,		"n32_personality"	}, /* 6132 */
+	{ 0,	0,	printargs,		"n32_ustat"		}, /* 6133 */
+	{ 0,	0,	printargs,		"n32_statfs"		}, /* 6134 */
+	{ 0,	0,	printargs,		"n32_fstatfs"		}, /* 6135 */
+	{ 0,	0,	printargs,		"n32_sysfs"		}, /* 6136 */
+	{ 0,	0,	printargs,		"n32_getpriority"	}, /* 6137 */
+	{ 0,	0,	printargs,		"n32_setpriority"	}, /* 6138 */
+	{ 0,	0,	printargs,		"n32_sched_setparam"	}, /* 6139 */
+	{ 0,	0,	printargs,		"n32_sched_getparam"	}, /* 6140 */
+	{ 0,	0,	printargs,		"n32_sched_setscheduler"}, /* 6141 */
+	{ 0,	0,	printargs,		"n32_sched_getscheduler"}, /* 6142 */
+	{ 0,	0,	printargs,		"n32_sched_get_priority_max"}, /* 6143 */
+	{ 0,	0,	printargs,		"n32_sched_get_priority_min"}, /* 6144 */
+	{ 0,	0,	printargs,		"n32_sched_rr_get_interval"}, /* 6145 */
+	{ 0,	0,	printargs,		"n32_mlock"		}, /* 6146 */
+	{ 0,	0,	printargs,		"n32_munlock"		}, /* 6147 */
+	{ 0,	0,	printargs,		"n32_mlockall"		}, /* 6148 */
+	{ 0,	0,	printargs,		"n32_munlockall"	}, /* 6149 */
+	{ 0,	0,	printargs,		"n32_vhangup"		}, /* 6150 */
+	{ 0,	0,	printargs,		"n32_pivot_root"	}, /* 6151 */
+	{ 0,	0,	printargs,		"n32__sysctl"		}, /* 6152 */
+	{ 0,	0,	printargs,		"n32_prctl"		}, /* 6153 */
+	{ 0,	0,	printargs,		"n32_adjtimex"		}, /* 6154 */
+	{ 0,	0,	printargs,		"n32_setrlimit"		}, /* 6155 */
+	{ 0,	0,	printargs,		"n32_chroot"		}, /* 6156 */
+	{ 0,	0,	printargs,		"n32_sync"		}, /* 6157 */
+	{ 0,	0,	printargs,		"n32_acct"		}, /* 6158 */
+	{ 0,	0,	printargs,		"n32_settimeofday"	}, /* 6159 */
+	{ 0,	0,	printargs,		"n32_mount"		}, /* 6160 */
+	{ 0,	0,	printargs,		"n32_umount"		}, /* 6161 */
+	{ 0,	0,	printargs,		"n32_swapon"		}, /* 6162 */
+	{ 0,	0,	printargs,		"n32_swapoff"		}, /* 6163 */
+	{ 0,	0,	printargs,		"n32_reboot"		}, /* 6164 */
+	{ 0,	0,	printargs,		"n32_sethostname"	}, /* 6165 */
+	{ 0,	0,	printargs,		"n32_setdomainname"	}, /* 6166 */
+	{ 0,	0,	printargs,		"n32_create_module"	}, /* 6167 */
+	{ 0,	0,	printargs,		"n32_init_module"	}, /* 6168 */
+	{ 0,	0,	printargs,		"n32_delete_module"	}, /* 6169 */
+	{ 0,	0,	printargs,		"n32_get_kernel_syms"	}, /* 6170 */
+	{ 0,	0,	printargs,		"n32_query_module"	}, /* 6171 */
+	{ 0,	0,	printargs,		"n32_quotactl"		}, /* 6172 */
+	{ 0,	0,	printargs,		"n32_nfsservctl"	}, /* 6173 */
+	{ 0,	0,	printargs,		"n32_getpmsg"		}, /* 6174 */
+	{ 0,	0,	printargs,		"n32_putpmsg"		}, /* 6175 */
+	{ 0,	0,	printargs,		"n32_afs_syscall"	}, /* 6176 */
+	{ 0,	0,	printargs,		"n32_reserved177"	}, /* 6177 */
+	{ 0,	0,	printargs,		"n32_gettid"		}, /* 6178 */
+	{ 0,	0,	printargs,		"n32_readahead"		}, /* 6179 */
+	{ 0,	0,	printargs,		"n32_setxattr"		}, /* 6180 */
+	{ 0,	0,	printargs,		"n32_lsetxattr"		}, /* 6181 */
+	{ 0,	0,	printargs,		"n32_fsetxattr"		}, /* 6182 */
+	{ 0,	0,	printargs,		"n32_getxattr"		}, /* 6183 */
+	{ 0,	0,	printargs,		"n32_lgetxattr"		}, /* 6184 */
+	{ 0,	0,	printargs,		"n32_fgetxattr"		}, /* 6185 */
+	{ 0,	0,	printargs,		"n32_listxattr"		}, /* 6186 */
+	{ 0,	0,	printargs,		"n32_llistxattr"	}, /* 6187 */
+	{ 0,	0,	printargs,		"n32_flistxattr"	}, /* 6188 */
+	{ 0,	0,	printargs,		"n32_removexattr"	}, /* 6189 */
+	{ 0,	0,	printargs,		"n32_lremovexattr"	}, /* 6190 */
+	{ 0,	0,	printargs,		"n32_fremovexattr"	}, /* 6191 */
+	{ 0,	0,	printargs,		"n32_tkill"		}, /* 6192 */
+	{ 0,	0,	printargs,		"n32_time"		}, /* 6193 */
+	{ 0,	0,	printargs,		"n32_futex"		}, /* 6194 */
+	{ 0,	0,	printargs,		"n32_sched_setaffinity"	}, /* 6195 */
+	{ 0,	0,	printargs,		"n32_sched_getaffinity"	}, /* 6196 */
+	{ 0,	0,	printargs,		"n32_cacheflush"	}, /* 6197 */
+	{ 0,	0,	printargs,		"n32_cachectl"		}, /* 6198 */
+	{ 0,	0,	printargs,		"n32_sysmips"		}, /* 6199 */
+	{ 0,	0,	printargs,		"n32_io_setup"		}, /* 6200 */
+	{ 0,	0,	printargs,		"n32_io_destroy"	}, /* 6201 */
+	{ 0,	0,	printargs,		"n32_io_getevents"	}, /* 6202 */
+	{ 0,	0,	printargs,		"n32_io_submit"		}, /* 6203 */
+	{ 0,	0,	printargs,		"n32_io_cancel"		}, /* 6204 */
+	{ 1,	TP,	printargs,		"n32_exit_group"	}, /* 6205 */
+	{ 0,	0,	printargs,		"n32_lookup_dcookie"	}, /* 6206 */
+	{ 0,	0,	printargs,		"n32_epoll_create"	}, /* 6207 */
+	{ 0,	0,	printargs,		"n32_epoll_ctl"		}, /* 6208 */
+	{ 0,	0,	printargs,		"n32_epoll_wait"	}, /* 6209 */
+	{ 0,	0,	printargs,		"n32_remap_file_pages"	}, /* 6210 */
+	{ 0,	0,	printargs,		"n32_rt_sigreturn"	}, /* 6211 */
+	{ 0,	0,	printargs,		"n32_fcntl64"		}, /* 6212 */
+	{ 0,	0,	printargs,		"n32_set_tid_address"	}, /* 6213 */
+	{ 0,	0,	printargs,		"n32_restart_syscall"	}, /* 6214 */
+	{ 0,	0,	printargs,		"n32_semtimedop"	}, /* 6215 */
+	{ 0,	0,	printargs,		"n32_fadvise64"		}, /* 6216 */
+	{ 0,	0,	printargs,		"n32_statfs64"		}, /* 6217 */
+	{ 0,	0,	printargs,		"n32_fstatfs64"		}, /* 6218 */
+	{ 0,	0,	printargs,		"n32_sendfile64"	}, /* 6219 */
+	{ 3,	0,	printargs,		"n32_timer_create"	}, /* 6220 */
+	{ 4,	0,	printargs,		"n32_timer_settime"	}, /* 6221 */
+	{ 2,	0,	printargs,		"n32_timer_gettime"	}, /* 6222 */
+	{ 1,	0,	printargs,		"n32_timer_getoverrun"	}, /* 6223 */
+	{ 1,	0,	printargs,		"n32_timer_delete"	}, /* 6224 */
+	{ 2,	0,	printargs,		"n32_clock_settime"	}, /* 6225 */
+	{ 2,	0,	printargs,		"n32_clock_gettime"	}, /* 6226 */
+	{ 2,	0,	printargs,		"n32_clock_getres"	}, /* 6227 */
+	{ 4,	0,	printargs,		"n32_clock_nanosleep"	}, /* 6228 */
+	{ 3,	0,	printargs,		"n32_tgkill"		}, /* 6229 */
+	{ 2,	0,	printargs,		"n32_utimes"		}, /* 6230 */
+	{ 0,	0,	printargs,		"n32_SYS_6231"		}, /* 6231 */
+	{ 0,	0,	printargs,		"n32_SYS_6232"		}, /* 6232 */
+	{ 0,	0,	printargs,		"n32_SYS_6233"		}, /* 6233 */
+	{ 4,	0,	printargs,		"n32_mq_open"		}, /* 6234 */
+	{ 1,	0,	printargs,		"n32_mq_unlink"		}, /* 6235 */
+	{ 5,	0,	printargs,		"n32_mq_timedsend"	}, /* 6236 */
+	{ 5,	0,	printargs,		"n32_mq_timedreceive"	}, /* 6237 */
+	{ 2,	0,	printargs,		"n32_mq_notify"		}, /* 6238 */
+	{ 3,	0,	printargs,		"n32_mq_getsetattr"	}, /* 6239 */
+	{ 0,	0,	printargs,		"n32_SYS_6240"		}, /* 6240 */
+	{ 5,	TP,	printargs,		"n32_waitid"		}, /* 6241 */
+	{ 0,	0,	printargs,		"n32_SYS_6242"		}, /* 6242 */
+	{ 5,	0,	printargs,		"n32_add_key"		}, /* 6243 */
+	{ 4,	0,	printargs,		"n32_request_key"	}, /* 6244 */
+	{ 5,	0,	printargs,		"n32_keyctl"		}, /* 6245 */
+	{ 1,	0,	printargs,		"n32_set_thread_area"	}, /* 6246 */
+	{ 0,	TD,	printargs,		"n32_inotify_init"	}, /* 6247 */
+	{ 3,	TD,	printargs,		"n32_inotify_add_watch" }, /* 6248 */
+	{ 2,	TD,	printargs,		"n32_inotify_rm_watch"	}, /* 6249 */
+	{ 4,	0,	printargs,		"n32_migrate_pages"	}, /* 6250 */
+	{ 4,	TD|TF,	printargs,		"n32_openat"		}, /* 6251 */
+	{ 3,	TD|TF,	printargs,		"n32_mkdirat"		}, /* 6252 */
+	{ 4,	TD|TF,	printargs,		"n32_mknodat"		}, /* 6253 */
+	{ 5,	TD|TF,	printargs,		"n32_fchownat"		}, /* 6254 */
+	{ 3,	TD|TF,	printargs,		"n32_futimesat"		}, /* 6255 */
+	{ 4,	TD|TF,	printargs,		"n32_newfstatat"	}, /* 6256 */
+	{ 3,	TD|TF,	printargs,		"n32_unlinkat"		}, /* 6257 */
+	{ 4,	TD|TF,	printargs,		"n32_renameat"		}, /* 6258 */
+	{ 5,	TD|TF,	printargs,		"n32_linkat"		}, /* 6259 */
+	{ 3,	TD|TF,	printargs,		"n32_symlinkat"		}, /* 6260 */
+	{ 4,	TD|TF,	printargs,		"n32_readlinkat"	}, /* 6261 */
+	{ 3,	TD|TF,	printargs,		"n32_fchmodat"		}, /* 6262 */
+	{ 3,	TD|TF,	printargs,		"n32_faccessat"		}, /* 6263 */
+	{ 6,	TD,	printargs,		"n32_pselect6"		}, /* 6264 */
+	{ 5,	TD,	printargs,		"n32_ppoll"		}, /* 6265 */
+	{ 1,	TP,	printargs,		"n32_unshare"		}, /* 6266 */
+	{ 6,	TD,	printargs,		"n32_splice"		}, /* 6267 */
+	{ 4,	TD,	printargs,		"n32_sync_file_range"	}, /* 6268 */
+	{ 4,	TD,	printargs,		"n32_tee"		}, /* 6269 */
+	{ 4,	TD,	printargs,		"n32_vmsplice"		}, /* 6270 */
+	{ 6,	0,	printargs,		"n32_move_pages"	}, /* 6271 */
+	{ 2,	0,	printargs,		"n32_set_robust_list"	}, /* 6272 */
+	{ 3,	0,	printargs,		"n32_get_robust_list"	}, /* 6273 */
+	{ 5,	0,	printargs,		"n32_kexec_load"	}, /* 6274 */
+	{ 3,	0,	printargs,		"n32_getcpu"		}, /* 6275 */
+	{ 5,	TD,	printargs,		"n32_epoll_pwait"	}, /* 6276 */
+	{ 3,	0,	printargs,		"n32_ioprio_set"	}, /* 6277 */
+	{ 2,	0,	printargs,		"n32_ioprio_get"	}, /* 6278 */
+	{ 4,	TD|TF,	printargs,		"n32_utimensat"		}, /* 6279 */
+	{ 3,	TD|TS,	printargs,		"n32_signalfd"		}, /* 6280 */
+	{ 0,	0,	printargs,		"n32_SYS_6281"		}, /* 6281 */
+	{ 1,	TD,	printargs,		"n32_eventfd"		}, /* 6282 */
+	{ 6,	TD,	printargs,		"n32_fallocate"		}, /* 6283 */
+	{ 2,	TD,	printargs,		"n32_timerfd_create"	}, /* 6284 */
+	{ 2,	TD,	printargs,		"n32_timerfd_gettime"	}, /* 6285 */
+	{ 4,	TD,	printargs,		"n32_timerfd_settime"	}, /* 6286 */
+	{ 4,	TD|TS,	printargs,		"n32_signalfd4"		}, /* 6287 */
+	{ 2,	TD,	printargs,		"n32_eventfd2"		}, /* 6288 */
+	{ 1,	TD,	printargs,		"n32_epoll_create1"	}, /* 6289 */
+	{ 3,	TD,	printargs,		"n32_dup3"		}, /* 6290 */
+	{ 2,	TD,	printargs,		"n32_pipe2"		}, /* 6291 */
+	{ 1,	TD,	printargs,		"n32_inotify_init1"	}, /* 6292 */
+	{ 5,	TD,	printargs,		"n32_preadv"		}, /* 6293 */
+	{ 5,	TD,	printargs,		"n32_pwritev"		}, /* 6294 */
+	{ 4,	TP|TS,	printargs,		"n32_rt_tgsigqueueinfo" }, /* 6295 */
+	{ 5,	TD,	printargs,		"n32_perf_event_open"	}, /* 6296 */
+	{ 4,	TN,	printargs,		"n32_accept4"		}, /* 6297 */
+	{ 5,	TN,	printargs,		"n32_recvmmsg"		}, /* 6298 */
+	{ 3,	TD,	printargs,		"n32_getdents"		}, /* 6299 */
+	{ 2,	0,	printargs,		"n32_fanotify_init"	}, /* 6300 */
+	{ 5,	0,	printargs,		"n32_fanotify_mark"	}, /* 6301 */
+	{ 4,	0,	printargs,		"n32_prlimit64"		}, /* 6302 */
+#endif
+	{ 0,	0,	printargs,		"SYS_6300"	}, /* 6300 */
+	{ 0,	0,	printargs,		"SYS_6301"	}, /* 6301 */
+	{ 0,	0,	printargs,		"SYS_6302"	}, /* 6302 */
+	{ 0,	0,	printargs,		"SYS_6303"	}, /* 6303 */
+	{ 0,	0,	printargs,		"SYS_6304"	}, /* 6304 */
+	{ 0,	0,	printargs,		"SYS_6305"	}, /* 6305 */
+	{ 0,	0,	printargs,		"SYS_6306"	}, /* 6306 */
+	{ 0,	0,	printargs,		"SYS_6307"	}, /* 6307 */
+	{ 0,	0,	printargs,		"SYS_6308"	}, /* 6308 */
+	{ 0,	0,	printargs,		"SYS_6309"	}, /* 6309 */
+	{ 0,	0,	printargs,		"SYS_6310"	}, /* 6310 */
+	{ 0,	0,	printargs,		"SYS_6311"	}, /* 6311 */
+	{ 0,	0,	printargs,		"SYS_6312"	}, /* 6312 */
+	{ 0,	0,	printargs,		"SYS_6313"	}, /* 6313 */
+	{ 0,	0,	printargs,		"SYS_6314"	}, /* 6314 */
+	{ 0,	0,	printargs,		"SYS_6315"	}, /* 6315 */
+	{ 0,	0,	printargs,		"SYS_6316"	}, /* 6316 */
+	{ 0,	0,	printargs,		"SYS_6317"	}, /* 6317 */
+	{ 0,	0,	printargs,		"SYS_6318"	}, /* 6318 */
+	{ 0,	0,	printargs,		"SYS_6319"	}, /* 6319 */
+	{ 0,	0,	printargs,		"SYS_6320"	}, /* 6320 */
+	{ 0,	0,	printargs,		"SYS_6321"	}, /* 6321 */
+	{ 0,	0,	printargs,		"SYS_6322"	}, /* 6322 */
+	{ 0,	0,	printargs,		"SYS_6323"	}, /* 6323 */
+	{ 0,	0,	printargs,		"SYS_6324"	}, /* 6324 */
+	{ 0,	0,	printargs,		"SYS_6325"	}, /* 6325 */
+	{ 0,	0,	printargs,		"SYS_6326"	}, /* 6326 */
+	{ 0,	0,	printargs,		"SYS_6327"	}, /* 6327 */
+	{ 0,	0,	printargs,		"SYS_6328"	}, /* 6328 */
+	{ 0,	0,	printargs,		"SYS_6329"	}, /* 6329 */
+	{ 0,	0,	printargs,		"SYS_6330"	}, /* 6330 */
+	{ 0,	0,	printargs,		"SYS_6331"	}, /* 6331 */
+	{ 0,	0,	printargs,		"SYS_6332"	}, /* 6332 */
+	{ 0,	0,	printargs,		"SYS_6333"	}, /* 6333 */
+	{ 0,	0,	printargs,		"SYS_6334"	}, /* 6334 */
+	{ 0,	0,	printargs,		"SYS_6335"	}, /* 6335 */
+	{ 0,	0,	printargs,		"SYS_6336"	}, /* 6336 */
+	{ 0,	0,	printargs,		"SYS_6337"	}, /* 6337 */
+	{ 0,	0,	printargs,		"SYS_6338"	}, /* 6338 */
+	{ 0,	0,	printargs,		"SYS_6339"	}, /* 6339 */
+	{ 0,	0,	printargs,		"SYS_6340"	}, /* 6340 */
+	{ 0,	0,	printargs,		"SYS_6341"	}, /* 6341 */
+	{ 0,	0,	printargs,		"SYS_6342"	}, /* 6342 */
+	{ 0,	0,	printargs,		"SYS_6343"	}, /* 6343 */
+	{ 0,	0,	printargs,		"SYS_6344"	}, /* 6344 */
+	{ 0,	0,	printargs,		"SYS_6345"	}, /* 6345 */
+	{ 0,	0,	printargs,		"SYS_6346"	}, /* 6346 */
+	{ 0,	0,	printargs,		"SYS_6347"	}, /* 6347 */
+	{ 0,	0,	printargs,		"SYS_6348"	}, /* 6348 */
+	{ 0,	0,	printargs,		"SYS_6349"	}, /* 6349 */
+	{ 0,	0,	printargs,		"SYS_6350"	}, /* 6350 */
+	{ 0,	0,	printargs,		"SYS_6351"	}, /* 6351 */
+	{ 0,	0,	printargs,		"SYS_6352"	}, /* 6352 */
+	{ 0,	0,	printargs,		"SYS_6353"	}, /* 6353 */
+	{ 0,	0,	printargs,		"SYS_6354"	}, /* 6354 */
+	{ 0,	0,	printargs,		"SYS_6355"	}, /* 6355 */
+	{ 0,	0,	printargs,		"SYS_6356"	}, /* 6356 */
+	{ 0,	0,	printargs,		"SYS_6357"	}, /* 6357 */
+	{ 0,	0,	printargs,		"SYS_6358"	}, /* 6358 */
+	{ 0,	0,	printargs,		"SYS_6359"	}, /* 6359 */
+	{ 0,	0,	printargs,		"SYS_6360"	}, /* 6360 */
+	{ 0,	0,	printargs,		"SYS_6361"	}, /* 6361 */
+	{ 0,	0,	printargs,		"SYS_6362"	}, /* 6362 */
+	{ 0,	0,	printargs,		"SYS_6363"	}, /* 6363 */
+	{ 0,	0,	printargs,		"SYS_6364"	}, /* 6364 */
+	{ 0,	0,	printargs,		"SYS_6365"	}, /* 6365 */
+	{ 0,	0,	printargs,		"SYS_6366"	}, /* 6366 */
+	{ 0,	0,	printargs,		"SYS_6367"	}, /* 6367 */
+	{ 0,	0,	printargs,		"SYS_6368"	}, /* 6368 */
+	{ 0,	0,	printargs,		"SYS_6369"	}, /* 6369 */
+	{ 0,	0,	printargs,		"SYS_6370"	}, /* 6370 */
+	{ 0,	0,	printargs,		"SYS_6371"	}, /* 6371 */
+	{ 0,	0,	printargs,		"SYS_6372"	}, /* 6372 */
+	{ 0,	0,	printargs,		"SYS_6373"	}, /* 6373 */
+	{ 0,	0,	printargs,		"SYS_6374"	}, /* 6374 */
+	{ 0,	0,	printargs,		"SYS_6375"	}, /* 6375 */
+	{ 0,	0,	printargs,		"SYS_6376"	}, /* 6376 */
+	{ 0,	0,	printargs,		"SYS_6377"	}, /* 6377 */
+	{ 0,	0,	printargs,		"SYS_6378"	}, /* 6378 */
+	{ 0,	0,	printargs,		"SYS_6379"	}, /* 6379 */
+	{ 0,	0,	printargs,		"SYS_6380"	}, /* 6380 */
+	{ 0,	0,	printargs,		"SYS_6381"	}, /* 6381 */
+	{ 0,	0,	printargs,		"SYS_6382"	}, /* 6382 */
+	{ 0,	0,	printargs,		"SYS_6383"	}, /* 6383 */
+	{ 0,	0,	printargs,		"SYS_6384"	}, /* 6384 */
+	{ 0,	0,	printargs,		"SYS_6385"	}, /* 6385 */
+	{ 0,	0,	printargs,		"SYS_6386"	}, /* 6386 */
+	{ 0,	0,	printargs,		"SYS_6387"	}, /* 6387 */
+	{ 0,	0,	printargs,		"SYS_6388"	}, /* 6388 */
+	{ 0,	0,	printargs,		"SYS_6389"	}, /* 6389 */
+	{ 0,	0,	printargs,		"SYS_6390"	}, /* 6390 */
+	{ 0,	0,	printargs,		"SYS_6391"	}, /* 6391 */
+	{ 0,	0,	printargs,		"SYS_6392"	}, /* 6392 */
+	{ 0,	0,	printargs,		"SYS_6393"	}, /* 6393 */
+	{ 0,	0,	printargs,		"SYS_6394"	}, /* 6394 */
+	{ 0,	0,	printargs,		"SYS_6395"	}, /* 6395 */
+	{ 0,	0,	printargs,		"SYS_6396"	}, /* 6396 */
+	{ 0,	0,	printargs,		"SYS_6397"	}, /* 6397 */
+	{ 0,	0,	printargs,		"SYS_6398"	}, /* 6398 */
+	{ 0,	0,	printargs,		"SYS_6399"	}, /* 6399 */
+	{ 0,	0,	printargs,		"SYS_6400"	}, /* 6400 */
+	{ 0,	0,	printargs,		"SYS_6401"	}, /* 6401 */
+	{ 0,	0,	printargs,		"SYS_6402"	}, /* 6402 */
+	{ 0,	0,	printargs,		"SYS_6403"	}, /* 6403 */
+	{ 0,	0,	printargs,		"SYS_6404"	}, /* 6404 */
+	{ 0,	0,	printargs,		"SYS_6405"	}, /* 6405 */
+	{ 0,	0,	printargs,		"SYS_6406"	}, /* 6406 */
+	{ 0,	0,	printargs,		"SYS_6407"	}, /* 6407 */
+	{ 0,	0,	printargs,		"SYS_6408"	}, /* 6408 */
+	{ 0,	0,	printargs,		"SYS_6409"	}, /* 6409 */
+	{ 0,	0,	printargs,		"SYS_6410"	}, /* 6410 */
+	{ 0,	0,	printargs,		"SYS_6411"	}, /* 6411 */
+	{ 0,	0,	printargs,		"SYS_6412"	}, /* 6412 */
+	{ 0,	0,	printargs,		"SYS_6413"	}, /* 6413 */
+	{ 0,	0,	printargs,		"SYS_6414"	}, /* 6414 */
+	{ 0,	0,	printargs,		"SYS_6415"	}, /* 6415 */
+	{ 0,	0,	printargs,		"SYS_6416"	}, /* 6416 */
+	{ 0,	0,	printargs,		"SYS_6417"	}, /* 6417 */
+	{ 0,	0,	printargs,		"SYS_6418"	}, /* 6418 */
+	{ 0,	0,	printargs,		"SYS_6419"	}, /* 6419 */
+	{ 0,	0,	printargs,		"SYS_6420"	}, /* 6420 */
+	{ 0,	0,	printargs,		"SYS_6421"	}, /* 6421 */
+	{ 0,	0,	printargs,		"SYS_6422"	}, /* 6422 */
+	{ 0,	0,	printargs,		"SYS_6423"	}, /* 6423 */
+	{ 0,	0,	printargs,		"SYS_6424"	}, /* 6424 */
+	{ 0,	0,	printargs,		"SYS_6425"	}, /* 6425 */
+	{ 0,	0,	printargs,		"SYS_6426"	}, /* 6426 */
+	{ 0,	0,	printargs,		"SYS_6427"	}, /* 6427 */
+	{ 0,	0,	printargs,		"SYS_6428"	}, /* 6428 */
+	{ 0,	0,	printargs,		"SYS_6429"	}, /* 6429 */
+	{ 0,	0,	printargs,		"SYS_6430"	}, /* 6430 */
+	{ 0,	0,	printargs,		"SYS_6431"	}, /* 6431 */
+	{ 0,	0,	printargs,		"SYS_6432"	}, /* 6432 */
+	{ 0,	0,	printargs,		"SYS_6433"	}, /* 6433 */
+	{ 0,	0,	printargs,		"SYS_6434"	}, /* 6434 */
+	{ 0,	0,	printargs,		"SYS_6435"	}, /* 6435 */
+	{ 0,	0,	printargs,		"SYS_6436"	}, /* 6436 */
+	{ 0,	0,	printargs,		"SYS_6437"	}, /* 6437 */
+	{ 0,	0,	printargs,		"SYS_6438"	}, /* 6438 */
+	{ 0,	0,	printargs,		"SYS_6439"	}, /* 6439 */
+	{ 0,	0,	printargs,		"SYS_6440"	}, /* 6440 */
+	{ 0,	0,	printargs,		"SYS_6441"	}, /* 6441 */
+	{ 0,	0,	printargs,		"SYS_6442"	}, /* 6442 */
+	{ 0,	0,	printargs,		"SYS_6443"	}, /* 6443 */
+	{ 0,	0,	printargs,		"SYS_6444"	}, /* 6444 */
+	{ 0,	0,	printargs,		"SYS_6445"	}, /* 6445 */
+	{ 0,	0,	printargs,		"SYS_6446"	}, /* 6446 */
+	{ 0,	0,	printargs,		"SYS_6447"	}, /* 6447 */
+	{ 0,	0,	printargs,		"SYS_6448"	}, /* 6448 */
+	{ 0,	0,	printargs,		"SYS_6449"	}, /* 6449 */
+	{ 0,	0,	printargs,		"SYS_6450"	}, /* 6450 */
+	{ 0,	0,	printargs,		"SYS_6451"	}, /* 6451 */
+	{ 0,	0,	printargs,		"SYS_6452"	}, /* 6452 */
+	{ 0,	0,	printargs,		"SYS_6453"	}, /* 6453 */
+	{ 0,	0,	printargs,		"SYS_6454"	}, /* 6454 */
+	{ 0,	0,	printargs,		"SYS_6455"	}, /* 6455 */
+	{ 0,	0,	printargs,		"SYS_6456"	}, /* 6456 */
+	{ 0,	0,	printargs,		"SYS_6457"	}, /* 6457 */
+	{ 0,	0,	printargs,		"SYS_6458"	}, /* 6458 */
+	{ 0,	0,	printargs,		"SYS_6459"	}, /* 6459 */
+	{ 0,	0,	printargs,		"SYS_6460"	}, /* 6460 */
+	{ 0,	0,	printargs,		"SYS_6461"	}, /* 6461 */
+	{ 0,	0,	printargs,		"SYS_6462"	}, /* 6462 */
+	{ 0,	0,	printargs,		"SYS_6463"	}, /* 6463 */
+	{ 0,	0,	printargs,		"SYS_6464"	}, /* 6464 */
+	{ 0,	0,	printargs,		"SYS_6465"	}, /* 6465 */
+	{ 0,	0,	printargs,		"SYS_6466"	}, /* 6466 */
+	{ 0,	0,	printargs,		"SYS_6467"	}, /* 6467 */
+	{ 0,	0,	printargs,		"SYS_6468"	}, /* 6468 */
+	{ 0,	0,	printargs,		"SYS_6469"	}, /* 6469 */
+	{ 0,	0,	printargs,		"SYS_6470"	}, /* 6470 */
+	{ 0,	0,	printargs,		"SYS_6471"	}, /* 6471 */
+	{ 0,	0,	printargs,		"SYS_6472"	}, /* 6472 */
+	{ 0,	0,	printargs,		"SYS_6473"	}, /* 6473 */
+	{ 0,	0,	printargs,		"SYS_6474"	}, /* 6474 */
+	{ 0,	0,	printargs,		"SYS_6475"	}, /* 6475 */
+	{ 0,	0,	printargs,		"SYS_6476"	}, /* 6476 */
+	{ 0,	0,	printargs,		"SYS_6477"	}, /* 6477 */
+	{ 0,	0,	printargs,		"SYS_6478"	}, /* 6478 */
+	{ 0,	0,	printargs,		"SYS_6479"	}, /* 6479 */
+	{ 0,	0,	printargs,		"SYS_6480"	}, /* 6480 */
+	{ 0,	0,	printargs,		"SYS_6481"	}, /* 6481 */
+	{ 0,	0,	printargs,		"SYS_6482"	}, /* 6482 */
+	{ 0,	0,	printargs,		"SYS_6483"	}, /* 6483 */
+	{ 0,	0,	printargs,		"SYS_6484"	}, /* 6484 */
+	{ 0,	0,	printargs,		"SYS_6485"	}, /* 6485 */
+	{ 0,	0,	printargs,		"SYS_6486"	}, /* 6486 */
+	{ 0,	0,	printargs,		"SYS_6487"	}, /* 6487 */
+	{ 0,	0,	printargs,		"SYS_6488"	}, /* 6488 */
+	{ 0,	0,	printargs,		"SYS_6489"	}, /* 6489 */
+	{ 0,	0,	printargs,		"SYS_6490"	}, /* 6490 */
+	{ 0,	0,	printargs,		"SYS_6491"	}, /* 6491 */
+	{ 0,	0,	printargs,		"SYS_6492"	}, /* 6492 */
+	{ 0,	0,	printargs,		"SYS_6493"	}, /* 6493 */
+	{ 0,	0,	printargs,		"SYS_6494"	}, /* 6494 */
+	{ 0,	0,	printargs,		"SYS_6495"	}, /* 6495 */
+	{ 0,	0,	printargs,		"SYS_6496"	}, /* 6496 */
+	{ 0,	0,	printargs,		"SYS_6497"	}, /* 6497 */
+	{ 0,	0,	printargs,		"SYS_6498"	}, /* 6498 */
+	{ 0,	0,	printargs,		"SYS_6499"	}, /* 6499 */
+	{ 0,	0,	printargs,		"SYS_6500"	}, /* 6500 */
+	{ 0,	0,	printargs,		"SYS_6501"	}, /* 6501 */
+	{ 0,	0,	printargs,		"SYS_6502"	}, /* 6502 */
+	{ 0,	0,	printargs,		"SYS_6503"	}, /* 6503 */
+	{ 0,	0,	printargs,		"SYS_6504"	}, /* 6504 */
+	{ 0,	0,	printargs,		"SYS_6505"	}, /* 6505 */
+	{ 0,	0,	printargs,		"SYS_6506"	}, /* 6506 */
+	{ 0,	0,	printargs,		"SYS_6507"	}, /* 6507 */
+	{ 0,	0,	printargs,		"SYS_6508"	}, /* 6508 */
+	{ 0,	0,	printargs,		"SYS_6509"	}, /* 6509 */
+	{ 0,	0,	printargs,		"SYS_6510"	}, /* 6510 */
+	{ 0,	0,	printargs,		"SYS_6511"	}, /* 6511 */
+	{ 0,	0,	printargs,		"SYS_6512"	}, /* 6512 */
+	{ 0,	0,	printargs,		"SYS_6513"	}, /* 6513 */
+	{ 0,	0,	printargs,		"SYS_6514"	}, /* 6514 */
+	{ 0,	0,	printargs,		"SYS_6515"	}, /* 6515 */
+	{ 0,	0,	printargs,		"SYS_6516"	}, /* 6516 */
+	{ 0,	0,	printargs,		"SYS_6517"	}, /* 6517 */
+	{ 0,	0,	printargs,		"SYS_6518"	}, /* 6518 */
+	{ 0,	0,	printargs,		"SYS_6519"	}, /* 6519 */
+	{ 0,	0,	printargs,		"SYS_6520"	}, /* 6520 */
+	{ 0,	0,	printargs,		"SYS_6521"	}, /* 6521 */
+	{ 0,	0,	printargs,		"SYS_6522"	}, /* 6522 */
+	{ 0,	0,	printargs,		"SYS_6523"	}, /* 6523 */
+	{ 0,	0,	printargs,		"SYS_6524"	}, /* 6524 */
+	{ 0,	0,	printargs,		"SYS_6525"	}, /* 6525 */
+	{ 0,	0,	printargs,		"SYS_6526"	}, /* 6526 */
+	{ 0,	0,	printargs,		"SYS_6527"	}, /* 6527 */
+	{ 0,	0,	printargs,		"SYS_6528"	}, /* 6528 */
+	{ 0,	0,	printargs,		"SYS_6529"	}, /* 6529 */
+	{ 0,	0,	printargs,		"SYS_6530"	}, /* 6530 */
+	{ 0,	0,	printargs,		"SYS_6531"	}, /* 6531 */
+	{ 0,	0,	printargs,		"SYS_6532"	}, /* 6532 */
+	{ 0,	0,	printargs,		"SYS_6533"	}, /* 6533 */
+	{ 0,	0,	printargs,		"SYS_6534"	}, /* 6534 */
+	{ 0,	0,	printargs,		"SYS_6535"	}, /* 6535 */
+	{ 0,	0,	printargs,		"SYS_6536"	}, /* 6536 */
+	{ 0,	0,	printargs,		"SYS_6537"	}, /* 6537 */
+	{ 0,	0,	printargs,		"SYS_6538"	}, /* 6538 */
+	{ 0,	0,	printargs,		"SYS_6539"	}, /* 6539 */
+	{ 0,	0,	printargs,		"SYS_6540"	}, /* 6540 */
+	{ 0,	0,	printargs,		"SYS_6541"	}, /* 6541 */
+	{ 0,	0,	printargs,		"SYS_6542"	}, /* 6542 */
+	{ 0,	0,	printargs,		"SYS_6543"	}, /* 6543 */
+	{ 0,	0,	printargs,		"SYS_6544"	}, /* 6544 */
+	{ 0,	0,	printargs,		"SYS_6545"	}, /* 6545 */
+	{ 0,	0,	printargs,		"SYS_6546"	}, /* 6546 */
+	{ 0,	0,	printargs,		"SYS_6547"	}, /* 6547 */
+	{ 0,	0,	printargs,		"SYS_6548"	}, /* 6548 */
+	{ 0,	0,	printargs,		"SYS_6549"	}, /* 6549 */
+	{ 0,	0,	printargs,		"SYS_6550"	}, /* 6550 */
+	{ 0,	0,	printargs,		"SYS_6551"	}, /* 6551 */
+	{ 0,	0,	printargs,		"SYS_6552"	}, /* 6552 */
+	{ 0,	0,	printargs,		"SYS_6553"	}, /* 6553 */
+	{ 0,	0,	printargs,		"SYS_6554"	}, /* 6554 */
+	{ 0,	0,	printargs,		"SYS_6555"	}, /* 6555 */
+	{ 0,	0,	printargs,		"SYS_6556"	}, /* 6556 */
+	{ 0,	0,	printargs,		"SYS_6557"	}, /* 6557 */
+	{ 0,	0,	printargs,		"SYS_6558"	}, /* 6558 */
+	{ 0,	0,	printargs,		"SYS_6559"	}, /* 6559 */
+	{ 0,	0,	printargs,		"SYS_6560"	}, /* 6560 */
+	{ 0,	0,	printargs,		"SYS_6561"	}, /* 6561 */
+	{ 0,	0,	printargs,		"SYS_6562"	}, /* 6562 */
+	{ 0,	0,	printargs,		"SYS_6563"	}, /* 6563 */
+	{ 0,	0,	printargs,		"SYS_6564"	}, /* 6564 */
+	{ 0,	0,	printargs,		"SYS_6565"	}, /* 6565 */
+	{ 0,	0,	printargs,		"SYS_6566"	}, /* 6566 */
+	{ 0,	0,	printargs,		"SYS_6567"	}, /* 6567 */
+	{ 0,	0,	printargs,		"SYS_6568"	}, /* 6568 */
+	{ 0,	0,	printargs,		"SYS_6569"	}, /* 6569 */
+	{ 0,	0,	printargs,		"SYS_6570"	}, /* 6570 */
+	{ 0,	0,	printargs,		"SYS_6571"	}, /* 6571 */
+	{ 0,	0,	printargs,		"SYS_6572"	}, /* 6572 */
+	{ 0,	0,	printargs,		"SYS_6573"	}, /* 6573 */
+	{ 0,	0,	printargs,		"SYS_6574"	}, /* 6574 */
+	{ 0,	0,	printargs,		"SYS_6575"	}, /* 6575 */
+	{ 0,	0,	printargs,		"SYS_6576"	}, /* 6576 */
+	{ 0,	0,	printargs,		"SYS_6577"	}, /* 6577 */
+	{ 0,	0,	printargs,		"SYS_6578"	}, /* 6578 */
+	{ 0,	0,	printargs,		"SYS_6579"	}, /* 6579 */
+	{ 0,	0,	printargs,		"SYS_6580"	}, /* 6580 */
+	{ 0,	0,	printargs,		"SYS_6581"	}, /* 6581 */
+	{ 0,	0,	printargs,		"SYS_6582"	}, /* 6582 */
+	{ 0,	0,	printargs,		"SYS_6583"	}, /* 6583 */
+	{ 0,	0,	printargs,		"SYS_6584"	}, /* 6584 */
+	{ 0,	0,	printargs,		"SYS_6585"	}, /* 6585 */
+	{ 0,	0,	printargs,		"SYS_6586"	}, /* 6586 */
+	{ 0,	0,	printargs,		"SYS_6587"	}, /* 6587 */
+	{ 0,	0,	printargs,		"SYS_6588"	}, /* 6588 */
+	{ 0,	0,	printargs,		"SYS_6589"	}, /* 6589 */
+	{ 0,	0,	printargs,		"SYS_6590"	}, /* 6590 */
+	{ 0,	0,	printargs,		"SYS_6591"	}, /* 6591 */
+	{ 0,	0,	printargs,		"SYS_6592"	}, /* 6592 */
+	{ 0,	0,	printargs,		"SYS_6593"	}, /* 6593 */
+	{ 0,	0,	printargs,		"SYS_6594"	}, /* 6594 */
+	{ 0,	0,	printargs,		"SYS_6595"	}, /* 6595 */
+	{ 0,	0,	printargs,		"SYS_6596"	}, /* 6596 */
+	{ 0,	0,	printargs,		"SYS_6597"	}, /* 6597 */
+	{ 0,	0,	printargs,		"SYS_6598"	}, /* 6598 */
+	{ 0,	0,	printargs,		"SYS_6599"	}, /* 6599 */
+	{ 0,	0,	printargs,		"SYS_6600"	}, /* 6600 */
+	{ 0,	0,	printargs,		"SYS_6601"	}, /* 6601 */
+	{ 0,	0,	printargs,		"SYS_6602"	}, /* 6602 */
+	{ 0,	0,	printargs,		"SYS_6603"	}, /* 6603 */
+	{ 0,	0,	printargs,		"SYS_6604"	}, /* 6604 */
+	{ 0,	0,	printargs,		"SYS_6605"	}, /* 6605 */
+	{ 0,	0,	printargs,		"SYS_6606"	}, /* 6606 */
+	{ 0,	0,	printargs,		"SYS_6607"	}, /* 6607 */
+	{ 0,	0,	printargs,		"SYS_6608"	}, /* 6608 */
+	{ 0,	0,	printargs,		"SYS_6609"	}, /* 6609 */
+	{ 0,	0,	printargs,		"SYS_6610"	}, /* 6610 */
+	{ 0,	0,	printargs,		"SYS_6611"	}, /* 6611 */
+	{ 0,	0,	printargs,		"SYS_6612"	}, /* 6612 */
+	{ 0,	0,	printargs,		"SYS_6613"	}, /* 6613 */
+	{ 0,	0,	printargs,		"SYS_6614"	}, /* 6614 */
+	{ 0,	0,	printargs,		"SYS_6615"	}, /* 6615 */
+	{ 0,	0,	printargs,		"SYS_6616"	}, /* 6616 */
+	{ 0,	0,	printargs,		"SYS_6617"	}, /* 6617 */
+	{ 0,	0,	printargs,		"SYS_6618"	}, /* 6618 */
+	{ 0,	0,	printargs,		"SYS_6619"	}, /* 6619 */
+	{ 0,	0,	printargs,		"SYS_6620"	}, /* 6620 */
+	{ 0,	0,	printargs,		"SYS_6621"	}, /* 6621 */
+	{ 0,	0,	printargs,		"SYS_6622"	}, /* 6622 */
+	{ 0,	0,	printargs,		"SYS_6623"	}, /* 6623 */
+	{ 0,	0,	printargs,		"SYS_6624"	}, /* 6624 */
+	{ 0,	0,	printargs,		"SYS_6625"	}, /* 6625 */
+	{ 0,	0,	printargs,		"SYS_6626"	}, /* 6626 */
+	{ 0,	0,	printargs,		"SYS_6627"	}, /* 6627 */
+	{ 0,	0,	printargs,		"SYS_6628"	}, /* 6628 */
+	{ 0,	0,	printargs,		"SYS_6629"	}, /* 6629 */
+	{ 0,	0,	printargs,		"SYS_6630"	}, /* 6630 */
+	{ 0,	0,	printargs,		"SYS_6631"	}, /* 6631 */
+	{ 0,	0,	printargs,		"SYS_6632"	}, /* 6632 */
+	{ 0,	0,	printargs,		"SYS_6633"	}, /* 6633 */
+	{ 0,	0,	printargs,		"SYS_6634"	}, /* 6634 */
+	{ 0,	0,	printargs,		"SYS_6635"	}, /* 6635 */
+	{ 0,	0,	printargs,		"SYS_6636"	}, /* 6636 */
+	{ 0,	0,	printargs,		"SYS_6637"	}, /* 6637 */
+	{ 0,	0,	printargs,		"SYS_6638"	}, /* 6638 */
+	{ 0,	0,	printargs,		"SYS_6639"	}, /* 6639 */
+	{ 0,	0,	printargs,		"SYS_6640"	}, /* 6640 */
+	{ 0,	0,	printargs,		"SYS_6641"	}, /* 6641 */
+	{ 0,	0,	printargs,		"SYS_6642"	}, /* 6642 */
+	{ 0,	0,	printargs,		"SYS_6643"	}, /* 6643 */
+	{ 0,	0,	printargs,		"SYS_6644"	}, /* 6644 */
+	{ 0,	0,	printargs,		"SYS_6645"	}, /* 6645 */
+	{ 0,	0,	printargs,		"SYS_6646"	}, /* 6646 */
+	{ 0,	0,	printargs,		"SYS_6647"	}, /* 6647 */
+	{ 0,	0,	printargs,		"SYS_6648"	}, /* 6648 */
+	{ 0,	0,	printargs,		"SYS_6649"	}, /* 6649 */
+	{ 0,	0,	printargs,		"SYS_6650"	}, /* 6650 */
+	{ 0,	0,	printargs,		"SYS_6651"	}, /* 6651 */
+	{ 0,	0,	printargs,		"SYS_6652"	}, /* 6652 */
+	{ 0,	0,	printargs,		"SYS_6653"	}, /* 6653 */
+	{ 0,	0,	printargs,		"SYS_6654"	}, /* 6654 */
+	{ 0,	0,	printargs,		"SYS_6655"	}, /* 6655 */
+	{ 0,	0,	printargs,		"SYS_6656"	}, /* 6656 */
+	{ 0,	0,	printargs,		"SYS_6657"	}, /* 6657 */
+	{ 0,	0,	printargs,		"SYS_6658"	}, /* 6658 */
+	{ 0,	0,	printargs,		"SYS_6659"	}, /* 6659 */
+	{ 0,	0,	printargs,		"SYS_6660"	}, /* 6660 */
+	{ 0,	0,	printargs,		"SYS_6661"	}, /* 6661 */
+	{ 0,	0,	printargs,		"SYS_6662"	}, /* 6662 */
+	{ 0,	0,	printargs,		"SYS_6663"	}, /* 6663 */
+	{ 0,	0,	printargs,		"SYS_6664"	}, /* 6664 */
+	{ 0,	0,	printargs,		"SYS_6665"	}, /* 6665 */
+	{ 0,	0,	printargs,		"SYS_6666"	}, /* 6666 */
+	{ 0,	0,	printargs,		"SYS_6667"	}, /* 6667 */
+	{ 0,	0,	printargs,		"SYS_6668"	}, /* 6668 */
+	{ 0,	0,	printargs,		"SYS_6669"	}, /* 6669 */
+	{ 0,	0,	printargs,		"SYS_6670"	}, /* 6670 */
+	{ 0,	0,	printargs,		"SYS_6671"	}, /* 6671 */
+	{ 0,	0,	printargs,		"SYS_6672"	}, /* 6672 */
+	{ 0,	0,	printargs,		"SYS_6673"	}, /* 6673 */
+	{ 0,	0,	printargs,		"SYS_6674"	}, /* 6674 */
+	{ 0,	0,	printargs,		"SYS_6675"	}, /* 6675 */
+	{ 0,	0,	printargs,		"SYS_6676"	}, /* 6676 */
+	{ 0,	0,	printargs,		"SYS_6677"	}, /* 6677 */
+	{ 0,	0,	printargs,		"SYS_6678"	}, /* 6678 */
+	{ 0,	0,	printargs,		"SYS_6679"	}, /* 6679 */
+	{ 0,	0,	printargs,		"SYS_6680"	}, /* 6680 */
+	{ 0,	0,	printargs,		"SYS_6681"	}, /* 6681 */
+	{ 0,	0,	printargs,		"SYS_6682"	}, /* 6682 */
+	{ 0,	0,	printargs,		"SYS_6683"	}, /* 6683 */
+	{ 0,	0,	printargs,		"SYS_6684"	}, /* 6684 */
+	{ 0,	0,	printargs,		"SYS_6685"	}, /* 6685 */
+	{ 0,	0,	printargs,		"SYS_6686"	}, /* 6686 */
+	{ 0,	0,	printargs,		"SYS_6687"	}, /* 6687 */
+	{ 0,	0,	printargs,		"SYS_6688"	}, /* 6688 */
+	{ 0,	0,	printargs,		"SYS_6689"	}, /* 6689 */
+	{ 0,	0,	printargs,		"SYS_6690"	}, /* 6690 */
+	{ 0,	0,	printargs,		"SYS_6691"	}, /* 6691 */
+	{ 0,	0,	printargs,		"SYS_6692"	}, /* 6692 */
+	{ 0,	0,	printargs,		"SYS_6693"	}, /* 6693 */
+	{ 0,	0,	printargs,		"SYS_6694"	}, /* 6694 */
+	{ 0,	0,	printargs,		"SYS_6695"	}, /* 6695 */
+	{ 0,	0,	printargs,		"SYS_6696"	}, /* 6696 */
+	{ 0,	0,	printargs,		"SYS_6697"	}, /* 6697 */
+	{ 0,	0,	printargs,		"SYS_6698"	}, /* 6698 */
+	{ 0,	0,	printargs,		"SYS_6699"	}, /* 6699 */
+	{ 0,	0,	printargs,		"SYS_6700"	}, /* 6700 */
+	{ 0,	0,	printargs,		"SYS_6701"	}, /* 6701 */
+	{ 0,	0,	printargs,		"SYS_6702"	}, /* 6702 */
+	{ 0,	0,	printargs,		"SYS_6703"	}, /* 6703 */
+	{ 0,	0,	printargs,		"SYS_6704"	}, /* 6704 */
+	{ 0,	0,	printargs,		"SYS_6705"	}, /* 6705 */
+	{ 0,	0,	printargs,		"SYS_6706"	}, /* 6706 */
+	{ 0,	0,	printargs,		"SYS_6707"	}, /* 6707 */
+	{ 0,	0,	printargs,		"SYS_6708"	}, /* 6708 */
+	{ 0,	0,	printargs,		"SYS_6709"	}, /* 6709 */
+	{ 0,	0,	printargs,		"SYS_6710"	}, /* 6710 */
+	{ 0,	0,	printargs,		"SYS_6711"	}, /* 6711 */
+	{ 0,	0,	printargs,		"SYS_6712"	}, /* 6712 */
+	{ 0,	0,	printargs,		"SYS_6713"	}, /* 6713 */
+	{ 0,	0,	printargs,		"SYS_6714"	}, /* 6714 */
+	{ 0,	0,	printargs,		"SYS_6715"	}, /* 6715 */
+	{ 0,	0,	printargs,		"SYS_6716"	}, /* 6716 */
+	{ 0,	0,	printargs,		"SYS_6717"	}, /* 6717 */
+	{ 0,	0,	printargs,		"SYS_6718"	}, /* 6718 */
+	{ 0,	0,	printargs,		"SYS_6719"	}, /* 6719 */
+	{ 0,	0,	printargs,		"SYS_6720"	}, /* 6720 */
+	{ 0,	0,	printargs,		"SYS_6721"	}, /* 6721 */
+	{ 0,	0,	printargs,		"SYS_6722"	}, /* 6722 */
+	{ 0,	0,	printargs,		"SYS_6723"	}, /* 6723 */
+	{ 0,	0,	printargs,		"SYS_6724"	}, /* 6724 */
+	{ 0,	0,	printargs,		"SYS_6725"	}, /* 6725 */
+	{ 0,	0,	printargs,		"SYS_6726"	}, /* 6726 */
+	{ 0,	0,	printargs,		"SYS_6727"	}, /* 6727 */
+	{ 0,	0,	printargs,		"SYS_6728"	}, /* 6728 */
+	{ 0,	0,	printargs,		"SYS_6729"	}, /* 6729 */
+	{ 0,	0,	printargs,		"SYS_6730"	}, /* 6730 */
+	{ 0,	0,	printargs,		"SYS_6731"	}, /* 6731 */
+	{ 0,	0,	printargs,		"SYS_6732"	}, /* 6732 */
+	{ 0,	0,	printargs,		"SYS_6733"	}, /* 6733 */
+	{ 0,	0,	printargs,		"SYS_6734"	}, /* 6734 */
+	{ 0,	0,	printargs,		"SYS_6735"	}, /* 6735 */
+	{ 0,	0,	printargs,		"SYS_6736"	}, /* 6736 */
+	{ 0,	0,	printargs,		"SYS_6737"	}, /* 6737 */
+	{ 0,	0,	printargs,		"SYS_6738"	}, /* 6738 */
+	{ 0,	0,	printargs,		"SYS_6739"	}, /* 6739 */
+	{ 0,	0,	printargs,		"SYS_6740"	}, /* 6740 */
+	{ 0,	0,	printargs,		"SYS_6741"	}, /* 6741 */
+	{ 0,	0,	printargs,		"SYS_6742"	}, /* 6742 */
+	{ 0,	0,	printargs,		"SYS_6743"	}, /* 6743 */
+	{ 0,	0,	printargs,		"SYS_6744"	}, /* 6744 */
+	{ 0,	0,	printargs,		"SYS_6745"	}, /* 6745 */
+	{ 0,	0,	printargs,		"SYS_6746"	}, /* 6746 */
+	{ 0,	0,	printargs,		"SYS_6747"	}, /* 6747 */
+	{ 0,	0,	printargs,		"SYS_6748"	}, /* 6748 */
+	{ 0,	0,	printargs,		"SYS_6749"	}, /* 6749 */
+	{ 0,	0,	printargs,		"SYS_6750"	}, /* 6750 */
+	{ 0,	0,	printargs,		"SYS_6751"	}, /* 6751 */
+	{ 0,	0,	printargs,		"SYS_6752"	}, /* 6752 */
+	{ 0,	0,	printargs,		"SYS_6753"	}, /* 6753 */
+	{ 0,	0,	printargs,		"SYS_6754"	}, /* 6754 */
+	{ 0,	0,	printargs,		"SYS_6755"	}, /* 6755 */
+	{ 0,	0,	printargs,		"SYS_6756"	}, /* 6756 */
+	{ 0,	0,	printargs,		"SYS_6757"	}, /* 6757 */
+	{ 0,	0,	printargs,		"SYS_6758"	}, /* 6758 */
+	{ 0,	0,	printargs,		"SYS_6759"	}, /* 6759 */
+	{ 0,	0,	printargs,		"SYS_6760"	}, /* 6760 */
+	{ 0,	0,	printargs,		"SYS_6761"	}, /* 6761 */
+	{ 0,	0,	printargs,		"SYS_6762"	}, /* 6762 */
+	{ 0,	0,	printargs,		"SYS_6763"	}, /* 6763 */
+	{ 0,	0,	printargs,		"SYS_6764"	}, /* 6764 */
+	{ 0,	0,	printargs,		"SYS_6765"	}, /* 6765 */
+	{ 0,	0,	printargs,		"SYS_6766"	}, /* 6766 */
+	{ 0,	0,	printargs,		"SYS_6767"	}, /* 6767 */
+	{ 0,	0,	printargs,		"SYS_6768"	}, /* 6768 */
+	{ 0,	0,	printargs,		"SYS_6769"	}, /* 6769 */
+	{ 0,	0,	printargs,		"SYS_6770"	}, /* 6770 */
+	{ 0,	0,	printargs,		"SYS_6771"	}, /* 6771 */
+	{ 0,	0,	printargs,		"SYS_6772"	}, /* 6772 */
+	{ 0,	0,	printargs,		"SYS_6773"	}, /* 6773 */
+	{ 0,	0,	printargs,		"SYS_6774"	}, /* 6774 */
+	{ 0,	0,	printargs,		"SYS_6775"	}, /* 6775 */
+	{ 0,	0,	printargs,		"SYS_6776"	}, /* 6776 */
+	{ 0,	0,	printargs,		"SYS_6777"	}, /* 6777 */
+	{ 0,	0,	printargs,		"SYS_6778"	}, /* 6778 */
+	{ 0,	0,	printargs,		"SYS_6779"	}, /* 6779 */
+	{ 0,	0,	printargs,		"SYS_6780"	}, /* 6780 */
+	{ 0,	0,	printargs,		"SYS_6781"	}, /* 6781 */
+	{ 0,	0,	printargs,		"SYS_6782"	}, /* 6782 */
+	{ 0,	0,	printargs,		"SYS_6783"	}, /* 6783 */
+	{ 0,	0,	printargs,		"SYS_6784"	}, /* 6784 */
+	{ 0,	0,	printargs,		"SYS_6785"	}, /* 6785 */
+	{ 0,	0,	printargs,		"SYS_6786"	}, /* 6786 */
+	{ 0,	0,	printargs,		"SYS_6787"	}, /* 6787 */
+	{ 0,	0,	printargs,		"SYS_6788"	}, /* 6788 */
+	{ 0,	0,	printargs,		"SYS_6789"	}, /* 6789 */
+	{ 0,	0,	printargs,		"SYS_6790"	}, /* 6790 */
+	{ 0,	0,	printargs,		"SYS_6791"	}, /* 6791 */
+	{ 0,	0,	printargs,		"SYS_6792"	}, /* 6792 */
+	{ 0,	0,	printargs,		"SYS_6793"	}, /* 6793 */
+	{ 0,	0,	printargs,		"SYS_6794"	}, /* 6794 */
+	{ 0,	0,	printargs,		"SYS_6795"	}, /* 6795 */
+	{ 0,	0,	printargs,		"SYS_6796"	}, /* 6796 */
+	{ 0,	0,	printargs,		"SYS_6797"	}, /* 6797 */
+	{ 0,	0,	printargs,		"SYS_6798"	}, /* 6798 */
+	{ 0,	0,	printargs,		"SYS_6799"	}, /* 6799 */
+	{ 0,	0,	printargs,		"SYS_6800"	}, /* 6800 */
+	{ 0,	0,	printargs,		"SYS_6801"	}, /* 6801 */
+	{ 0,	0,	printargs,		"SYS_6802"	}, /* 6802 */
+	{ 0,	0,	printargs,		"SYS_6803"	}, /* 6803 */
+	{ 0,	0,	printargs,		"SYS_6804"	}, /* 6804 */
+	{ 0,	0,	printargs,		"SYS_6805"	}, /* 6805 */
+	{ 0,	0,	printargs,		"SYS_6806"	}, /* 6806 */
+	{ 0,	0,	printargs,		"SYS_6807"	}, /* 6807 */
+	{ 0,	0,	printargs,		"SYS_6808"	}, /* 6808 */
+	{ 0,	0,	printargs,		"SYS_6809"	}, /* 6809 */
+	{ 0,	0,	printargs,		"SYS_6810"	}, /* 6810 */
+	{ 0,	0,	printargs,		"SYS_6811"	}, /* 6811 */
+	{ 0,	0,	printargs,		"SYS_6812"	}, /* 6812 */
+	{ 0,	0,	printargs,		"SYS_6813"	}, /* 6813 */
+	{ 0,	0,	printargs,		"SYS_6814"	}, /* 6814 */
+	{ 0,	0,	printargs,		"SYS_6815"	}, /* 6815 */
+	{ 0,	0,	printargs,		"SYS_6816"	}, /* 6816 */
+	{ 0,	0,	printargs,		"SYS_6817"	}, /* 6817 */
+	{ 0,	0,	printargs,		"SYS_6818"	}, /* 6818 */
+	{ 0,	0,	printargs,		"SYS_6819"	}, /* 6819 */
+	{ 0,	0,	printargs,		"SYS_6820"	}, /* 6820 */
+	{ 0,	0,	printargs,		"SYS_6821"	}, /* 6821 */
+	{ 0,	0,	printargs,		"SYS_6822"	}, /* 6822 */
+	{ 0,	0,	printargs,		"SYS_6823"	}, /* 6823 */
+	{ 0,	0,	printargs,		"SYS_6824"	}, /* 6824 */
+	{ 0,	0,	printargs,		"SYS_6825"	}, /* 6825 */
+	{ 0,	0,	printargs,		"SYS_6826"	}, /* 6826 */
+	{ 0,	0,	printargs,		"SYS_6827"	}, /* 6827 */
+	{ 0,	0,	printargs,		"SYS_6828"	}, /* 6828 */
+	{ 0,	0,	printargs,		"SYS_6829"	}, /* 6829 */
+	{ 0,	0,	printargs,		"SYS_6830"	}, /* 6830 */
+	{ 0,	0,	printargs,		"SYS_6831"	}, /* 6831 */
+	{ 0,	0,	printargs,		"SYS_6832"	}, /* 6832 */
+	{ 0,	0,	printargs,		"SYS_6833"	}, /* 6833 */
+	{ 0,	0,	printargs,		"SYS_6834"	}, /* 6834 */
+	{ 0,	0,	printargs,		"SYS_6835"	}, /* 6835 */
+	{ 0,	0,	printargs,		"SYS_6836"	}, /* 6836 */
+	{ 0,	0,	printargs,		"SYS_6837"	}, /* 6837 */
+	{ 0,	0,	printargs,		"SYS_6838"	}, /* 6838 */
+	{ 0,	0,	printargs,		"SYS_6839"	}, /* 6839 */
+	{ 0,	0,	printargs,		"SYS_6840"	}, /* 6840 */
+	{ 0,	0,	printargs,		"SYS_6841"	}, /* 6841 */
+	{ 0,	0,	printargs,		"SYS_6842"	}, /* 6842 */
+	{ 0,	0,	printargs,		"SYS_6843"	}, /* 6843 */
+	{ 0,	0,	printargs,		"SYS_6844"	}, /* 6844 */
+	{ 0,	0,	printargs,		"SYS_6845"	}, /* 6845 */
+	{ 0,	0,	printargs,		"SYS_6846"	}, /* 6846 */
+	{ 0,	0,	printargs,		"SYS_6847"	}, /* 6847 */
+	{ 0,	0,	printargs,		"SYS_6848"	}, /* 6848 */
+	{ 0,	0,	printargs,		"SYS_6849"	}, /* 6849 */
+	{ 0,	0,	printargs,		"SYS_6850"	}, /* 6850 */
+	{ 0,	0,	printargs,		"SYS_6851"	}, /* 6851 */
+	{ 0,	0,	printargs,		"SYS_6852"	}, /* 6852 */
+	{ 0,	0,	printargs,		"SYS_6853"	}, /* 6853 */
+	{ 0,	0,	printargs,		"SYS_6854"	}, /* 6854 */
+	{ 0,	0,	printargs,		"SYS_6855"	}, /* 6855 */
+	{ 0,	0,	printargs,		"SYS_6856"	}, /* 6856 */
+	{ 0,	0,	printargs,		"SYS_6857"	}, /* 6857 */
+	{ 0,	0,	printargs,		"SYS_6858"	}, /* 6858 */
+	{ 0,	0,	printargs,		"SYS_6859"	}, /* 6859 */
+	{ 0,	0,	printargs,		"SYS_6860"	}, /* 6860 */
+	{ 0,	0,	printargs,		"SYS_6861"	}, /* 6861 */
+	{ 0,	0,	printargs,		"SYS_6862"	}, /* 6862 */
+	{ 0,	0,	printargs,		"SYS_6863"	}, /* 6863 */
+	{ 0,	0,	printargs,		"SYS_6864"	}, /* 6864 */
+	{ 0,	0,	printargs,		"SYS_6865"	}, /* 6865 */
+	{ 0,	0,	printargs,		"SYS_6866"	}, /* 6866 */
+	{ 0,	0,	printargs,		"SYS_6867"	}, /* 6867 */
+	{ 0,	0,	printargs,		"SYS_6868"	}, /* 6868 */
+	{ 0,	0,	printargs,		"SYS_6869"	}, /* 6869 */
+	{ 0,	0,	printargs,		"SYS_6870"	}, /* 6870 */
+	{ 0,	0,	printargs,		"SYS_6871"	}, /* 6871 */
+	{ 0,	0,	printargs,		"SYS_6872"	}, /* 6872 */
+	{ 0,	0,	printargs,		"SYS_6873"	}, /* 6873 */
+	{ 0,	0,	printargs,		"SYS_6874"	}, /* 6874 */
+	{ 0,	0,	printargs,		"SYS_6875"	}, /* 6875 */
+	{ 0,	0,	printargs,		"SYS_6876"	}, /* 6876 */
+	{ 0,	0,	printargs,		"SYS_6877"	}, /* 6877 */
+	{ 0,	0,	printargs,		"SYS_6878"	}, /* 6878 */
+	{ 0,	0,	printargs,		"SYS_6879"	}, /* 6879 */
+	{ 0,	0,	printargs,		"SYS_6880"	}, /* 6880 */
+	{ 0,	0,	printargs,		"SYS_6881"	}, /* 6881 */
+	{ 0,	0,	printargs,		"SYS_6882"	}, /* 6882 */
+	{ 0,	0,	printargs,		"SYS_6883"	}, /* 6883 */
+	{ 0,	0,	printargs,		"SYS_6884"	}, /* 6884 */
+	{ 0,	0,	printargs,		"SYS_6885"	}, /* 6885 */
+	{ 0,	0,	printargs,		"SYS_6886"	}, /* 6886 */
+	{ 0,	0,	printargs,		"SYS_6887"	}, /* 6887 */
+	{ 0,	0,	printargs,		"SYS_6888"	}, /* 6888 */
+	{ 0,	0,	printargs,		"SYS_6889"	}, /* 6889 */
+	{ 0,	0,	printargs,		"SYS_6890"	}, /* 6890 */
+	{ 0,	0,	printargs,		"SYS_6891"	}, /* 6891 */
+	{ 0,	0,	printargs,		"SYS_6892"	}, /* 6892 */
+	{ 0,	0,	printargs,		"SYS_6893"	}, /* 6893 */
+	{ 0,	0,	printargs,		"SYS_6894"	}, /* 6894 */
+	{ 0,	0,	printargs,		"SYS_6895"	}, /* 6895 */
+	{ 0,	0,	printargs,		"SYS_6896"	}, /* 6896 */
+	{ 0,	0,	printargs,		"SYS_6897"	}, /* 6897 */
+	{ 0,	0,	printargs,		"SYS_6898"	}, /* 6898 */
+	{ 0,	0,	printargs,		"SYS_6899"	}, /* 6899 */
+	{ 0,	0,	printargs,		"SYS_6900"	}, /* 6900 */
+	{ 0,	0,	printargs,		"SYS_6901"	}, /* 6901 */
+	{ 0,	0,	printargs,		"SYS_6902"	}, /* 6902 */
+	{ 0,	0,	printargs,		"SYS_6903"	}, /* 6903 */
+	{ 0,	0,	printargs,		"SYS_6904"	}, /* 6904 */
+	{ 0,	0,	printargs,		"SYS_6905"	}, /* 6905 */
+	{ 0,	0,	printargs,		"SYS_6906"	}, /* 6906 */
+	{ 0,	0,	printargs,		"SYS_6907"	}, /* 6907 */
+	{ 0,	0,	printargs,		"SYS_6908"	}, /* 6908 */
+	{ 0,	0,	printargs,		"SYS_6909"	}, /* 6909 */
+	{ 0,	0,	printargs,		"SYS_6910"	}, /* 6910 */
+	{ 0,	0,	printargs,		"SYS_6911"	}, /* 6911 */
+	{ 0,	0,	printargs,		"SYS_6912"	}, /* 6912 */
+	{ 0,	0,	printargs,		"SYS_6913"	}, /* 6913 */
+	{ 0,	0,	printargs,		"SYS_6914"	}, /* 6914 */
+	{ 0,	0,	printargs,		"SYS_6915"	}, /* 6915 */
+	{ 0,	0,	printargs,		"SYS_6916"	}, /* 6916 */
+	{ 0,	0,	printargs,		"SYS_6917"	}, /* 6917 */
+	{ 0,	0,	printargs,		"SYS_6918"	}, /* 6918 */
+	{ 0,	0,	printargs,		"SYS_6919"	}, /* 6919 */
+	{ 0,	0,	printargs,		"SYS_6920"	}, /* 6920 */
+	{ 0,	0,	printargs,		"SYS_6921"	}, /* 6921 */
+	{ 0,	0,	printargs,		"SYS_6922"	}, /* 6922 */
+	{ 0,	0,	printargs,		"SYS_6923"	}, /* 6923 */
+	{ 0,	0,	printargs,		"SYS_6924"	}, /* 6924 */
+	{ 0,	0,	printargs,		"SYS_6925"	}, /* 6925 */
+	{ 0,	0,	printargs,		"SYS_6926"	}, /* 6926 */
+	{ 0,	0,	printargs,		"SYS_6927"	}, /* 6927 */
+	{ 0,	0,	printargs,		"SYS_6928"	}, /* 6928 */
+	{ 0,	0,	printargs,		"SYS_6929"	}, /* 6929 */
+	{ 0,	0,	printargs,		"SYS_6930"	}, /* 6930 */
+	{ 0,	0,	printargs,		"SYS_6931"	}, /* 6931 */
+	{ 0,	0,	printargs,		"SYS_6932"	}, /* 6932 */
+	{ 0,	0,	printargs,		"SYS_6933"	}, /* 6933 */
+	{ 0,	0,	printargs,		"SYS_6934"	}, /* 6934 */
+	{ 0,	0,	printargs,		"SYS_6935"	}, /* 6935 */
+	{ 0,	0,	printargs,		"SYS_6936"	}, /* 6936 */
+	{ 0,	0,	printargs,		"SYS_6937"	}, /* 6937 */
+	{ 0,	0,	printargs,		"SYS_6938"	}, /* 6938 */
+	{ 0,	0,	printargs,		"SYS_6939"	}, /* 6939 */
+	{ 0,	0,	printargs,		"SYS_6940"	}, /* 6940 */
+	{ 0,	0,	printargs,		"SYS_6941"	}, /* 6941 */
+	{ 0,	0,	printargs,		"SYS_6942"	}, /* 6942 */
+	{ 0,	0,	printargs,		"SYS_6943"	}, /* 6943 */
+	{ 0,	0,	printargs,		"SYS_6944"	}, /* 6944 */
+	{ 0,	0,	printargs,		"SYS_6945"	}, /* 6945 */
+	{ 0,	0,	printargs,		"SYS_6946"	}, /* 6946 */
+	{ 0,	0,	printargs,		"SYS_6947"	}, /* 6947 */
+	{ 0,	0,	printargs,		"SYS_6948"	}, /* 6948 */
+	{ 0,	0,	printargs,		"SYS_6949"	}, /* 6949 */
+	{ 0,	0,	printargs,		"SYS_6950"	}, /* 6950 */
+	{ 0,	0,	printargs,		"SYS_6951"	}, /* 6951 */
+	{ 0,	0,	printargs,		"SYS_6952"	}, /* 6952 */
+	{ 0,	0,	printargs,		"SYS_6953"	}, /* 6953 */
+	{ 0,	0,	printargs,		"SYS_6954"	}, /* 6954 */
+	{ 0,	0,	printargs,		"SYS_6955"	}, /* 6955 */
+	{ 0,	0,	printargs,		"SYS_6956"	}, /* 6956 */
+	{ 0,	0,	printargs,		"SYS_6957"	}, /* 6957 */
+	{ 0,	0,	printargs,		"SYS_6958"	}, /* 6958 */
+	{ 0,	0,	printargs,		"SYS_6959"	}, /* 6959 */
+	{ 0,	0,	printargs,		"SYS_6960"	}, /* 6960 */
+	{ 0,	0,	printargs,		"SYS_6961"	}, /* 6961 */
+	{ 0,	0,	printargs,		"SYS_6962"	}, /* 6962 */
+	{ 0,	0,	printargs,		"SYS_6963"	}, /* 6963 */
+	{ 0,	0,	printargs,		"SYS_6964"	}, /* 6964 */
+	{ 0,	0,	printargs,		"SYS_6965"	}, /* 6965 */
+	{ 0,	0,	printargs,		"SYS_6966"	}, /* 6966 */
+	{ 0,	0,	printargs,		"SYS_6967"	}, /* 6967 */
+	{ 0,	0,	printargs,		"SYS_6968"	}, /* 6968 */
+	{ 0,	0,	printargs,		"SYS_6969"	}, /* 6969 */
+	{ 0,	0,	printargs,		"SYS_6970"	}, /* 6970 */
+	{ 0,	0,	printargs,		"SYS_6971"	}, /* 6971 */
+	{ 0,	0,	printargs,		"SYS_6972"	}, /* 6972 */
+	{ 0,	0,	printargs,		"SYS_6973"	}, /* 6973 */
+	{ 0,	0,	printargs,		"SYS_6974"	}, /* 6974 */
+	{ 0,	0,	printargs,		"SYS_6975"	}, /* 6975 */
+	{ 0,	0,	printargs,		"SYS_6976"	}, /* 6976 */
+	{ 0,	0,	printargs,		"SYS_6977"	}, /* 6977 */
+	{ 0,	0,	printargs,		"SYS_6978"	}, /* 6978 */
+	{ 0,	0,	printargs,		"SYS_6979"	}, /* 6979 */
+	{ 0,	0,	printargs,		"SYS_6980"	}, /* 6980 */
+	{ 0,	0,	printargs,		"SYS_6981"	}, /* 6981 */
+	{ 0,	0,	printargs,		"SYS_6982"	}, /* 6982 */
+	{ 0,	0,	printargs,		"SYS_6983"	}, /* 6983 */
+	{ 0,	0,	printargs,		"SYS_6984"	}, /* 6984 */
+	{ 0,	0,	printargs,		"SYS_6985"	}, /* 6985 */
+	{ 0,	0,	printargs,		"SYS_6986"	}, /* 6986 */
+	{ 0,	0,	printargs,		"SYS_6987"	}, /* 6987 */
+	{ 0,	0,	printargs,		"SYS_6988"	}, /* 6988 */
+	{ 0,	0,	printargs,		"SYS_6989"	}, /* 6989 */
+	{ 0,	0,	printargs,		"SYS_6990"	}, /* 6990 */
+	{ 0,	0,	printargs,		"SYS_6991"	}, /* 6991 */
+	{ 0,	0,	printargs,		"SYS_6992"	}, /* 6992 */
+	{ 0,	0,	printargs,		"SYS_6993"	}, /* 6993 */
+	{ 0,	0,	printargs,		"SYS_6994"	}, /* 6994 */
+	{ 0,	0,	printargs,		"SYS_6995"	}, /* 6995 */
+	{ 0,	0,	printargs,		"SYS_6996"	}, /* 6996 */
+	{ 0,	0,	printargs,		"SYS_6997"	}, /* 6997 */
+	{ 0,	0,	printargs,		"SYS_6998"	}, /* 6998 */
+	{ 0,	0,	printargs,		"SYS_6999"	}, /* 6999 */ /* end of Linux N32 */
diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h
new file mode 100644
index 0000000..2906800
--- /dev/null
+++ b/linux/sh/syscallent.h
@@ -0,0 +1,488 @@
+/*
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 2000 PocketPenguins Inc.  Linux for Hitachi SuperH
+ *                    port by Greg Banks <gbanks@pocketpenguins.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
+	{ 0,	0,	sys_restart_syscall,	"restart_syscall"}, /* 0 */
+	{ 1,	TP,	sys_exit,		"_exit"		}, /* 1 */
+	{ 0,	TP,	sys_fork,		"fork"		}, /* 2 */
+	{ 3,	TD,	sys_read,		"read"		}, /* 3 */
+	{ 3,	TD,	sys_write,		"write"		}, /* 4 */
+	{ 3,	TD|TF,	sys_open,		"open"		}, /* 5 */
+	{ 1,	TD,	sys_close,		"close"		}, /* 6 */
+	{ 3,	TP,	sys_waitpid,		"waitpid"	}, /* 7 */
+	{ 2,	TD|TF,	sys_creat,		"creat"		}, /* 8 */
+	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
+	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
+	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 11 */
+	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
+	{ 1,	0,	sys_time,		"time"		}, /* 13 */
+	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
+	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
+	{ 3,	TF,	sys_chown,		"lchown"		}, /* 16 */
+	{ 0,	0,	sys_break,		"break"		}, /* 17 */
+	{ 2,	TF,	sys_oldstat,		"oldstat"	}, /* 18 */
+	{ 3,	TD,	sys_lseek,		"lseek"		}, /* 19 */
+	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
+	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
+	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
+	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
+	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
+	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
+	{ 2,	TD,	sys_oldfstat,		"oldfstat"	}, /* 28 */
+	{ 0,	TS,	sys_pause,		"pause"		}, /* 29 */
+	{ 2,	TF,	sys_utime,		"utime"		}, /* 30 */
+	{ 2,	0,	sys_stty,		"stty"		}, /* 31 */
+	{ 2,	0,	sys_gtty,		"gtty"		}, /* 32 */
+	{ 2,	TF,	sys_access,		"access"	}, /* 33 */
+	{ 1,	0,	sys_nice,		"nice"		}, /* 34 */
+	{ 0,	0,	sys_ftime,		"ftime"		}, /* 35 */
+	{ 0,	0,	sys_sync,		"sync"		}, /* 36 */
+	{ 2,	TS,	sys_kill,		"kill"		}, /* 37 */
+	{ 2,	TF,	sys_rename,		"rename"	}, /* 38 */
+	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 39 */
+	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 40 */
+	{ 1,	TD,	sys_dup,		"dup"		}, /* 41 */
+	{ 1,	TD,	sys_pipe,		"pipe"		}, /* 42 */
+	{ 1,	0,	sys_times,		"times"		}, /* 43 */
+	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
+	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
+	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 47 */
+	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
+	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
+	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
+	{ 3,	TD,	sys_ioctl,		"ioctl"		}, /* 54 */
+	{ 3,	TD,	sys_fcntl,		"fcntl"		}, /* 55 */
+	{ 0,	0,	sys_mpx,		"mpx"		}, /* 56 */
+	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 57 */
+	{ 2,	0,	sys_ulimit,		"ulimit"	}, /* 58 */
+	{ 1,	0,	sys_oldolduname,	"oldolduname"	}, /* 59 */
+	{ 1,	0,	sys_umask,		"umask"		}, /* 60 */
+	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 61 */
+	{ 2,	0,	sys_ustat,		"ustat"		}, /* 62 */
+	{ 2,	TD,	sys_dup2,		"dup2"		}, /* 63 */
+	{ 0,	0,	sys_getppid,		"getppid"	}, /* 64 */
+	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
+	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
+	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
+	{ 0,	TS,	sys_siggetmask,		"siggetmask"	}, /* 68 */
+	{ 1,	TS,	sys_sigsetmask,		"sigsetmask"	}, /* 69 */
+	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
+	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
+	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
+	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
+	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
+	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 75 */
+	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 76 */
+	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 77 */
+	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 78 */
+	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 79 */
+	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 80 */
+	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 81 */
+	{ 1,	TD,	sys_oldselect,		"oldselect"	}, /* 82 */
+	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 83 */
+	{ 2,	TF,	sys_oldlstat,		"oldlstat"	}, /* 84 */
+	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
+	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
+	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
+	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
+	{ 3,	TD,	sys_readdir,		"readdir"	}, /* 89 */
+	{ 6,	TD,	sys_old_mmap,		"old_mmap"   	}, /* 90 */
+	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
+	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
+	{ 2,	TD,	sys_ftruncate,		"ftruncate"	}, /* 93 */
+	{ 2,	TD,	sys_fchmod,		"fchmod"	}, /* 94 */
+	{ 3,	TD,	sys_fchown,		"fchown"	}, /* 95 */
+	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
+	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
+	{ 4,	0,	sys_profil,		"profil"	}, /* 98 */
+	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
+	{ 2,	TD,	sys_fstatfs,		"fstatfs"	}, /* 100 */
+	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
+	{ 2,	TD,	sys_socketcall,		"socketcall"	}, /* 102 */
+	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
+	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
+	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
+	{ 2,	TF,	sys_stat,		"stat"		}, /* 106 */
+	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 107 */
+	{ 2,	TD,	sys_fstat,		"fstat"		}, /* 108 */
+	{ 1,	0,	sys_olduname,		"olduname"	}, /* 109 */
+	{ 1,	0,	sys_iopl,		"iopl"		}, /* 110 */
+	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
+	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
+	{ 1,	0,	sys_vm86old,		"vm86old"	}, /* 113 */
+	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 114 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 115 */
+	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
+	{ 5,	0,	sys_ipc,		"ipc"		}, /* 117 */
+	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
+	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
+	{ 5,	TP,	sys_clone,		"clone"		}, /* 120 */
+	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
+	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
+	{ 3,	0,	sys_cacheflush,		"cacheflush"	}, /* 123 */
+	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 124 */
+	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 125 */
+	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
+	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
+	{ 3,	0,	sys_init_module,	"init_module"	}, /* 128 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
+	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
+	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
+	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
+	{ 1,	TD,	sys_fchdir,		"fchdir"	}, /* 133 */
+	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
+	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
+	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
+	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 138 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 139 */
+	{ 5,	TD,	sys_llseek,		"_llseek"	}, /* 140 */
+	{ 3,	TD,	sys_getdents,		"getdents"	}, /* 141 */
+	{ 5,	TD,	sys_select,		"select"	}, /* 142 */
+	{ 2,	TD,	sys_flock,		"flock"		}, /* 143 */
+	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
+	{ 3,	TD,	sys_readv,		"readv"		}, /* 145 */
+	{ 3,	TD,	sys_writev,		"writev"	}, /* 146 */
+	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
+	{ 1,	TD,	sys_fdatasync,		"fdatasync"	}, /* 148 */
+	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
+	{ 1,	0,	sys_mlock,		"mlock"		}, /* 150 */
+	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
+	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
+	{ 1,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
+	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
+	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
+	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 156 */
+	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 157 */
+	{ 0,	0,	sys_sched_yield,	"sched_yield"}, /* 158 */
+	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
+	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
+	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
+	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 163 */
+	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
+	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
+	{ 5,	0,	printargs,		"vm86"		}, /* 166 */
+	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
+	{ 3,	TD,	sys_poll,		"poll"		}, /* 168 */
+	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
+	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
+	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
+	{ 5,	0,	sys_prctl,		"prctl"		}, /* 172 */
+	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 173 */
+	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"  }, /* 174 */
+	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
+	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
+	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
+	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
+	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
+
+	{ 6,	TD,	sys_pread,		"pread"		}, /* 180 */
+	{ 6,	TD,	sys_pwrite,		"pwrite"	}, /* 181 */
+	{ 3,	TF,	sys_chown,		"chown"		}, /* 182 */
+	{ 2,	0,	sys_getcwd,		"getcwd"	}, /* 183 */
+	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
+	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */
+	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	}, /* 186 */
+	{ 4,	TD|TN,	sys_sendfile,		"sendfile"	}, /* 187 */
+	{ 5,	0,	printargs,		"SYS_188"	}, /* 188 */
+	{ 5,	0,	printargs,		"SYS_189"	}, /* 189 */
+	{ 0,	TP,	sys_vfork,		"vfork"		}, /* 190 */
+	{ 5,	0,	printargs,		"getrlimit"	}, /* 191 */
+	{ 6,	TD,	sys_mmap,		"mmap2"		}, /* 192 */
+	{ 5,	0,	sys_truncate64,		"truncate64"	}, /* 193 */
+	{ 5,	TD,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
+	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
+	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
+	{ 2,	TD,	sys_fstat64,		"fstat64"	}, /* 197 */
+/*TODO*/{ 3,	TF,	printargs,		"lchown32"	}, /* 198 */
+/*TODO*/{ 0,	0,	printargs,		"getuid32"	}, /* 199 */
+
+	{ 0,	0,	printargs,		"getgid32"	}, /* 200 */
+	{ 0,	0,	printargs,		"geteuid32"	}, /* 201 */
+	{ 0,	0,	printargs,		"getegid32"	}, /* 202 */
+	{ 2,	0,	printargs,		"setreuid32"	}, /* 203 */
+	{ 2,	0,	printargs,		"setregid32"	}, /* 204 */
+	{ 2,	0,	sys_getgroups32,	"getgroups32"	}, /* 205 */
+	{ 2,	0,	sys_setgroups32,	"setgroups32"	}, /* 206 */
+	{ 3,	0,	printargs,		"fchown32"	}, /* 207 */
+	{ 3,	0,	printargs,		"setresuid32"	}, /* 208 */
+	{ 3,	0,	printargs,		"getresuid32"	}, /* 209 */
+	{ 3,	0,	printargs,		"setresgid32"	}, /* 210 */
+	{ 3,	0,	printargs,		"getsetgid32"	}, /* 211 */
+	{ 3,	TF,	printargs,		"chown32"	}, /* 212 */
+	{ 1,	0,	printargs,		"setuid32"	}, /* 213 */
+	{ 1,	0,	printargs,		"setgid32"	}, /* 214 */
+	{ 1,	0,	printargs,		"setfsuid32"	}, /* 215 */
+	{ 1,	0,	printargs,		"setfsgid32"	}, /* 216 */
+	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
+	{ 3,	0,	printargs,		"mincore"	}, /* 218 */
+	{ 3,	0,	sys_madvise,		"madvise"	}, /* 219 */
+	{ 3,	TD,	sys_getdents64,		"getdents64"	}, /* 220 */
+	{ 3,	TD,	sys_fcntl,		"fcntl64"	}, /* 221 */
+	{ 4,	0,	printargs,		"SYS_222"	}, /* 222 */
+	{ 4,	0,	printargs,		"SYS_223"	}, /* 223 */
+	{ 4,	0,	printargs,		"gettid"	}, /* 224 */
+	{ 5,	TD,	sys_readahead,		"readahead"	}, /* 225 */
+	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 226 */
+	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 227 */
+	{ 5,	TD,	sys_fsetxattr,		"fsetxattr"	}, /* 228 */
+	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 229 */
+	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 230 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 231 */
+	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 232 */
+	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 233 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 234 */
+	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 235 */
+	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 236 */
+	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 237 */
+	{ 2,	TD,	sys_kill,		"tkill"		}, /* 238 */
+	{ 5,	TD|TN,	sys_sendfile64,		"sendfile64"	}, /* 239 */
+	{ 6,	0,	sys_futex,		"futex"		}, /* 240 */
+	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity"}, /* 241 */
+	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity"}, /* 242 */
+	{ 0,	0,	printargs,		"SYS_243"	}, /* 243 */
+	{ 0,	0,	printargs,		"SYS_244"	}, /* 244 */
+	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 245 */
+	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 246 */
+	{ 5,	0,	sys_io_getevents,	"io_getevents"	}, /* 247 */
+	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 248 */
+	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
+	{ 5,	TD,	sys_fadvise64,		"fadvise64"	}, /* 250 */
+	{ 0,	0,	printargs,		"SYS_251"	}, /* 251 */
+	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 252 */
+	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 253 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"	}, /* 254 */
+	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
+	{ 3,	TD,	sys_epoll_wait,		"epoll_wait"	}, /* 256 */
+	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 257 */
+	{ 1,	0,	printargs,		"set_tid_address"}, /* 258 */
+	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 259 */
+	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 260 */
+	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 261 */
+	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"}, /* 262 */
+	{ 1,	0,	sys_timer_delete,	"timer_delete"	}, /* 263 */
+	{ 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 264 */
+	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 265 */
+	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 266 */
+	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"}, /* 267 */
+	{ 3,	TF,	sys_statfs64,		"statfs64"	}, /* 268 */
+	{ 2,	TD,	sys_fstatfs64,		"fstatfs64"	}, /* 269 */
+	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 270 */
+	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 271 */
+	{ 6,	TD,	sys_fadvise64_64,	"fadvise64_64"	}, /* 272 */
+	{ 0,	0,	printargs,		"SYS_273"	}, /* 273 */
+	{ 4,	0,	sys_mbind,		"mbind"		}, /* 274 */
+	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"	}, /* 275 */
+	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"	}, /* 276 */
+	{ 4,	0,	sys_mq_open,		"mq_open"	}, /* 277 */
+	{ 1,	0,	sys_mq_unlink,		"mq_unlink"	}, /* 278 */
+	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"	}, /* 279 */
+	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive"}, /* 280 */
+	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 281 */
+	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 282 */
+	{ 5,	0,	printargs,		"kexec_load"	}, /* 283 */
+	{ 5,	TP,	sys_waitid,		"waitid"	}, /* 284 */
+	{ 5,	0,	printargs,		"add_key"	}, /* 285 */
+	{ 4,	0,	printargs,		"request_key"	}, /* 286 */
+	{ 5,	0,	printargs,		"keyctl"	}, /* 287 */
+	{ 3,	0,	printargs,		"ioprio_set"	}, /* 288 */
+	{ 2,	0,	printargs,		"ioprio_get"	}, /* 289 */
+	{ 0,	TD,	printargs,		"inotify_init"	}, /* 290 */
+	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch"}, /* 291 */
+	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch"}, /* 292 */
+	{ 5,	0,	printargs,		"SYS_293"	}, /* 293 */
+	{ 4,	0,	printargs,		"migrate_pages"	}, /* 294 */
+	{ 4,	TD|TF,	sys_openat,		"openat"	}, /* 295 */
+	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"	}, /* 296 */
+	{ 4,	TD|TF,	sys_mknodat,		"mknodat"	}, /* 297 */
+	{ 5,	TD|TF,	sys_fchownat,		"fchownat"	}, /* 298 */
+	{ 3,	TD|TF,	sys_futimesat,		"futimesat"	}, /* 299 */
+	{ 4,	TD|TF,	sys_newfstatat,		"newfstatat"	}, /* 300 */
+	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"	}, /* 301 */
+	{ 4,	TD|TF,	sys_renameat,		"renameat"	}, /* 302 */
+	{ 5,	TD|TF,	sys_linkat,		"linkat"	}, /* 303 */
+	{ 3,	TD|TF,	sys_symlinkat,		"symlinkat"	}, /* 304 */
+	{ 4,	TD|TF,	sys_readlinkat,		"readlinkat"	}, /* 305 */
+	{ 3,	TD|TF,	sys_fchmodat,		"fchmodat"	}, /* 306 */
+	{ 3,	TD|TF,	sys_faccessat,		"faccessat"	}, /* 307 */
+	{ 6,	TD,	sys_pselect6,		"pselect6"	}, /* 308 */
+	{ 5,	TD,	sys_ppoll,		"ppoll"		}, /* 309 */
+	{ 1,	TP,	sys_unshare,		"unshare"	}, /* 310 */
+	{ 2,	0,	printargs,		"set_robust_list"}, /* 311 */
+	{ 3,	0,	printargs,		"get_robust_list"}, /* 312 */
+	{ 6,	TD,	printargs,		"splice"	}, /* 313 */
+	{ 4,	TD,	printargs,		"sync_file_range"}, /* 314 */
+	{ 4,	TD,	printargs,		"tee"		}, /* 315 */
+	{ 5,	TD,	printargs,		"vmsplice"	}, /* 316 */
+	{ 6,	0,	sys_move_pages,		"move_pages"	}, /* 317 */
+	{ 3,	0,	sys_getcpu,		"getcpu"	}, /* 318 */
+	{ 5,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 319 */
+	{ 4,	TD|TF,	sys_utimensat,		"utimensat"	}, /* 320 */
+	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 321 */
+	{ 4,	TD,	sys_timerfd,		"timerfd"	}, /* 322 */
+	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 323 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"	}, /* 324 */
+	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"}, /* 325 */
+	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"}, /* 326 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"	}, /* 327 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"	}, /* 328 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"	}, /* 329 */
+	{ 3,	TD,	sys_dup3,		"dup3"		}, /* 330 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"		}, /* 331 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"	}, /* 332 */
+	{ 5,	TD,	printargs,		"preadv"	}, /* 333 */
+	{ 5,	TD,	printargs,		"pwritev"	}, /* 334 */
+	{ 4,	TP|TS,	printargs,		"rt_tgsigqueueinfo"}, /* 335 */
+	{ 5,	TD,	printargs,		"perf_event_open"}, /* 336 */
+	{ 2,	TD,	printargs,		"fanotify_init"	}, /* 337 */
+	{ 5,	TD|TF,	printargs,		"fanotify_mark"	}, /* 338 */
+	{ 4,	0,	printargs,		"prlimit64"	}, /* 339 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 340 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 341 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 342 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 343 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 344 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 345 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 346 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 347 */
+	{ 4,	TN,	sys_send,		"send"		}, /* 348 */
+	{ 4,	TN,	sys_recv,		"recv"		}, /* 349 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 350 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 351 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 352 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 353 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 354 */
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 355 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 356 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 357 */
+	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 358 */
+	{ 5,	0,	printargs,		"SYS_359"	}, /* 359 */
+	{ 5,	0,	printargs,		"SYS_360"	}, /* 360 */
+	{ 5,	0,	printargs,		"SYS_361"	}, /* 361 */
+	{ 5,	0,	printargs,		"SYS_362"	}, /* 362 */
+	{ 5,	0,	printargs,		"SYS_363"	}, /* 363 */
+	{ 5,	0,	printargs,		"SYS_364"	}, /* 364 */
+	{ 5,	0,	printargs,		"SYS_365"	}, /* 365 */
+	{ 5,	0,	printargs,		"SYS_366"	}, /* 366 */
+	{ 5,	0,	printargs,		"SYS_367"	}, /* 367 */
+	{ 5,	0,	printargs,		"SYS_368"	}, /* 368 */
+	{ 5,	0,	printargs,		"SYS_369"	}, /* 369 */
+	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
+	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
+	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
+	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
+	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
+	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
+	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
+	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
+	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
+	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
+	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
+	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
+	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
+	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
+	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
+	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
+	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
+	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
+	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
+	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
+	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
+	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
+	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
+	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
+	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
+	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
+	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
+	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
+	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
+	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
+
+#if SYS_socket_subcall != 400
+ #error fix me
+#endif
+	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 404 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 405 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 406 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 407 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
+	{ 4,	TN,	sys_send,		"send"		}, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv"		}, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 412 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
+	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 418 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 419 */
+
+#if SYS_ipc_subcall != 420
+ #error fix me
+#endif
+
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 420 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 421 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 422 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 423 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 429 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 430 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 431 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 432 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 433 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 439 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 440 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 441 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 442 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 443 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 444 */
diff --git a/linux/syscall.h b/linux/syscall.h
index b0a5993..e657f1e 100644
--- a/linux/syscall.h
+++ b/linux/syscall.h
@@ -25,13 +25,14 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscall.h,v 1.45 2005/06/07 23:21:28 roland Exp $
+ *	$Id$
  */
 
 #include "dummy.h"
 
 /* primary syscalls */
 
+int sys_restart_syscall();
 int sys_setup(), sys_exit(), sys_fork(), sys_read(), sys_write();
 int sys_open(), sys_close(), sys_waitpid(), sys_creat(), sys_link();
 int sys_unlink(), sys_execve(), sys_chdir(), sys_time(), sys_mknod();
@@ -98,21 +99,47 @@
 int sys_mq_notify(), sys_mq_getsetattr();
 int sys_epoll_create(), sys_epoll_ctl(), sys_epoll_wait();
 int sys_waitid(), sys_fadvise64(), sys_fadvise64_64();
-int sys_mbind(), sys_get_mempolicy(), sys_set_mempolicy();
+int sys_mbind(), sys_get_mempolicy(), sys_set_mempolicy(), sys_move_pages();
 int sys_arch_prctl();
 int sys_io_setup(), sys_io_submit(), sys_io_cancel(), sys_io_getevents(), sys_io_destroy();
+int sys_utimensat(), sys_epoll_pwait(), sys_signalfd(), sys_timerfd(), sys_eventfd();
+int sys_getcpu();
+int sys_fallocate(), sys_timerfd_create(), sys_timerfd_settime(), sys_timerfd_gettime();
+int sys_signalfd4(), sys_eventfd2(), sys_epoll_create1(), sys_dup3(), sys_pipe2();
 
 /* sys_socketcall subcalls */
 
-int sys_socket(), sys_bind(), sys_connect(), sys_listen();
+int sys_socket(), sys_bind(), sys_connect(), sys_listen(), sys_accept4();
 int sys_accept(), sys_getsockname(), sys_getpeername(), sys_socketpair();
 int sys_send(), sys_recv(), sys_sendto(), sys_recvfrom();
 int sys_shutdown(), sys_setsockopt(), sys_getsockopt();
+int sys_recvmmsg();
+
+/* *at syscalls */
+int sys_fchmodat();
+int sys_newfstatat();
+int sys_unlinkat();
+int sys_fchownat();
+int sys_openat();
+int sys_renameat();
+int sys_symlinkat();
+int sys_readlinkat();
+int sys_linkat();
+int sys_faccessat();
+int sys_mkdirat();
+int sys_mknodat();
+int sys_futimesat();
 
 /* new ones */
 int sys_query_module();
 int sys_poll();
 int sys_mincore();
+int sys_inotify_add_watch();
+int sys_inotify_rm_watch();
+int sys_inotify_init1();
+int sys_pselect6();
+int sys_ppoll();
+int sys_unshare();
 
 /* architecture-specific calls */
 #ifdef ALPHA
@@ -155,7 +182,8 @@
 # endif
 #endif
 
-#if !defined(ALPHA) && !defined(MIPS) && !defined(HPPA)
+#if !defined(ALPHA) && !defined(MIPS) && !defined(HPPA) && \
+	!defined(__ARM_EABI__)
 # ifdef	IA64
 /*
  *  IA64 syscall numbers (the only ones available from standard header
@@ -182,7 +210,11 @@
 #  undef SYS_sendmsg
 #  undef SYS_recvmsg
 # endif /* IA64 */
-#  define SYS_socket_subcall	300
+# if defined(SPARC) || defined(SPARC64)
+#  define SYS_socket_subcall	353
+# else
+#  define SYS_socket_subcall	400
+# endif
 #define SYS_sub_socket		(SYS_socket_subcall + 1)
 #define SYS_sub_bind		(SYS_socket_subcall + 2)
 #define SYS_sub_connect		(SYS_socket_subcall + 3)
@@ -200,8 +232,10 @@
 #define SYS_sub_getsockopt	(SYS_socket_subcall + 15)
 #define SYS_sub_sendmsg		(SYS_socket_subcall + 16)
 #define SYS_sub_recvmsg		(SYS_socket_subcall + 17)
+#define SYS_sub_accept4		(SYS_socket_subcall + 18)
+#define SYS_sub_recvmmsg	(SYS_socket_subcall + 19)
 
-#define SYS_socket_nsubcalls	18
+#define SYS_socket_nsubcalls	20
 #endif /* !(ALPHA || MIPS || HPPA) */
 
 /* sys_ipc subcalls */
@@ -210,7 +244,8 @@
 int sys_msgsnd(), sys_msgrcv(), sys_msgget(), sys_msgctl();
 int sys_shmat(), sys_shmdt(), sys_shmget(), sys_shmctl();
 
-#if !defined(ALPHA) && !defined(MIPS) && !defined(SPARC) && !defined(HPPA)
+#if !defined(ALPHA) && !defined(MIPS) && !defined(HPPA) && \
+	!defined(__ARM_EABI__)
 # ifdef	IA64
    /*
     * IA64 syscall numbers (the only ones available from standard
@@ -249,7 +284,7 @@
 #define SYS_sub_shmctl		(SYS_ipc_subcall + 24)
 
 #define SYS_ipc_nsubcalls	25
-#endif /* !(ALPHA || MIPS || SPARC || HPPA) */
+#endif /* !(ALPHA || MIPS || HPPA) */
 
 #if defined SYS_ipc_subcall && !defined SYS_ipc
 # define SYS_ipc SYS_ipc_subcall
@@ -291,6 +326,45 @@
 int sys_setpgrp(), sys_gethostname(), sys_getdtablesize(), sys_utimes();
 int sys_capget(), sys_capset();
 
-#ifdef M68K
+#if defined M68K || defined SH
 int sys_cacheflush();
 #endif
+
+int sys_pread64(), sys_pwrite64();
+
+#ifdef POWERPC
+int sys_subpage_prot();
+#endif
+
+#ifdef BFIN
+int sys_sram_alloc();
+int sys_cacheflush();
+#endif
+
+#if defined SPARC || defined SPARC64
+#include "sparc/syscall1.h"
+int sys_execv();
+int sys_getpagesize();
+int sys_getmsg(), sys_putmsg();
+
+int	sys_semsys(), sys_semctl(), sys_semget();
+#define SYS_semsys_subcall	200
+#define SYS_semsys_nsubcalls	3
+#define SYS_semctl		(SYS_semsys_subcall + 0)
+#define SYS_semget		(SYS_semsys_subcall + 1)
+#define SYS_semop		(SYS_semsys_subcall + 2)
+int	sys_msgsys(), sys_msgget(), sys_msgctl(), sys_msgrcv(), sys_msgsnd();
+#define SYS_msgsys_subcall	203
+#define SYS_msgsys_nsubcalls	4
+#define SYS_msgget		(SYS_msgsys_subcall + 0)
+#define SYS_msgctl		(SYS_msgsys_subcall + 1)
+#define SYS_msgrcv		(SYS_msgsys_subcall + 2)
+#define SYS_msgsnd		(SYS_msgsys_subcall + 3)
+int	sys_shmsys(), sys_shmat(), sys_shmctl(), sys_shmdt(), sys_shmget();
+#define SYS_shmsys_subcall	207
+#define SYS_shmsys_nsubcalls	4
+#define SYS_shmat		(SYS_shmsys_subcall + 0)
+#define SYS_shmctl		(SYS_shmsys_subcall + 1)
+#define SYS_shmdt		(SYS_shmsys_subcall + 2)
+#define SYS_shmget		(SYS_shmsys_subcall + 3)
+#endif
diff --git a/linux/syscallent.h b/linux/syscallent.h
deleted file mode 100644
index f5d5b24..0000000
--- a/linux/syscallent.h
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscallent.h,v 1.34 2005/06/07 23:21:24 roland Exp $
- */
-
-	{ 0,	0,	sys_setup,		"setup"		}, /* 0 */
-	{ 1,	TP,	sys_exit,		"_exit", SYS_exit }, /* 1 */
-	{ 0,	TP,	sys_fork,		"fork", SYS_fork }, /* 2 */
-	{ 3,	0,	sys_read,		"read", SYS_read }, /* 3 */
-	{ 3,	0,	sys_write,		"write", SYS_write }, /* 4 */
-	{ 3,	TF,	sys_open,		"open"		}, /* 5 */
-	{ 1,	0,	sys_close,		"close"		}, /* 6 */
-	{ 3,	TP,	sys_waitpid,		"waitpid", SYS_wait4 }, /* 7 */
-	{ 2,	TF,	sys_creat,		"creat"		}, /* 8 */
-	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
-	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
-	{ 3,	TF|TP,	sys_execve,		"execve", SYS_execve }, /* 11 */
-	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
-	{ 1,	0,	sys_time,		"time"		}, /* 13 */
-	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
-	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
-#ifdef M68K
-	{ 3,	TF,	sys_chown,		"chown"		}, /* 16 */
-#else
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 16 */
-#endif
-	{ 0,	0,	sys_break,		"break"		}, /* 17 */
-	{ 2,	TF,	sys_oldstat,		"oldstat"	}, /* 18 */
-	{ 3,	0,	sys_lseek,		"lseek"		}, /* 19 */
-	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
-	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
-	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
-	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 24 */
-	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
-	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
-	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
-	{ 2,	0,	sys_oldfstat,		"oldfstat"	}, /* 28 */
-	{ 0,	TS,	sys_pause,		"pause"		}, /* 29 */
-	{ 2,	TF,	sys_utime,		"utime"		}, /* 30 */
-	{ 2,	0,	sys_stty,		"stty"		}, /* 31 */
-	{ 2,	0,	sys_gtty,		"gtty"		}, /* 32 */
-	{ 2,	TF,	sys_access,		"access"	}, /* 33 */
-	{ 1,	0,	sys_nice,		"nice"		}, /* 34 */
-	{ 0,	0,	sys_ftime,		"ftime"		}, /* 35 */
-	{ 0,	0,	sys_sync,		"sync"		}, /* 36 */
-	{ 2,	TS,	sys_kill,		"kill"		}, /* 37 */
-	{ 2,	TF,	sys_rename,		"rename"	}, /* 38 */
-	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 39 */
-	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 40 */
-	{ 1,	0,	sys_dup,		"dup"		}, /* 41 */
-	{ 1,	0,	sys_pipe,		"pipe"		}, /* 42 */
-	{ 1,	0,	sys_times,		"times"		}, /* 43 */
-	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
-	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
-	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 47 */
-	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 50 */
-	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
-	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
-	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
-	{ 3,	0,	sys_ioctl,		"ioctl"		}, /* 54 */
-	{ 3,	0,	sys_fcntl,		"fcntl"		}, /* 55 */
-	{ 0,	0,	sys_mpx,		"mpx"		}, /* 56 */
-	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 57 */
-	{ 2,	0,	sys_ulimit,		"ulimit"	}, /* 58 */
-	{ 1,	0,	sys_oldolduname,	"oldolduname"	}, /* 59 */
-	{ 1,	0,	sys_umask,		"umask"		}, /* 60 */
-	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 61 */
-	{ 2,	0,	sys_ustat,		"ustat"		}, /* 62 */
-	{ 2,	0,	sys_dup2,		"dup2"		}, /* 63 */
-	{ 0,	0,	sys_getppid,		"getppid"	}, /* 64 */
-	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
-	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
-	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
-	{ 0,	TS,	sys_siggetmask,		"siggetmask"	}, /* 68 */
-	{ 1,	TS,	sys_sigsetmask,		"sigsetmask"	}, /* 69 */
-	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
-	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
-	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
-	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
-	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
-	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 75 */
-	{ 2,	0,	sys_getrlimit,		"old_getrlimit"	}, /* 76 */
-	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 77 */
-	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 78 */
-	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 79 */
-	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 80 */
-	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 81 */
-	{ 1,	0,	sys_oldselect,		"oldselect"	}, /* 82 */
-	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 83 */
-	{ 2,	TF,	sys_oldlstat,		"oldlstat"	}, /* 84 */
-	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
-	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
-	{ 3,	0,	sys_readdir,		"readdir"	}, /* 89 */
-	{ 6,	0,	sys_old_mmap,		"old_mmap"	}, /* 90 */
-	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
-	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
-	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 93 */
-	{ 2,	0,	sys_fchmod,		"fchmod"	}, /* 94 */
-	{ 3,	0,	sys_fchown,		"fchown"	}, /* 95 */
-	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
-	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
-	{ 4,	0,	sys_profil,		"profil"	}, /* 98 */
-	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
-	{ 2,	0,	sys_fstatfs,		"fstatfs"	}, /* 100 */
-	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
-#ifdef HAVE_ANDROID_OS
-	{ 2,	0,	sys_socketcall,		"socketcall"}, /* 102 */
-#else
-	{ 2,	0,	sys_socketcall,		"socketcall", SYS_socketcall }, /* 102 */
-#endif
-	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
-	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
-	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
-	{ 2,	TF,	sys_stat,		"stat"		}, /* 106 */
-	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 107 */
-	{ 2,	0,	sys_fstat,		"fstat"		}, /* 108 */
-	{ 1,	0,	sys_olduname,		"olduname"	}, /* 109 */
-	{ 1,	0,	sys_iopl,		"iopl"		}, /* 110 */
-	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
-	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
-	{ 1,	0,	sys_vm86old,		"vm86old"	}, /* 113 */
-	{ 4,	TP,	sys_wait4,		"wait4", SYS_wait4 }, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
-	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
-#ifdef HAVE_ANDROID_OS
-	{ 6,	0,	sys_ipc,		"ipc"}, /* 117 */
-#else
-	{ 6,	0,	sys_ipc,		"ipc", SYS_ipc }, /* 117 */
-#endif
-	{ 1,	0,	sys_fsync,		"fsync"		}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
-	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */
-	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
-	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
-#ifdef M68K
-	{ 4,	0,	sys_cacheflush,		"cacheflush"	}, /* 123 */
-#else
-	{ 3,	0,	sys_modify_ldt,		"modify_ldt"	}, /* 123 */
-#endif
-	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 124 */
-	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 125 */
-	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
-	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
-	{ 2,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
-	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
-	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
-	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
-	{ 1,	0,	sys_fchdir,		"fchdir"	}, /* 133 */
-	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
-	{ 3,	0,	sys_sysfs,		"sysfs", SYS_sysfs }, /* 135 */
-	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
-	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 139 */
-	{ 5,	0,	sys_llseek,		"_llseek"	}, /* 140 */
-	{ 3,	0,	sys_getdents,		"getdents"	}, /* 141 */
-	{ 5,	0,	sys_select,		"select"	}, /* 142 */
-	{ 2,	0,	sys_flock,		"flock"		}, /* 143 */
-	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
-	{ 3,	0,	sys_readv,		"readv", SYS_readv }, /* 145 */
-	{ 3,	0,	sys_writev,		"writev", SYS_writev }, /* 146 */
-	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
-	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 148 */
-	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
-	{ 2,	0,	sys_mlock,		"mlock"		}, /* 150 */
-	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
-	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
-	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
-	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
-	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 156 */
-	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 157 */
-	{ 0,	0,	sys_sched_yield,	"sched_yield"}, /* 158 */
-	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
-	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
-	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
-	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 163 */
-	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
-	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
-#ifdef M68K
-	{ 5,	0,	printargs,		"SYS_166"	}, /* 166 */
-#else
-	{ 5,	0,	printargs,		"vm86"		}, /* 166 */
-#endif
-	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
-	{ 3,	0,	sys_poll,		"poll"		}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
-	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
-	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
-	{ 5,	0,	printargs,		"prctl"		}, /* 172 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 173 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"  }, /* 174 */
-	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
-	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
-	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
-	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
-
-	{ 5,	TF,	sys_pread,		"pread64", SYS_read }, /* 180 */
-	{ 5,	TF,	sys_pwrite,		"pwrite64", SYS_write }, /* 181 */
-#ifdef M68K
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 182 */
-#else
-	{ 3,	TF,	sys_chown,		"chown"		}, /* 182 */
-#endif
-	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
-	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
-	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */
-	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	}, /* 186 */
-	{ 4,	TF,	sys_sendfile,		"sendfile"	}, /* 187 */
-	{ 5,	0,	sys_getpmsg,		"getpmsg"	}, /* 188 */
-	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 189 */
-	{ 0,	TP,	sys_vfork,		"vfork", SYS_vfork }, /* 190 */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 191 */
-	{ 6,	0,	sys_mmap,		"mmap2"		}, /* 192 */
-	{ 3,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
-	{ 3,	TF,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
-	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
-	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
-	{ 2,	TF,	sys_fstat64,		"fstat64"	}, /* 197 */
-	{ 3,	TF,	sys_chown,		"lchown32"	}, /* 198 */
-	{ 0,	0,	sys_getuid,		"getuid32"	}, /* 199 */
-
-	{ 0,	0,	sys_getgid,		"getgid32"	}, /* 200 */
-	{ 0,	0,	sys_geteuid,		"geteuid32"	}, /* 201 */
-	{ 0,	0,	sys_geteuid,		"getegid32"	}, /* 202 */
-	{ 2,	0,	sys_setreuid,		"setreuid32"	}, /* 203 */
-	{ 2,	0,	sys_setregid,		"setregid32"	}, /* 204 */
-	{ 2,	0,	sys_getgroups32,	"getgroups32"	}, /* 205 */
-	{ 2,	0,	sys_setgroups32,	"setgroups32"	}, /* 206 */
-	{ 3,	0,	sys_fchown,		"fchown32"	}, /* 207 */
-	{ 3,	0,	sys_setresuid,		"setresuid32"	}, /* 208 */
-	{ 3,	0,	sys_getresuid,		"getresuid32"	}, /* 209 */
-	{ 3,	0,	sys_setresgid,		"setresgid32"	}, /* 210 */
-	{ 3,	0,	sys_getresgid,		"getresgid32"	}, /* 211 */
-	{ 3,	TF,	sys_chown,		"chown32"	}, /* 212 */
-	{ 1,	0,	sys_setuid,		"setuid32"	}, /* 213 */
-	{ 1,	0,	sys_setgid,		"setgid32"	}, /* 214 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
-	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
-	{ 3,	0,	sys_mincore,		"mincore"	}, /* 218 */
-	{ 3,	0,	sys_madvise,		"madvise"	}, /* 219 */
-	{ 4,	0,	sys_getdents64,		"getdents64"	}, /* 220 */
-	{ 3,	0,	sys_fcntl,		"fcntl64"	}, /* 221 */
-	{ 4,	0,	printargs,		"SYS_222"	}, /* 222 */
-/*TODO*/{ 5,	0,	printargs,		"security"	}, /* 223 */
-	{ 0,	0,	printargs,		"gettid"	}, /* 224 */
-	{ 4,	0,	sys_readahead,		"readahead"	}, /* 225 */
-	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 226 */
-	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 227 */
-	{ 5,	0,	sys_fsetxattr,		"fsetxattr"	}, /* 228 */
-	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 229 */
-	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 230 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"	}, /* 231 */
-	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 232 */
-	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 233 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"	}, /* 234 */
-	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 235 */
-	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 236 */
-	{ 2,	0,	sys_fremovexattr,	"fremovexattr"	}, /* 237 */
-	{ 2,	TS,	sys_kill,		"tkill"		}, /* 238 */
-	{ 4,	TF,	sys_sendfile64,		"sendfile64"	}, /* 239 */
-	{ 5,	0,	sys_futex,		"futex"		}, /* 240 */
-	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 241 */
-	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 242 */
-	{ 1,	0,	sys_set_thread_area,	"set_thread_area" }, /* 243 */
-	{ 1,	0,	sys_get_thread_area,	"get_thread_area" }, /* 244 */
-	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 245 */
-	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 246 */
-	{ 5,	0,	sys_io_getevents,	"io_getevents"	}, /* 247 */
-	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 248 */
-	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
-	{ 5,	TF,	sys_fadvise64,		"fadvise64"	}, /* 250 */
-	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */
-	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 252 */
-	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 253 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 254 */
-	{ 4,	0,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
-	{ 4,	0,	sys_epoll_wait,		"epoll_wait"	}, /* 256 */
-	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 257 */
-	{ 1,	0,	printargs,		"set_tid_address"}, /* 258 */
-	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 259 */
-	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 260 */
-	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 261 */
-	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"}, /* 262 */
-	{ 1,	0,	sys_timer_delete,	"timer_delete"	}, /* 263 */
-	{ 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 264 */
-	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 265 */
-	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 266 */
-	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"}, /* 267 */
-	{ 3,	TF,	sys_statfs64,		"statfs64"	}, /* 268 */
-	{ 3,	TF,	sys_fstatfs64,		"fstatfs64"	}, /* 269 */
-	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 270 */
-	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 271 */
-	{ 6,	TF,	sys_fadvise64_64,	"fadvise64_64"	}, /* 272 */
-	{ 5,	0,	printargs,		"vserver"	}, /* 273 */
-	{ 6,	0,	sys_mbind,		"mbind"		}, /* 274 */
-	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"	}, /* 275 */
-	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"	}, /* 276 */
-	{ 4,	0,	sys_mq_open,		"mq_open"	}, /* 277 */
-	{ 1,	0,	sys_mq_unlink,		"mq_unlink"	}, /* 278 */
-	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"	}, /* 279 */
-	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 280 */
-	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 281 */
-	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 282 */
-	{ 5,	0,	printargs,		"sys_kexec_load" }, /* 283 */
-	{ 5,	TP,	sys_waitid,		"waitid", SYS_waitid }, /* 284 */
-	{ 5,	0,	printargs,		"SYS_285"	}, /* 285 */
-	{ 5,	0,	printargs,		"SYS_286"	}, /* 286 */
-	{ 5,	0,	printargs,		"SYS_287"	}, /* 287 */
-	{ 5,	0,	printargs,		"SYS_288"	}, /* 288 */
-	{ 5,	0,	printargs,		"SYS_289"	}, /* 289 */
-	{ 5,	0,	printargs,		"SYS_290"	}, /* 290 */
-	{ 5,	0,	printargs,		"SYS_291"	}, /* 291 */
-	{ 5,	0,	printargs,		"SYS_292"	}, /* 292 */
-	{ 5,	0,	printargs,		"SYS_293"	}, /* 293 */
-	{ 5,	0,	printargs,		"SYS_294"	}, /* 294 */
-	{ 5,	0,	printargs,		"SYS_295"	}, /* 295 */
-	{ 5,	0,	printargs,		"SYS_296"	}, /* 296 */
-	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
-	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
-
-#if SYS_socket_subcall != 300
- #error fix me
-#endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send", SYS_sub_send }, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv }, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto }, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom }, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
-
-#if SYS_ipc_subcall != 318
- #error fix me
-#endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
diff --git a/mem.c b/mem.c
index d7fc857..d4c223a 100644
--- a/mem.c
+++ b/mem.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mem.c,v 1.36 2005/06/01 19:22:07 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -70,6 +70,7 @@
 #endif
 }
 
+#if defined(FREEBSD) || defined(SUNOS4)
 int
 sys_sbrk(tcp)
 struct tcb *tcp;
@@ -79,6 +80,7 @@
 	}
 	return RVAL_HEX;
 }
+#endif /* FREEBSD || SUNOS4 */
 
 static const struct xlat mmap_prot[] = {
 	{ PROT_NONE,	"PROT_NONE",	},
@@ -94,6 +96,9 @@
 #ifdef PROT_GROWSUP
 	{ PROT_GROWSUP, "PROT_GROWSUP"	},
 #endif
+#ifdef PROT_SAO
+	{ PROT_SAO,	"PROT_SAO"	},
+#endif
 	{ 0,		NULL		},
 };
 
@@ -104,6 +109,9 @@
 #ifdef MAP_ANONYMOUS
 	{ MAP_ANONYMOUS,"MAP_ANONYMOUS"	},
 #endif
+#ifdef MAP_32BIT
+	{ MAP_32BIT,	"MAP_32BIT"	},
+#endif
 #ifdef MAP_RENAME
 	{ MAP_RENAME,	"MAP_RENAME"	},
 #endif
@@ -180,15 +188,52 @@
 #ifdef MAP_NOCORE
 	{ MAP_NOCORE,		"MAP_NOCORE"	},
 #endif
+#ifdef TILE
+	{ MAP_CACHE_NO_LOCAL, "MAP_CACHE_NO_LOCAL" },
+	{ MAP_CACHE_NO_L2, "MAP_CACHE_NO_L2" },
+	{ MAP_CACHE_NO_L1, "MAP_CACHE_NO_L1" },
+#endif
 	{ 0,		NULL		},
 };
 
-#if !HAVE_LONG_LONG_OFF_T
+#ifdef TILE
 static
 int
-print_mmap(tcp,u_arg)
-struct tcb *tcp;
-long *u_arg;
+addtileflags(flags)
+long flags;
+{
+	long home = flags & _MAP_CACHE_MKHOME(_MAP_CACHE_HOME_MASK);
+	flags &= ~_MAP_CACHE_MKHOME(_MAP_CACHE_HOME_MASK);
+
+	if (flags & _MAP_CACHE_INCOHERENT) {
+		flags &= ~_MAP_CACHE_INCOHERENT;
+		if (home == MAP_CACHE_HOME_NONE) {
+			tprintf("|MAP_CACHE_INCOHERENT");
+			return flags;
+		}
+		tprintf("|_MAP_CACHE_INCOHERENT");
+	}
+
+	switch (home) {
+	case 0:	break;
+	case MAP_CACHE_HOME_HERE: tprintf("|MAP_CACHE_HOME_HERE"); break;
+	case MAP_CACHE_HOME_NONE: tprintf("|MAP_CACHE_HOME_NONE"); break;
+	case MAP_CACHE_HOME_SINGLE: tprintf("|MAP_CACHE_HOME_SINGLE"); break;
+	case MAP_CACHE_HOME_TASK: tprintf("|MAP_CACHE_HOME_TASK"); break;
+	case MAP_CACHE_HOME_HASH: tprintf("|MAP_CACHE_HOME_HASH"); break;
+	default:
+		tprintf("|MAP_CACHE_HOME(%d)",
+			(home >> _MAP_CACHE_HOME_SHIFT) );
+		break;
+	}
+
+	return flags;
+}
+#endif
+
+#if !HAVE_LONG_LONG_OFF_T
+static int
+print_mmap(struct tcb *tcp, long *u_arg, long long offset)
 {
 	if (entering(tcp)) {
 		/* addr */
@@ -204,14 +249,19 @@
 		/* flags */
 #ifdef MAP_TYPE
 		printxval(mmap_flags, u_arg[3] & MAP_TYPE, "MAP_???");
+#ifdef TILE
+		addflags(mmap_flags, addtileflags(u_arg[3] & ~MAP_TYPE));
+#else
 		addflags(mmap_flags, u_arg[3] & ~MAP_TYPE);
+#endif
 #else
 		printflags(mmap_flags, u_arg[3], "MAP_???");
 #endif
-		/* fd (is always int, not long) */
-		tprintf(", %d, ", (int)u_arg[4]);
+		/* fd */
+		tprintf(", ");
+		printfd(tcp, u_arg[4]);
 		/* offset */
-		tprintf("%#lx", u_arg[5]);
+		tprintf(", %#llx", offset);
 	}
 	return RVAL_HEX;
 }
@@ -220,36 +270,47 @@
 int sys_old_mmap(tcp)
 struct tcb *tcp;
 {
-    long u_arg[6];
+	long u_arg[6];
 
 #if	defined(IA64)
-    int i, v;
-    /*
-     *  IA64 processes never call this routine, they only use the
-     *  new `sys_mmap' interface.  This code converts the integer
-     *  arguments that the IA32 process pushed onto the stack into
-     *  longs.
-     *
-     *  Note that addresses with bit 31 set will be sign extended.
-     *  Fortunately, those addresses are not currently being generated
-     *  for IA32 processes so it's not a problem.
-     */
-    for (i = 0; i < 6; i++)
-	if (umove(tcp, tcp->u_arg[0] + (i * sizeof(int)), &v) == -1)
-		return 0;
-	else
-		u_arg[i] = v;
+	int i, v;
+	/*
+	 *  IA64 processes never call this routine, they only use the
+	 *  new `sys_mmap' interface.  This code converts the integer
+	 *  arguments that the IA32 process pushed onto the stack into
+	 *  longs.
+	 *
+	 *  Note that addresses with bit 31 set will be sign extended.
+	 *  Fortunately, those addresses are not currently being generated
+	 *  for IA32 processes so it's not a problem.
+	 */
+	for (i = 0; i < 6; i++)
+		if (umove(tcp, tcp->u_arg[0] + (i * sizeof(int)), &v) == -1)
+			return 0;
+		else
+			u_arg[i] = v;
 #elif defined(SH) || defined(SH64)
-    /* SH has always passed the args in registers */
-    int i;
-    for (i=0; i<6; i++)
-        u_arg[i] = tcp->u_arg[i];
+	/* SH has always passed the args in registers */
+	int i;
+	for (i=0; i<6; i++)
+		u_arg[i] = tcp->u_arg[i];
 #else
-    if (umoven(tcp, tcp->u_arg[0], sizeof u_arg, (char *) u_arg) == -1)
-	    return 0;
+# if defined(X86_64)
+	if (current_personality == 1) {
+		int i;
+		for (i = 0; i < 6; ++i) {
+			unsigned int val;
+			if (umove(tcp, tcp->u_arg[0] + i * 4, &val) == -1)
+				return 0;
+			u_arg[i] = val;
+		}
+	}
+	else
+# endif
+	if (umoven(tcp, tcp->u_arg[0], sizeof u_arg, (char *) u_arg) == -1)
+		return 0;
 #endif	// defined(IA64)
-    return print_mmap(tcp, u_arg);
-
+	return print_mmap(tcp, u_arg, u_arg[5]);
 }
 #endif
 
@@ -257,23 +318,27 @@
 sys_mmap(tcp)
 struct tcb *tcp;
 {
+	long long offset = tcp->u_arg[5];
+
 #if defined(LINUX) && defined(SH64)
-    /*
-     * Old mmap differs from new mmap in specifying the
-     * offset in units of bytes rather than pages.  We
-     * pretend it's in byte units so the user only ever
-     * sees bytes in the printout.
-     */
-    tcp->u_arg[5] <<= PAGE_SHIFT;
+	/*
+	 * Old mmap differs from new mmap in specifying the
+	 * offset in units of bytes rather than pages.  We
+	 * pretend it's in byte units so the user only ever
+	 * sees bytes in the printout.
+	 */
+	offset <<= PAGE_SHIFT;
 #endif
-    return print_mmap(tcp, tcp->u_arg);
+#if defined(LINUX_MIPSN32)
+	offset = tcp->ext_arg[5];
+#endif
+	return print_mmap(tcp, tcp->u_arg, offset);
 }
 #endif /* !HAVE_LONG_LONG_OFF_T */
 
 #if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
 int
-sys_mmap64(tcp)
-struct tcb *tcp;
+sys_mmap64(struct tcb *tcp)
 {
 #ifdef linux
 #ifdef ALPHA
@@ -293,7 +358,6 @@
 			return 0;
 #endif /* ALPHA */
 #endif /* linux */
-		ALIGN64 (tcp, 5);	/* FreeBSD wierdies */
 
 		/* addr */
 		tprintf("%#lx, ", u_arg[0]);
@@ -310,9 +374,10 @@
 		printflags(mmap_flags, u_arg[3], "MAP_???");
 #endif
 		/* fd */
-		tprintf(", %ld, ", u_arg[4]);
+		tprintf(", ");
+		printfd(tcp, tcp->u_arg[4]);
 		/* offset */
-		tprintf("%#llx", LONG_LONG(u_arg[5], u_arg[6]));
+		printllval(tcp, ", %#llx", 5);
 	}
 	return RVAL_HEX;
 }
@@ -346,26 +411,33 @@
 
 static const struct xlat mremap_flags[] = {
 	{ MREMAP_MAYMOVE,	"MREMAP_MAYMOVE"	},
+#ifdef MREMAP_FIXED
+	{ MREMAP_FIXED,		"MREMAP_FIXED"		},
+#endif
 	{ 0,			NULL			}
 };
 
 int
-sys_mremap(tcp)
-struct tcb *tcp;
+sys_mremap(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%#lx, %lu, %lu, ", tcp->u_arg[0], tcp->u_arg[1],
 			tcp->u_arg[2]);
 		printflags(mremap_flags, tcp->u_arg[3], "MREMAP_???");
+#ifdef MREMAP_FIXED
+		if ((tcp->u_arg[3] & (MREMAP_MAYMOVE | MREMAP_FIXED)) ==
+		    (MREMAP_MAYMOVE | MREMAP_FIXED))
+			tprintf(", %#lx", tcp->u_arg[4]);
+#endif
 	}
 	return RVAL_HEX;
 }
 
-static const struct xlat madvise_flags[] = {
+static const struct xlat madvise_cmds[] = {
 #ifdef MADV_NORMAL
 	{ MADV_NORMAL,		"MADV_NORMAL" },
 #endif
-#ifdef MADZV_RANDOM
+#ifdef MADV_RANDOM
 	{ MADV_RANDOM,		"MADV_RANDOM" },
 #endif
 #ifdef MADV_SEQUENTIAL
@@ -374,7 +446,7 @@
 #ifdef MADV_WILLNEED
 	{ MADV_WILLNEED,	"MADV_WILLNEED" },
 #endif
-#ifdef MADV_DONTNED
+#ifdef MADV_DONTNEED
 	{ MADV_DONTNEED,	"MADV_DONTNEED" },
 #endif
 	{ 0,			NULL },
@@ -387,7 +459,7 @@
 {
 	if (entering(tcp)) {
 		tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
-		printflags(madvise_flags, tcp->u_arg[2], "MADV_???");
+		printxval(madvise_cmds, tcp->u_arg[2], "MADV_???");
 	}
 	return 0;
 }
@@ -527,6 +599,7 @@
 	return 0;
 }
 
+#if defined(ALPHA) || defined(FREEBSD) || defined(IA64) || defined(SUNOS4) || defined(SVR4) || defined(SPARC) || defined(SPARC64)
 int
 sys_getpagesize(tcp)
 struct tcb *tcp;
@@ -535,11 +608,11 @@
 		return RVAL_HEX;
 	return 0;
 }
+#endif /* ALPHA || FREEBSD || IA64 || SUNOS4 || SVR4 */
 
 #if defined(LINUX) && defined(__i386__)
 void
-print_ldt_entry (ldt_entry)
-struct modify_ldt_ldt_s *ldt_entry;
+print_ldt_entry(struct modify_ldt_ldt_s *ldt_entry)
 {
 	tprintf("base_addr:%#08lx, "
 		"limit:%d, "
@@ -549,7 +622,7 @@
 		"limit_in_pages:%d, "
 		"seg_not_present:%d, "
 		"useable:%d}",
-		ldt_entry->base_addr,
+		(long) ldt_entry->base_addr,
 		ldt_entry->limit,
 		ldt_entry->seg_32bit,
 		ldt_entry->contents,
@@ -634,6 +707,26 @@
 }
 #endif /* LINUX && __i386__ */
 
+#if defined(LINUX) && defined(M68K)
+
+int
+sys_set_thread_area(tcp)
+struct tcb *tcp;
+{
+	if (entering(tcp))
+		tprintf("%#lx", tcp->u_arg[0]);
+	return 0;
+
+}
+
+int
+sys_get_thread_area(tcp)
+struct tcb *tcp;
+{
+	return RVAL_HEX;
+}
+#endif
+
 #if defined(LINUX)
 int
 sys_remap_file_pages(tcp)
@@ -663,6 +756,8 @@
 #define MPOL_F_ADDR     (1<<1)
 
 #define MPOL_MF_STRICT  (1<<0)
+#define MPOL_MF_MOVE	(1<<1)
+#define MPOL_MF_MOVE_ALL (1<<2)
 
 
 static const struct xlat policies[] = {
@@ -675,6 +770,8 @@
 
 static const struct xlat mbindflags[] = {
 	{ MPOL_MF_STRICT,	"MPOL_MF_STRICT"	},
+	{ MPOL_MF_MOVE,		"MPOL_MF_MOVE"		},
+	{ MPOL_MF_MOVE_ALL,	"MPOL_MF_MOVE_ALL"	},
 	{ 0,			NULL			}
 };
 
@@ -684,6 +781,12 @@
 	{ 0,			NULL			}
 };
 
+static const struct xlat move_pages_flags[] = {
+	{ MPOL_MF_MOVE,		"MPOL_MF_MOVE"		},
+	{ MPOL_MF_MOVE_ALL,	"MPOL_MF_MOVE_ALL"	},
+	{ 0,			NULL			}
+};
+
 
 static void
 get_nodes(tcp, ptr, maxnodes, err)
@@ -737,7 +840,7 @@
 struct tcb *tcp;
 {
 	if (entering(tcp)) {
-		tprintf("%lu, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
+		tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
 		printxval(policies, tcp->u_arg[2], "MPOL_???");
 		get_nodes(tcp, tcp->u_arg[3], tcp->u_arg[4], 0);
 		tprintf(", ");
@@ -775,4 +878,126 @@
 	}
 	return 0;
 }
+
+int
+sys_move_pages(tcp)
+struct tcb *tcp;
+{
+	if (entering(tcp)) {
+		unsigned long npages = tcp->u_arg[1];
+		tprintf("%ld, %lu, ", tcp->u_arg[0], npages);
+		if (tcp->u_arg[2] == 0)
+			tprintf("NULL, ");
+		else {
+			int i;
+			long puser = tcp->u_arg[2];
+			tprintf("{");
+			for (i = 0; i < npages; ++i) {
+				void *p;
+				if (i > 0)
+					tprintf(", ");
+				if (umove(tcp, puser, &p) < 0) {
+					tprintf("???");
+					break;
+				}
+				tprintf("%p", p);
+				puser += sizeof (void *);
+			}
+			tprintf("}, ");
+		}
+		if (tcp->u_arg[3] == 0)
+			tprintf("NULL, ");
+		else {
+			int i;
+			long nodeuser = tcp->u_arg[3];
+			tprintf("{");
+			for (i = 0; i < npages; ++i) {
+				int node;
+				if (i > 0)
+					tprintf(", ");
+				if (umove(tcp, nodeuser, &node) < 0) {
+					tprintf("???");
+					break;
+				}
+				tprintf("%#x", node);
+				nodeuser += sizeof (int);
+			}
+			tprintf("}, ");
+		}
+	}
+	if (exiting(tcp)) {
+		unsigned long npages = tcp->u_arg[1];
+		if (tcp->u_arg[4] == 0)
+			tprintf("NULL, ");
+		else {
+			int i;
+			long statususer = tcp->u_arg[4];
+			tprintf("{");
+			for (i = 0; i < npages; ++i) {
+				int status;
+				if (i > 0)
+					tprintf(", ");
+				if (umove(tcp, statususer, &status) < 0) {
+					tprintf("???");
+					break;
+				}
+				tprintf("%#x", status);
+				statususer += sizeof (int);
+			}
+			tprintf("}, ");
+		}
+		printflags(move_pages_flags, tcp->u_arg[5], "MPOL_???");
+	}
+	return 0;
+}
+#endif
+
+#if defined(LINUX) && defined(POWERPC)
+int
+sys_subpage_prot(tcp)
+struct tcb *tcp;
+{
+	if (entering(tcp)) {
+		unsigned long cur, end, abbrev_end, entries;
+		unsigned int entry;
+
+		tprintf("%#lx, %#lx, ", tcp->u_arg[0], tcp->u_arg[1]);
+		entries = tcp->u_arg[1] >> 16;
+		if (!entries || !tcp->u_arg[2]) {
+			tprintf("{}");
+			return 0;
+		}
+		cur = tcp->u_arg[2];
+		end = cur + (sizeof(int) * entries);
+		if (!verbose(tcp) || end < tcp->u_arg[2]) {
+			tprintf("%#lx", tcp->u_arg[2]);
+			return 0;
+		}
+		if (abbrev(tcp)) {
+			abbrev_end = cur + (sizeof(int) * max_strlen);
+			if (abbrev_end > end)
+				abbrev_end = end;
+		}
+		else
+			abbrev_end = end;
+		tprintf("{");
+		for (; cur < end; cur += sizeof(int)) {
+			if (cur > tcp->u_arg[2])
+				tprintf(", ");
+			if (cur >= abbrev_end) {
+				tprintf("...");
+				break;
+			}
+			if (umove(tcp, cur, &entry) < 0) {
+				tprintf("??? [%#lx]", cur);
+				break;
+			}
+			else
+				tprintf("%#08x", entry);
+		}
+		tprintf("}");
+	}
+
+	return 0;
+}
 #endif
diff --git a/missing b/missing
deleted file mode 100755
index e7ef83a..0000000
--- a/missing
+++ /dev/null
@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2003-09-02.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index 6fbe5e1..0000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,150 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2004-02-15.20
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit 0
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=""
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/net.c b/net.c
index 640c767..a46cf06 100644
--- a/net.c
+++ b/net.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: net.c,v 1.48 2005/06/01 19:22:07 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -49,6 +49,9 @@
 #ifdef HAVE_NETINET_UDP_H
 #include <netinet/udp.h>
 #endif
+#ifdef HAVE_NETINET_SCTP_H
+#include <netinet/sctp.h>
+#endif
 #include <arpa/inet.h>
 #include <net/if.h>
 #if defined(LINUX)
@@ -320,17 +323,32 @@
 #ifdef SOCK_RAW
 	{ SOCK_RAW,	"SOCK_RAW"	},
 #endif
+#ifdef SOCK_RDM
+	{ SOCK_RDM,	"SOCK_RDM"	},
+#endif
 #ifdef SOCK_SEQPACKET
 	{ SOCK_SEQPACKET,"SOCK_SEQPACKET"},
 #endif
-#ifdef SOCK_RDM
-	{ SOCK_RDM,	"SOCK_RDM"	},
+#ifdef SOCK_DCCP
+	{ SOCK_DCCP,	"SOCK_DCCP"	},
 #endif
 #ifdef SOCK_PACKET
 	{ SOCK_PACKET,	"SOCK_PACKET"	},
 #endif
 	{ 0,		NULL		},
 };
+static const struct xlat sock_type_flags[] = {
+#ifdef SOCK_CLOEXEC
+	{ SOCK_CLOEXEC,	"SOCK_CLOEXEC"	},
+#endif
+#ifdef SOCK_NONBLOCK
+	{ SOCK_NONBLOCK,"SOCK_NONBLOCK"	},
+#endif
+	{ 0,		NULL		},
+};
+#ifndef SOCK_TYPE_MASK
+# define SOCK_TYPE_MASK 0xf
+#endif
 static const struct xlat socketlayers[] = {
 #if defined(SOL_IP)
 	{ SOL_IP,	"SOL_IP"	},
@@ -350,15 +368,18 @@
 #if defined(SOL_ICMPV6)
 	{ SOL_ICMPV6,	"SOL_ICMPV6"	},
 #endif
+#if defined(SOL_SCTP)
+	{ SOL_SCTP,	"SOL_SCTP"	},
+#endif
+#if defined(SOL_UDPLITE)
+	{ SOL_UDPLITE,	"SOL_UDPLITE"	},
+#endif
 #if defined(SOL_RAW)
 	{ SOL_RAW,	"SOL_RAW"	},
 #endif
 #if defined(SOL_IPX)
 	{ SOL_IPX,	"SOL_IPX"	},
 #endif
-#if defined(SOL_IPX)
-	{ SOL_IPX,	"SOL_IPX"	},
-#endif
 #if defined(SOL_AX25)
 	{ SOL_AX25,	"SOL_AX25"	},
 #endif
@@ -389,7 +410,44 @@
 #if defined(SOL_IRDA)
 	{ SOL_IRDA,	"SOL_IRDA"	},
 #endif
+#if defined(SOL_NETBEUI)
+	{ SOL_NETBEUI,	"SOL_NETBEUI"	},
+#endif
+#if defined(SOL_LLC)
+	{ SOL_LLC,	"SOL_LLC"	},
+#endif
+#if defined(SOL_DCCP)
+	{ SOL_DCCP,	"SOL_DCCP"	},
+#endif
+#if defined(SOL_NETLINK)
+	{ SOL_NETLINK,	"SOL_NETLINK"	},
+#endif
+#if defined(SOL_TIPC)
+	{ SOL_TIPC,	"SOL_TIPC"	},
+#endif
+#if defined(SOL_RXRPC)
+	{ SOL_RXRPC,	"SOL_RXRPC"	},
+#endif
+#if defined(SOL_PPPOL2TP)
+	{ SOL_PPPOL2TP,	"SOL_PPPOL2TP"	},
+#endif
+#if defined(SOL_BLUETOOTH)
+	{ SOL_BLUETOOTH,"SOL_BLUETOOTH" },
+#endif
+#if defined(SOL_PNPIPE)
+	{ SOL_PNPIPE,	"SOL_PNPIPE"	},
+#endif
+#if defined(SOL_RDS)
+	{ SOL_RDS,	"SOL_RDS"	},
+#endif
+#if defined(SOL_IUVC)
+	{ SOL_IUCV,	"SOL_IUCV"	},
+#endif
+#if defined(SOL_CAIF)
+	{ SOL_CAIF,	"SOL_CAIF"	},
+#endif
 	{ SOL_SOCKET,	"SOL_SOCKET"	},	/* Never used! */
+	/* The SOL_* array should remain not NULL-terminated. */
 };
 /*** WARNING: DANGER WILL ROBINSON: NOTE "socketlayers" array above
      falls into "protocols" array below!!!!   This is intended!!! ***/
@@ -398,9 +456,15 @@
 	{ IPPROTO_ICMP,	"IPPROTO_ICMP"	},
 	{ IPPROTO_TCP,	"IPPROTO_TCP"	},
 	{ IPPROTO_UDP,	"IPPROTO_UDP"	},
+#ifdef IPPROTO_IGMP
+	{ IPPROTO_IGMP,	"IPPROTO_IGMP"	},
+#endif
 #ifdef IPPROTO_GGP
 	{ IPPROTO_GGP,	"IPPROTO_GGP"	},
 #endif
+#ifdef IPPROTO_IPIP
+	{ IPPROTO_IPIP,	"IPPROTO_IPIP"	},
+#endif
 #ifdef IPPROTO_EGP
 	{ IPPROTO_EGP,	"IPPROTO_EGP"	},
 #endif
@@ -410,86 +474,131 @@
 #ifdef IPPROTO_IDP
 	{ IPPROTO_IDP,	"IPPROTO_IDP"	},
 #endif
+#ifdef IPPROTO_TP
+	{ IPPROTO_TP,	"IPPROTO_TP"	},
+#endif
+#ifdef IPPROTO_DCCP
+	{ IPPROTO_DCCP,	"IPPROTO_DCCP"	},
+#endif
 #ifdef IPPROTO_IPV6
 	{ IPPROTO_IPV6,	"IPPROTO_IPV6"	},
 #endif
-#ifdef IPPROTO_ICMPV6
-	{ IPPROTO_ICMPV6,"IPPROTO_ICMPV6"},
+#ifdef IPPROTO_ROUTING
+	{ IPPROTO_ROUTING, "IPPROTO_ROUTING" },
 #endif
-#ifdef IPPROTO_IGMP
-	{ IPPROTO_IGMP,	"IPPROTO_IGMP"	},
+#ifdef IPPROTO_FRAGMENT
+	{ IPPROTO_FRAGMENT, "IPPROTO_FRAGMENT" },
+#endif
+#ifdef IPPROTO_RSVP
+	{ IPPROTO_RSVP,	"IPPROTO_RSVP"	},
+#endif
+#ifdef IPPROTO_GRE
+	{ IPPROTO_GRE,	"IPPROTO_GRE"	},
+#endif
+#ifdef IPPROTO_ESP
+	{ IPPROTO_ESP,	"IPPROTO_ESP"	},
+#endif
+#ifdef IPPROTO_AH
+	{ IPPROTO_AH,	"IPPROTO_AH"	},
+#endif
+#ifdef IPPROTO_ICMPV6
+	{ IPPROTO_ICMPV6, "IPPROTO_ICMPV6" },
+#endif
+#ifdef IPPROTO_NONE
+	{ IPPROTO_NONE,	"IPPROTO_NONE"	},
+#endif
+#ifdef IPPROTO_DSTOPTS
+	{ IPPROTO_DSTOPTS, "IPPROTO_DSTOPTS" },
 #endif
 #ifdef IPPROTO_HELLO
-	{ IPPROTO_HELLO,"IPPROTO_HELLO"	},
+	{ IPPROTO_HELLO, "IPPROTO_HELLO" },
 #endif
 #ifdef IPPROTO_ND
 	{ IPPROTO_ND,	"IPPROTO_ND"	},
 #endif
+#ifdef IPPROTO_MTP
+	{ IPPROTO_MTP,	"IPPROTO_MTP"	},
+#endif
+#ifdef IPPROTO_ENCAP
+	{ IPPROTO_ENCAP, "IPPROTO_ENCAP" },
+#endif
+#ifdef IPPROTO_PIM
+	{ IPPROTO_PIM,	"IPPROTO_PIM"	},
+#endif
+#ifdef IPPROTO_COMP
+	{ IPPROTO_COMP,	"IPPROTO_COMP"	},
+#endif
+#ifdef IPPROTO_SCTP
+	{ IPPROTO_SCTP,	"IPPROTO_SCTP"	},
+#endif
+#ifdef IPPROTO_UDPLITE
+	{ IPPROTO_UDPLITE, "IPPROTO_UDPLITE" },
+#endif
 #ifdef IPPROTO_RAW
 	{ IPPROTO_RAW,	"IPPROTO_RAW"	},
 #endif
 #ifdef IPPROTO_MAX
 	{ IPPROTO_MAX,	"IPPROTO_MAX"	},
 #endif
-#ifdef IPPROTO_IPIP
-	{ IPPROTO_IPIP,	"IPPROTO_IPIP"	},
-#endif
 	{ 0,		NULL		},
 };
 static const struct xlat msg_flags[] = {
-	{ MSG_OOB,	"MSG_OOB"	},
+	{ MSG_OOB,		"MSG_OOB"		},
 #ifdef MSG_DONTROUTE
-	{ MSG_DONTROUTE,"MSG_DONTROUTE"	},
+	{ MSG_DONTROUTE,	"MSG_DONTROUTE"		},
 #endif
 #ifdef MSG_PEEK
-	{ MSG_PEEK,	"MSG_PEEK"	},
+	{ MSG_PEEK,		"MSG_PEEK"		},
 #endif
 #ifdef MSG_CTRUNC
-	{ MSG_CTRUNC,	"MSG_CTRUNC"	},
+	{ MSG_CTRUNC,		"MSG_CTRUNC"		},
 #endif
 #ifdef MSG_PROXY
-	{ MSG_PROXY,	"MSG_PROXY"	},
+	{ MSG_PROXY,		"MSG_PROXY"		},
 #endif
 #ifdef MSG_EOR
-	{ MSG_EOR,	"MSG_EOR"	},
+	{ MSG_EOR,		"MSG_EOR"		},
 #endif
 #ifdef MSG_WAITALL
-	{ MSG_WAITALL,	"MSG_WAITALL"	},
+	{ MSG_WAITALL,		"MSG_WAITALL"		},
 #endif
 #ifdef MSG_TRUNC
-	{ MSG_TRUNC,	"MSG_TRUNC"	},
+	{ MSG_TRUNC,		"MSG_TRUNC"		},
 #endif
 #ifdef MSG_CTRUNC
-	{ MSG_CTRUNC,	"MSG_CTRUNC"	},
+	{ MSG_CTRUNC,		"MSG_CTRUNC"		},
 #endif
 #ifdef MSG_ERRQUEUE
-	{ MSG_ERRQUEUE,	"MSG_ERRQUEUE"	},
+	{ MSG_ERRQUEUE,		"MSG_ERRQUEUE"		},
 #endif
 #ifdef MSG_DONTWAIT
-	{ MSG_DONTWAIT,	"MSG_DONTWAIT"	},
+	{ MSG_DONTWAIT,		"MSG_DONTWAIT"		},
 #endif
 #ifdef MSG_CONFIRM
-	{ MSG_CONFIRM,	"MSG_CONFIRM"	},
+	{ MSG_CONFIRM,		"MSG_CONFIRM"		},
 #endif
 #ifdef MSG_PROBE
-	{ MSG_PROBE,	"MSG_PROBE"	},
+	{ MSG_PROBE,		"MSG_PROBE"		},
 #endif
 #ifdef MSG_FIN
-	{ MSG_FIN,	"MSG_FIN"	},
+	{ MSG_FIN,		"MSG_FIN"		},
 #endif
 #ifdef MSG_SYN
-	{ MSG_SYN,	"MSG_SYN"	},
+	{ MSG_SYN,		"MSG_SYN"		},
 #endif
 #ifdef MSG_RST
-	{ MSG_RST,	"MSG_RST"	},
+	{ MSG_RST,		"MSG_RST"		},
 #endif
 #ifdef MSG_NOSIGNAL
-	{ MSG_NOSIGNAL,	"MSG_NOSIGNAL"	},
+	{ MSG_NOSIGNAL,		"MSG_NOSIGNAL"		},
 #endif
 #ifdef MSG_MORE
-	{ MSG_MORE,	"MSG_MORE"	},
+	{ MSG_MORE,		"MSG_MORE"		},
 #endif
-	{ 0,		NULL		},
+#ifdef MSG_CMSG_CLOEXEC
+	{ MSG_CMSG_CLOEXEC,	"MSG_CMSG_CLOEXEC"	},
+#endif
+	{ 0,			NULL			},
 };
 
 static const struct xlat sockoptions[] = {
@@ -671,10 +780,10 @@
 	{ IP_RECVERR,		"IP_RECVERR"		},
 #endif
 #ifdef IP_RECVTTL
-	{ IP_RECVTTL,		"IP_RECRECVTTL"		},
+	{ IP_RECVTTL,		"IP_RECVTTL"		},
 #endif
 #ifdef IP_RECVTOS
-	{ IP_RECVTOS,		"IP_RECRECVTOS"		},
+	{ IP_RECVTOS,		"IP_RECVTOS"		},
 #endif
 #ifdef IP_MTU
 	{ IP_MTU,		"IP_MTU"		},
@@ -769,6 +878,15 @@
 #ifdef IPV6_FLOWINFO_SEND
 	{ IPV6_FLOWINFO_SEND,	"IPV6_FLOWINFO_SEND"	},
 #endif
+#ifdef IPV6_ADD_MEMBERSHIP
+	{ IPV6_ADD_MEMBERSHIP,	"IPV6_ADD_MEMBERSHIP"	},
+#endif
+#ifdef IPV6_DROP_MEMBERSHIP
+	{ IPV6_DROP_MEMBERSHIP,	"IPV6_DROP_MEMBERSHIP"	},
+#endif
+#ifdef IPV6_ROUTER_ALERT
+	{ IPV6_ROUTER_ALERT,	"IPV6_ROUTER_ALERT"	},
+#endif
 	{ 0,			NULL			},
 };
 #endif /* SOL_IPV6 */
@@ -791,8 +909,12 @@
 
 #ifdef SOL_PACKET
 static const struct xlat sockpacketoptions[] = {
+#ifdef PACKET_ADD_MEMBERSHIP
 	{ PACKET_ADD_MEMBERSHIP,	"PACKET_ADD_MEMBERSHIP"	},
+#endif
+#ifdef PACKET_DROP_MEMBERSHIP
 	{ PACKET_DROP_MEMBERSHIP,	"PACKET_DROP_MEMBERSHIP"},
+#endif
 #if defined(PACKET_RECV_OUTPUT)
 	{ PACKET_RECV_OUTPUT,		"PACKET_RECV_OUTPUT"	},
 #endif
@@ -802,10 +924,160 @@
 #if defined(PACKET_STATISTICS)
 	{ PACKET_STATISTICS,		"PACKET_STATISTICS"	},
 #endif
+#if defined(PACKET_COPY_THRESH)
+	{ PACKET_COPY_THRESH,		"PACKET_COPY_THRESH"	},
+#endif
+#if defined(PACKET_AUXDATA)
+	{ PACKET_AUXDATA,		"PACKET_AUXDATA"	},
+#endif
+#if defined(PACKET_ORIGDEV)
+	{ PACKET_ORIGDEV,		"PACKET_ORIGDEV"	},
+#endif
+#if defined(PACKET_VERSION)
+	{ PACKET_VERSION,		"PACKET_VERSION"	},
+#endif
+#if defined(PACKET_HDRLEN)
+	{ PACKET_HDRLEN,		"PACKET_HDRLEN"	},
+#endif
+#if defined(PACKET_RESERVE)
+	{ PACKET_RESERVE,		"PACKET_RESERVE"	},
+#endif
+#if defined(PACKET_TX_RING)
+	{ PACKET_TX_RING,		"PACKET_TX_RING"	},
+#endif
+#if defined(PACKET_LOSS)
+	{ PACKET_LOSS,			"PACKET_LOSS"	},
+#endif
 	{ 0,				NULL			},
 };
 #endif /* SOL_PACKET */
 
+#ifdef SOL_SCTP
+static const struct xlat socksctpoptions[] = {
+#if defined(SCTP_RTOINFO)
+	{ SCTP_RTOINFO,			"SCTP_RTOINFO"	},
+#endif
+#if defined(SCTP_ASSOCINFO)
+	{ SCTP_ASSOCINFO,		"SCTP_ASSOCINFO"},
+#endif
+#if defined(SCTP_INITMSG)
+	{ SCTP_INITMSG,			"SCTP_INITMSG"	},
+#endif
+#if defined(SCTP_NODELAY)
+	{ SCTP_NODELAY,			"SCTP_NODELAY"	},
+#endif
+#if defined(SCTP_AUTOCLOSE)
+	{ SCTP_AUTOCLOSE,		"SCTP_AUTOCLOSE"},
+#endif
+#if defined(SCTP_SET_PEER_PRIMARY_ADDR)
+	{ SCTP_SET_PEER_PRIMARY_ADDR,	"SCTP_SET_PEER_PRIMARY_ADDR"},
+#endif
+#if defined(SCTP_PRIMARY_ADDR)
+	{ SCTP_PRIMARY_ADDR,		"SCTP_PRIMARY_ADDR"	},
+#endif
+#if defined(SCTP_ADAPTATION_LAYER)
+	{ SCTP_ADAPTATION_LAYER,	"SCTP_ADAPTATION_LAYER"	},
+#endif
+#if defined(SCTP_DISABLE_FRAGMENTS)
+	{ SCTP_DISABLE_FRAGMENTS,	"SCTP_DISABLE_FRAGMENTS"},
+#endif
+#if defined(SCTP_PEER_ADDR_PARAMS)
+	{ SCTP_PEER_ADDR_PARAMS,	"SCTP_PEER_ADDR_PARAMS"	},
+#endif
+#if defined(SCTP_DEFAULT_SEND_PARAM)
+	{ SCTP_DEFAULT_SEND_PARAM,	"SCTP_DEFAULT_SEND_PARAM"},
+#endif
+#if defined(SCTP_EVENTS)
+	{ SCTP_EVENTS,			"SCTP_EVENTS"		},
+#endif
+#if defined(SCTP_I_WANT_MAPPED_V4_ADDR)
+	{ SCTP_I_WANT_MAPPED_V4_ADDR,	"SCTP_I_WANT_MAPPED_V4_ADDR"},
+#endif
+#if defined(SCTP_MAXSEG)
+	{ SCTP_MAXSEG,			"SCTP_MAXSEG"		},
+#endif
+#if defined(SCTP_STATUS)
+	{ SCTP_STATUS,			"SCTP_STATUS"		},
+#endif
+#if defined(SCTP_GET_PEER_ADDR_INFO)
+	{ SCTP_GET_PEER_ADDR_INFO,	"SCTP_GET_PEER_ADDR_INFO"},
+#endif
+#if defined(SCTP_DELAYED_ACK)
+	{ SCTP_DELAYED_ACK,		"SCTP_DELAYED_ACK"	},
+#endif
+#if defined(SCTP_CONTEXT)
+	{ SCTP_CONTEXT,			"SCTP_CONTEXT"		},
+#endif
+#if defined(SCTP_FRAGMENT_INTERLEAVE)
+	{ SCTP_FRAGMENT_INTERLEAVE,	"SCTP_FRAGMENT_INTERLEAVE"},
+#endif
+#if defined(SCTP_PARTIAL_DELIVERY_POINT)
+	{ SCTP_PARTIAL_DELIVERY_POINT,	"SCTP_PARTIAL_DELIVERY_POINT"},
+#endif
+#if defined(SCTP_MAX_BURST)
+	{ SCTP_MAX_BURST,		"SCTP_MAX_BURST"	},
+#endif
+#if defined(SCTP_AUTH_CHUNK)
+	{ SCTP_AUTH_CHUNK,		"SCTP_AUTH_CHUNK"	},
+#endif
+#if defined(SCTP_HMAC_IDENT)
+	{ SCTP_HMAC_IDENT,		"SCTP_HMAC_IDENT"	},
+#endif
+#if defined(SCTP_AUTH_KEY)
+	{ SCTP_AUTH_KEY,		"SCTP_AUTH_KEY"		},
+#endif
+#if defined(SCTP_AUTH_ACTIVE_KEY)
+	{ SCTP_AUTH_ACTIVE_KEY,		"SCTP_AUTH_ACTIVE_KEY"	},
+#endif
+#if defined(SCTP_AUTH_DELETE_KEY)
+	{ SCTP_AUTH_DELETE_KEY,		"SCTP_AUTH_DELETE_KEY"	},
+#endif
+#if defined(SCTP_PEER_AUTH_CHUNKS)
+	{ SCTP_PEER_AUTH_CHUNKS,	"SCTP_PEER_AUTH_CHUNKS"	},
+#endif
+#if defined(SCTP_LOCAL_AUTH_CHUNKS)
+	{ SCTP_LOCAL_AUTH_CHUNKS,	"SCTP_LOCAL_AUTH_CHUNKS"},
+#endif
+#if defined(SCTP_GET_ASSOC_NUMBER)
+	{ SCTP_GET_ASSOC_NUMBER,	"SCTP_GET_ASSOC_NUMBER"	},
+#endif
+
+	/* linux specific things */
+#if defined(SCTP_SOCKOPT_BINDX_ADD)
+	{ SCTP_SOCKOPT_BINDX_ADD,	"SCTP_SOCKOPT_BINDX_ADD"	},
+#endif
+#if defined(SCTP_SOCKOPT_BINDX_REM)
+	{ SCTP_SOCKOPT_BINDX_REM,	"SCTP_SOCKOPT_BINDX_REM"	},
+#endif
+#if defined(SCTP_SOCKOPT_PEELOFF)
+	{ SCTP_SOCKOPT_PEELOFF,		"SCTP_SOCKOPT_PEELOFF"		},
+#endif
+#if defined(SCTP_GET_PEER_ADDRS_NUM_OLD)
+	{ SCTP_GET_PEER_ADDRS_NUM_OLD,	"SCTP_GET_PEER_ADDRS_NUM_OLD"	},
+#endif
+#if defined(SCTP_GET_PEER_ADDRS_OLD)
+	{ SCTP_GET_PEER_ADDRS_OLD,	"SCTP_GET_PEER_ADDRS_OLD"	},
+#endif
+#if defined(SCTP_GET_LOCAL_ADDRS_NUM_OLD)
+	{ SCTP_GET_LOCAL_ADDRS_NUM_OLD,	"SCTP_GET_LOCAL_ADDRS_NUM_OLD"	},
+#endif
+#if defined(SCTP_GET_LOCAL_ADDRS_OLD)
+	{ SCTP_GET_LOCAL_ADDRS_OLD,	"SCTP_GET_LOCAL_ADDRS_OLD"	},
+#endif
+#if defined(SCTP_SOCKOPT_CONNECTX_OLD)
+	{ SCTP_SOCKOPT_CONNECTX_OLD,	"SCTP_SOCKOPT_CONNECTX_OLD"	},
+#endif
+#if defined(SCTP_GET_PEER_ADDRS)
+	{ SCTP_GET_PEER_ADDRS,		"SCTP_GET_PEER_ADDRS"		},
+#endif
+#if defined(SCTP_GET_LOCAL_ADDRS)
+	{ SCTP_GET_LOCAL_ADDRS,		"SCTP_GET_LOCAL_ADDRS"		},
+#endif
+
+	{ 0,	NULL	},
+};
+#endif
+
 #if  !defined (SOL_TCP) && defined (IPPROTO_TCP)
 #define SOL_TCP IPPROTO_TCP
 #endif
@@ -925,10 +1197,7 @@
 
 
 void
-printsock(tcp, addr, addrlen)
-struct tcb *tcp;
-long addr;
-int addrlen;
+printsock(struct tcb *tcp, long addr, int addrlen)
 {
 	union {
 		char pad[128];
@@ -958,13 +1227,16 @@
 		tprintf("%#lx", addr);
 		return;
 	}
-	if ((addrlen<2) || (addrlen>sizeof(addrbuf)))
-		addrlen=sizeof(addrbuf);
 
-	if (umoven(tcp, addr, addrlen, (char*)&addrbuf) < 0) {
+	if (addrlen < 2 || addrlen > sizeof(addrbuf))
+		addrlen = sizeof(addrbuf);
+
+	memset(&addrbuf, 0, sizeof(addrbuf));
+	if (umoven(tcp, addr, addrlen, addrbuf.pad) < 0) {
 		tprintf("{...}");
 		return;
 	}
+	addrbuf.pad[sizeof(addrbuf.pad) - 1] = '\0';
 
 	tprintf("{sa_family=");
 	printxval(addrfams, addrbuf.sa.sa_family, "AF_???");
@@ -972,12 +1244,14 @@
 
 	switch (addrbuf.sa.sa_family) {
 	case AF_UNIX:
-		if (addrlen==2) {
-			tprintf("<nil>");
+		if (addrlen == 2) {
+			tprintf("NULL");
 		} else if (addrbuf.sau.sun_path[0]) {
-			tprintf("path=\"%-.*s\"", addrlen-2, addrbuf.sau.sun_path);
+			tprintf("path=");
+			printpathn(tcp, addr + 2, strlen(addrbuf.sau.sun_path));
 		} else {
-			tprintf("path=@%-.*s", addrlen-3, addrbuf.sau.sun_path+1);
+			tprintf("path=@");
+			printpathn(tcp, addr + 3, strlen(addrbuf.sau.sun_path + 1));
 		}
 		break;
 	case AF_INET:
@@ -1077,10 +1351,7 @@
 };
 
 static void
-printcmsghdr(tcp, addr, len)
-struct tcb *tcp;
-unsigned long addr;
-unsigned long len;
+printcmsghdr(struct tcb *tcp, unsigned long addr, unsigned long len)
 {
 	struct cmsghdr *cmsg = len < sizeof(struct cmsghdr) ?
 			       NULL : malloc(len);
@@ -1090,7 +1361,7 @@
 		return;
 	}
 
-	tprintf(", {cmsg_len=%zu, cmsg_level=", cmsg->cmsg_len);
+	tprintf(", {cmsg_len=%u, cmsg_level=", (unsigned) cmsg->cmsg_len);
 	printxval(socketlayers, cmsg->cmsg_level, "SOL_???");
 	tprintf(", cmsg_type=");
 
@@ -1131,6 +1402,30 @@
 }
 
 static void
+do_msghdr(struct tcb *tcp, struct msghdr *msg)
+{
+	tprintf("{msg_name(%d)=", msg->msg_namelen);
+	printsock(tcp, (long)msg->msg_name, msg->msg_namelen);
+
+	tprintf(", msg_iov(%lu)=", (unsigned long)msg->msg_iovlen);
+	tprint_iov(tcp, (unsigned long)msg->msg_iovlen,
+		   (unsigned long)msg->msg_iov);
+
+#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
+	tprintf(", msg_controllen=%lu", (unsigned long)msg->msg_controllen);
+	if (msg->msg_controllen)
+		printcmsghdr(tcp, (unsigned long) msg->msg_control,
+			     msg->msg_controllen);
+	tprintf(", msg_flags=");
+	printflags(msg_flags, msg->msg_flags, "MSG_???");
+#else /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
+	tprintf("msg_accrights=%#lx, msg_accrightslen=%u",
+		(unsigned long) msg->msg_accrights, msg->msg_accrightslen);
+#endif /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
+	tprintf("}");
+}
+
+static void
 printmsghdr(tcp, addr)
 struct tcb *tcp;
 long addr;
@@ -1141,37 +1436,57 @@
 		tprintf("%#lx", addr);
 		return;
 	}
-	tprintf("{msg_name(%d)=", msg.msg_namelen);
-	printsock(tcp, (long)msg.msg_name, msg.msg_namelen);
-
-	tprintf(", msg_iov(%lu)=", (unsigned long)msg.msg_iovlen);
-	tprint_iov(tcp, (unsigned long)msg.msg_iovlen,
-		   (unsigned long)msg.msg_iov);
-
-#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
-	tprintf(", msg_controllen=%lu", (unsigned long)msg.msg_controllen);
-	if (msg.msg_controllen)
-		printcmsghdr(tcp, (unsigned long) msg.msg_control,
-			     msg.msg_controllen);
-	tprintf(", msg_flags=");
-	printflags(msg_flags, msg.msg_flags, "MSG_???");
-#else /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
-	tprintf("msg_accrights=%#lx, msg_accrightslen=%u",
-		(unsigned long) msg.msg_accrights, msg.msg_accrightslen);
-#endif /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
-	tprintf("}");
+	do_msghdr(tcp, &msg);
 }
 
+#ifdef LINUX
+static void
+printmmsghdr(struct tcb *tcp, long addr)
+{
+	struct mmsghdr {
+		struct msghdr msg_hdr;
+		unsigned msg_len;
+	} mmsg;
+
+	if (umove(tcp, addr, &mmsg) < 0) {
+		tprintf("%#lx", addr);
+		return;
+	}
+	tprintf("{");
+	do_msghdr(tcp, &mmsg.msg_hdr);
+	tprintf(", %u}", mmsg.msg_len);
+}
+#endif
+
 #endif /* HAVE_SENDMSG */
 
+/*
+ * low bits of the socket type define real socket type,
+ * other bits are socket type flags.
+ */
+static void
+tprint_sock_type(struct tcb *tcp, int flags)
+{
+	const char *str = xlookup(socktypes, flags & SOCK_TYPE_MASK);
+
+	if (str)
+	{
+		tprintf("%s", str);
+		flags &= ~SOCK_TYPE_MASK;
+		if (!flags)
+			return;
+		tprintf("|");
+	}
+	printflags(sock_type_flags, flags, "SOCK_???");
+}
+
 int
-sys_socket(tcp)
-struct tcb *tcp;
+sys_socket(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printxval(domains, tcp->u_arg[0], "PF_???");
 		tprintf(", ");
-		printxval(socktypes, tcp->u_arg[1], "SOCK_???");
+		tprint_sock_type(tcp, tcp->u_arg[1]);
 		tprintf(", ");
 		switch (tcp->u_arg[0]) {
 		case PF_INET:
@@ -1196,6 +1511,7 @@
 	return 0;
 }
 
+#ifdef SVR4
 int
 sys_so_socket(tcp)
 struct tcb *tcp;
@@ -1217,11 +1533,12 @@
 struct tcb *tcp;
 {
 	if (entering(tcp)) {
-	  	/* not sure what this arg is */
+		/* not sure what this arg is */
 		tprintf("0x%lx", tcp->u_arg[0]);
 	}
 	return 0;
 }
+#endif /* SVR4 */
 
 int
 sys_bind(tcp)
@@ -1252,27 +1569,49 @@
 	return 0;
 }
 
-int
-sys_accept(tcp)
-struct tcb *tcp;
+static int
+do_accept(struct tcb *tcp, int flags_arg)
 {
 	if (entering(tcp)) {
 		tprintf("%ld, ", tcp->u_arg[0]);
-	} else if (!tcp->u_arg[2])
+		return 0;
+	}
+	if (!tcp->u_arg[2])
 		tprintf("%#lx, NULL", tcp->u_arg[1]);
 	else {
-		if (tcp->u_arg[1] == 0 || syserror(tcp)) {
+		int len;
+		if (tcp->u_arg[1] == 0 || syserror(tcp)
+		    || umove (tcp, tcp->u_arg[2], &len) < 0) {
 			tprintf("%#lx", tcp->u_arg[1]);
 		} else {
-			printsock(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+			printsock(tcp, tcp->u_arg[1], len);
 		}
 		tprintf(", ");
-		printnum(tcp, tcp->u_arg[2], "%lu");
+		printnum_int(tcp, tcp->u_arg[2], "%u");
+	}
+	if (flags_arg >= 0) {
+		tprintf(", ");
+		printflags(sock_type_flags, tcp->u_arg[flags_arg],
+			   "SOCK_???");
 	}
 	return 0;
 }
 
 int
+sys_accept(struct tcb *tcp)
+{
+	return do_accept(tcp, -1);
+}
+
+#ifdef LINUX
+int
+sys_accept4(struct tcb *tcp)
+{
+	return do_accept(tcp, 3);
+}
+#endif
+
+int
 sys_send(tcp)
 struct tcb *tcp;
 {
@@ -1406,25 +1745,71 @@
 	return 0;
 }
 
+#ifdef LINUX
+int
+sys_recvmmsg(struct tcb *tcp)
+{
+	static char str[128];
+	if (entering(tcp)) {
+
+		tprintf("%ld, ", tcp->u_arg[0]);
+		if (verbose(tcp)) {
+			sprint_timespec(str, tcp, tcp->u_arg[4]);
+			tcp->auxstr = strdup(str);
+		} else {
+			tprintf("%#lx, %ld, ", tcp->u_arg[1], tcp->u_arg[2]);
+			printflags(msg_flags, tcp->u_arg[3], "MSG_???");
+			tprintf(", ");
+			print_timespec(tcp, tcp->u_arg[4]);
+		}
+		return 0;
+	} else {
+		if (verbose(tcp)) {
+			if (syserror(tcp))
+				tprintf("%#lx", tcp->u_arg[1]);
+			else
+				printmmsghdr(tcp, tcp->u_arg[1]);
+			tprintf(", %ld, ", tcp->u_arg[2]);
+			/* flags */
+			printflags(msg_flags, tcp->u_arg[3], "MSG_???");
+			/* timeout on entrance */
+			tprintf(", %s", tcp->auxstr ? tcp->auxstr : "{...}");
+			free((void *) tcp->auxstr);
+			tcp->auxstr = NULL;
+		}
+		if (syserror(tcp))
+			return 0;
+		if (tcp->u_rval == 0) {
+			tcp->auxstr = "Timeout";
+			return RVAL_STR;
+		}
+		if (!verbose(tcp))
+			return 0;
+		/* timeout on exit */
+		strcpy(str, "left ");
+		sprint_timespec(str + strlen(str), tcp, tcp->u_arg[4]);
+		tcp->auxstr = str;
+		return RVAL_STR;
+	}
+}
+#endif
+
 #endif /* HAVE_SENDMSG */
 
+static const struct xlat shutdown_modes[] = {
+       { 0,	"SHUT_RD"	},
+       { 1,	"SHUT_WR"	},
+       { 2,	"SHUT_RDWR"	},
+       { 0,	NULL		}
+};
+
 int
 sys_shutdown(tcp)
 struct tcb *tcp;
 {
 	if (entering(tcp)) {
-		tprintf("%ld, %ld", tcp->u_arg[0], tcp->u_arg[1]);
-		switch (tcp->u_arg[1]) {
-		case 0:
-			tprintf("%s", " /* receive */");
-			break;
-		case 1:
-			tprintf("%s", " /* send */");
-			break;
-		case 2:
-			tprintf("%s", " /* send and receive */");
-			break;
-		}
+		tprintf("%ld, ", tcp->u_arg[0]);
+		printxval(shutdown_modes, tcp->u_arg[1], "SHUT_???");
 	}
 	return 0;
 }
@@ -1443,34 +1828,50 @@
 	return sys_accept(tcp);
 }
 
-int
-sys_pipe(tcp)
-struct tcb *tcp;
+static int
+do_pipe(struct tcb *tcp, int flags_arg)
 {
-
-#if defined(LINUX) && !defined(SPARC) && !defined(SPARC64) && !defined(SH) && !defined(IA64)
-	int fds[2];
-
 	if (exiting(tcp)) {
 		if (syserror(tcp)) {
 			tprintf("%#lx", tcp->u_arg[0]);
-			return 0;
-		}
-		if (umoven(tcp, tcp->u_arg[0], sizeof fds, (char *) fds) < 0)
-			tprintf("[...]");
-		else
-			tprintf("[%u, %u]", fds[0], fds[1]);
-	}
+		} else {
+#if defined(LINUX) && !defined(SPARC) && !defined(SPARC64) && !defined(SH) && !defined(IA64)
+			int fds[2];
+
+			if (umoven(tcp, tcp->u_arg[0], sizeof fds, (char *) fds) < 0)
+				tprintf("[...]");
+			else
+				tprintf("[%u, %u]", fds[0], fds[1]);
 #elif defined(SPARC) || defined(SPARC64) || defined(SH) || defined(SVR4) || defined(FREEBSD) || defined(IA64)
-	if (exiting(tcp))
-		tprintf("[%lu, %lu]", tcp->u_rval, getrval2(tcp));
+			tprintf("[%lu, %lu]", tcp->u_rval, getrval2(tcp));
+#else
+			tprintf("%#lx", tcp->u_arg[0]);
 #endif
+		}
+		if (flags_arg >= 0) {
+			tprintf(", ");
+			printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
+		}
+	}
 	return 0;
 }
 
 int
-sys_socketpair(tcp)
-struct tcb *tcp;
+sys_pipe(struct tcb *tcp)
+{
+	return do_pipe(tcp, -1);
+}
+
+#ifdef LINUX
+int
+sys_pipe2(struct tcb *tcp)
+{
+	return do_pipe(tcp, 1);
+}
+#endif
+
+int
+sys_socketpair(struct tcb *tcp)
 {
 #ifdef LINUX
 	int fds[2];
@@ -1479,7 +1880,7 @@
 	if (entering(tcp)) {
 		printxval(domains, tcp->u_arg[0], "PF_???");
 		tprintf(", ");
-		printxval(socktypes, tcp->u_arg[1], "SOCK_???");
+		tprint_sock_type(tcp, tcp->u_arg[1]);
 		tprintf(", ");
 		switch (tcp->u_arg[0]) {
 		case PF_INET:
@@ -1516,8 +1917,7 @@
 }
 
 int
-sys_getsockopt(tcp)
-struct tcb *tcp;
+sys_getsockopt(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%ld, ", tcp->u_arg[0]);
@@ -1552,6 +1952,11 @@
 			printxval(socktcpoptions, tcp->u_arg[2], "TCP_???");
 			break;
 #endif
+#ifdef SOL_SCTP
+		case SOL_SCTP:
+			printxval(socksctpoptions, tcp->u_arg[2], "SCTP_???");
+			break;
+#endif
 
 		/* SOL_AX25 SOL_ROSE SOL_ATALK SOL_NETROM SOL_UDP SOL_DECNET SOL_X25
 		 * etc. still need work */
@@ -1559,10 +1964,11 @@
 			tprintf("%lu", tcp->u_arg[2]);
 			break;
 		}
+		tprintf (", ");
 	} else {
 		int len;
 		if (syserror(tcp) || umove (tcp, tcp->u_arg[4], &len) < 0) {
-			tprintf(", %#lx, %#lx",
+			tprintf("%#lx, %#lx",
 				tcp->u_arg[3], tcp->u_arg[4]);
 			return 0;
 		}
@@ -1572,13 +1978,13 @@
 			switch (tcp->u_arg[2]) {
 #ifdef SO_LINGER
 			case SO_LINGER:
-			        if (len == sizeof (struct linger)) {
+				if (len == sizeof (struct linger)) {
 					struct linger linger;
 					if (umove (tcp,
 						   tcp->u_arg[3],
 						   &linger) < 0)
 						break;
-					tprintf(", {onoff=%d, linger=%d}, "
+					tprintf("{onoff=%d, linger=%d}, "
 						"[%d]",
 						linger.l_onoff,
 						linger.l_linger,
@@ -1587,13 +1993,51 @@
 				}
 				break;
 #endif
+#ifdef SO_PEERCRED
+			case SO_PEERCRED:
+				if (len == sizeof (struct ucred)) {
+					struct ucred uc;
+					if (umove (tcp,
+						   tcp->u_arg[3],
+						   &uc) < 0)
+						break;
+					tprintf("{pid=%ld, uid=%ld, gid=%ld}, "
+						"[%d]",
+						(long)uc.pid,
+						(long)uc.uid,
+						(long)uc.gid,
+						len);
+					return 0;
+				}
+				break;
+#endif
+			}
+			break;
+		case SOL_PACKET:
+			switch (tcp->u_arg[2]) {
+#ifdef PACKET_STATISTICS
+			case PACKET_STATISTICS:
+				if (len == sizeof(struct tpacket_stats)) {
+					struct tpacket_stats stats;
+					if (umove (tcp,
+						   tcp->u_arg[3],
+						   &stats) < 0)
+						break;
+					tprintf("{packets=%u, drops=%u}, "
+						"[%d]",
+						stats.tp_packets,
+						stats.tp_drops,
+						len);
+					return 0;
+				}
+				break;
+#endif
 			}
 			break;
 		}
 
-		tprintf (", ");
 		if (len == sizeof (int)) {
-			printnum(tcp, tcp->u_arg[3], "%ld");
+			printnum_int(tcp, tcp->u_arg[3], "%d");
 		}
 		else {
 			printstr (tcp, tcp->u_arg[3], len);
@@ -1677,6 +2121,28 @@
 	    case SOL_PACKET:
 		printxval(sockpacketoptions, name, "PACKET_???");
 		/* TODO: decode packate_mreq for PACKET_*_MEMBERSHIP */
+		switch (name) {
+#ifdef PACKET_RX_RING
+		    case PACKET_RX_RING:
+#endif
+#ifdef PACKET_TX_RING
+		    case PACKET_TX_RING:
+#endif
+#if defined(PACKET_RX_RING) || defined(PACKET_TX_RING)
+			if (len == sizeof(struct tpacket_req)) {
+				struct tpacket_req req;
+				if (umove(tcp, addr, &req) < 0)
+					break;
+				tprintf(", {block_size=%u, block_nr=%u, frame_size=%u, frame_nr=%u}",
+					req.tp_block_size,
+					req.tp_block_nr,
+					req.tp_frame_size,
+					req.tp_frame_nr);
+				return 0;
+			}
+			break;
+#endif /* PACKET_RX_RING || PACKET_TX_RING */
+		}
 		break;
 #endif
 #ifdef SOL_TCP
@@ -1684,6 +2150,11 @@
 		printxval(socktcpoptions, name, "TCP_???");
 		break;
 #endif
+#ifdef SOL_SCTP
+	   case SOL_SCTP:
+		printxval(socksctpoptions, name, "SCTP_???");
+		break;
+#endif
 #ifdef SOL_RAW
 	    case SOL_RAW:
 		printxval(sockrawoptions, name, "RAW_???");
@@ -1710,7 +2181,7 @@
 	tprintf (", ");
 
 	if (len == sizeof (int)) {
-		printnum(tcp, addr, "%ld");
+		printnum_int (tcp, addr, "%d");
 	}
 	else {
 		printstr (tcp, addr, len);
@@ -1890,17 +2361,6 @@
 
 }
 
-#if 0
-
-int
-sys_xsetsockaddr(tcp)
-struct tcb *tcp;
-{
-	return netlib_call (tcp, sys_setsockaddr);
-}
-
-#endif
-
 int
 sys_xgetsockopt(tcp)
 struct tcb *tcp;
@@ -1922,4 +2382,4 @@
 	return netlib_call (tcp, sys_shutdown);
 }
 
-#endif
+#endif /* UNIXWARE */
diff --git a/proc.c b/proc.c
index f7c5636..04ef8fb 100644
--- a/proc.c
+++ b/proc.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: proc.c,v 1.7 2005/06/01 19:02:36 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -242,7 +242,7 @@
 		printflags(proc_status_flags, arg, "PF_???");
 		return 1;
 	case PIOCGFL:
-	        if (syserror(tcp))
+		if (syserror(tcp))
 			tprintf(", %#x", arg);
 		else if (umove(tcp, arg, &val) < 0)
 			tprintf(", {...}");
diff --git a/process.c b/process.c
index f62f98d..1ffe649 100644
--- a/process.c
+++ b/process.c
@@ -34,7 +34,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: process.c,v 1.97 2005/06/08 20:45:28 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -60,25 +60,6 @@
 #include <sys/ptrace.h>
 #endif
 
-#ifdef HAVE_ANDROID_OS
-/* for struct sched_param */
-#define sched_priority  __sched_priority
-#endif
-
-#if HAVE_ASM_REG_H
-#if defined (SPARC) || defined (SPARC64)
-#  define fpq kernel_fpq
-#  define fq kernel_fq
-#  define fpu kernel_fpu
-#endif /* SPARC || SPARC64 */
-#include <asm/reg.h>
-#if defined (SPARC) || defined (SPARC64)
-#  undef fpq
-#  undef fq
-#  undef fpu
-#endif /* SPARC || SPARC64 */
-#endif /* HAVE_ASM_REG_H */
-
 #ifdef HAVE_SYS_REG_H
 # include <sys/reg.h>
 #ifndef PTRACE_PEEKUSR
@@ -111,9 +92,9 @@
 #endif /* LINUX && SPARC64 */
 
 #ifdef HAVE_LINUX_FUTEX_H
-#include <linux/futex.h>
+# include <linux/futex.h>
 #endif
-#if defined LINUX
+#ifdef LINUX
 # ifndef FUTEX_WAIT
 #  define FUTEX_WAIT 0
 # endif
@@ -126,7 +107,7 @@
 # ifndef FUTEX_REQUEUE
 #  define FUTEX_REQUEUE 3
 # endif
-#endif
+#endif /* LINUX */
 
 #ifdef LINUX
 #include <sched.h>
@@ -137,21 +118,18 @@
 #define GETGROUPS32_T __kernel_gid32_t
 #endif /* LINUX */
 
+#ifdef HAVE_ANDROID_OS
+#define __sched_priority sched_priority
+#endif
+
 #if defined(LINUX) && defined(IA64)
 # include <asm/ptrace_offsets.h>
 # include <asm/rse.h>
 #endif
 
 #ifdef HAVE_PRCTL
-#include <sys/prctl.h>
-#endif
+# include <sys/prctl.h>
 
-#ifndef WCOREDUMP
-#define WCOREDUMP(status) ((status) & 0200)
-#endif
-
-/* WTA: this was `&& !defined(LINUXSPARC)', this seems unneeded though? */
-#if defined(HAVE_PRCTL)
 static const struct xlat prctl_options[] = {
 #ifdef PR_MAXPROCS
 	{ PR_MAXPROCS,		"PR_MAXPROCS"		},
@@ -195,9 +173,6 @@
 #ifdef PR_GETNSHARE
 	{ PR_GETNSHARE,		"PR_GETNSHARE"		},
 #endif
-#if defined(PR_SET_PDEATHSIG)
-	{ PR_SET_PDEATHSIG,	"PR_SET_PDEATHSIG"	},
-#endif
 #ifdef PR_COREPID
 	{ PR_COREPID,		"PR_COREPID"		},
 #endif
@@ -213,6 +188,12 @@
 #ifdef PR_GET_PDEATHSIG
 	{ PR_GET_PDEATHSIG,	"PR_GET_PDEATHSIG"	},
 #endif
+#ifdef PR_GET_DUMPABLE
+	{ PR_GET_DUMPABLE,	"PR_GET_DUMPABLE"	},
+#endif
+#ifdef PR_SET_DUMPABLE
+	{ PR_SET_DUMPABLE,	"PR_SET_DUMPABLE"	},
+#endif
 #ifdef PR_GET_UNALIGN
 	{ PR_GET_UNALIGN,	"PR_GET_UNALIGN"	},
 #endif
@@ -220,10 +201,58 @@
 	{ PR_SET_UNALIGN,	"PR_SET_UNALIGN"	},
 #endif
 #ifdef PR_GET_KEEPCAPS
-	{ PR_GET_KEEPCAPS,	"PR_GET_KEEP_CAPS"	},
+	{ PR_GET_KEEPCAPS,	"PR_GET_KEEPCAPS"	},
 #endif
 #ifdef PR_SET_KEEPCAPS
-	{ PR_SET_KEEPCAPS,	"PR_SET_KEEP_CAPS"	},
+	{ PR_SET_KEEPCAPS,	"PR_SET_KEEPCAPS"	},
+#endif
+#ifdef PR_GET_FPEMU
+	{ PR_GET_FPEMU,		"PR_GET_FPEMU"		},
+#endif
+#ifdef PR_SET_FPEMU
+	{ PR_SET_FPEMU,		"PR_SET_FPEMU"		},
+#endif
+#ifdef PR_GET_FPEXC
+	{ PR_GET_FPEXC,		"PR_GET_FPEXC"		},
+#endif
+#ifdef PR_SET_FPEXC
+	{ PR_SET_FPEXC,		"PR_SET_FPEXC"		},
+#endif
+#ifdef PR_GET_TIMING
+	{ PR_GET_TIMING,	"PR_GET_TIMING"		},
+#endif
+#ifdef PR_SET_TIMING
+	{ PR_SET_TIMING,	"PR_SET_TIMING"		},
+#endif
+#ifdef PR_SET_NAME
+	{ PR_SET_NAME,		"PR_SET_NAME"		},
+#endif
+#ifdef PR_GET_NAME
+	{ PR_GET_NAME,		"PR_GET_NAME"		},
+#endif
+#ifdef PR_GET_ENDIAN
+	{ PR_GET_ENDIAN,	"PR_GET_ENDIAN"		},
+#endif
+#ifdef PR_SET_ENDIAN
+	{ PR_SET_ENDIAN,	"PR_SET_ENDIAN"		},
+#endif
+#ifdef PR_GET_SECCOMP
+	{ PR_GET_SECCOMP,	"PR_GET_SECCOMP"	},
+#endif
+#ifdef PR_SET_SECCOMP
+	{ PR_SET_SECCOMP,	"PR_SET_SECCOMP"	},
+#endif
+#ifdef PR_GET_TSC
+	{ PR_GET_TSC,		"PR_GET_TSC"		},
+#endif
+#ifdef PR_SET_TSC
+	{ PR_SET_TSC,		"PR_SET_TSC"		},
+#endif
+#ifdef PR_GET_SECUREBITS
+	{ PR_GET_SECUREBITS,	"PR_GET_SECUREBITS"	},
+#endif
+#ifdef PR_SET_SECUREBITS
+	{ PR_SET_SECUREBITS,	"PR_SET_SECUREBITS"	},
 #endif
 	{ 0,			NULL			},
 };
@@ -264,10 +293,24 @@
 		case PR_GETNSHARE:
 			break;
 #endif
-#ifdef PR_SET_DEATHSIG
+#ifdef PR_SET_PDEATHSIG
+		case PR_SET_PDEATHSIG:
+			tprintf(", %lu", tcp->u_arg[1]);
+			break;
+#endif
+#ifdef PR_GET_PDEATHSIG
 		case PR_GET_PDEATHSIG:
 			break;
 #endif
+#ifdef PR_SET_DUMPABLE
+		case PR_SET_DUMPABLE:
+			tprintf(", %lu", tcp->u_arg[1]);
+			break;
+#endif
+#ifdef PR_GET_DUMPABLE
+		case PR_GET_DUMPABLE:
+			break;
+#endif
 #ifdef PR_SET_UNALIGN
 		case PR_SET_UNALIGN:
 			tprintf(", %s", unalignctl_string(tcp->u_arg[1]));
@@ -278,6 +321,15 @@
 			tprintf(", %#lx", tcp->u_arg[1]);
 			break;
 #endif
+#ifdef PR_SET_KEEPCAPS
+		case PR_SET_KEEPCAPS:
+			tprintf(", %lu", tcp->u_arg[1]);
+			break;
+#endif
+#ifdef PR_GET_KEEPCAPS
+		case PR_GET_KEEPCAPS:
+			break;
+#endif
 		default:
 			for (i = 1; i < tcp->u_nargs; i++)
 				tprintf(", %#lx", tcp->u_arg[i]);
@@ -287,23 +339,26 @@
 		switch (tcp->u_arg[0]) {
 #ifdef PR_GET_PDEATHSIG
 		case PR_GET_PDEATHSIG:
-			for (i=1; i<tcp->u_nargs; i++)
-				tprintf(", %#lx", tcp->u_arg[i]);
+			if (umove(tcp, tcp->u_arg[1], &i) < 0)
+				tprintf(", %#lx", tcp->u_arg[1]);
+			else
+				tprintf(", {%u}", i);
 			break;
 #endif
-#ifdef PR_SET_UNALIGN
-		case PR_SET_UNALIGN:
-			break;
+#ifdef PR_GET_DUMPABLE
+		case PR_GET_DUMPABLE:
+			return RVAL_UDECIMAL;
 #endif
 #ifdef PR_GET_UNALIGN
 		case PR_GET_UNALIGN:
-		{
-			int ctl;
-
-			umove(tcp, tcp->u_arg[1], &ctl);
-			tcp->auxstr = unalignctl_string(ctl);
+			if (syserror(tcp) || umove(tcp, tcp->u_arg[1], &i) < 0)
+				break;
+			tcp->auxstr = unalignctl_string(i);
 			return RVAL_STR;
-		}
+#endif
+#ifdef PR_GET_KEEPCAPS
+		case PR_GET_KEEPCAPS:
+			return RVAL_UDECIMAL;
 #endif
 		default:
 			break;
@@ -311,9 +366,9 @@
 	}
 	return 0;
 }
-
 #endif /* HAVE_PRCTL */
 
+#if defined(FREEBSD) || defined(SUNOS4) || defined(SVR4)
 int
 sys_gethostid(tcp)
 struct tcb *tcp;
@@ -322,6 +377,7 @@
 		return RVAL_HEX;
 	return 0;
 }
+#endif /* FREEBSD || SUNOS4 || SVR4 */
 
 int
 sys_sethostname(tcp)
@@ -334,6 +390,7 @@
 	return 0;
 }
 
+#if defined(ALPHA) || defined(FREEBSD) || defined(SUNOS4) || defined(SVR4)
 int
 sys_gethostname(tcp)
 struct tcb *tcp;
@@ -347,6 +404,7 @@
 	}
 	return 0;
 }
+#endif /* ALPHA || FREEBSD || SUNOS4 || SVR4 */
 
 int
 sys_setdomainname(tcp)
@@ -388,23 +446,16 @@
 	tprintf("%ld) ", tcp->u_arg[0]);
 	tabto(acolumn);
 	tprintf("= ?");
-	printtrailer(tcp);
+	printtrailer();
 	return 0;
 }
 
 int
-internal_exit(tcp)
-struct tcb *tcp;
+internal_exit(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tcp->flags |= TCB_EXITING;
 #ifdef __NR_exit_group
-# ifdef IA64
-		if (ia32) {
-			if (tcp->scno == 252)
-				tcp->flags |= TCB_GROUP_EXITING;
-		} else
-# endif
 		if (known_scno(tcp) == __NR_exit_group)
 			tcp->flags |= TCB_GROUP_EXITING;
 #endif
@@ -415,27 +466,21 @@
 /* TCP is creating a child we want to follow.
    If there will be space in tcbtab for it, set TCB_FOLLOWFORK and return 0.
    If not, clear TCB_FOLLOWFORK, print an error, and return 1.  */
-static int
+static void
 fork_tcb(struct tcb *tcp)
 {
-	if (nprocs == tcbtabsize) {
-		if (expand_tcbtab()) {
-			tcp->flags &= ~TCB_FOLLOWFORK;
-			fprintf(stderr, "sys_fork: tcb table full\n");
-		}
-	}
+	if (nprocs == tcbtabsize)
+		expand_tcbtab();
 
 	tcp->flags |= TCB_FOLLOWFORK;
-	return 0;
 }
 
 #ifdef USE_PROCFS
 
 int
-sys_fork(tcp)
-struct tcb *tcp;
+sys_fork(struct tcb *tcp)
 {
-	if (exiting(tcp)) {
+	if (exiting(tcp) && !syserror(tcp)) {
 		if (getrval2(tcp)) {
 			tcp->auxstr = "child process";
 			return RVAL_UDECIMAL | RVAL_STR;
@@ -453,7 +498,7 @@
 	if (entering(tcp)) {
 		tprintf ("%ld", tcp->u_arg[0]);
 	}
-	else {
+	else if (!syserror(tcp)) {
 		if (getrval2(tcp)) {
 			tcp->auxstr = "child process";
 			return RVAL_UDECIMAL | RVAL_STR;
@@ -479,16 +524,12 @@
 			return 0;
 		if (!followfork)
 			return 0;
-		if (fork_tcb(tcp))
-			return 0;
+		fork_tcb(tcp);
 		if (syserror(tcp))
 			return 0;
-		if ((tcpchild = alloctcb(tcp->u_rval)) == NULL) {
-			fprintf(stderr, "sys_fork: tcb table full\n");
-			return 0;
-		}
+		tcpchild = alloctcb(tcp->u_rval);
 		if (proc_open(tcpchild, 2) < 0)
-		  	droptcb(tcpchild);
+			droptcb(tcpchild);
 	}
 	return 0;
 }
@@ -515,9 +556,15 @@
 #define CLONE_SETTLS	0x00080000	/* create a new TLS for the child */
 #define CLONE_PARENT_SETTID	0x00100000	/* set the TID in the parent */
 #define CLONE_CHILD_CLEARTID	0x00200000	/* clear the TID in the child */
-#define CLONE_DETACHED		0x00400000	/* parent wants no child-exit signal */
 #define CLONE_UNTRACED		0x00800000	/* set if the tracing process can't force CLONE_PTRACE on this clone */
 #define CLONE_CHILD_SETTID	0x01000000	/* set the TID in the child */
+#define CLONE_STOPPED		0x02000000	/* Start in stopped state */
+#define CLONE_NEWUTS		0x04000000	/* New utsname group? */
+#define CLONE_NEWIPC		0x08000000	/* New ipcs */
+#define CLONE_NEWUSER		0x10000000	/* New user namespace */
+#define CLONE_NEWPID		0x20000000	/* New pid namespace */
+#define CLONE_NEWNET		0x40000000	/* New network namespace */
+#define CLONE_IO		0x80000000	/* Clone io context */
 
 static const struct xlat clone_flags[] = {
     { CLONE_VM,		"CLONE_VM"	},
@@ -534,9 +581,15 @@
     { CLONE_SETTLS,	"CLONE_SETTLS" },
     { CLONE_PARENT_SETTID,"CLONE_PARENT_SETTID" },
     { CLONE_CHILD_CLEARTID,"CLONE_CHILD_CLEARTID" },
-    { CLONE_DETACHED,	"CLONE_DETACHED" },
     { CLONE_UNTRACED,	"CLONE_UNTRACED" },
     { CLONE_CHILD_SETTID,"CLONE_CHILD_SETTID" },
+    { CLONE_STOPPED,	"CLONE_STOPPED" },
+    { CLONE_NEWUTS,	"CLONE_NEWUTS" },
+    { CLONE_NEWIPC,	"CLONE_NEWIPC" },
+    { CLONE_NEWUSER,	"CLONE_NEWUSER" },
+    { CLONE_NEWPID,	"CLONE_NEWPID" },
+    { CLONE_NEWNET,	"CLONE_NEWNET" },
+    { CLONE_IO,		"CLONE_IO" },
     { 0,		NULL		},
 };
 
@@ -555,7 +608,7 @@
 #  define ARG_PTID	(known_scno(tcp) == SYS_clone2 ? 3 : 2)
 #  define ARG_CTID	(known_scno(tcp) == SYS_clone2 ? 4 : 3)
 #  define ARG_TLS	(known_scno(tcp) == SYS_clone2 ? 5 : 4)
-# elif defined S390 || defined S390X
+# elif defined S390 || defined S390X || defined CRISV10 || defined CRISV32
 #  define ARG_STACK	0
 #  define ARG_FLAGS	1
 #  define ARG_PTID	2
@@ -580,6 +633,7 @@
 struct tcb *tcp;
 {
 	if (exiting(tcp)) {
+		const char *sep = "|";
 		unsigned long flags = tcp->u_arg[ARG_FLAGS];
 		tprintf("child_stack=%#lx, ", tcp->u_arg[ARG_STACK]);
 # ifdef ARG_STACKSIZE
@@ -588,9 +642,10 @@
 				tcp->u_arg[ARG_STACKSIZE]);
 # endif
 		tprintf("flags=");
-		printflags(clone_flags, flags &~ CSIGNAL, NULL);
+		if (!printflags(clone_flags, flags &~ CSIGNAL, NULL))
+			sep = "";
 		if ((flags & CSIGNAL) != 0)
-			tprintf("|%s", signame(flags & CSIGNAL));
+			tprintf("%s%s", sep, signame(flags & CSIGNAL));
 		if ((flags & (CLONE_PARENT_SETTID|CLONE_CHILD_SETTID
 			      |CLONE_CHILD_CLEARTID|CLONE_SETTLS)) == 0)
 			return 0;
@@ -616,7 +671,15 @@
 	}
 	return 0;
 }
-#endif
+
+int
+sys_unshare(struct tcb *tcp)
+{
+	if (entering(tcp))
+		printflags(clone_flags, tcp->u_arg[0], "CLONE_???");
+	return 0;
+}
+#endif /* LINUX */
 
 int
 sys_fork(tcp)
@@ -628,11 +691,9 @@
 }
 
 int
-change_syscall(tcp, new)
-struct tcb *tcp;
-int new;
+change_syscall(struct tcb *tcp, int new)
 {
-#if defined(LINUX)
+#ifdef LINUX
 #if defined(I386)
 	/* Attempt to make vfork into fork, which we can follow. */
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(ORIG_EAX * 4), new) < 0)
@@ -647,38 +708,49 @@
 	if (ptrace(PTRACE_POKEUSER, tcp->pid,
 		   (char*)(sizeof(unsigned long)*PT_R0), new) < 0)
 		return -1;
-       return 0;
+	return 0;
 #elif defined(S390) || defined(S390X)
 	/* s390 linux after 2.4.7 has a hook in entry.S to allow this */
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(PT_GPR2), new)<0)
-	        return -1;
+		return -1;
 	return 0;
 #elif defined(M68K)
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*PT_ORIG_D0), new)<0)
-	    	return -1;
+		return -1;
 	return 0;
 #elif defined(SPARC) || defined(SPARC64)
-	struct regs regs;
+	struct pt_regs regs;
 	if (ptrace(PTRACE_GETREGS, tcp->pid, (char*)&regs, 0)<0)
 		return -1;
-	regs.r_g1=new;
+	regs.u_regs[U_REG_G1] = new;
 	if (ptrace(PTRACE_SETREGS, tcp->pid, (char*)&regs, 0)<0)
-	    	return -1;
+		return -1;
 	return 0;
 #elif defined(MIPS)
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_V0), new)<0)
-	    	return -1;
+		return -1;
 	return 0;
 #elif defined(ALPHA)
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_A3), new)<0)
-	    	return -1;
+		return -1;
+	return 0;
+#elif defined(AVR32)
+	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_R8), new) < 0)
+		return -1;
+	return 0;
+#elif defined(BFIN)
+	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_P0), new)<0)
+		return -1;
 	return 0;
 #elif defined(IA64)
 	if (ia32) {
 		switch (new) {
-		      case 2: break;	/* x86 SYS_fork */
-		      case SYS_clone:	new = 120; break;
-		      default:
+		case 2:
+			break;	/* x86 SYS_fork */
+		case SYS_clone:
+			new = 120;
+			break;
+		default:
 			fprintf(stderr, "%s: unexpected syscall %d\n",
 				__FUNCTION__, new);
 			return -1;
@@ -690,29 +762,43 @@
 	return 0;
 #elif defined(HPPA)
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(PT_GR20), new)<0)
-	    	return -1;
+		return -1;
 	return 0;
 #elif defined(SH)
-       if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*(REG_REG0+3)), new)<0)
-               return -1;
-       return 0;
+	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*(REG_REG0+3)), new)<0)
+		return -1;
+	return 0;
 #elif defined(SH64)
-       /* Top half of reg encodes the no. of args n as 0x1n.
-          Assume 0 args as kernel never actually checks... */
-       if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_SYSCALL),
-                                   0x100000 | new) < 0)
-                       return -1;
-       return 0;
+	/* Top half of reg encodes the no. of args n as 0x1n.
+	   Assume 0 args as kernel never actually checks... */
+	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_SYSCALL),
+				0x100000 | new) < 0)
+		return -1;
+	return 0;
+#elif defined(CRISV10) || defined(CRISV32)
+	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*PT_R9), new) < 0)
+		return -1;
+	return 0;
 #elif defined(ARM)
-       /* Some kernels support this, some (pre-2.6.16 or so) don't.  */
+	/* Some kernels support this, some (pre-2.6.16 or so) don't.  */
 # ifndef PTRACE_SET_SYSCALL
 #  define PTRACE_SET_SYSCALL 23
 # endif
 
-       if (ptrace (PTRACE_SET_SYSCALL, tcp->pid, 0, new) != 0)
+	if (ptrace (PTRACE_SET_SYSCALL, tcp->pid, 0, new & 0xffff) != 0)
 		return -1;
 
-       return 0;
+	return 0;
+#elif defined(TILE)
+	if (ptrace(PTRACE_POKEUSER, tcp->pid,
+		   (char*)PTREGS_OFFSET_REG(0),
+		   new) != 0)
+		return -1;
+	return 0;
+#elif defined(MICROBLAZE)
+	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(PT_GPR(0)), new)<0)
+		return -1;
+	return 0;
 #else
 #warning Do not know how to handle change_syscall for this architecture
 #endif /* architecture */
@@ -720,106 +806,152 @@
 	return -1;
 }
 
-#if 0
+#ifdef LINUX
 int
-setarg(tcp, argnum)
-	struct tcb *tcp;
-	int argnum;
-{
-#if defined (IA64)
-	{
-		unsigned long *bsp, *ap;
-
-		if (upeek(tcp->pid, PT_AR_BSP, (long *) &bsp) , 0)
-			return -1;
-
-		ap = ia64_rse_skip_regs(bsp, argnum);
-		errno = 0;
-		ptrace(PTRACE_POKEDATA, tcp->pid, (char *) ap, tcp->u_arg[argnum]);
-		if (errno)
-			return -1;
-
-	}
-#elif defined(I386)
-	{
-		ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*argnum), tcp->u_arg[argnum]);
-		if (errno)
-			return -1;
-	}
-#elif defined(X86_64)
-	{
-		ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(8*(long)argnum), tcp->u_arg[argnum]);
-		if (errno)
-			return -1;
-	}
-#elif defined(POWERPC)
-#ifndef PT_ORIG_R3
-#define PT_ORIG_R3 34
-#endif
-	{
-		ptrace(PTRACE_POKEUSER, tcp->pid,
-		       (char*)((argnum==0 ? PT_ORIG_R3 : argnum+PT_R3)*sizeof(unsigned long)),
-		       tcp->u_arg[argnum]);
-		if (errno)
-			return -1;
-	}
-#elif defined(MIPS)
-	{
-		errno = 0;
-		if (argnum < 4)
-			ptrace(PTRACE_POKEUSER, tcp->pid,
-			       (char*)(REG_A0 + argnum), tcp->u_arg[argnum]);
-		else {
-			unsigned long *sp;
-
-			if (upeek(tcp->pid, REG_SP, (long *) &sp) , 0)
-				return -1;
-
-			ptrace(PTRACE_POKEDATA, tcp->pid,
-			       (char*)(sp + argnum - 4), tcp->u_arg[argnum]);
-		}
-		if (errno)
-			return -1;
-	}
-#elif defined(S390) || defined(S390X)
-        {
-		if(argnum <= 5)
-			ptrace(PTRACE_POKEUSER, tcp->pid,
-			       (char *) (argnum==0 ? PT_ORIGGPR2 :
-			       PT_GPR2 + argnum*sizeof(long)),
-			       tcp->u_arg[argnum]);
-		else
-			return -E2BIG;
-		if (errno)
-			return -1;
-        }
-#else
-# warning Sorry, setargs not implemented for this architecture.
-#endif
-	return 0;
-}
-#endif
-
-#if defined SYS_clone || defined SYS_clone2 || defined __NR_clone
-int
-internal_clone(tcp)
-struct tcb *tcp;
+handle_new_child(struct tcb *tcp, int pid, int bpt)
 {
 	struct tcb *tcpchild;
-	int pid;
+
+#ifdef CLONE_PTRACE		/* See new setbpt code.  */
+	tcpchild = pid2tcb(pid);
+	if (tcpchild != NULL) {
+		/* The child already reported its startup trap
+		   before the parent reported its syscall return.  */
+		if ((tcpchild->flags
+		     & (TCB_STARTUP|TCB_ATTACHED|TCB_SUSPENDED))
+		    != (TCB_STARTUP|TCB_ATTACHED|TCB_SUSPENDED))
+			fprintf(stderr, "\
+[preattached child %d of %d in weird state!]\n",
+				pid, tcp->pid);
+	}
+	else
+#endif /* CLONE_PTRACE */
+	{
+		fork_tcb(tcp);
+		tcpchild = alloctcb(pid);
+	}
+
+#ifndef CLONE_PTRACE
+	/* Attach to the new child */
+	if (ptrace(PTRACE_ATTACH, pid, (char *) 1, 0) < 0) {
+		if (bpt)
+			clearbpt(tcp);
+		perror("PTRACE_ATTACH");
+		fprintf(stderr, "Too late?\n");
+		droptcb(tcpchild);
+		return 0;
+	}
+#endif /* !CLONE_PTRACE */
+
+	if (bpt)
+		clearbpt(tcp);
+
+	tcpchild->flags |= TCB_ATTACHED;
+	/* Child has BPT too, must be removed on first occasion.  */
+	if (bpt) {
+		tcpchild->flags |= TCB_BPTSET;
+		tcpchild->baddr = tcp->baddr;
+		memcpy(tcpchild->inst, tcp->inst,
+			sizeof tcpchild->inst);
+	}
+	tcpchild->parent = tcp;
+	tcp->nchildren++;
+	if (tcpchild->flags & TCB_SUSPENDED) {
+		/* The child was born suspended, due to our having
+		   forced CLONE_PTRACE.  */
+		if (bpt)
+			clearbpt(tcpchild);
+
+		tcpchild->flags &= ~(TCB_SUSPENDED|TCB_STARTUP);
+		if (ptrace_restart(PTRACE_SYSCALL, tcpchild, 0) < 0)
+			return -1;
+
+		if (!qflag)
+			fprintf(stderr, "\
+Process %u resumed (parent %d ready)\n",
+				pid, tcp->pid);
+	}
+	else {
+		if (!qflag)
+			fprintf(stderr, "Process %d attached\n", pid);
+	}
+
+#ifdef TCB_CLONE_THREAD
+	if (sysent[tcp->scno].sys_func == sys_clone)
+	{
+		/*
+		 * Save the flags used in this call,
+		 * in case we point TCP to our parent below.
+		 */
+		int call_flags = tcp->u_arg[ARG_FLAGS];
+		if ((tcp->flags & TCB_CLONE_THREAD) &&
+		    tcp->parent != NULL) {
+			/* The parent in this clone is itself a
+			   thread belonging to another process.
+			   There is no meaning to the parentage
+			   relationship of the new child with the
+			   thread, only with the process.  We
+			   associate the new thread with our
+			   parent.  Since this is done for every
+			   new thread, there will never be a
+			   TCB_CLONE_THREAD process that has
+			   children.  */
+			--tcp->nchildren;
+			tcp = tcp->parent;
+			tcpchild->parent = tcp;
+			++tcp->nchildren;
+		}
+		if (call_flags & CLONE_THREAD) {
+			tcpchild->flags |= TCB_CLONE_THREAD;
+			++tcp->nclone_threads;
+		}
+		if ((call_flags & CLONE_PARENT) &&
+		    !(call_flags & CLONE_THREAD)) {
+			--tcp->nchildren;
+			tcpchild->parent = NULL;
+			if (tcp->parent != NULL) {
+				tcp = tcp->parent;
+				tcpchild->parent = tcp;
+				++tcp->nchildren;
+			}
+		}
+	}
+#endif /* TCB_CLONE_THREAD */
+	return 0;
+}
+
+int
+internal_fork(struct tcb *tcp)
+{
+	if ((ptrace_setoptions
+	    & (PTRACE_O_TRACECLONE | PTRACE_O_TRACEFORK | PTRACE_O_TRACEVFORK))
+	   == (PTRACE_O_TRACECLONE | PTRACE_O_TRACEFORK | PTRACE_O_TRACEVFORK))
+		return 0;
+
 	if (entering(tcp)) {
+		tcp->flags &= ~TCB_FOLLOWFORK;
 		if (!followfork)
 			return 0;
-		if (fork_tcb(tcp))
+		/*
+		 * In occasion of using PTRACE_O_TRACECLONE, we won't see the
+		 * new child if clone is called with flag CLONE_UNTRACED, so
+		 * we keep the same logic with that option and don't trace it.
+		 */
+		if ((sysent[tcp->scno].sys_func == sys_clone) &&
+		    (tcp->u_arg[ARG_FLAGS] & CLONE_UNTRACED))
 			return 0;
+		fork_tcb(tcp);
 		if (setbpt(tcp) < 0)
 			return 0;
 	} else {
-		int bpt = tcp->flags & TCB_BPTSET;
+		int pid;
+		int bpt;
 
 		if (!(tcp->flags & TCB_FOLLOWFORK))
 			return 0;
 
+		bpt = tcp->flags & TCB_BPTSET;
+
 		if (syserror(tcp)) {
 			if (bpt)
 				clearbpt(tcp);
@@ -828,125 +960,17 @@
 
 		pid = tcp->u_rval;
 
-#ifdef CLONE_PTRACE		/* See new setbpt code.  */
-		tcpchild = pid2tcb(pid);
-		if (tcpchild != NULL) {
-			/* The child already reported its startup trap
-			   before the parent reported its syscall return.  */
-			if ((tcpchild->flags
-			     & (TCB_STARTUP|TCB_ATTACHED|TCB_SUSPENDED))
-			    != (TCB_STARTUP|TCB_ATTACHED|TCB_SUSPENDED))
-				fprintf(stderr, "\
-[preattached child %d of %d in weird state!]\n",
-					pid, tcp->pid);
-		}
-		else
-#endif
-		if ((tcpchild = alloctcb(pid)) == NULL) {
-			if (bpt)
-				clearbpt(tcp);
-			fprintf(stderr, " [tcb table full]\n");
-			kill(pid, SIGKILL); /* XXX */
-			return 0;
-		}
-
-#ifndef CLONE_PTRACE
-		/* Attach to the new child */
-		if (ptrace(PTRACE_ATTACH, pid, (char *) 1, 0) < 0) {
-			if (bpt)
-				clearbpt(tcp);
-			perror("PTRACE_ATTACH");
-			fprintf(stderr, "Too late?\n");
-			droptcb(tcpchild);
-			return 0;
-		}
-#endif
-
-		if (bpt)
-			clearbpt(tcp);
-
-		tcpchild->flags |= TCB_ATTACHED;
-		/* Child has BPT too, must be removed on first occasion.  */
-		if (bpt) {
-			tcpchild->flags |= TCB_BPTSET;
-			tcpchild->baddr = tcp->baddr;
-			memcpy(tcpchild->inst, tcp->inst,
-				sizeof tcpchild->inst);
-		}
-		tcpchild->parent = tcp;
- 		tcp->nchildren++;
-		if (tcpchild->flags & TCB_SUSPENDED) {
-			/* The child was born suspended, due to our having
-			   forced CLONE_PTRACE.  */
-			if (bpt)
-				clearbpt(tcpchild);
-
-			tcpchild->flags &= ~(TCB_SUSPENDED|TCB_STARTUP);
-			if (ptrace(PTRACE_SYSCALL, pid, (char *) 1, 0) < 0) {
-				perror("resume: ptrace(PTRACE_SYSCALL, ...)");
-				return -1;
-			}
-
-			if (!qflag)
-				fprintf(stderr, "\
-Process %u resumed (parent %d ready)\n",
-					pid, tcp->pid);
-		}
-		else {
-			newoutf(tcpchild);
-			if (!qflag)
-				fprintf(stderr, "Process %d attached\n", pid);
-		}
-
-#ifdef TCB_CLONE_THREAD
-		{
-			/*
-			 * Save the flags used in this call,
-			 * in case we point TCP to our parent below.
-			 */
-			int call_flags = tcp->u_arg[ARG_FLAGS];
-			if ((tcp->flags & TCB_CLONE_THREAD) &&
-			    tcp->parent != NULL) {
-				/* The parent in this clone is itself a
-				   thread belonging to another process.
-				   There is no meaning to the parentage
-				   relationship of the new child with the
-				   thread, only with the process.  We
-				   associate the new thread with our
-				   parent.  Since this is done for every
-				   new thread, there will never be a
-				   TCB_CLONE_THREAD process that has
-				   children.  */
-				--tcp->nchildren;
-				tcp = tcp->parent;
-				tcpchild->parent = tcp;
-				++tcp->nchildren;
-			}
-			if (call_flags & CLONE_THREAD) {
-				tcpchild->flags |= TCB_CLONE_THREAD;
-				++tcp->nclone_threads;
-			}
-			if (call_flags & CLONE_DETACHED) {
-				tcpchild->flags |= TCB_CLONE_DETACHED;
-				++tcp->nclone_detached;
-			}
-		}
-#endif
-
- 	}
+		return handle_new_child(tcp, pid, bpt);
+	}
 	return 0;
 }
-#endif
+
+#else /* !LINUX */
 
 int
 internal_fork(tcp)
 struct tcb *tcp;
 {
-#ifdef LINUX
-	/* We do special magic with clone for any clone or fork.  */
-	return internal_clone(tcp);
-#else
-
 	struct tcb *tcpchild;
 	int pid;
 	int dont_follow = 0;
@@ -954,19 +978,17 @@
 #ifdef SYS_vfork
 	if (known_scno(tcp) == SYS_vfork) {
 		/* Attempt to make vfork into fork, which we can follow. */
-		if (!followvfork ||
-		    change_syscall(tcp, SYS_fork) < 0)
+		if (change_syscall(tcp, SYS_fork) < 0)
 			dont_follow = 1;
 	}
 #endif
 	if (entering(tcp)) {
 		if (!followfork || dont_follow)
 			return 0;
-		if (fork_tcb(tcp))
-			return 0;
+		fork_tcb(tcp);
 		if (setbpt(tcp) < 0)
 			return 0;
-  	}
+	}
 	else {
 		int bpt = tcp->flags & TCB_BPTSET;
 
@@ -979,37 +1001,8 @@
 			return 0;
 
 		pid = tcp->u_rval;
-		if ((tcpchild = alloctcb(pid)) == NULL) {
-			fprintf(stderr, " [tcb table full]\n");
-			kill(pid, SIGKILL); /* XXX */
-			return 0;
-		}
-#ifdef LINUX
-#ifdef HPPA
-		/* The child must have run before it can be attached. */
-		/* This must be a bug in the parisc kernel, but I havn't
-		 * identified it yet.  Seems to be an issue associated
-		 * with attaching to a process (which sends it a signal)
-		 * before that process has ever been scheduled.  When
-		 * debugging, I started seeing crashes in
-		 * arch/parisc/kernel/signal.c:do_signal(), apparently
-		 * caused by r8 getting corrupt over the dequeue_signal()
-		 * call.  Didn't make much sense though...
-		 */
-		{
-			struct timeval tv;
-			tv.tv_sec = 0;
-			tv.tv_usec = 10000;
-			select(0, NULL, NULL, NULL, &tv);
-		}
-#endif
-		if (ptrace(PTRACE_ATTACH, pid, (char *) 1, 0) < 0) {
-			perror("PTRACE_ATTACH");
-			fprintf(stderr, "Too late?\n");
-			droptcb(tcpchild);
-			return 0;
-		}
-#endif /* LINUX */
+		fork_tcb(tcp);
+		tcpchild = alloctcb(pid);
 #ifdef SUNOS4
 #ifdef oldway
 		/* The child must have run before it can be attached. */
@@ -1049,16 +1042,16 @@
 			memcpy(tcpchild->inst, tcp->inst,
 				sizeof tcpchild->inst);
 		}
-		newoutf(tcpchild);
 		tcpchild->parent = tcp;
 		tcp->nchildren++;
 		if (!qflag)
 			fprintf(stderr, "Process %d attached\n", pid);
 	}
 	return 0;
-#endif
 }
 
+#endif /* !LINUX */
+
 #endif /* !USE_PROCFS */
 
 #if defined(SUNOS4) || defined(LINUX) || defined(FREEBSD)
@@ -1118,6 +1111,22 @@
 
 #ifdef LINUX
 
+int sys_getuid(struct tcb *tcp)
+{
+	if (exiting(tcp))
+		tcp->u_rval = (uid_t) tcp->u_rval;
+	return RVAL_UDECIMAL;
+}
+
+int sys_setfsuid(struct tcb *tcp)
+{
+	if (entering(tcp))
+		tprintf("%u", (uid_t) tcp->u_arg[0]);
+	else
+		tcp->u_rval = (uid_t) tcp->u_rval;
+	return RVAL_UDECIMAL;
+}
+
 int
 sys_setuid(tcp)
 struct tcb *tcp;
@@ -1139,8 +1148,7 @@
 }
 
 int
-sys_getresuid(tcp)
-    struct tcb *tcp;
+sys_getresuid(struct tcb *tcp)
 {
 	if (exiting(tcp)) {
 		__kernel_uid_t uid;
@@ -1478,6 +1486,7 @@
 }
 #endif /* LINUX */
 
+#if defined(ALPHA) || defined(SUNOS4) || defined(SVR4)
 int
 sys_setpgrp(tcp)
 struct tcb *tcp;
@@ -1489,6 +1498,7 @@
 	}
 	return 0;
 }
+#endif /* ALPHA || SUNOS4 || SVR4 */
 
 int
 sys_getpgrp(tcp)
@@ -1597,11 +1607,7 @@
 
 
 static void
-printpriv(tcp, addr, len, opt)
-struct tcb *tcp;
-long addr;
-int len;
-const struct xlat *opt;
+printpriv(struct tcb *tcp, long addr, int len, const struct xlat *opt)
 {
 	priv_t buf [128];
 	int max = verbose (tcp) ? sizeof buf / sizeof buf [0] : 10;
@@ -1620,7 +1626,7 @@
 	tprintf ("[");
 
 	for (i = 0; i < len; ++i) {
-		char *t, *p;
+		const char *t, *p;
 
 		if (i) tprintf (", ");
 
@@ -1674,40 +1680,41 @@
 	return 0;
 }
 
-#endif
+#endif /* UNIXWARE */
 
 
 static void
-printargv(tcp, addr)
-struct tcb *tcp;
-long addr;
+printargv(struct tcb *tcp, long addr)
 {
-	char *cp;
-	char *sep;
-	int max = max_strlen / 2;
+	union {
+		unsigned int p32;
+		unsigned long p64;
+		char data[sizeof(long)];
+	} cp;
+	const char *sep;
+	int n = 0;
 
-	for (sep = ""; --max >= 0; sep = ", ") {
-		if (!abbrev(tcp))
-			max++;
-		if (umove(tcp, addr, &cp) < 0) {
+	cp.p64 = 1;
+	for (sep = ""; !abbrev(tcp) || n < max_strlen / 2; sep = ", ", ++n) {
+		if (umoven(tcp, addr, personality_wordsize[current_personality],
+			   cp.data) < 0) {
 			tprintf("%#lx", addr);
 			return;
 		}
-		if (cp == 0)
+		if (personality_wordsize[current_personality] == 4)
+			cp.p64 = cp.p32;
+		if (cp.p64 == 0)
 			break;
 		tprintf("%s", sep);
-		printstr(tcp, (long) cp, -1);
-		addr += sizeof(char *);
+		printstr(tcp, cp.p64, -1);
+		addr += personality_wordsize[current_personality];
 	}
-	if (cp)
-		tprintf(", ...");
+	if (cp.p64)
+		tprintf("%s...", sep);
 }
 
 static void
-printargc(fmt, tcp, addr)
-char *fmt;
-struct tcb *tcp;
-long addr;
+printargc(const char *fmt, struct tcb *tcp, long addr)
 {
 	int count;
 	char *cp;
@@ -1718,18 +1725,14 @@
 	tprintf(fmt, count, count == 1 ? "" : "s");
 }
 
+#if defined(SPARC) || defined(SPARC64) || defined(SUNOS4)
 int
-sys_execv(tcp)
-struct tcb *tcp;
+sys_execv(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
 		if (!verbose(tcp))
 			tprintf(", %#lx", tcp->u_arg[1]);
-#if 0
-		else if (abbrev(tcp))
-			printargc(", [/* %d arg%s */]", tcp, tcp->u_arg[1]);
-#endif
 		else {
 			tprintf(", [");
 			printargv(tcp, tcp->u_arg[1]);
@@ -1738,19 +1741,15 @@
 	}
 	return 0;
 }
+#endif /* SPARC || SPARC64 || SUNOS4 */
 
 int
-sys_execve(tcp)
-struct tcb *tcp;
+sys_execve(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
 		if (!verbose(tcp))
 			tprintf(", %#lx", tcp->u_arg[1]);
-#if 0
-		else if (abbrev(tcp))
-			printargc(", [/* %d arg%s */]", tcp, tcp->u_arg[1]);
-#endif
 		else {
 			tprintf(", [");
 			printargv(tcp, tcp->u_arg[1]);
@@ -1848,8 +1847,12 @@
 # define WCOREFLAG WCOREFLG
 #endif
 #ifndef WCOREFLAG
-#define WCOREFLAG 0x80
+# define WCOREFLAG 0x80
 #endif
+#ifndef WCOREDUMP
+# define WCOREDUMP(status) ((status) & 0200)
+#endif
+
 
 #ifndef W_STOPCODE
 #define W_STOPCODE(sig)		((sig) << 8 | 0x7f)
@@ -1900,16 +1903,32 @@
 }
 
 static int
-printwaitn(tcp, n, bitness)
-struct tcb *tcp;
-int n;
-int bitness;
+printwaitn(struct tcb *tcp, int n, int bitness)
 {
 	int status;
+#ifdef SUNOS4
 	int exited = 0;
+#endif
 
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+#ifdef LINUX
+		/* On Linux, kernel-side pid_t is typedef'ed to int
+		 * on all arches. Also, glibc-2.8 truncates wait3 and wait4
+		 * pid argument to int on 64bit arches, producing,
+		 * for example, wait4(4294967295, ...) instead of -1
+		 * in strace. We have to use int here, not long.
+		 */
+		int pid = tcp->u_arg[0];
+		tprintf("%d, ", pid);
+#else
+		/*
+		 * Sign-extend a 32-bit value when that's what it is.
+		 */
+		long pid = tcp->u_arg[0];
+		if (personality_wordsize[current_personality] < sizeof pid)
+			pid = (long) (int) pid;
+		tprintf("%ld, ", pid);
+#endif
 	} else {
 		/* status */
 		if (!tcp->u_arg[1])
@@ -1919,7 +1938,10 @@
 		else if (umove(tcp, tcp->u_arg[1], &status) < 0)
 			tprintf("[?]");
 		else
-			exited = printstatus(status);
+#ifdef SUNOS4
+			exited =
+#endif
+			printstatus(status);
 		/* options */
 		tprintf(", ");
 		printflags(wait4_options, tcp->u_arg[2], "W???");
@@ -1930,7 +1952,7 @@
 				tprintf("NULL");
 #ifdef LINUX
 			else if (tcp->u_rval > 0) {
-#ifdef LINUX_64BIT
+#ifdef ALPHA
 				if (bitness)
 					printrusage32(tcp, tcp->u_arg[3]);
 				else
@@ -1960,9 +1982,9 @@
 	if (tcp->flags & TCB_CLONE_THREAD)
 		/* The children we wait for are our parent's children.  */
 		got_kids = (tcp->parent->nchildren
-			    > tcp->parent->nclone_detached);
+			    > tcp->parent->nclone_threads);
 	else
-		got_kids = (tcp->nchildren > tcp->nclone_detached);
+		got_kids = (tcp->nchildren > tcp->nclone_threads);
 #else
 	got_kids = tcp->nchildren > 0;
 #endif
@@ -2007,7 +2029,8 @@
 					    (tcp->flags & TCB_CLONE_THREAD)
 					    ? tcp->parent :
 #endif
-					    tcp))
+					    tcp) ||
+				    (child->flags & TCB_EXITING))
 					return 0;
 			}
 			tcp->flags |= TCB_SUSPENDED;
@@ -2022,7 +2045,6 @@
 		if (tcp->u_arg[flagarg] & WNOHANG) {
 			/* We must force a fake result of 0 instead of
 			   the ECHILD error.  */
-			extern int force_result();
 			return force_result(tcp, 0, 0);
 		}
 	}
@@ -2123,11 +2145,9 @@
 };
 
 int
-sys_waitid(tcp)
-struct tcb *tcp;
+sys_waitid(struct tcb *tcp)
 {
 	siginfo_t si;
-	int exited;
 
 	if (entering(tcp)) {
 		printxval(waitid_types, tcp->u_arg[0], "P_???");
@@ -2135,7 +2155,6 @@
 	}
 	else {
 		/* siginfo */
-		exited = 0;
 		if (!tcp->u_arg[2])
 			tprintf("NULL");
 		else if (syserror(tcp))
@@ -2143,7 +2162,7 @@
 		else if (umove(tcp, tcp->u_arg[2], &si) < 0)
 			tprintf("{???}");
 		else
-			printsiginfo(&si, verbose (tcp));
+			printsiginfo(&si, verbose(tcp));
 		/* options */
 		tprintf(", ");
 		printflags(wait4_options, tcp->u_arg[3], "W???");
@@ -2193,8 +2212,8 @@
 #ifdef LINUX
 #ifndef __GLIBC__
 			tprintf(", domainname=\"%s\"", uname.domainname);
-#endif /* __GLIBC__ */
-#endif /* LINUX */
+#endif
+#endif
 			tprintf("}");
 		}
 		else
@@ -2207,7 +2226,7 @@
 #ifndef SVR4
 
 static const struct xlat ptrace_cmds[] = {
-#ifndef FREEBSD
+# ifndef FREEBSD
 	{ PTRACE_TRACEME,	"PTRACE_TRACEME"	},
 	{ PTRACE_PEEKTEXT,	"PTRACE_PEEKTEXT",	},
 	{ PTRACE_PEEKDATA,	"PTRACE_PEEKDATA",	},
@@ -2220,68 +2239,91 @@
 	{ PTRACE_SINGLESTEP,	"PTRACE_SINGLESTEP"	},
 	{ PTRACE_ATTACH,	"PTRACE_ATTACH"		},
 	{ PTRACE_DETACH,	"PTRACE_DETACH"		},
-#ifdef PTRACE_GETREGS
+#  ifdef PTRACE_GETREGS
 	{ PTRACE_GETREGS,	"PTRACE_GETREGS"	},
-#endif
-#ifdef PTRACE_SETREGS
+#  endif
+#  ifdef PTRACE_SETREGS
 	{ PTRACE_SETREGS,	"PTRACE_SETREGS"	},
-#endif
-#ifdef PTRACE_GETFPREGS
+#  endif
+#  ifdef PTRACE_GETFPREGS
 	{ PTRACE_GETFPREGS,	"PTRACE_GETFPREGS",	},
-#endif
-#ifdef PTRACE_SETFPREGS
+#  endif
+#  ifdef PTRACE_SETFPREGS
 	{ PTRACE_SETFPREGS,	"PTRACE_SETFPREGS",	},
-#endif
-#ifdef PTRACE_GETFPXREGS
+#  endif
+#  ifdef PTRACE_GETFPXREGS
 	{ PTRACE_GETFPXREGS,	"PTRACE_GETFPXREGS",	},
-#endif
-#ifdef PTRACE_SETFPXREGS
+#  endif
+#  ifdef PTRACE_SETFPXREGS
 	{ PTRACE_SETFPXREGS,	"PTRACE_SETFPXREGS",	},
-#endif
-#ifdef PTRACE_GETVRREGS
+#  endif
+#  ifdef PTRACE_GETVRREGS
 	{ PTRACE_GETVRREGS,	"PTRACE_GETVRREGS",	},
-#endif
-#ifdef PTRACE_SETVRREGS
+#  endif
+#  ifdef PTRACE_SETVRREGS
 	{ PTRACE_SETVRREGS,	"PTRACE_SETVRREGS",	},
-#endif
-#ifdef SUNOS4
+#  endif
+#  ifdef PTRACE_SETOPTIONS
+	{ PTRACE_SETOPTIONS,	"PTRACE_SETOPTIONS",	},
+#  endif
+#  ifdef PTRACE_GETEVENTMSG
+	{ PTRACE_GETEVENTMSG,	"PTRACE_GETEVENTMSG",	},
+#  endif
+#  ifdef PTRACE_GETSIGINFO
+	{ PTRACE_GETSIGINFO,	"PTRACE_GETSIGINFO",	},
+#  endif
+#  ifdef PTRACE_SETSIGINFO
+	{ PTRACE_SETSIGINFO,	"PTRACE_SETSIGINFO",	},
+#  endif
+#  ifdef PTRACE_GETREGSET
+	{ PTRACE_GETREGSET,	"PTRACE_GETREGSET",	},
+#  endif
+#  ifdef PTRACE_SETREGSET
+	{ PTRACE_SETREGSET,	"PTRACE_SETREGSET",	},
+#  endif
+#  ifdef PTRACE_SET_SYSCALL
+	{ PTRACE_SET_SYSCALL,	"PTRACE_SET_SYSCALL",	},
+#  endif
+#  ifdef SUNOS4
 	{ PTRACE_READDATA,	"PTRACE_READDATA"	},
 	{ PTRACE_WRITEDATA,	"PTRACE_WRITEDATA"	},
 	{ PTRACE_READTEXT,	"PTRACE_READTEXT"	},
 	{ PTRACE_WRITETEXT,	"PTRACE_WRITETEXT"	},
 	{ PTRACE_GETFPAREGS,	"PTRACE_GETFPAREGS"	},
 	{ PTRACE_SETFPAREGS,	"PTRACE_SETFPAREGS"	},
-#ifdef SPARC
+#   ifdef SPARC
 	{ PTRACE_GETWINDOW,	"PTRACE_GETWINDOW"	},
 	{ PTRACE_SETWINDOW,	"PTRACE_SETWINDOW"	},
-#else /* !SPARC */
-	{ PTRACE_22,		"PTRACE_PTRACE_22"	},
-	{ PTRACE_23,		"PTRACE_PTRACE_23"	},
-#endif /* !SPARC */
-#endif /* SUNOS4 */
+#   else /* !SPARC */
+	{ PTRACE_22,		"PTRACE_22"		},
+	{ PTRACE_23,		"PTRACE_3"		},
+#   endif /* !SPARC */
+#  endif /* SUNOS4 */
 	{ PTRACE_SYSCALL,	"PTRACE_SYSCALL"	},
-#ifdef SUNOS4
+#  ifdef SUNOS4
 	{ PTRACE_DUMPCORE,	"PTRACE_DUMPCORE"	},
-#ifdef I386
+#   ifdef I386
 	{ PTRACE_SETWRBKPT,	"PTRACE_SETWRBKPT"	},
 	{ PTRACE_SETACBKPT,	"PTRACE_SETACBKPT"	},
 	{ PTRACE_CLRDR7,	"PTRACE_CLRDR7"		},
-#else /* !I386 */
+#   else /* !I386 */
 	{ PTRACE_26,		"PTRACE_26"		},
 	{ PTRACE_27,		"PTRACE_27"		},
 	{ PTRACE_28,		"PTRACE_28"		},
-#endif /* !I386 */
+#   endif /* !I386 */
 	{ PTRACE_GETUCODE,	"PTRACE_GETUCODE"	},
-#endif /* SUNOS4 */
-#else /* FREEBSD */
+#  endif /* SUNOS4 */
+
+# else /* FREEBSD */
+
 	{ PT_TRACE_ME,		"PT_TRACE_ME"		},
 	{ PT_READ_I,		"PT_READ_I"		},
 	{ PT_READ_D,		"PT_READ_D"		},
 	{ PT_WRITE_I,		"PT_WRITE_I"		},
 	{ PT_WRITE_D,		"PT_WRITE_D"		},
-#ifdef PT_READ_U
+#  ifdef PT_READ_U
 	{ PT_READ_U,		"PT_READ_U"		},
-#endif
+#  endif
 	{ PT_CONTINUE,		"PT_CONTINUE"		},
 	{ PT_KILL,		"PT_KILL"		},
 	{ PT_STEP,		"PT_STEP"		},
@@ -2293,17 +2335,43 @@
 	{ PT_SETFPREGS,		"PT_SETFPREGS"		},
 	{ PT_GETDBREGS,		"PT_GETDBREGS"		},
 	{ PT_SETDBREGS,		"PT_SETDBREGS"		},
-#endif /* FREEBSD */
+# endif /* FREEBSD */
 	{ 0,			NULL			},
 };
 
-#ifndef FREEBSD
-#ifndef SUNOS4_KERNEL_ARCH_KLUDGE
-static
-#endif /* !SUNOS4_KERNEL_ARCH_KLUDGE */
+# ifndef FREEBSD
+#  ifdef PTRACE_SETOPTIONS
+static const struct xlat ptrace_setoptions_flags[] = {
+#   ifdef PTRACE_O_TRACESYSGOOD
+	{ PTRACE_O_TRACESYSGOOD,"PTRACE_O_TRACESYSGOOD"	},
+#   endif
+#   ifdef PTRACE_O_TRACEFORK
+	{ PTRACE_O_TRACEFORK,	"PTRACE_O_TRACEFORK"	},
+#   endif
+#   ifdef PTRACE_O_TRACEVFORK
+	{ PTRACE_O_TRACEVFORK,	"PTRACE_O_TRACEVFORK"	},
+#   endif
+#   ifdef PTRACE_O_TRACECLONE
+	{ PTRACE_O_TRACECLONE,	"PTRACE_O_TRACECLONE"	},
+#   endif
+#   ifdef PTRACE_O_TRACEEXEC
+	{ PTRACE_O_TRACEEXEC,	"PTRACE_O_TRACEEXEC"	},
+#   endif
+#   ifdef PTRACE_O_TRACEVFORKDONE
+	{ PTRACE_O_TRACEVFORKDONE,"PTRACE_O_TRACEVFORKDONE"},
+#   endif
+#   ifdef PTRACE_O_TRACEEXIT
+	{ PTRACE_O_TRACEEXIT,	"PTRACE_O_TRACEEXIT"	},
+#   endif
+	{ 0,			NULL			},
+};
+#  endif /* PTRACE_SETOPTIONS */
+# endif /* !FREEBSD */
+
+# ifndef FREEBSD
 const struct xlat struct_user_offsets[] = {
-#ifdef LINUX
-#if defined(S390) || defined(S390X)
+#  ifdef LINUX
+#   if defined(S390) || defined(S390X)
 	{ PT_PSWMASK,		"psw_mask"				},
 	{ PT_PSWADDR,		"psw_addr"				},
 	{ PT_GPR0,		"gpr0"					},
@@ -2340,7 +2408,7 @@
 	{ PT_ACR15,		"acr15"					},
 	{ PT_ORIGGPR2,		"orig_gpr2"				},
 	{ PT_FPC,		"fpc"					},
-#if defined(S390)
+#    if defined(S390)
 	{ PT_FPR0_HI,		"fpr0.hi"				},
 	{ PT_FPR0_LO,		"fpr0.lo"				},
 	{ PT_FPR1_HI,		"fpr1.hi"				},
@@ -2373,8 +2441,8 @@
 	{ PT_FPR14_LO,		"fpr14.lo"				},
 	{ PT_FPR15_HI,		"fpr15.hi"				},
 	{ PT_FPR15_LO,		"fpr15.lo"				},
-#endif
-#if defined(S390X)
+#    endif
+#    if defined(S390X)
 	{ PT_FPR0,		"fpr0"					},
 	{ PT_FPR1,		"fpr1"					},
 	{ PT_FPR2,		"fpr2"					},
@@ -2391,21 +2459,20 @@
 	{ PT_FPR13,		"fpr13"					},
 	{ PT_FPR14,		"fpr14"					},
 	{ PT_FPR15,		"fpr15"					},
-#endif
+#    endif
 	{ PT_CR_9,		"cr9"					},
 	{ PT_CR_10,		"cr10"					},
 	{ PT_CR_11,		"cr11"					},
 	{ PT_IEEE_IP,           "ieee_exception_ip"                     },
-#endif
-#if defined(SPARC)
+#   elif defined(SPARC)
 	/* XXX No support for these offsets yet. */
-#elif defined(HPPA)
+#   elif defined(HPPA)
 	/* XXX No support for these offsets yet. */
-#elif defined(POWERPC)
-#ifndef PT_ORIG_R3
-#define PT_ORIG_R3 34
-#endif
-#define REGSIZE (sizeof(unsigned long))
+#   elif defined(POWERPC)
+#    ifndef PT_ORIG_R3
+#     define PT_ORIG_R3 34
+#    endif
+#    define REGSIZE (sizeof(unsigned long))
 	{ REGSIZE*PT_R0,		"r0"				},
 	{ REGSIZE*PT_R1,		"r1"				},
 	{ REGSIZE*PT_R2,		"r2"				},
@@ -2446,9 +2513,8 @@
 	{ REGSIZE*PT_XER,		"XER"				},
 	{ REGSIZE*PT_CCR,		"CCR"				},
 	{ REGSIZE*PT_FPR0,		"FPR0"				},
-#undef REGSIZE
-#else
-#ifdef ALPHA
+#    undef REGSIZE
+#   elif defined(ALPHA)
 	{ 0,			"r0"					},
 	{ 1,			"r1"					},
 	{ 2,			"r2"					},
@@ -2514,8 +2580,7 @@
 	{ 62,			"fp30"					},
 	{ 63,			"fp31"					},
 	{ 64,			"pc"					},
-#else /* !ALPHA */
-#ifdef IA64
+#   elif defined(IA64)
 	{ PT_F32, "f32" }, { PT_F33, "f33" }, { PT_F34, "f34" },
 	{ PT_F35, "f35" }, { PT_F36, "f36" }, { PT_F37, "f37" },
 	{ PT_F38, "f38" }, { PT_F39, "f39" }, { PT_F40, "f40" },
@@ -2580,15 +2645,14 @@
 	{ PT_AR_CCV, "ar.ccv" }, { PT_AR_FPSR, "ar.fpsr" },
 	{ PT_B0, "b0" }, { PT_B7, "b7" }, { PT_F6, "f6" },
 	{ PT_F7, "f7" }, { PT_F8, "f8" }, { PT_F9, "f9" },
-# ifdef PT_AR_CSD
+#    ifdef PT_AR_CSD
 	{ PT_AR_CSD, "ar.csd" },
-# endif
-# ifdef PT_AR_SSD
+#    endif
+#    ifdef PT_AR_SSD
 	{ PT_AR_SSD, "ar.ssd" },
-# endif
+#    endif
 	{ PT_DBR, "dbr" }, { PT_IBR, "ibr" }, { PT_PMD, "pmd" },
-#else /* !IA64 */
-#ifdef I386
+#   elif defined(I386)
 	{ 4*EBX,		"4*EBX"					},
 	{ 4*ECX,		"4*ECX"					},
 	{ 4*EDX,		"4*EDX"					},
@@ -2606,8 +2670,7 @@
 	{ 4*EFL,		"4*EFL"					},
 	{ 4*UESP,		"4*UESP"				},
 	{ 4*SS,			"4*SS"					},
-#else /* !I386 */
-#ifdef X86_64
+#   elif defined(X86_64)
 	{ 8*R15, 		"8*R15"					},
 	{ 8*R14, 		"8*R14"					},
 	{ 8*R13, 		"8*R13"					},
@@ -2623,20 +2686,13 @@
 	{ 8*RDX,		"8*RDX"					},
 	{ 8*RSI,		"8*RSI"					},
 	{ 8*RDI,		"8*RDI"					},
-#if 0
-	{ DS,			"DS"					},
-	{ ES,			"ES"					},
-	{ FS,			"FS"					},
-	{ GS,			"GS"					},
-#endif
 	{ 8*ORIG_RAX,		"8*ORIG_RAX"				},
 	{ 8*RIP,		"8*RIP"					},
 	{ 8*CS,			"8*CS"					},
 	{ 8*EFLAGS,		"8*EFL"					},
 	{ 8*RSP,		"8*RSP"					},
 	{ 8*SS,			"8*SS"					},
-#endif
-#ifdef M68K
+#   elif defined(M68K)
 	{ 4*PT_D1,		"4*PT_D1"				},
 	{ 4*PT_D2,		"4*PT_D2"				},
 	{ 4*PT_D3,		"4*PT_D3"				},
@@ -2656,62 +2712,59 @@
 	{ 4*PT_ORIG_D0,		"4*PT_ORIG_D0"				},
 	{ 4*PT_SR,		"4*PT_SR"				},
 	{ 4*PT_PC,		"4*PT_PC"				},
-#endif /* M68K */
-#endif /* !I386 */
-#ifdef SH
-       { 4*REG_REG0,           "4*REG_REG0"                            },
-       { 4*(REG_REG0+1),       "4*REG_REG1"                            },
-       { 4*(REG_REG0+2),       "4*REG_REG2"                            },
-       { 4*(REG_REG0+3),       "4*REG_REG3"                            },
-       { 4*(REG_REG0+4),       "4*REG_REG4"                            },
-       { 4*(REG_REG0+5),       "4*REG_REG5"                            },
-       { 4*(REG_REG0+6),       "4*REG_REG6"                            },
-       { 4*(REG_REG0+7),       "4*REG_REG7"                            },
-       { 4*(REG_REG0+8),       "4*REG_REG8"                            },
-       { 4*(REG_REG0+9),       "4*REG_REG9"                            },
-       { 4*(REG_REG0+10),      "4*REG_REG10"                           },
-       { 4*(REG_REG0+11),      "4*REG_REG11"                           },
-       { 4*(REG_REG0+12),      "4*REG_REG12"                           },
-       { 4*(REG_REG0+13),      "4*REG_REG13"                           },
-       { 4*(REG_REG0+14),      "4*REG_REG14"                           },
-       { 4*REG_REG15,          "4*REG_REG15"                           },
-       { 4*REG_PC,             "4*REG_PC"                              },
-       { 4*REG_PR,             "4*REG_PR"                              },
-       { 4*REG_SR,             "4*REG_SR"                              },
-       { 4*REG_GBR,            "4*REG_GBR"                             },
-       { 4*REG_MACH,           "4*REG_MACH"                            },
-       { 4*REG_MACL,           "4*REG_MACL"                            },
-       { 4*REG_SYSCALL,        "4*REG_SYSCALL"                         },
-       { 4*REG_FPUL,           "4*REG_FPUL"                            },
-       { 4*REG_FPREG0,         "4*REG_FPREG0"                          },
-       { 4*(REG_FPREG0+1),     "4*REG_FPREG1"                          },
-       { 4*(REG_FPREG0+2),     "4*REG_FPREG2"                          },
-       { 4*(REG_FPREG0+3),     "4*REG_FPREG3"                          },
-       { 4*(REG_FPREG0+4),     "4*REG_FPREG4"                          },
-       { 4*(REG_FPREG0+5),     "4*REG_FPREG5"                          },
-       { 4*(REG_FPREG0+6),     "4*REG_FPREG6"                          },
-       { 4*(REG_FPREG0+7),     "4*REG_FPREG7"                          },
-       { 4*(REG_FPREG0+8),     "4*REG_FPREG8"                          },
-       { 4*(REG_FPREG0+9),     "4*REG_FPREG9"                          },
-       { 4*(REG_FPREG0+10),    "4*REG_FPREG10"                         },
-       { 4*(REG_FPREG0+11),    "4*REG_FPREG11"                         },
-       { 4*(REG_FPREG0+12),    "4*REG_FPREG12"                         },
-       { 4*(REG_FPREG0+13),    "4*REG_FPREG13"                         },
-       { 4*(REG_FPREG0+14),    "4*REG_FPREG14"                         },
-       { 4*REG_FPREG15,        "4*REG_FPREG15"                         },
-#ifdef REG_XDREG0
-       { 4*REG_XDREG0,         "4*REG_XDREG0"                          },
-       { 4*(REG_XDREG0+2),     "4*REG_XDREG2"                          },
-       { 4*(REG_XDREG0+4),     "4*REG_XDREG4"                          },
-       { 4*(REG_XDREG0+6),     "4*REG_XDREG6"                          },
-       { 4*(REG_XDREG0+8),     "4*REG_XDREG8"                          },
-       { 4*(REG_XDREG0+10),    "4*REG_XDREG10"                         },
-       { 4*(REG_XDREG0+12),    "4*REG_XDREG12"                         },
-       { 4*REG_XDREG14,        "4*REG_XDREG14"                         },
-#endif
-       { 4*REG_FPSCR,          "4*REG_FPSCR"                           },
-#endif /* SH */
-#ifdef SH64
+#   elif defined(SH)
+	{ 4*REG_REG0,           "4*REG_REG0"                            },
+	{ 4*(REG_REG0+1),       "4*REG_REG1"                            },
+	{ 4*(REG_REG0+2),       "4*REG_REG2"                            },
+	{ 4*(REG_REG0+3),       "4*REG_REG3"                            },
+	{ 4*(REG_REG0+4),       "4*REG_REG4"                            },
+	{ 4*(REG_REG0+5),       "4*REG_REG5"                            },
+	{ 4*(REG_REG0+6),       "4*REG_REG6"                            },
+	{ 4*(REG_REG0+7),       "4*REG_REG7"                            },
+	{ 4*(REG_REG0+8),       "4*REG_REG8"                            },
+	{ 4*(REG_REG0+9),       "4*REG_REG9"                            },
+	{ 4*(REG_REG0+10),      "4*REG_REG10"                           },
+	{ 4*(REG_REG0+11),      "4*REG_REG11"                           },
+	{ 4*(REG_REG0+12),      "4*REG_REG12"                           },
+	{ 4*(REG_REG0+13),      "4*REG_REG13"                           },
+	{ 4*(REG_REG0+14),      "4*REG_REG14"                           },
+	{ 4*REG_REG15,          "4*REG_REG15"                           },
+	{ 4*REG_PC,             "4*REG_PC"                              },
+	{ 4*REG_PR,             "4*REG_PR"                              },
+	{ 4*REG_SR,             "4*REG_SR"                              },
+	{ 4*REG_GBR,            "4*REG_GBR"                             },
+	{ 4*REG_MACH,           "4*REG_MACH"                            },
+	{ 4*REG_MACL,           "4*REG_MACL"                            },
+	{ 4*REG_SYSCALL,        "4*REG_SYSCALL"                         },
+	{ 4*REG_FPUL,           "4*REG_FPUL"                            },
+	{ 4*REG_FPREG0,         "4*REG_FPREG0"                          },
+	{ 4*(REG_FPREG0+1),     "4*REG_FPREG1"                          },
+	{ 4*(REG_FPREG0+2),     "4*REG_FPREG2"                          },
+	{ 4*(REG_FPREG0+3),     "4*REG_FPREG3"                          },
+	{ 4*(REG_FPREG0+4),     "4*REG_FPREG4"                          },
+	{ 4*(REG_FPREG0+5),     "4*REG_FPREG5"                          },
+	{ 4*(REG_FPREG0+6),     "4*REG_FPREG6"                          },
+	{ 4*(REG_FPREG0+7),     "4*REG_FPREG7"                          },
+	{ 4*(REG_FPREG0+8),     "4*REG_FPREG8"                          },
+	{ 4*(REG_FPREG0+9),     "4*REG_FPREG9"                          },
+	{ 4*(REG_FPREG0+10),    "4*REG_FPREG10"                         },
+	{ 4*(REG_FPREG0+11),    "4*REG_FPREG11"                         },
+	{ 4*(REG_FPREG0+12),    "4*REG_FPREG12"                         },
+	{ 4*(REG_FPREG0+13),    "4*REG_FPREG13"                         },
+	{ 4*(REG_FPREG0+14),    "4*REG_FPREG14"                         },
+	{ 4*REG_FPREG15,        "4*REG_FPREG15"                         },
+#    ifdef REG_XDREG0
+	{ 4*REG_XDREG0,         "4*REG_XDREG0"                          },
+	{ 4*(REG_XDREG0+2),     "4*REG_XDREG2"                          },
+	{ 4*(REG_XDREG0+4),     "4*REG_XDREG4"                          },
+	{ 4*(REG_XDREG0+6),     "4*REG_XDREG6"                          },
+	{ 4*(REG_XDREG0+8),     "4*REG_XDREG8"                          },
+	{ 4*(REG_XDREG0+10),    "4*REG_XDREG10"                         },
+	{ 4*(REG_XDREG0+12),    "4*REG_XDREG12"                         },
+	{ 4*REG_XDREG14,        "4*REG_XDREG14"                         },
+#    endif
+	{ 4*REG_FPSCR,          "4*REG_FPSCR"                           },
+#   elif defined(SH64)
 	{ 0,		        "PC(L)"				        },
 	{ 4,	                "PC(U)"				        },
 	{ 8, 	                "SR(L)"	  	         		},
@@ -2860,12 +2913,11 @@
 	{ 580,                  "TR6(U)"                                },
 	{ 584,                  "TR7(L)"                                },
 	{ 588,                  "TR7(U)"                                },
-        /* This entry is in case pt_regs contains dregs (depends on
-           the kernel build options). */
+	/* This entry is in case pt_regs contains dregs (depends on
+	   the kernel build options). */
 	{ uoff(regs),	        "offsetof(struct user, regs)"	        },
 	{ uoff(fpu),	        "offsetof(struct user, fpu)"	        },
-#endif
-#ifdef ARM
+#   elif defined(ARM)
 	{ uoff(regs.ARM_r0),	"r0"					},
 	{ uoff(regs.ARM_r1),	"r1"					},
 	{ uoff(regs.ARM_r2),	"r2"					},
@@ -2883,50 +2935,314 @@
 	{ uoff(regs.ARM_lr),	"lr"					},
 	{ uoff(regs.ARM_pc),	"pc"					},
 	{ uoff(regs.ARM_cpsr),	"cpsr"					},
-#endif
+#   elif defined(AVR32)
+	{ uoff(regs.sr),	"sr"					},
+	{ uoff(regs.pc),	"pc"					},
+	{ uoff(regs.lr),	"lr"					},
+	{ uoff(regs.sp),	"sp"					},
+	{ uoff(regs.r12),	"r12"					},
+	{ uoff(regs.r11),	"r11"					},
+	{ uoff(regs.r10),	"r10"					},
+	{ uoff(regs.r9),	"r9"					},
+	{ uoff(regs.r8),	"r8"					},
+	{ uoff(regs.r7),	"r7"					},
+	{ uoff(regs.r6),	"r6"					},
+	{ uoff(regs.r5),	"r5"					},
+	{ uoff(regs.r4),	"r4"					},
+	{ uoff(regs.r3),	"r3"					},
+	{ uoff(regs.r2),	"r2"					},
+	{ uoff(regs.r1),	"r1"					},
+	{ uoff(regs.r0),	"r0"					},
+	{ uoff(regs.r12_orig),	"orig_r12"				},
+#   elif defined(MIPS)
+	{ 0,			"r0"					},
+	{ 1,			"r1"					},
+	{ 2,			"r2"					},
+	{ 3,			"r3"					},
+	{ 4,			"r4"					},
+	{ 5,			"r5"					},
+	{ 6,			"r6"					},
+	{ 7,			"r7"					},
+	{ 8,			"r8"					},
+	{ 9,			"r9"					},
+	{ 10,			"r10"					},
+	{ 11,			"r11"					},
+	{ 12,			"r12"					},
+	{ 13,			"r13"					},
+	{ 14,			"r14"					},
+	{ 15,			"r15"					},
+	{ 16,			"r16"					},
+	{ 17,			"r17"					},
+	{ 18,			"r18"					},
+	{ 19,			"r19"					},
+	{ 20,			"r20"					},
+	{ 21,			"r21"					},
+	{ 22,			"r22"					},
+	{ 23,			"r23"					},
+	{ 24,			"r24"					},
+	{ 25,			"r25"					},
+	{ 26,			"r26"					},
+	{ 27,			"r27"					},
+	{ 28,			"r28"					},
+	{ 29,			"r29"					},
+	{ 30,			"r30"					},
+	{ 31,			"r31"					},
+	{ 32,			"f0"					},
+	{ 33,			"f1"					},
+	{ 34,			"f2"					},
+	{ 35,			"f3"					},
+	{ 36,			"f4"					},
+	{ 37,			"f5"					},
+	{ 38,			"f6"					},
+	{ 39,			"f7"					},
+	{ 40,			"f8"					},
+	{ 41,			"f9"					},
+	{ 42,			"f10"					},
+	{ 43,			"f11"					},
+	{ 44,			"f12"					},
+	{ 45,			"f13"					},
+	{ 46,			"f14"					},
+	{ 47,			"f15"					},
+	{ 48,			"f16"					},
+	{ 49,			"f17"					},
+	{ 50,			"f18"					},
+	{ 51,			"f19"					},
+	{ 52,			"f20"					},
+	{ 53,			"f21"					},
+	{ 54,			"f22"					},
+	{ 55,			"f23"					},
+	{ 56,			"f24"					},
+	{ 57,			"f25"					},
+	{ 58,			"f26"					},
+	{ 59,			"f27"					},
+	{ 60,			"f28"					},
+	{ 61,			"f29"					},
+	{ 62,			"f30"					},
+	{ 63,			"f31"					},
+	{ 64,			"pc"					},
+	{ 65,			"cause"					},
+	{ 66,			"badvaddr"				},
+	{ 67,			"mmhi"					},
+	{ 68,			"mmlo"					},
+	{ 69,			"fpcsr"					},
+	{ 70,			"fpeir"					},
+#   elif defined(TILE)
+	{ PTREGS_OFFSET_REG(0),  "r0"  },
+	{ PTREGS_OFFSET_REG(1),  "r1"  },
+	{ PTREGS_OFFSET_REG(2),  "r2"  },
+	{ PTREGS_OFFSET_REG(3),  "r3"  },
+	{ PTREGS_OFFSET_REG(4),  "r4"  },
+	{ PTREGS_OFFSET_REG(5),  "r5"  },
+	{ PTREGS_OFFSET_REG(6),  "r6"  },
+	{ PTREGS_OFFSET_REG(7),  "r7"  },
+	{ PTREGS_OFFSET_REG(8),  "r8"  },
+	{ PTREGS_OFFSET_REG(9),  "r9"  },
+	{ PTREGS_OFFSET_REG(10), "r10" },
+	{ PTREGS_OFFSET_REG(11), "r11" },
+	{ PTREGS_OFFSET_REG(12), "r12" },
+	{ PTREGS_OFFSET_REG(13), "r13" },
+	{ PTREGS_OFFSET_REG(14), "r14" },
+	{ PTREGS_OFFSET_REG(15), "r15" },
+	{ PTREGS_OFFSET_REG(16), "r16" },
+	{ PTREGS_OFFSET_REG(17), "r17" },
+	{ PTREGS_OFFSET_REG(18), "r18" },
+	{ PTREGS_OFFSET_REG(19), "r19" },
+	{ PTREGS_OFFSET_REG(20), "r20" },
+	{ PTREGS_OFFSET_REG(21), "r21" },
+	{ PTREGS_OFFSET_REG(22), "r22" },
+	{ PTREGS_OFFSET_REG(23), "r23" },
+	{ PTREGS_OFFSET_REG(24), "r24" },
+	{ PTREGS_OFFSET_REG(25), "r25" },
+	{ PTREGS_OFFSET_REG(26), "r26" },
+	{ PTREGS_OFFSET_REG(27), "r27" },
+	{ PTREGS_OFFSET_REG(28), "r28" },
+	{ PTREGS_OFFSET_REG(29), "r29" },
+	{ PTREGS_OFFSET_REG(30), "r30" },
+	{ PTREGS_OFFSET_REG(31), "r31" },
+	{ PTREGS_OFFSET_REG(32), "r32" },
+	{ PTREGS_OFFSET_REG(33), "r33" },
+	{ PTREGS_OFFSET_REG(34), "r34" },
+	{ PTREGS_OFFSET_REG(35), "r35" },
+	{ PTREGS_OFFSET_REG(36), "r36" },
+	{ PTREGS_OFFSET_REG(37), "r37" },
+	{ PTREGS_OFFSET_REG(38), "r38" },
+	{ PTREGS_OFFSET_REG(39), "r39" },
+	{ PTREGS_OFFSET_REG(40), "r40" },
+	{ PTREGS_OFFSET_REG(41), "r41" },
+	{ PTREGS_OFFSET_REG(42), "r42" },
+	{ PTREGS_OFFSET_REG(43), "r43" },
+	{ PTREGS_OFFSET_REG(44), "r44" },
+	{ PTREGS_OFFSET_REG(45), "r45" },
+	{ PTREGS_OFFSET_REG(46), "r46" },
+	{ PTREGS_OFFSET_REG(47), "r47" },
+	{ PTREGS_OFFSET_REG(48), "r48" },
+	{ PTREGS_OFFSET_REG(49), "r49" },
+	{ PTREGS_OFFSET_REG(50), "r50" },
+	{ PTREGS_OFFSET_REG(51), "r51" },
+	{ PTREGS_OFFSET_REG(52), "r52" },
+	{ PTREGS_OFFSET_TP, "tp" },
+	{ PTREGS_OFFSET_SP, "sp" },
+	{ PTREGS_OFFSET_LR, "lr" },
+	{ PTREGS_OFFSET_PC, "pc" },
+	{ PTREGS_OFFSET_EX1, "ex1" },
+	{ PTREGS_OFFSET_FAULTNUM, "faultnum" },
+	{ PTREGS_OFFSET_ORIG_R0, "orig_r0" },
+	{ PTREGS_OFFSET_FLAGS, "flags" },
+#   endif
+#   ifdef CRISV10
+	{ 4*PT_FRAMETYPE, "4*PT_FRAMETYPE" },
+	{ 4*PT_ORIG_R10, "4*PT_ORIG_R10" },
+	{ 4*PT_R13, "4*PT_R13" },
+	{ 4*PT_R12, "4*PT_R12" },
+	{ 4*PT_R11, "4*PT_R11" },
+	{ 4*PT_R10, "4*PT_R10" },
+	{ 4*PT_R9, "4*PT_R9" },
+	{ 4*PT_R8, "4*PT_R8" },
+	{ 4*PT_R7, "4*PT_R7" },
+	{ 4*PT_R6, "4*PT_R6" },
+	{ 4*PT_R5, "4*PT_R5" },
+	{ 4*PT_R4, "4*PT_R4" },
+	{ 4*PT_R3, "4*PT_R3" },
+	{ 4*PT_R2, "4*PT_R2" },
+	{ 4*PT_R1, "4*PT_R1" },
+	{ 4*PT_R0, "4*PT_R0" },
+	{ 4*PT_MOF, "4*PT_MOF" },
+	{ 4*PT_DCCR, "4*PT_DCCR" },
+	{ 4*PT_SRP, "4*PT_SRP" },
+	{ 4*PT_IRP, "4*PT_IRP" },
+	{ 4*PT_CSRINSTR, "4*PT_CSRINSTR" },
+	{ 4*PT_CSRADDR, "4*PT_CSRADDR" },
+	{ 4*PT_CSRDATA, "4*PT_CSRDATA" },
+	{ 4*PT_USP, "4*PT_USP" },
+#   endif
+#   ifdef CRISV32
+	{ 4*PT_ORIG_R10, "4*PT_ORIG_R10" },
+	{ 4*PT_R0, "4*PT_R0" },
+	{ 4*PT_R1, "4*PT_R1" },
+	{ 4*PT_R2, "4*PT_R2" },
+	{ 4*PT_R3, "4*PT_R3" },
+	{ 4*PT_R4, "4*PT_R4" },
+	{ 4*PT_R5, "4*PT_R5" },
+	{ 4*PT_R6, "4*PT_R6" },
+	{ 4*PT_R7, "4*PT_R7" },
+	{ 4*PT_R8, "4*PT_R8" },
+	{ 4*PT_R9, "4*PT_R9" },
+	{ 4*PT_R10, "4*PT_R10" },
+	{ 4*PT_R11, "4*PT_R11" },
+	{ 4*PT_R12, "4*PT_R12" },
+	{ 4*PT_R13, "4*PT_R13" },
+	{ 4*PT_ACR, "4*PT_ACR" },
+	{ 4*PT_SRS, "4*PT_SRS" },
+	{ 4*PT_MOF, "4*PT_MOF" },
+	{ 4*PT_SPC, "4*PT_SPC" },
+	{ 4*PT_CCS, "4*PT_CCS" },
+	{ 4*PT_SRP, "4*PT_SRP" },
+	{ 4*PT_ERP, "4*PT_ERP" },
+	{ 4*PT_EXS, "4*PT_EXS" },
+	{ 4*PT_EDA, "4*PT_EDA" },
+	{ 4*PT_USP, "4*PT_USP" },
+	{ 4*PT_PPC, "4*PT_PPC" },
+	{ 4*PT_BP_CTRL, "4*PT_BP_CTRL" },
+	{ 4*PT_BP+4, "4*PT_BP+4" },
+	{ 4*PT_BP+8, "4*PT_BP+8" },
+	{ 4*PT_BP+12, "4*PT_BP+12" },
+	{ 4*PT_BP+16, "4*PT_BP+16" },
+	{ 4*PT_BP+20, "4*PT_BP+20" },
+	{ 4*PT_BP+24, "4*PT_BP+24" },
+	{ 4*PT_BP+28, "4*PT_BP+28" },
+	{ 4*PT_BP+32, "4*PT_BP+32" },
+	{ 4*PT_BP+36, "4*PT_BP+36" },
+	{ 4*PT_BP+40, "4*PT_BP+40" },
+	{ 4*PT_BP+44, "4*PT_BP+44" },
+	{ 4*PT_BP+48, "4*PT_BP+48" },
+	{ 4*PT_BP+52, "4*PT_BP+52" },
+	{ 4*PT_BP+56, "4*PT_BP+56" },
+#   endif
+#   ifdef MICROBLAZE
+	{ PT_GPR(0),		"r0"					},
+	{ PT_GPR(1),		"r1"					},
+	{ PT_GPR(2),		"r2"					},
+	{ PT_GPR(3),		"r3"					},
+	{ PT_GPR(4),		"r4"					},
+	{ PT_GPR(5),		"r5"					},
+	{ PT_GPR(6),		"r6"					},
+	{ PT_GPR(7),		"r7"					},
+	{ PT_GPR(8),		"r8"					},
+	{ PT_GPR(9),		"r9"					},
+	{ PT_GPR(10),		"r10"					},
+	{ PT_GPR(11),		"r11"					},
+	{ PT_GPR(12),		"r12"					},
+	{ PT_GPR(13),		"r13"					},
+	{ PT_GPR(14),		"r14"					},
+	{ PT_GPR(15),		"r15"					},
+	{ PT_GPR(16),		"r16"					},
+	{ PT_GPR(17),		"r17"					},
+	{ PT_GPR(18),		"r18"					},
+	{ PT_GPR(19),		"r19"					},
+	{ PT_GPR(20),		"r20"					},
+	{ PT_GPR(21),		"r21"					},
+	{ PT_GPR(22),		"r22"					},
+	{ PT_GPR(23),		"r23"					},
+	{ PT_GPR(24),		"r24"					},
+	{ PT_GPR(25),		"r25"					},
+	{ PT_GPR(26),		"r26"					},
+	{ PT_GPR(27),		"r27"					},
+	{ PT_GPR(28),		"r28"					},
+	{ PT_GPR(29),		"r29"					},
+	{ PT_GPR(30),		"r30"					},
+	{ PT_GPR(31),		"r31"					},
+	{ PT_PC, 		"rpc",					},
+	{ PT_MSR, 		"rmsr",					},
+	{ PT_EAR,		"rear",					},
+	{ PT_ESR,		"resr",					},
+	{ PT_FSR,		"rfsr",					},
+	{ PT_KERNEL_MODE, 	"kernel_mode",				},
+#   endif
 
-#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64)
+#   if !defined(SPARC) && !defined(HPPA) && !defined(POWERPC) \
+		&& !defined(ALPHA) && !defined(IA64) \
+		&& !defined(CRISV10) && !defined(CRISV32) && !defined(MICROBLAZE)
+#    if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) && !defined(AVR32) && !defined(BFIN) && !defined(TILE)
 	{ uoff(u_fpvalid),	"offsetof(struct user, u_fpvalid)"	},
-#endif
-#if  defined(I386) || defined(X86_64)
+#    endif
+#    if defined(I386) || defined(X86_64)
 	{ uoff(i387),		"offsetof(struct user, i387)"		},
-#else /* !I386 */
-#ifdef M68K
+#    endif
+#    if defined(M68K)
 	{ uoff(m68kfp),		"offsetof(struct user, m68kfp)"		},
-#endif /* M68K */
-#endif /* !I386 */
+#    endif
 	{ uoff(u_tsize),	"offsetof(struct user, u_tsize)"	},
 	{ uoff(u_dsize),	"offsetof(struct user, u_dsize)"	},
 	{ uoff(u_ssize),	"offsetof(struct user, u_ssize)"	},
-#if !defined(SPARC64)
+#    if !defined(SPARC64)
 	{ uoff(start_code),	"offsetof(struct user, start_code)"	},
-#endif
-#ifdef SH64
+#    endif
+#    if defined(AVR32) || defined(SH64)
 	{ uoff(start_data),	"offsetof(struct user, start_data)"	},
-#endif
-#if !defined(SPARC64)
+#    endif
+#    if !defined(SPARC64)
 	{ uoff(start_stack),	"offsetof(struct user, start_stack)"	},
-#endif
+#    endif
 	{ uoff(signal),		"offsetof(struct user, signal)"		},
-#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SH) && !defined(SH64) && !defined(SPARC64)
+#    if !defined(AVR32) && !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SH) && !defined(SH64) && !defined(SPARC64) && !defined(TILE)
 	{ uoff(reserved),	"offsetof(struct user, reserved)"	},
-#endif
-#if !defined(SPARC64)
+#    endif
+#    if !defined(SPARC64)
 	{ uoff(u_ar0),		"offsetof(struct user, u_ar0)"		},
-#endif
-#if !defined(ARM) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64)
+#    endif
+#    if !defined(ARM) && !defined(AVR32) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64) && !defined(BFIN) && !defined(TILE)
 	{ uoff(u_fpstate),	"offsetof(struct user, u_fpstate)"	},
-#endif
+#    endif
 	{ uoff(magic),		"offsetof(struct user, magic)"		},
 	{ uoff(u_comm),		"offsetof(struct user, u_comm)"		},
-#if defined(I386) || defined(X86_64)
+#    if defined(I386) || defined(X86_64)
 	{ uoff(u_debugreg),	"offsetof(struct user, u_debugreg)"	},
-#endif /* I386 */
-#endif /* !IA64 */
-#endif /* !ALPHA */
-#endif /* !POWERPC/!SPARC */
-#endif /* LINUX */
-#ifdef SUNOS4
+#    endif
+#   endif /* !defined(many arches) */
+
+#  endif /* LINUX */
+
+#  ifdef SUNOS4
 	{ uoff(u_pcb),		"offsetof(struct user, u_pcb)"		},
 	{ uoff(u_procp),	"offsetof(struct user, u_procp)"	},
 	{ uoff(u_ar0),		"offsetof(struct user, u_ar0)"		},
@@ -2972,32 +3288,31 @@
 	{ uoff(u_exdata.Ux_A),	"offsetof(struct user, u_exdata.Ux_A)"	},
 	{ uoff(u_exdata.ux_shell[0]),"offsetof(struct user, u_exdata.ux_shell[0])"},
 	{ uoff(u_lofault),	"offsetof(struct user, u_lofault)"	},
-#endif /* SUNOS4 */
-#ifndef HPPA
+#  endif /* SUNOS4 */
+#  ifndef HPPA
 	{ sizeof(struct user),	"sizeof(struct user)"			},
-#endif
+#  endif
 	{ 0,			NULL					},
 };
-#endif
+# endif /* !FREEBSD */
 
 int
-sys_ptrace(tcp)
-struct tcb *tcp;
+sys_ptrace(struct tcb *tcp)
 {
 	const struct xlat *x;
 	long addr;
 
 	if (entering(tcp)) {
 		printxval(ptrace_cmds, tcp->u_arg[0],
-#ifndef FREEBSD
+# ifndef FREEBSD
 			  "PTRACE_???"
-#else
+# else
 			  "PT_???"
-#endif
+# endif
 			);
 		tprintf(", %lu, ", tcp->u_arg[1]);
 		addr = tcp->u_arg[2];
-#ifndef FREEBSD
+# ifndef FREEBSD
 		if (tcp->u_arg[0] == PTRACE_PEEKUSER
 			|| tcp->u_arg[0] == PTRACE_POKEUSER) {
 			for (x = struct_user_offsets; x->str; x++) {
@@ -3014,20 +3329,46 @@
 				tprintf("%s, ", x->str);
 		}
 		else
-#endif
+# endif
 			tprintf("%#lx, ", tcp->u_arg[2]);
-#ifdef LINUX
+# ifdef LINUX
 		switch (tcp->u_arg[0]) {
+#  ifndef IA64
 		case PTRACE_PEEKDATA:
 		case PTRACE_PEEKTEXT:
 		case PTRACE_PEEKUSER:
 			break;
+#  endif
 		case PTRACE_CONT:
 		case PTRACE_SINGLESTEP:
 		case PTRACE_SYSCALL:
 		case PTRACE_DETACH:
 			printsignal(tcp->u_arg[3]);
 			break;
+#  ifdef PTRACE_SETOPTIONS
+		case PTRACE_SETOPTIONS:
+			printflags(ptrace_setoptions_flags, tcp->u_arg[3], "PTRACE_O_???");
+			break;
+#  endif
+#  ifdef PTRACE_SETSIGINFO
+		case PTRACE_SETSIGINFO: {
+			siginfo_t si;
+			if (!tcp->u_arg[3])
+				tprintf("NULL");
+			else if (syserror(tcp))
+				tprintf("%#lx", tcp->u_arg[3]);
+			else if (umove(tcp, tcp->u_arg[3], &si) < 0)
+				tprintf("{???}");
+			else
+				printsiginfo(&si, verbose(tcp));
+			break;
+		}
+#  endif
+#  ifdef PTRACE_GETSIGINFO
+		case PTRACE_GETSIGINFO:
+			/* Don't print anything, do it at syscall return. */
+			break;
+#  endif
 		default:
 			tprintf("%#lx", tcp->u_arg[3]);
 			break;
@@ -3037,12 +3378,30 @@
 		case PTRACE_PEEKDATA:
 		case PTRACE_PEEKTEXT:
 		case PTRACE_PEEKUSER:
+#  ifdef IA64
+			return RVAL_HEX;
+#  else
 			printnum(tcp, tcp->u_arg[3], "%#lx");
 			break;
+#  endif
+#  ifdef PTRACE_GETSIGINFO
+		case PTRACE_GETSIGINFO: {
+			siginfo_t si;
+			if (!tcp->u_arg[3])
+				tprintf("NULL");
+			else if (syserror(tcp))
+				tprintf("%#lx", tcp->u_arg[3]);
+			else if (umove(tcp, tcp->u_arg[3], &si) < 0)
+				tprintf("{???}");
+			else
+				printsiginfo(&si, verbose(tcp));
+			break;
+		}
+#  endif
 		}
 	}
-#endif /* LINUX */
-#ifdef SUNOS4
+# endif /* LINUX */
+# ifdef SUNOS4
 		if (tcp->u_arg[0] == PTRACE_WRITEDATA ||
 			tcp->u_arg[0] == PTRACE_WRITETEXT) {
 			tprintf("%lu, ", tcp->u_arg[3]);
@@ -3058,85 +3417,204 @@
 			printstr(tcp, tcp->u_arg[4], tcp->u_arg[3]);
 		}
 	}
-#endif /* SUNOS4 */
-#ifdef FREEBSD
+# endif /* SUNOS4 */
+# ifdef FREEBSD
 		tprintf("%lu", tcp->u_arg[3]);
 	}
-#endif /* FREEBSD */
+# endif /* FREEBSD */
 	return 0;
 }
 
 #endif /* !SVR4 */
 
 #ifdef LINUX
+# ifndef FUTEX_CMP_REQUEUE
+#  define FUTEX_CMP_REQUEUE 4
+# endif
+# ifndef FUTEX_WAKE_OP
+#  define FUTEX_WAKE_OP 5
+# endif
+# ifndef FUTEX_LOCK_PI
+#  define FUTEX_LOCK_PI 6
+#  define FUTEX_UNLOCK_PI 7
+#  define FUTEX_TRYLOCK_PI 8
+# endif
+# ifndef FUTEX_WAIT_BITSET
+#  define FUTEX_WAIT_BITSET 9
+# endif
+# ifndef FUTEX_WAKE_BITSET
+#  define FUTEX_WAKE_BITSET 10
+# endif
+# ifndef FUTEX_WAIT_REQUEUE_PI
+#  define FUTEX_WAIT_REQUEUE_PI 11
+# endif
+# ifndef FUTEX_CMP_REQUEUE_PI
+#  define FUTEX_CMP_REQUEUE_PI 12
+# endif
+# ifndef FUTEX_PRIVATE_FLAG
+#  define FUTEX_PRIVATE_FLAG 128
+# endif
+# ifndef FUTEX_CLOCK_REALTIME
+#  define FUTEX_CLOCK_REALTIME 256
+# endif
 static const struct xlat futexops[] = {
-	{ FUTEX_WAIT,	"FUTEX_WAIT" },
-	{ FUTEX_WAKE,	"FUTEX_WAKE" },
-	{ FUTEX_FD,	"FUTEX_FD" },
-	{ FUTEX_REQUEUE,"FUTEX_REQUEUE" },
-	{ 0,		NULL }
+	{ FUTEX_WAIT,					"FUTEX_WAIT" },
+	{ FUTEX_WAKE,					"FUTEX_WAKE" },
+	{ FUTEX_FD,					"FUTEX_FD" },
+	{ FUTEX_REQUEUE,				"FUTEX_REQUEUE" },
+	{ FUTEX_CMP_REQUEUE,				"FUTEX_CMP_REQUEUE" },
+	{ FUTEX_WAKE_OP,				"FUTEX_WAKE_OP" },
+	{ FUTEX_LOCK_PI,				"FUTEX_LOCK_PI" },
+	{ FUTEX_UNLOCK_PI,				"FUTEX_UNLOCK_PI" },
+	{ FUTEX_TRYLOCK_PI,				"FUTEX_TRYLOCK_PI" },
+	{ FUTEX_WAIT_BITSET,				"FUTEX_WAIT_BITSET" },
+	{ FUTEX_WAKE_BITSET,				"FUTEX_WAKE_BITSET" },
+	{ FUTEX_WAIT_REQUEUE_PI,			"FUTEX_WAIT_REQUEUE_PI" },
+	{ FUTEX_CMP_REQUEUE_PI,				"FUTEX_CMP_REQUEUE_PI" },
+	{ FUTEX_WAIT|FUTEX_PRIVATE_FLAG,		"FUTEX_WAIT_PRIVATE" },
+	{ FUTEX_WAKE|FUTEX_PRIVATE_FLAG,		"FUTEX_WAKE_PRIVATE" },
+	{ FUTEX_FD|FUTEX_PRIVATE_FLAG,			"FUTEX_FD_PRIVATE" },
+	{ FUTEX_REQUEUE|FUTEX_PRIVATE_FLAG,		"FUTEX_REQUEUE_PRIVATE" },
+	{ FUTEX_CMP_REQUEUE|FUTEX_PRIVATE_FLAG,		"FUTEX_CMP_REQUEUE_PRIVATE" },
+	{ FUTEX_WAKE_OP|FUTEX_PRIVATE_FLAG,		"FUTEX_WAKE_OP_PRIVATE" },
+	{ FUTEX_LOCK_PI|FUTEX_PRIVATE_FLAG,		"FUTEX_LOCK_PI_PRIVATE" },
+	{ FUTEX_UNLOCK_PI|FUTEX_PRIVATE_FLAG,		"FUTEX_UNLOCK_PI_PRIVATE" },
+	{ FUTEX_TRYLOCK_PI|FUTEX_PRIVATE_FLAG,		"FUTEX_TRYLOCK_PI_PRIVATE" },
+	{ FUTEX_WAIT_BITSET|FUTEX_PRIVATE_FLAG,		"FUTEX_WAIT_BITSET_PRIVATE" },
+	{ FUTEX_WAKE_BITSET|FUTEX_PRIVATE_FLAG,		"FUTEX_WAKE_BITSET_PRIVATE" },
+	{ FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG,	"FUTEX_WAIT_REQUEUE_PI_PRIVATE" },
+	{ FUTEX_CMP_REQUEUE_PI|FUTEX_PRIVATE_FLAG,	"FUTEX_CMP_REQUEUE_PI_PRIVATE" },
+	{ FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME,	"FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME" },
+	{ FUTEX_WAIT_BITSET|FUTEX_PRIVATE_FLAG|FUTEX_CLOCK_REALTIME,	"FUTEX_WAIT_BITSET_PRIVATE|FUTEX_CLOCK_REALTIME" },
+	{ FUTEX_WAIT_REQUEUE_PI|FUTEX_CLOCK_REALTIME,	"FUTEX_WAIT_REQUEUE_PI|FUTEX_CLOCK_REALTIME" },
+	{ FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG|FUTEX_CLOCK_REALTIME,	"FUTEX_WAIT_REQUEUE_PI_PRIVATE|FUTEX_CLOCK_REALTIME" },
+	{ 0,						NULL }
+};
+# ifndef FUTEX_OP_SET
+#  define FUTEX_OP_SET		0
+#  define FUTEX_OP_ADD		1
+#  define FUTEX_OP_OR		2
+#  define FUTEX_OP_ANDN		3
+#  define FUTEX_OP_XOR		4
+#  define FUTEX_OP_CMP_EQ	0
+#  define FUTEX_OP_CMP_NE	1
+#  define FUTEX_OP_CMP_LT	2
+#  define FUTEX_OP_CMP_LE	3
+#  define FUTEX_OP_CMP_GT	4
+#  define FUTEX_OP_CMP_GE	5
+# endif
+static const struct xlat futexwakeops[] = {
+	{ FUTEX_OP_SET,		"FUTEX_OP_SET" },
+	{ FUTEX_OP_ADD,		"FUTEX_OP_ADD" },
+	{ FUTEX_OP_OR,		"FUTEX_OP_OR" },
+	{ FUTEX_OP_ANDN,	"FUTEX_OP_ANDN" },
+	{ FUTEX_OP_XOR,		"FUTEX_OP_XOR" },
+	{ 0,			NULL }
+};
+static const struct xlat futexwakecmps[] = {
+	{ FUTEX_OP_CMP_EQ,	"FUTEX_OP_CMP_EQ" },
+	{ FUTEX_OP_CMP_NE,	"FUTEX_OP_CMP_NE" },
+	{ FUTEX_OP_CMP_LT,	"FUTEX_OP_CMP_LT" },
+	{ FUTEX_OP_CMP_LE,	"FUTEX_OP_CMP_LE" },
+	{ FUTEX_OP_CMP_GT,	"FUTEX_OP_CMP_GT" },
+	{ FUTEX_OP_CMP_GE,	"FUTEX_OP_CMP_GE" },
+	{ 0,			NULL }
 };
 
 int
-sys_futex(tcp)
-struct tcb *tcp;
+sys_futex(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	tprintf("%p, ", (void *) tcp->u_arg[0]);
-	printxval(futexops, tcp->u_arg[1], "FUTEX_???");
-	tprintf(", %ld", tcp->u_arg[2]);
-	if (tcp->u_arg[1] == FUTEX_WAIT) {
-		tprintf(", ");
-		printtv(tcp, tcp->u_arg[3]);
-	} else if (tcp->u_arg[1] == FUTEX_REQUEUE)
-		tprintf(", %ld, %p", tcp->u_arg[3], (void *) tcp->u_arg[4]);
-    }
-    return 0;
+	if (entering(tcp)) {
+		long int cmd = tcp->u_arg[1] & 127;
+		tprintf("%p, ", (void *) tcp->u_arg[0]);
+		printxval(futexops, tcp->u_arg[1], "FUTEX_???");
+		tprintf(", %ld", tcp->u_arg[2]);
+		if (cmd == FUTEX_WAKE_BITSET)
+			tprintf(", %lx", tcp->u_arg[5]);
+		else if (cmd == FUTEX_WAIT) {
+			tprintf(", ");
+			printtv(tcp, tcp->u_arg[3]);
+		} else if (cmd == FUTEX_WAIT_BITSET) {
+			tprintf(", ");
+			printtv(tcp, tcp->u_arg[3]);
+			tprintf(", %lx", tcp->u_arg[5]);
+		} else if (cmd == FUTEX_REQUEUE)
+			tprintf(", %ld, %p", tcp->u_arg[3], (void *) tcp->u_arg[4]);
+		else if (cmd == FUTEX_CMP_REQUEUE || cmd == FUTEX_CMP_REQUEUE_PI)
+			tprintf(", %ld, %p, %ld", tcp->u_arg[3], (void *) tcp->u_arg[4], tcp->u_arg[5]);
+		else if (cmd == FUTEX_WAKE_OP) {
+			tprintf(", %ld, %p, {", tcp->u_arg[3], (void *) tcp->u_arg[4]);
+			if ((tcp->u_arg[5] >> 28) & 8)
+				tprintf("FUTEX_OP_OPARG_SHIFT|");
+			printxval(futexwakeops, (tcp->u_arg[5] >> 28) & 0x7, "FUTEX_OP_???");
+			tprintf(", %ld, ", (tcp->u_arg[5] >> 12) & 0xfff);
+			if ((tcp->u_arg[5] >> 24) & 8)
+				tprintf("FUTEX_OP_OPARG_SHIFT|");
+			printxval(futexwakecmps, (tcp->u_arg[5] >> 24) & 0x7, "FUTEX_OP_CMP_???");
+			tprintf(", %ld}", tcp->u_arg[5] & 0xfff);
+		} else if (cmd == FUTEX_WAIT_REQUEUE_PI) {
+			tprintf(", ");
+			printtv(tcp, tcp->u_arg[3]);
+			tprintf(", %p", (void *) tcp->u_arg[4]);
+		}
+	}
+	return 0;
 }
 
 static void
-print_affinitylist(tcp, list, len)
-struct tcb *tcp;
-long list;
-unsigned int len;
+print_affinitylist(struct tcb *tcp, long list, unsigned int len)
 {
-    int first = 1;
-    tprintf(" {");
-    while (len >= sizeof (unsigned long)) {
-	unsigned long w;
-	umove(tcp, list, &w);
-	tprintf("%s %lx", first ? "" : ",", w);
-	first = 0;
-	len -= sizeof (unsigned long);
-	list += sizeof(unsigned long);
-    }
-    tprintf(" }");
-}
+	int first = 1;
+	unsigned long w, min_len;
 
-int
-sys_sched_setaffinity(tcp)
-struct tcb *tcp;
-{
-    if (entering(tcp)) {
-	tprintf("%ld, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
-	print_affinitylist(tcp, tcp->u_arg[2], tcp->u_arg[1]);
-    }
-    return 0;
-}
-
-int
-sys_sched_getaffinity(tcp)
-struct tcb *tcp;
-{
-    if (entering(tcp)) {
-	tprintf("%ld, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
-    } else {
-	if (tcp->u_rval == -1)
-	    tprintf("%#lx", tcp->u_arg[2]);
+	if (abbrev(tcp) && len / sizeof(w) > max_strlen)
+		min_len = len - max_strlen * sizeof(w);
 	else
-	    print_affinitylist(tcp, tcp->u_arg[2], tcp->u_rval);
-    }
-    return 0;
+		min_len = 0;
+	for (; len >= sizeof(w) && len > min_len;
+	     len -= sizeof(w), list += sizeof(w)) {
+		if (umove(tcp, list, &w) < 0)
+			break;
+		if (first)
+			tprintf("{");
+		else
+			tprintf(", ");
+		first = 0;
+		tprintf("%lx", w);
+	}
+	if (len) {
+		if (first)
+			tprintf("%#lx", list);
+		else
+			tprintf(", %s}", (len >= sizeof(w) && len > min_len ?
+				"???" : "..."));
+	} else {
+		tprintf(first ? "{}" : "}");
+	}
+}
+
+int
+sys_sched_setaffinity(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		tprintf("%ld, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
+		print_affinitylist(tcp, tcp->u_arg[2], tcp->u_arg[1]);
+	}
+	return 0;
+}
+
+int
+sys_sched_getaffinity(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		tprintf("%ld, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
+	} else {
+		if (tcp->u_rval == -1)
+			tprintf("%#lx", tcp->u_arg[2]);
+		else
+			print_affinitylist(tcp, tcp->u_arg[2], tcp->u_rval);
+	}
+	return 0;
 }
 
 static const struct xlat schedulers[] = {
@@ -3147,77 +3625,72 @@
 };
 
 int
-sys_sched_getscheduler(tcp)
-struct tcb *tcp;
+sys_sched_getscheduler(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	tprintf("%d", (int) tcp->u_arg[0]);
-    } else if (! syserror(tcp)) {
-	tcp->auxstr = xlookup (schedulers, tcp->u_rval);
-	if (tcp->auxstr != NULL)
-	    return RVAL_STR;
-    }
-    return 0;
+	if (entering(tcp)) {
+		tprintf("%d", (int) tcp->u_arg[0]);
+	} else if (! syserror(tcp)) {
+		tcp->auxstr = xlookup (schedulers, tcp->u_rval);
+		if (tcp->auxstr != NULL)
+			return RVAL_STR;
+	}
+	return 0;
 }
 
 int
-sys_sched_setscheduler(tcp)
-struct tcb *tcp;
+sys_sched_setscheduler(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	struct sched_param p;
-	tprintf("%d, ", (int) tcp->u_arg[0]);
-	printxval(schedulers, tcp->u_arg[1], "SCHED_???");
-	if (umove(tcp, tcp->u_arg[2], &p) < 0)
-	    tprintf(", %#lx", tcp->u_arg[2]);
-	else
-	    tprintf(", { %d }", p.__sched_priority);
-    }
-    return 0;
+	if (entering(tcp)) {
+		struct sched_param p;
+		tprintf("%d, ", (int) tcp->u_arg[0]);
+		printxval(schedulers, tcp->u_arg[1], "SCHED_???");
+		if (umove(tcp, tcp->u_arg[2], &p) < 0)
+			tprintf(", %#lx", tcp->u_arg[2]);
+		else
+			tprintf(", { %d }", p.__sched_priority);
+	}
+	return 0;
 }
 
 int
-sys_sched_getparam(tcp)
-struct tcb *tcp;
+sys_sched_getparam(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	    tprintf("%d, ", (int) tcp->u_arg[0]);
-    } else {
-	struct sched_param p;
-	if (umove(tcp, tcp->u_arg[1], &p) < 0)
-	    tprintf("%#lx", tcp->u_arg[1]);
-	else
-	    tprintf("{ %d }", p.__sched_priority);
-    }
-    return 0;
+	if (entering(tcp)) {
+		tprintf("%d, ", (int) tcp->u_arg[0]);
+	} else {
+		struct sched_param p;
+		if (umove(tcp, tcp->u_arg[1], &p) < 0)
+			tprintf("%#lx", tcp->u_arg[1]);
+		else
+			tprintf("{ %d }", p.__sched_priority);
+	}
+	return 0;
 }
 
 int
-sys_sched_setparam(tcp)
-struct tcb *tcp;
+sys_sched_setparam(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	struct sched_param p;
-	if (umove(tcp, tcp->u_arg[1], &p) < 0)
-	    tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
-	else
-	    tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority);
-    }
-    return 0;
+	if (entering(tcp)) {
+		struct sched_param p;
+		if (umove(tcp, tcp->u_arg[1], &p) < 0)
+			tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
+		else
+			tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority);
+	}
+	return 0;
 }
 
 int
-sys_sched_get_priority_min(tcp)
-struct tcb *tcp;
+sys_sched_get_priority_min(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	printxval(schedulers, tcp->u_arg[0], "SCHED_???");
-    }
-    return 0;
+	if (entering(tcp)) {
+		printxval(schedulers, tcp->u_arg[0], "SCHED_???");
+	}
+	return 0;
 }
 
-#ifdef X86_64
-#include <asm/prctl.h>
+# ifdef X86_64
+# include <asm/prctl.h>
 
 static const struct xlat archvals[] = {
 	{ ARCH_SET_GS,		"ARCH_SET_GS"		},
@@ -3228,26 +3701,51 @@
 };
 
 int
-sys_arch_prctl(tcp)
-struct tcb *tcp;
+sys_arch_prctl(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	printxval(archvals, tcp->u_arg[0], "ARCH_???");
-	if (tcp->u_arg[0] == ARCH_SET_GS
-	    || tcp->u_arg[0] == ARCH_SET_FS)
-	    tprintf(", %#lx", tcp->u_arg[1]);
-    } else {
-	if (tcp->u_arg[0] == ARCH_GET_GS
-	    || tcp->u_arg[0] == ARCH_GET_FS) {
-	    long int v;
-	    if (!syserror(tcp) && umove(tcp, tcp->u_arg[1], &v) != -1)
-		tprintf(", [%#lx]", v);
-	    else
-		tprintf(", %#lx", tcp->u_arg[1]);
+	if (entering(tcp)) {
+		printxval(archvals, tcp->u_arg[0], "ARCH_???");
+		if (tcp->u_arg[0] == ARCH_SET_GS
+		 || tcp->u_arg[0] == ARCH_SET_FS
+		) {
+			tprintf(", %#lx", tcp->u_arg[1]);
+		}
+	} else {
+		if (tcp->u_arg[0] == ARCH_GET_GS
+		 || tcp->u_arg[0] == ARCH_GET_FS
+		) {
+			long int v;
+			if (!syserror(tcp) && umove(tcp, tcp->u_arg[1], &v) != -1)
+				tprintf(", [%#lx]", v);
+			else
+				tprintf(", %#lx", tcp->u_arg[1]);
+		}
 	}
-    }
-    return 0;
+	return 0;
 }
-#endif
+# endif /* X86_64 */
 
-#endif
+
+int
+sys_getcpu(struct tcb *tcp)
+{
+	if (exiting(tcp)) {
+		unsigned u;
+		if (tcp->u_arg[0] == 0)
+			tprintf("NULL, ");
+		else if (umove(tcp, tcp->u_arg[0], &u) < 0)
+			tprintf("%#lx, ", tcp->u_arg[0]);
+		else
+			tprintf("[%u], ", u);
+		if (tcp->u_arg[1] == 0)
+			tprintf("NULL, ");
+		else if (umove(tcp, tcp->u_arg[1], &u) < 0)
+			tprintf("%#lx, ", tcp->u_arg[1]);
+		else
+			tprintf("[%u], ", u);
+		tprintf("%#lx", tcp->u_arg[2]);
+	}
+	return 0;
+}
+
+#endif /* LINUX */
diff --git a/quota.c b/quota.c
new file mode 100644
index 0000000..f07d1a1
--- /dev/null
+++ b/quota.c
@@ -0,0 +1,736 @@
+/*
+ * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 2005, 2006 Dmitry V. Levin <ldv@altlinux.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
+#include "defs.h"
+
+#ifdef LINUX
+
+#include <inttypes.h>
+
+#define SUBCMDMASK  0x00ff
+#define SUBCMDSHIFT 8
+#define QCMD_CMD(cmd)	((u_int32_t)(cmd) >> SUBCMDSHIFT)
+#define QCMD_TYPE(cmd)	((u_int32_t)(cmd) & SUBCMDMASK)
+
+#define OLD_CMD(cmd)	((u_int32_t)(cmd) << 8)
+#define NEW_CMD(cmd)	((u_int32_t)(cmd) | 0x800000)
+#define XQM_CMD(cmd)	((u_int32_t)(cmd) | ('X'<<8))
+
+#define Q_V1_QUOTAON	OLD_CMD(0x1)
+#define Q_V1_QUOTAOFF	OLD_CMD(0x2)
+#define Q_V1_GETQUOTA	OLD_CMD(0x3)
+#define Q_V1_SETQUOTA	OLD_CMD(0x4)
+#define Q_V1_SETUSE	OLD_CMD(0x5)
+#define Q_V1_SYNC	OLD_CMD(0x6)
+#define Q_SETQLIM	OLD_CMD(0x7)
+#define Q_V1_GETSTATS	OLD_CMD(0x8)
+#define Q_V1_RSQUASH	OLD_CMD(0x10)
+
+#define Q_V2_GETQUOTA	OLD_CMD(0xD)
+#define Q_V2_SETQUOTA	OLD_CMD(0xE)
+#define Q_V2_SETUSE	OLD_CMD(0xF)
+#define Q_V2_GETINFO	OLD_CMD(0x9)
+#define Q_V2_SETINFO	OLD_CMD(0xA)
+#define Q_V2_SETGRACE	OLD_CMD(0xB)
+#define Q_V2_SETFLAGS	OLD_CMD(0xC)
+#define Q_V2_GETSTATS	OLD_CMD(0x11)
+
+#define Q_SYNC		NEW_CMD(0x1)
+#define Q_QUOTAON	NEW_CMD(0x2)
+#define Q_QUOTAOFF	NEW_CMD(0x3)
+#define Q_GETFMT	NEW_CMD(0x4)
+#define Q_GETINFO	NEW_CMD(0x5)
+#define Q_SETINFO	NEW_CMD(0x6)
+#define Q_GETQUOTA	NEW_CMD(0x7)
+#define Q_SETQUOTA	NEW_CMD(0x8)
+
+#define Q_XQUOTAON	XQM_CMD(0x1)
+#define Q_XQUOTAOFF	XQM_CMD(0x2)
+#define Q_XGETQUOTA	XQM_CMD(0x3)
+#define Q_XSETQLIM	XQM_CMD(0x4)
+#define Q_XGETQSTAT	XQM_CMD(0x5)
+#define Q_XQUOTARM	XQM_CMD(0x6)
+#define Q_XQUOTASYNC	XQM_CMD(0x7)
+
+static const struct xlat quotacmds[] = {
+	{Q_V1_QUOTAON, "Q_V1_QUOTAON"},
+	{Q_V1_QUOTAOFF, "Q_V1_QUOTAOFF"},
+	{Q_V1_GETQUOTA, "Q_V1_GETQUOTA"},
+	{Q_V1_SETQUOTA, "Q_V1_SETQUOTA"},
+	{Q_V1_SETUSE, "Q_V1_SETUSE"},
+	{Q_V1_SYNC, "Q_V1_SYNC"},
+	{Q_SETQLIM, "Q_SETQLIM"},
+	{Q_V1_GETSTATS, "Q_V1_GETSTATS"},
+	{Q_V1_RSQUASH, "Q_V1_RSQUASH"},
+
+	{Q_V2_GETQUOTA, "Q_V2_GETQUOTA"},
+	{Q_V2_SETQUOTA, "Q_V2_SETQUOTA"},
+	{Q_V2_SETUSE, "Q_V2_SETUSE"},
+	{Q_V2_GETINFO, "Q_V2_GETINFO"},
+	{Q_V2_SETINFO, "Q_V2_SETINFO"},
+	{Q_V2_SETGRACE, "Q_V2_SETGRACE"},
+	{Q_V2_SETFLAGS, "Q_V2_SETFLAGS"},
+	{Q_V2_GETSTATS, "Q_V2_GETSTATS"},
+
+	{Q_SYNC, "Q_SYNC"},
+	{Q_QUOTAON, "Q_QUOTAON"},
+	{Q_QUOTAOFF, "Q_QUOTAOFF"},
+	{Q_GETFMT, "Q_GETFMT"},
+	{Q_GETINFO, "Q_GETINFO"},
+	{Q_SETINFO, "Q_SETINFO"},
+	{Q_GETQUOTA, "Q_GETQUOTA"},
+	{Q_SETQUOTA, "Q_SETQUOTA"},
+
+	{Q_XQUOTAON, "Q_XQUOTAON"},
+	{Q_XQUOTAOFF, "Q_XQUOTAOFF"},
+	{Q_XGETQUOTA, "Q_XGETQUOTA"},
+	{Q_XSETQLIM, "Q_XSETQLIM"},
+	{Q_XGETQSTAT, "Q_XGETQSTAT"},
+	{Q_XQUOTARM, "Q_XQUOTARM"},
+	{Q_XQUOTASYNC, "Q_XQUOTASYNC"},
+
+	{0, NULL},
+};
+
+#define USRQUOTA 0
+#define GRPQUOTA 1
+
+static const struct xlat quotatypes[] = {
+	{USRQUOTA, "USRQUOTA"},
+	{GRPQUOTA, "GRPQUOTA"},
+	{0, NULL},
+};
+
+/* Quota format identifiers */
+#define QFMT_VFS_OLD 1
+#define QFMT_VFS_V0  2
+
+static const struct xlat quota_formats[] = {
+	{QFMT_VFS_OLD, "QFMT_VFS_OLD"},
+	{QFMT_VFS_V0, "QFMT_VFS_V0"},
+	{0, NULL},
+};
+
+#define XFS_QUOTA_UDQ_ACCT	(1<<0)	/* user quota accounting */
+#define XFS_QUOTA_UDQ_ENFD	(1<<1)	/* user quota limits enforcement */
+#define XFS_QUOTA_GDQ_ACCT	(1<<2)	/* group quota accounting */
+#define XFS_QUOTA_GDQ_ENFD	(1<<3)	/* group quota limits enforcement */
+
+#define XFS_USER_QUOTA		(1<<0)	/* user quota type */
+#define XFS_PROJ_QUOTA		(1<<1)	/* (IRIX) project quota type */
+#define XFS_GROUP_QUOTA		(1<<2)	/* group quota type */
+
+static const struct xlat xfs_quota_flags[] = {
+	{XFS_QUOTA_UDQ_ACCT, "XFS_QUOTA_UDQ_ACCT"},
+	{XFS_QUOTA_UDQ_ENFD, "XFS_QUOTA_UDQ_ENFD"},
+	{XFS_QUOTA_GDQ_ACCT, "XFS_QUOTA_GDQ_ACCT"},
+	{XFS_QUOTA_GDQ_ENFD, "XFS_QUOTA_GDQ_ENFD"},
+	{0, NULL}
+};
+
+static const struct xlat xfs_dqblk_flags[] = {
+	{XFS_USER_QUOTA, "XFS_USER_QUOTA"},
+	{XFS_PROJ_QUOTA, "XFS_PROJ_QUOTA"},
+	{XFS_GROUP_QUOTA, "XFS_GROUP_QUOTA"},
+	{0, NULL}
+};
+
+/*
+ * Following flags are used to specify which fields are valid
+ */
+#define QIF_BLIMITS	1
+#define QIF_SPACE	2
+#define QIF_ILIMITS	4
+#define QIF_INODES	8
+#define QIF_BTIME	16
+#define QIF_ITIME	32
+
+static const struct xlat if_dqblk_valid[] = {
+	{QIF_BLIMITS, "QIF_BLIMITS"},
+	{QIF_SPACE, "QIF_SPACE"},
+	{QIF_ILIMITS, "QIF_ILIMITS"},
+	{QIF_INODES, "QIF_INODES"},
+	{QIF_BTIME, "QIF_BTIME"},
+	{QIF_ITIME, "QIF_ITIME"},
+	{0, NULL}
+};
+
+struct if_dqblk
+{
+	u_int64_t dqb_bhardlimit;
+	u_int64_t dqb_bsoftlimit;
+	u_int64_t dqb_curspace;
+	u_int64_t dqb_ihardlimit;
+	u_int64_t dqb_isoftlimit;
+	u_int64_t dqb_curinodes;
+	u_int64_t dqb_btime;
+	u_int64_t dqb_itime;
+	u_int32_t dqb_valid;
+};
+
+struct v1_dqblk
+{
+	u_int32_t dqb_bhardlimit;	/* absolute limit on disk blks alloc */
+	u_int32_t dqb_bsoftlimit;	/* preferred limit on disk blks */
+	u_int32_t dqb_curblocks;	/* current block count */
+	u_int32_t dqb_ihardlimit;	/* maximum # allocated inodes */
+	u_int32_t dqb_isoftlimit;	/* preferred inode limit */
+	u_int32_t dqb_curinodes;	/* current # allocated inodes */
+	time_t  dqb_btime;	/* time limit for excessive disk use */
+	time_t  dqb_itime;	/* time limit for excessive files */
+};
+
+struct v2_dqblk
+{
+	unsigned int dqb_ihardlimit;
+	unsigned int dqb_isoftlimit;
+	unsigned int dqb_curinodes;
+	unsigned int dqb_bhardlimit;
+	unsigned int dqb_bsoftlimit;
+	u_int64_t dqb_curspace;
+	time_t  dqb_btime;
+	time_t  dqb_itime;
+};
+
+struct xfs_dqblk
+{
+	int8_t  d_version;	/* version of this structure */
+	int8_t  d_flags;	/* XFS_{USER,PROJ,GROUP}_QUOTA */
+	u_int16_t d_fieldmask;	/* field specifier */
+	u_int32_t d_id;		/* user, project, or group ID */
+	u_int64_t d_blk_hardlimit;	/* absolute limit on disk blks */
+	u_int64_t d_blk_softlimit;	/* preferred limit on disk blks */
+	u_int64_t d_ino_hardlimit;	/* maximum # allocated inodes */
+	u_int64_t d_ino_softlimit;	/* preferred inode limit */
+	u_int64_t d_bcount;	/* # disk blocks owned by the user */
+	u_int64_t d_icount;	/* # inodes owned by the user */
+	int32_t d_itimer;	/* zero if within inode limits */
+	int32_t d_btimer;	/* similar to above; for disk blocks */
+	u_int16_t d_iwarns;	/* # warnings issued wrt num inodes */
+	u_int16_t d_bwarns;	/* # warnings issued wrt disk blocks */
+	int32_t d_padding2;	/* padding2 - for future use */
+	u_int64_t d_rtb_hardlimit;	/* absolute limit on realtime blks */
+	u_int64_t d_rtb_softlimit;	/* preferred limit on RT disk blks */
+	u_int64_t d_rtbcount;	/* # realtime blocks owned */
+	int32_t d_rtbtimer;	/* similar to above; for RT disk blks */
+	u_int16_t d_rtbwarns;	/* # warnings issued wrt RT disk blks */
+	int16_t d_padding3;	/* padding3 - for future use */
+	char    d_padding4[8];	/* yet more padding */
+};
+
+/*
+ * Following flags are used to specify which fields are valid
+ */
+#define IIF_BGRACE	1
+#define IIF_IGRACE	2
+#define IIF_FLAGS	4
+
+static const struct xlat if_dqinfo_valid[] = {
+	{IIF_BGRACE, "IIF_BGRACE"},
+	{IIF_IGRACE, "IIF_IGRACE"},
+	{IIF_FLAGS, "IIF_FLAGS"},
+	{0, NULL}
+};
+
+struct if_dqinfo
+{
+	u_int64_t dqi_bgrace;
+	u_int64_t dqi_igrace;
+	u_int32_t dqi_flags;
+	u_int32_t dqi_valid;
+};
+
+struct v2_dqinfo
+{
+	unsigned int dqi_bgrace;
+	unsigned int dqi_igrace;
+	unsigned int dqi_flags;
+	unsigned int dqi_blocks;
+	unsigned int dqi_free_blk;
+	unsigned int dqi_free_entry;
+};
+
+struct v1_dqstats
+{
+	u_int32_t lookups;
+	u_int32_t drops;
+	u_int32_t reads;
+	u_int32_t writes;
+	u_int32_t cache_hits;
+	u_int32_t allocated_dquots;
+	u_int32_t free_dquots;
+	u_int32_t syncs;
+};
+
+struct v2_dqstats
+{
+	u_int32_t lookups;
+	u_int32_t drops;
+	u_int32_t reads;
+	u_int32_t writes;
+	u_int32_t cache_hits;
+	u_int32_t allocated_dquots;
+	u_int32_t free_dquots;
+	u_int32_t syncs;
+	u_int32_t version;
+};
+
+typedef struct fs_qfilestat
+{
+	u_int64_t qfs_ino;	/* inode number */
+	u_int64_t qfs_nblks;	/* number of BBs 512-byte-blks */
+	u_int32_t qfs_nextents;	/* number of extents */
+} fs_qfilestat_t;
+
+struct xfs_dqstats
+{
+	int8_t  qs_version;	/* version number for future changes */
+	u_int16_t qs_flags;	/* XFS_QUOTA_{U,P,G}DQ_{ACCT,ENFD} */
+	int8_t  qs_pad;		/* unused */
+	fs_qfilestat_t qs_uquota;	/* user quota storage information */
+	fs_qfilestat_t qs_gquota;	/* group quota storage information */
+	u_int32_t qs_incoredqs;	/* number of dquots incore */
+	int32_t qs_btimelimit;	/* limit for blks timer */
+	int32_t qs_itimelimit;	/* limit for inodes timer */
+	int32_t qs_rtbtimelimit;	/* limit for rt blks timer */
+	u_int16_t qs_bwarnlimit;	/* limit for num warnings */
+	u_int16_t qs_iwarnlimit;	/* limit for num warnings */
+};
+
+static void
+decode_cmd_data(struct tcb *tcp, u_int32_t cmd, unsigned long data)
+{
+	switch (cmd)
+	{
+		case Q_GETQUOTA:
+		case Q_SETQUOTA:
+		{
+			struct if_dqblk dq;
+
+			if (cmd == Q_GETQUOTA && syserror(tcp))
+			{
+				tprintf("%#lx", data);
+				break;
+			}
+			if (umove(tcp, data, &dq) < 0)
+			{
+				tprintf("{???} %#lx", data);
+				break;
+			}
+			tprintf("{bhardlimit=%" PRIu64 ", ", dq.dqb_bhardlimit);
+			tprintf("bsoftlimit=%" PRIu64 ", ", dq.dqb_bsoftlimit);
+			tprintf("curspace=%" PRIu64 ", ", dq.dqb_curspace);
+			tprintf("ihardlimit=%" PRIu64 ", ", dq.dqb_ihardlimit);
+			tprintf("isoftlimit=%" PRIu64 ", ", dq.dqb_isoftlimit);
+			tprintf("curinodes=%" PRIu64 ", ", dq.dqb_curinodes);
+			if (!abbrev(tcp))
+			{
+				tprintf("btime=%" PRIu64 ", ", dq.dqb_btime);
+				tprintf("itime=%" PRIu64 ", ", dq.dqb_itime);
+				tprintf("valid=");
+				printflags(if_dqblk_valid,
+					   dq.dqb_valid, "QIF_???");
+				tprintf("}");
+			} else
+				tprintf("...}");
+			break;
+		}
+		case Q_V1_GETQUOTA:
+		case Q_V1_SETQUOTA:
+		{
+			struct v1_dqblk dq;
+
+			if (cmd == Q_V1_GETQUOTA && syserror(tcp))
+			{
+				tprintf("%#lx", data);
+				break;
+			}
+			if (umove(tcp, data, &dq) < 0)
+			{
+				tprintf("{???} %#lx", data);
+				break;
+			}
+			tprintf("{bhardlimit=%u, ", dq.dqb_bhardlimit);
+			tprintf("bsoftlimit=%u, ", dq.dqb_bsoftlimit);
+			tprintf("curblocks=%u, ", dq.dqb_curblocks);
+			tprintf("ihardlimit=%u, ", dq.dqb_ihardlimit);
+			tprintf("isoftlimit=%u, ", dq.dqb_isoftlimit);
+			tprintf("curinodes=%u, ", dq.dqb_curinodes);
+			tprintf("btime=%lu, ", dq.dqb_btime);
+			tprintf("itime=%lu}", dq.dqb_itime);
+			break;
+		}
+		case Q_V2_GETQUOTA:
+		case Q_V2_SETQUOTA:
+		{
+			struct v2_dqblk dq;
+
+			if (cmd == Q_V2_GETQUOTA && syserror(tcp))
+			{
+				tprintf("%#lx", data);
+				break;
+			}
+			if (umove(tcp, data, &dq) < 0)
+			{
+				tprintf("{???} %#lx", data);
+				break;
+			}
+			tprintf("{ihardlimit=%u, ", dq.dqb_ihardlimit);
+			tprintf("isoftlimit=%u, ", dq.dqb_isoftlimit);
+			tprintf("curinodes=%u, ", dq.dqb_curinodes);
+			tprintf("bhardlimit=%u, ", dq.dqb_bhardlimit);
+			tprintf("bsoftlimit=%u, ", dq.dqb_bsoftlimit);
+			tprintf("curspace=%" PRIu64 ", ", dq.dqb_curspace);
+			tprintf("btime=%lu, ", dq.dqb_btime);
+			tprintf("itime=%lu}", dq.dqb_itime);
+			break;
+		}
+		case Q_XGETQUOTA:
+		case Q_XSETQLIM:
+		{
+			struct xfs_dqblk dq;
+
+			if (cmd == Q_XGETQUOTA && syserror(tcp))
+			{
+				tprintf("%#lx", data);
+				break;
+			}
+			if (umove(tcp, data, &dq) < 0)
+			{
+				tprintf("{???} %#lx", data);
+				break;
+			}
+			tprintf("{version=%d, ", dq.d_version);
+			tprintf("flags=");
+			printflags(xfs_dqblk_flags,
+				   dq.d_flags, "XFS_???_QUOTA");
+			tprintf(", fieldmask=%#x, ", dq.d_fieldmask);
+			tprintf("id=%u, ", dq.d_id);
+			tprintf("blk_hardlimit=%" PRIu64 ", ", dq.d_blk_hardlimit);
+			tprintf("blk_softlimit=%" PRIu64 ", ", dq.d_blk_softlimit);
+			tprintf("ino_hardlimit=%" PRIu64 ", ", dq.d_ino_hardlimit);
+			tprintf("ino_softlimit=%" PRIu64 ", ", dq.d_ino_softlimit);
+			tprintf("bcount=%" PRIu64 ", ", dq.d_bcount);
+			tprintf("icount=%" PRIu64 ", ", dq.d_icount);
+			if (!abbrev(tcp))
+			{
+				tprintf("itimer=%d, ", dq.d_itimer);
+				tprintf("btimer=%d, ", dq.d_btimer);
+				tprintf("iwarns=%u, ", dq.d_iwarns);
+				tprintf("bwarns=%u, ", dq.d_bwarns);
+				tprintf("rtbcount=%" PRIu64 ", ", dq.d_rtbcount);
+				tprintf("rtbtimer=%d, ", dq.d_rtbtimer);
+				tprintf("rtbwarns=%u}", dq.d_rtbwarns);
+			} else
+				tprintf("...}");
+			break;
+		}
+		case Q_GETFMT:
+		{
+			u_int32_t fmt;
+
+			if (syserror(tcp))
+			{
+				tprintf("%#lx", data);
+				break;
+			}
+			if (umove(tcp, data, &fmt) < 0)
+			{
+				tprintf("{???} %#lx", data);
+				break;
+			}
+			tprintf("{");
+			printxval(quota_formats, fmt, "QFMT_VFS_???");
+			tprintf("}");
+			break;
+		}
+		case Q_GETINFO:
+		case Q_SETINFO:
+		{
+			struct if_dqinfo dq;
+
+			if (cmd == Q_GETINFO && syserror(tcp))
+			{
+				tprintf("%#lx", data);
+				break;
+			}
+			if (umove(tcp, data, &dq) < 0)
+			{
+				tprintf("{???} %#lx", data);
+				break;
+			}
+			tprintf("{bgrace=%" PRIu64 ", ", dq.dqi_bgrace);
+			tprintf("igrace=%" PRIu64 ", ", dq.dqi_igrace);
+			tprintf("flags=%#x, ", dq.dqi_flags);
+			tprintf("valid=");
+			printflags(if_dqinfo_valid, dq.dqi_valid, "IIF_???");
+			tprintf("}");
+			break;
+		}
+		case Q_V2_GETINFO:
+		case Q_V2_SETINFO:
+		{
+			struct v2_dqinfo dq;
+
+			if (cmd == Q_V2_GETINFO && syserror(tcp))
+			{
+				tprintf("%#lx", data);
+				break;
+			}
+			if (umove(tcp, data, &dq) < 0)
+			{
+				tprintf("{???} %#lx", data);
+				break;
+			}
+			tprintf("{bgrace=%u, ", dq.dqi_bgrace);
+			tprintf("igrace=%u, ", dq.dqi_igrace);
+			tprintf("flags=%#x, ", dq.dqi_flags);
+			tprintf("blocks=%u, ", dq.dqi_blocks);
+			tprintf("free_blk=%u, ", dq.dqi_free_blk);
+			tprintf("free_entry=%u}", dq.dqi_free_entry);
+			break;
+		}
+		case Q_V1_GETSTATS:
+		{
+			struct v1_dqstats dq;
+
+			if (syserror(tcp))
+			{
+				tprintf("%#lx", data);
+				break;
+			}
+			if (umove(tcp, data, &dq) < 0)
+			{
+				tprintf("{???} %#lx", data);
+				break;
+			}
+			tprintf("{lookups=%u, ", dq.lookups);
+			tprintf("drops=%u, ", dq.drops);
+			tprintf("reads=%u, ", dq.reads);
+			tprintf("writes=%u, ", dq.writes);
+			tprintf("cache_hits=%u, ", dq.cache_hits);
+			tprintf("allocated_dquots=%u, ", dq.allocated_dquots);
+			tprintf("free_dquots=%u, ", dq.free_dquots);
+			tprintf("syncs=%u}", dq.syncs);
+			break;
+		}
+		case Q_V2_GETSTATS:
+		{
+			struct v2_dqstats dq;
+
+			if (syserror(tcp))
+			{
+				tprintf("%#lx", data);
+				break;
+			}
+			if (umove(tcp, data, &dq) < 0)
+			{
+				tprintf("{???} %#lx", data);
+				break;
+			}
+			tprintf("{lookups=%u, ", dq.lookups);
+			tprintf("drops=%u, ", dq.drops);
+			tprintf("reads=%u, ", dq.reads);
+			tprintf("writes=%u, ", dq.writes);
+			tprintf("cache_hits=%u, ", dq.cache_hits);
+			tprintf("allocated_dquots=%u, ", dq.allocated_dquots);
+			tprintf("free_dquots=%u, ", dq.free_dquots);
+			tprintf("syncs=%u, ", dq.syncs);
+			tprintf("version=%u}", dq.version);
+			break;
+		}
+		case Q_XGETQSTAT:
+		{
+			struct xfs_dqstats dq;
+
+			if (syserror(tcp))
+			{
+				tprintf("%#lx", data);
+				break;
+			}
+			if (umove(tcp, data, &dq) < 0)
+			{
+				tprintf("{???} %#lx", data);
+				break;
+			}
+			tprintf("{version=%d, ", dq.qs_version);
+			if (abbrev(tcp))
+			{
+				tprintf("...}");
+				break;
+			}
+			tprintf("flags=");
+			printflags(xfs_quota_flags,
+				   dq.qs_flags, "XFS_QUOTA_???");
+			tprintf(", incoredqs=%u, ", dq.qs_incoredqs);
+			tprintf("u_ino=%" PRIu64 ", ", dq.qs_uquota.qfs_ino);
+			tprintf("u_nblks=%" PRIu64 ", ", dq.qs_uquota.qfs_nblks);
+			tprintf("u_nextents=%u, ", dq.qs_uquota.qfs_nextents);
+			tprintf("g_ino=%" PRIu64 ", ", dq.qs_gquota.qfs_ino);
+			tprintf("g_nblks=%" PRIu64 ", ", dq.qs_gquota.qfs_nblks);
+			tprintf("g_nextents=%u, ", dq.qs_gquota.qfs_nextents);
+			tprintf("btimelimit=%d, ", dq.qs_btimelimit);
+			tprintf("itimelimit=%d, ", dq.qs_itimelimit);
+			tprintf("rtbtimelimit=%d, ", dq.qs_rtbtimelimit);
+			tprintf("bwarnlimit=%u, ", dq.qs_bwarnlimit);
+			tprintf("iwarnlimit=%u}", dq.qs_iwarnlimit);
+			break;
+		}
+		case Q_XQUOTAON:
+		{
+			u_int32_t flag;
+
+			if (umove(tcp, data, &flag) < 0)
+			{
+				tprintf("{???} %#lx", data);
+				break;
+			}
+			tprintf("{");
+			printflags(xfs_quota_flags, flag, "XFS_QUOTA_???");
+			tprintf("}");
+			break;
+		}
+		default:
+			tprintf("%#lx", data);
+			break;
+	}
+}
+
+int
+sys_quotactl(struct tcb *tcp)
+{
+	/*
+	 * The Linux kernel only looks at the low 32 bits of command and id
+	 * arguments, but on some 64-bit architectures (s390x) this word
+	 * will have been sign-extended when we see it.  The high 1 bits
+	 * don't mean anything, so don't confuse the output with them.
+	 */
+	u_int32_t qcmd = tcp->u_arg[0];
+	u_int32_t cmd = QCMD_CMD(qcmd);
+	u_int32_t type = QCMD_TYPE(qcmd);
+	u_int32_t id = tcp->u_arg[2];
+
+	if (!verbose(tcp))
+		return printargs(tcp);
+
+	if (entering(tcp))
+	{
+		printxval(quotacmds, cmd, "Q_???");
+		tprintf("|");
+		printxval(quotatypes, type, "???QUOTA");
+		tprintf(", ");
+		printstr(tcp, tcp->u_arg[1], -1);
+		tprintf(", ");
+		switch (cmd)
+		{
+			case Q_V1_QUOTAON:
+			case Q_QUOTAON:
+				printxval(quota_formats, id, "QFMT_VFS_???");
+				break;
+			case Q_V1_GETQUOTA:
+			case Q_V2_GETQUOTA:
+			case Q_GETQUOTA:
+			case Q_V1_SETQUOTA:
+			case Q_V2_SETQUOTA:
+			case Q_V1_SETUSE:
+			case Q_V2_SETUSE:
+			case Q_SETQLIM:
+			case Q_SETQUOTA:
+			case Q_XGETQUOTA:
+			case Q_XSETQLIM:
+				tprintf("%u", id);
+				break;
+			default:
+				tprintf("%#lx", tcp->u_arg[2]);
+				break;
+		}
+		tprintf(", ");
+	} else
+	{
+		if (!tcp->u_arg[3])
+			tprintf("NULL");
+		else
+			decode_cmd_data(tcp, cmd, tcp->u_arg[3]);
+	}
+	return 0;
+}
+
+#endif /* Linux */
+
+#if defined(SUNOS4) || defined(FREEBSD)
+
+#ifdef SUNOS4
+#include <ufs/quota.h>
+#endif
+
+#ifdef FREEBSD
+#include <ufs/ufs/quota.h>
+#endif
+
+static const struct xlat quotacmds[] = {
+	{Q_QUOTAON, "Q_QUOTAON"},
+	{Q_QUOTAOFF, "Q_QUOTAOFF"},
+	{Q_GETQUOTA, "Q_GETQUOTA"},
+	{Q_SETQUOTA, "Q_SETQUOTA"},
+#ifdef Q_SETQLIM
+	{Q_SETQLIM, "Q_SETQLIM"},
+#endif
+#ifdef Q_SETUSE
+	{Q_SETUSE, "Q_SETUSE"},
+#endif
+	{Q_SYNC, "Q_SYNC"},
+	{0, NULL},
+};
+
+int
+sys_quotactl(struct tcb *tcp)
+{
+	/* fourth arg (addr) not interpreted here */
+	if (entering(tcp))
+	{
+#ifdef SUNOS4
+		printxval(quotacmds, tcp->u_arg[0], "Q_???");
+		tprintf(", ");
+		printstr(tcp, tcp->u_arg[1], -1);
+#endif
+#ifdef FREEBSD
+		printpath(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printxval(quotacmds, tcp->u_arg[1], "Q_???");
+#endif
+		tprintf(", %lu, %#lx", tcp->u_arg[2], tcp->u_arg[3]);
+	}
+	return 0;
+}
+
+#endif /* SUNOS4 || FREEBSD */
diff --git a/resource.c b/resource.c
index 1c31bbc..b9550b8 100644
--- a/resource.c
+++ b/resource.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: resource.c,v 1.13 2004/10/06 22:14:53 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -36,18 +36,7 @@
 #ifdef LINUX
 #include <sys/times.h>
 #include <linux/kernel.h>
-#ifdef HAVE_ANDROID_OS
-#define spinlock_t struct spinlock_t
-#define if_dqblk dqblk
-#define dqb_curblocks dqb_curspace
-#else
-#include <sys/quota.h>
-#endif
-#include <linux/quota.h>
 #endif /* LINUX */
-#ifdef SUNOS4
-#include <ufs/quota.h>
-#endif /* SUNOS4 */
 #if defined(SVR4) || defined(FREEBSD)
 #include <sys/times.h>
 #include <sys/time.h>
@@ -67,55 +56,60 @@
 #endif
 
 static const struct xlat resources[] = {
-#ifdef RLIMIT_CPU
-	{ RLIMIT_CPU,	"RLIMIT_CPU"	},
-#endif
-#ifdef RLIMIT_FSIZE
-	{ RLIMIT_FSIZE,	"RLIMIT_FSIZE"	},
-#endif
-#ifdef RLIMIT_DATA
-	{ RLIMIT_DATA,	"RLIMIT_DATA"	},
-#endif
-#ifdef RLIMIT_STACK
-	{ RLIMIT_STACK,	"RLIMIT_STACK"	},
+#ifdef RLIMIT_AS
+	{ RLIMIT_AS,	"RLIMIT_AS"	},
 #endif
 #ifdef RLIMIT_CORE
 	{ RLIMIT_CORE,	"RLIMIT_CORE"	},
 #endif
-#ifdef RLIMIT_RSS
-	{ RLIMIT_RSS,	"RLIMIT_RSS"	},
+#ifdef RLIMIT_CPU
+	{ RLIMIT_CPU,	"RLIMIT_CPU"	},
 #endif
-#ifdef RLIMIT_NPROC
-	{ RLIMIT_NPROC,"RLIMIT_NPROC"	},
+#ifdef RLIMIT_DATA
+	{ RLIMIT_DATA,	"RLIMIT_DATA"	},
 #endif
-#ifdef RLIMIT_NOFILE
-	{ RLIMIT_NOFILE,"RLIMIT_NOFILE"	},
-#endif
-#ifdef RLIMIT_MEMLOCK
-	{ RLIMIT_MEMLOCK,	"RLIMIT_MEMLOCK"	},
-#endif
-#ifdef RLIMIT_VMEM
-	{ RLIMIT_VMEM,	"RLIMIT_VMEM"	},
-#endif
-#ifdef RLIMIT_AS
-	{ RLIMIT_AS,	"RLIMIT_AS"	},
+#ifdef RLIMIT_FSIZE
+	{ RLIMIT_FSIZE,	"RLIMIT_FSIZE"	},
 #endif
 #ifdef RLIMIT_LOCKS
 	{ RLIMIT_LOCKS,	"RLIMIT_LOCKS"	},
 #endif
-#ifdef RLIMIT_SIGPENDING
-	{ RLIMIT_SIGPENDING,	"RLIMIT_SIGPENDING"	},
+#ifdef RLIMIT_MEMLOCK
+	{ RLIMIT_MEMLOCK,	"RLIMIT_MEMLOCK"	},
 #endif
 #ifdef RLIMIT_MSGQUEUE
 	{ RLIMIT_MSGQUEUE,	"RLIMIT_MSGQUEUE"	},
 #endif
+#ifdef RLIMIT_NICE
+	{ RLIMIT_NICE,	"RLIMIT_NICE"	},
+#endif
+#ifdef RLIMIT_NOFILE
+	{ RLIMIT_NOFILE,	"RLIMIT_NOFILE"	},
+#endif
+#ifdef RLIMIT_NPROC
+	{ RLIMIT_NPROC,	"RLIMIT_NPROC"	},
+#endif
+#ifdef RLIMIT_RSS
+	{ RLIMIT_RSS,	"RLIMIT_RSS"	},
+#endif
+#ifdef RLIMIT_RTPRIO
+	{ RLIMIT_RTPRIO,	"RLIMIT_RTPRIO"	},
+#endif
+#ifdef RLIMIT_SIGPENDING
+	{ RLIMIT_SIGPENDING,	"RLIMIT_SIGPENDING"	},
+#endif
+#ifdef RLIMIT_STACK
+	{ RLIMIT_STACK,	"RLIMIT_STACK"	},
+#endif
+#ifdef RLIMIT_VMEM
+	{ RLIMIT_VMEM,	"RLIMIT_VMEM"	},
+#endif
 	{ 0,		NULL		},
 };
 
 #if !HAVE_LONG_LONG_RLIM_T
 static char *
-sprintrlim(lim)
-long lim;
+sprintrlim(long lim)
 {
 	static char buf[32];
 
@@ -128,9 +122,30 @@
 	return buf;
 }
 
+# if defined LINUX && (defined POWERPC64 || defined X86_64)
+static void
+print_rlimit32(struct tcb *tcp)
+{
+	struct rlimit32 {
+		unsigned int rlim_cur;
+		unsigned int rlim_max;
+	} rlim;
+
+	if (umove(tcp, tcp->u_arg[1], &rlim) < 0)
+		tprintf("{...}");
+	else {
+		tprintf("{rlim_cur=%s,",
+			sprintrlim(rlim.rlim_cur == -1 ? RLIM_INFINITY
+				   : rlim.rlim_cur));
+		tprintf(" rlim_max=%s}",
+			sprintrlim(rlim.rlim_max == -1 ? RLIM_INFINITY
+				   : rlim.rlim_max));
+	}
+}
+# endif
+
 int
-sys_getrlimit(tcp)
-struct tcb *tcp;
+sys_getrlimit(struct tcb *tcp)
 {
 	struct rlimit rlim;
 
@@ -141,6 +156,10 @@
 	else {
 		if (syserror(tcp) || !verbose(tcp))
 			tprintf("%#lx", tcp->u_arg[1]);
+# if defined LINUX && (defined POWERPC64 || defined X86_64)
+		else if (current_personality == 1)
+			print_rlimit32(tcp);
+# endif
 		else if (umove(tcp, tcp->u_arg[1], &rlim) < 0)
 			tprintf("{...}");
 		else {
@@ -152,8 +171,7 @@
 }
 
 int
-sys_setrlimit(tcp)
-struct tcb *tcp;
+sys_setrlimit(struct tcb *tcp)
 {
 	struct rlimit rlim;
 
@@ -162,6 +180,10 @@
 		tprintf(", ");
 		if (!verbose(tcp))
 			tprintf("%#lx", tcp->u_arg[1]);
+# if defined LINUX && (defined POWERPC64 || defined X86_64)
+		else if (current_personality == 1)
+			print_rlimit32(tcp);
+# endif
 		else if (umove(tcp, tcp->u_arg[1], &rlim) < 0)
 			tprintf("{...}");
 		else {
@@ -173,11 +195,9 @@
 }
 #endif /* !HAVE_LONG_LONG_RLIM_T */
 
-#ifndef HAVE_ANDROID_OS
 #if _LFS64_LARGEFILE || HAVE_LONG_LONG_RLIM_T
 static char *
-sprintrlim64(lim)
-rlim64_t lim;
+sprintrlim64(rlim64_t lim)
 {
 	static char buf[64];
 
@@ -191,8 +211,7 @@
 }
 
 int
-sys_getrlimit64(tcp)
-struct tcb *tcp;
+sys_getrlimit64(struct tcb *tcp)
 {
 	struct rlimit64 rlim;
 
@@ -214,8 +233,7 @@
 }
 
 int
-sys_setrlimit64(tcp)
-struct tcb *tcp;
+sys_setrlimit64(struct tcb *tcp)
 {
 	struct rlimit64 rlim;
 
@@ -234,7 +252,6 @@
 	return 0;
 }
 #endif /* _LFS64_LARGEFILES || HAVE_LONG_LONG_RLIM_T */
-#endif /* HAVE_ANDROID_OS */
 
 #ifndef SVR4
 
@@ -249,70 +266,64 @@
 
 #ifdef ALPHA
 void
-printrusage32(tcp, addr)
-struct tcb *tcp;
-long addr;
+printrusage32(struct tcb *tcp, long addr)
 {
-    struct timeval32
-    {
-	unsigned tv_sec;
-	unsigned tv_usec;
-    };
-    struct rusage32
-    {
-	struct timeval32 ru_utime;	/* user time used */
-	struct timeval32 ru_stime;	/* system time used */
-	long	ru_maxrss;		/* maximum resident set size */
-	long	ru_ixrss;		/* integral shared memory size */
-	long	ru_idrss;		/* integral unshared data size */
-	long	ru_isrss;		/* integral unshared stack size */
-	long	ru_minflt;		/* page reclaims */
-	long	ru_majflt;		/* page faults */
-	long	ru_nswap;		/* swaps */
-	long	ru_inblock;		/* block input operations */
-	long	ru_oublock;		/* block output operations */
-	long	ru_msgsnd;		/* messages sent */
-	long	ru_msgrcv;		/* messages received */
-	long	ru_nsignals;		/* signals received */
-	long	ru_nvcsw;		/* voluntary context switches */
-	long	ru_nivcsw;		/* involuntary " */
-    } ru;
+	struct timeval32 {
+		unsigned tv_sec;
+		unsigned tv_usec;
+	};
+	struct rusage32 {
+		struct timeval32 ru_utime;	/* user time used */
+		struct timeval32 ru_stime;	/* system time used */
+		long	ru_maxrss;		/* maximum resident set size */
+		long	ru_ixrss;		/* integral shared memory size */
+		long	ru_idrss;		/* integral unshared data size */
+		long	ru_isrss;		/* integral unshared stack size */
+		long	ru_minflt;		/* page reclaims */
+		long	ru_majflt;		/* page faults */
+		long	ru_nswap;		/* swaps */
+		long	ru_inblock;		/* block input operations */
+		long	ru_oublock;		/* block output operations */
+		long	ru_msgsnd;		/* messages sent */
+		long	ru_msgrcv;		/* messages received */
+		long	ru_nsignals;		/* signals received */
+		long	ru_nvcsw;		/* voluntary context switches */
+		long	ru_nivcsw;		/* involuntary " */
+	} ru;
 
-    if (!addr)
-	tprintf("NULL");
-    else if (syserror(tcp) || !verbose(tcp))
-	tprintf("%#lx", addr);
-    else if (umove(tcp, addr, &ru) < 0)
-	tprintf("{...}");
-    else if (!abbrev(tcp)) {
-	tprintf("{ru_utime={%lu, %lu}, ru_stime={%lu, %lu}, ",
-		(long) ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec,
-		(long) ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec);
-	tprintf("ru_maxrss=%lu, ru_ixrss=%lu, ",
-		ru.ru_maxrss, ru.ru_ixrss);
-	tprintf("ru_idrss=%lu, ru_isrss=%lu, ",
-		ru.ru_idrss, ru.ru_isrss);
-	tprintf("ru_minflt=%lu, ru_majflt=%lu, ru_nswap=%lu, ",
-		ru.ru_minflt, ru.ru_majflt, ru.ru_nswap);
-	tprintf("ru_inblock=%lu, ru_oublock=%lu, ",
-		ru.ru_inblock, ru.ru_oublock);
-	tprintf("ru_msgsnd=%lu, ru_msgrcv=%lu, ",
-		ru.ru_msgsnd, ru.ru_msgrcv);
-	tprintf("ru_nsignals=%lu, ru_nvcsw=%lu, ru_nivcsw=%lu}",
-		ru.ru_nsignals, ru.ru_nvcsw, ru.ru_nivcsw);
-    }
-    else {
-	tprintf("{ru_utime={%lu, %lu}, ru_stime={%lu, %lu}, ...}",
-		(long) ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec,
-		(long) ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec);
-    }
+	if (!addr)
+		tprintf("NULL");
+	else if (syserror(tcp) || !verbose(tcp))
+		tprintf("%#lx", addr);
+	else if (umove(tcp, addr, &ru) < 0)
+		tprintf("{...}");
+	else if (!abbrev(tcp)) {
+		tprintf("{ru_utime={%lu, %lu}, ru_stime={%lu, %lu}, ",
+			(long) ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec,
+			(long) ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec);
+		tprintf("ru_maxrss=%lu, ru_ixrss=%lu, ",
+			ru.ru_maxrss, ru.ru_ixrss);
+		tprintf("ru_idrss=%lu, ru_isrss=%lu, ",
+			ru.ru_idrss, ru.ru_isrss);
+		tprintf("ru_minflt=%lu, ru_majflt=%lu, ru_nswap=%lu, ",
+			ru.ru_minflt, ru.ru_majflt, ru.ru_nswap);
+		tprintf("ru_inblock=%lu, ru_oublock=%lu, ",
+			ru.ru_inblock, ru.ru_oublock);
+		tprintf("ru_msgsnd=%lu, ru_msgrcv=%lu, ",
+			ru.ru_msgsnd, ru.ru_msgrcv);
+		tprintf("ru_nsignals=%lu, ru_nvcsw=%lu, ru_nivcsw=%lu}",
+			ru.ru_nsignals, ru.ru_nvcsw, ru.ru_nivcsw);
+	}
+	else {
+		tprintf("{ru_utime={%lu, %lu}, ru_stime={%lu, %lu}, ...}",
+			(long) ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec,
+			(long) ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec);
+	}
 }
 #endif
 
 void
-printrusage(tcp, addr)
-struct tcb *tcp;
-long addr;
+printrusage(struct tcb *tcp, long addr)
 {
 	struct rusage ru;
 
@@ -347,8 +358,7 @@
 }
 
 int
-sys_getrusage(tcp)
-struct tcb *tcp;
+sys_getrusage(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printxval(usagewho, tcp->u_arg[0], "RUSAGE_???");
@@ -361,16 +371,15 @@
 
 #ifdef ALPHA
 int
-sys_osf_getrusage(tcp)
-struct tcb *tcp;
+sys_osf_getrusage(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-	printxval(usagewho, tcp->u_arg[0], "RUSAGE_???");
-	tprintf(", ");
-    }
-    else
-	printrusage32(tcp, tcp->u_arg[1]);
-    return 0;
+	if (entering(tcp)) {
+		printxval(usagewho, tcp->u_arg[0], "RUSAGE_???");
+		tprintf(", ");
+	}
+	else
+		printrusage32(tcp, tcp->u_arg[1]);
+	return 0;
 }
 #endif /* ALPHA */
 
@@ -379,8 +388,7 @@
 #ifdef LINUX
 
 int
-sys_sysinfo(tcp)
-struct tcb *tcp;
+sys_sysinfo(struct tcb *tcp)
 {
 	struct sysinfo si;
 
@@ -414,8 +422,7 @@
 };
 
 int
-sys_getpriority(tcp)
-struct tcb *tcp;
+sys_getpriority(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printxval(priorities, tcp->u_arg[0], "PRIO_???");
@@ -425,8 +432,7 @@
 }
 
 int
-sys_setpriority(tcp)
-struct tcb *tcp;
+sys_setpriority(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printxval(priorities, tcp->u_arg[0], "PRIO_???");
@@ -436,8 +442,7 @@
 }
 
 int
-sys_nice(tcp)
-struct tcb *tcp;
+sys_nice(struct tcb *tcp)
 {
 	if (entering(tcp))
 		tprintf("%ld", tcp->u_arg[0]);
@@ -447,8 +452,7 @@
 #ifndef SUNOS4
 
 int
-sys_times(tcp)
-struct tcb *tcp;
+sys_times(struct tcb *tcp)
 {
 	struct tms tbuf;
 
@@ -470,144 +474,3 @@
 }
 
 #endif /* !SUNOS4 */
-
-
-//#ifndef HAVE_ANDROID_OS
-#ifdef LINUX
-
-#define NEW_CMD(c)      ((0x80<<16)+(c))
-#define XQM_CMD(c)      (('X'<<8)+(c))
-#define NEW_COMMAND(c) (( ((c) >> SUBCMDSHIFT) & (0x80 << 16)))
-#define XQM_COMMAND(c) (( ((c) >> SUBCMDSHIFT) & ('X' << 8)) == ('X' << 8))
-#define OLD_COMMAND(c) (!NEW_COMMAND(c) && !XQM_COMMAND(c))
-
-static const struct xlat quotacmds[] = {
-	{ Q_QUOTAON,	"Q_QUOTAON"	},
-	{ Q_QUOTAOFF,	"Q_QUOTAOFF"	},
-	{ Q_GETQUOTA,	"Q_GETQUOTA"	},
-	{ Q_SETQUOTA,	"Q_SETQUOTA"	},
-#ifndef HAVE_ANDROID_OS
-	{ Q_SETUSE,	"Q_SETUSE"	},
-#endif
-	{ Q_SYNC,	"Q_SYNC"	},
-#ifndef HAVE_ANDROID_OS
-	{ Q_SETQLIM,	"Q_SETQLIM"	},
-	{ Q_GETSTATS,	"Q_GETSTATS"	},
-	{ Q_RSQUASH,	"Q_RSQUASH"	},
-#endif
-	{ NEW_CMD(0x1), "Q_SYNC"        },
-	{ NEW_CMD(0x2), "Q_QUOTAON"     },
-	{ NEW_CMD(0x3), "Q_QUOTAOFF"    },
-	{ NEW_CMD(0x4), "Q_GETFMT"      },
-	{ NEW_CMD(0x5), "Q_GETINFO"     },
-	{ NEW_CMD(0x6), "Q_SETINFO"     },
-	{ NEW_CMD(0x7), "Q_GETQUOTA"    },
-	{ NEW_CMD(0x8), "Q_SETQUOTA"    },
-	{ XQM_CMD(0x1), "Q_XQUOTAON"    },
-	{ XQM_CMD(0x2), "Q_XQUOTAOFF"   },
-	{ XQM_CMD(0x3), "Q_XGETQUOTA"   },
-	{ XQM_CMD(0x4), "Q_XSETQLIM"    },
-	{ XQM_CMD(0x5), "Q_XGETQSTAT"   },
-	{ XQM_CMD(0x6), "Q_XQUOTARM"    },
-	{ 0,		NULL		},
-};
-
-static const struct xlat quotatypes[] = {
-	{ USRQUOTA,	"USRQUOTA"	},
-	{ GRPQUOTA,	"GRPQUOTA"	},
-	{ 0,		NULL		},
-};
-
-int
-sys_quotactl(tcp)
-struct tcb *tcp;
-{
-	/*
-	 * The Linux kernel only looks at the low 32 bits of the command
-	 * argument, but on some 64-bit architectures (s390x) this word
-	 * will have been sign-extended when we see it.  The high 1 bits
-	 * don't mean anything, so don't confuse the output with them.
-	 */
-	unsigned int cmd = tcp->u_arg[0];
-
-	if (entering(tcp)) {
-		printxval(quotacmds, cmd >> SUBCMDSHIFT, "Q_???");
-		tprintf("|");
-		printxval(quotatypes, cmd & SUBCMDMASK, "???QUOTA");
-		tprintf(", ");
-		printstr(tcp, tcp->u_arg[1], -1);
-		tprintf(", %lu, ", tcp->u_arg[2]);
-	}
-	else {
-		struct dqblk dq;
-
-		if (!tcp->u_arg[3])
-			tprintf("NULL");
-               else if (!verbose(tcp) || !OLD_COMMAND(cmd))
-			tprintf("%#lx", tcp->u_arg[3]);
-                else if (umoven(tcp, tcp->u_arg[3], sizeof(struct dqblk),
-                    (char *) &dq) < 0)
-                        tprintf("???");
-		else {
-                        tprintf("{");
-			tprintf("%u, ", dq.dqb_bhardlimit);
-			tprintf("%u, ", dq.dqb_bsoftlimit);
-			tprintf("%u, ", dq.dqb_curblocks);
-			tprintf("%u, ", dq.dqb_ihardlimit);
-			tprintf("%u, ", dq.dqb_isoftlimit);
-			tprintf("%u, ", dq.dqb_curinodes);
-			tprintf("%lu, ", dq.dqb_btime);
-			tprintf("%lu", dq.dqb_itime);
-                        tprintf("}");
-		}
-
-	}
-	return 0;
-}
-
-#endif /* Linux */
-//#endif /* HAVE_ANDROID_OS */
-
-#if defined(SUNOS4) || defined(FREEBSD)
-
-#ifdef FREEBSD
-#include <ufs/ufs/quota.h>
-#endif
-
-static const struct xlat quotacmds[] = {
-	{ Q_QUOTAON,	"Q_QUOTAON"	},
-	{ Q_QUOTAOFF,	"Q_QUOTAOFF"	},
-	{ Q_GETQUOTA,	"Q_GETQUOTA"	},
-	{ Q_SETQUOTA,	"Q_SETQUOTA"	},
-#ifdef Q_SETQLIM
-	{ Q_SETQLIM,	"Q_SETQLIM"	},
-#endif
-#ifdef Q_SETUSE
-	{ Q_SETUSE,	"Q_SETUSE"	},
-#endif
-	{ Q_SYNC,	"Q_SYNC"	},
-	{ 0,		NULL		},
-};
-
-int
-sys_quotactl(tcp)
-struct tcb *tcp;
-{
-	/* fourth arg (addr) not interpreted here */
-	if (entering(tcp)) {
-#ifdef SUNOS4
-		printxval(quotacmds, tcp->u_arg[0], "Q_???");
-		tprintf(", ");
-		printstr(tcp, tcp->u_arg[1], -1);
-#endif
-#ifdef FREEBSD
-		printpath(tcp, tcp->u_arg[0]);
-		tprintf(", ");
-		printxval(quotacmds, tcp->u_arg[1], "Q_???");
-#endif
-		tprintf(", %lu, %#lx", tcp->u_arg[2], tcp->u_arg[3]);
-	}
-	return 0;
-}
-
-#endif /* SUNOS4 || FREEBSD */
diff --git a/scsi.c b/scsi.c
new file mode 100644
index 0000000..cc077a9
--- /dev/null
+++ b/scsi.c
@@ -0,0 +1,114 @@
+#include "defs.h"
+
+#ifdef LINUX
+#include <sys/ioctl.h>
+#include <scsi/sg.h>
+
+static const struct xlat sg_io_dxfer_direction[] = {
+	{SG_DXFER_NONE,        "SG_DXFER_NONE"},
+	{SG_DXFER_TO_DEV,      "SG_DXFER_TO_DEV"},
+	{SG_DXFER_FROM_DEV,    "SG_DXFER_FROM_DEV"},
+	{SG_DXFER_TO_FROM_DEV, "SG_DXFER_TO_FROM_DEV"},
+	{0, NULL}
+};
+
+static void
+print_sg_io_buffer(struct tcb *tcp, unsigned char *addr, int len)
+{
+	unsigned char *buf = NULL;
+	int     allocated, i;
+
+	if (len == 0)
+		return;
+	allocated = (len > max_strlen) ? max_strlen : len;
+	if (len < 0 ||
+	    (buf = malloc(allocated)) == NULL ||
+	    umoven(tcp, (unsigned long) addr, allocated, (char *) buf) < 0) {
+		tprintf("%p", addr);
+		free(buf);
+		return;
+	}
+	tprintf("%02x", buf[0]);
+	for (i = 1; i < allocated; ++i)
+		tprintf(", %02x", buf[i]);
+	free(buf);
+	if (allocated != len)
+		tprintf(", ...");
+}
+
+static void
+print_sg_io_req(struct tcb *tcp, struct sg_io_hdr *sg_io)
+{
+	tprintf("{'%c', ", sg_io->interface_id);
+	printxval(sg_io_dxfer_direction, sg_io->dxfer_direction,
+		  "SG_DXFER_???");
+	tprintf(", cmd[%u]=[", sg_io->cmd_len);
+	print_sg_io_buffer(tcp, sg_io->cmdp, sg_io->cmd_len);
+	tprintf("], mx_sb_len=%d, ", sg_io->mx_sb_len);
+	tprintf("iovec_count=%d, ", sg_io->iovec_count);
+	tprintf("dxfer_len=%u, ", sg_io->dxfer_len);
+	tprintf("timeout=%u, ", sg_io->timeout);
+	tprintf("flags=%#x", sg_io->flags);
+
+	if (sg_io->dxfer_direction == SG_DXFER_TO_DEV ||
+	    sg_io->dxfer_direction == SG_DXFER_TO_FROM_DEV) {
+		tprintf(", data[%u]=[", sg_io->dxfer_len);
+		printstr(tcp, (unsigned long) sg_io->dxferp,
+			 sg_io->dxfer_len);
+		tprintf("]");
+	}
+}
+
+static void
+print_sg_io_res(struct tcb *tcp, struct sg_io_hdr *sg_io)
+{
+	if (sg_io->dxfer_direction == SG_DXFER_FROM_DEV ||
+	    sg_io->dxfer_direction == SG_DXFER_TO_FROM_DEV) {
+		tprintf(", data[%u]=[", sg_io->dxfer_len);
+		printstr(tcp, (unsigned long) sg_io->dxferp,
+			 sg_io->dxfer_len);
+		tprintf("]");
+	}
+	tprintf(", status=%02x, ", sg_io->status);
+	tprintf("masked_status=%02x, ", sg_io->masked_status);
+	tprintf("sb[%u]=[", sg_io->sb_len_wr);
+	print_sg_io_buffer(tcp, sg_io->sbp, sg_io->sb_len_wr);
+	tprintf("], host_status=%#x, ", sg_io->host_status);
+	tprintf("driver_status=%#x, ", sg_io->driver_status);
+	tprintf("resid=%d, ", sg_io->resid);
+	tprintf("duration=%d, ", sg_io->duration);
+	tprintf("info=%#x}", sg_io->info);
+}
+
+int
+scsi_ioctl(struct tcb *tcp, long code, long arg)
+{
+	switch (code) {
+	case SG_IO:
+		if (entering(tcp)) {
+			struct sg_io_hdr sg_io;
+
+			if (umove(tcp, arg, &sg_io) < 0)
+				tprintf(", %#lx", arg);
+			else {
+				tprintf(", ");
+				print_sg_io_req(tcp, &sg_io);
+			}
+		}
+		if (exiting(tcp)) {
+			struct sg_io_hdr sg_io;
+
+			if (!syserror(tcp) && umove(tcp, arg, &sg_io) >= 0)
+				print_sg_io_res(tcp, &sg_io);
+			else
+				tprintf("}");
+		}
+		break;
+	default:
+		if (entering(tcp))
+			tprintf(", %#lx", arg);
+		break;
+	}
+	return 1;
+}
+#endif /* LINUX */
diff --git a/signal.c b/signal.c
index cec367c..ce5b462 100644
--- a/signal.c
+++ b/signal.c
@@ -30,18 +30,24 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: signal.c,v 1.54 2005/06/01 19:02:37 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
 
+#include <stdint.h>
 #include <signal.h>
-#ifdef HAVE_ANDROID_OS
-#else
+#ifndef HAVE_ANDROID_OS
 #include <sys/user.h>
 #endif
 #include <fcntl.h>
 
+#ifdef HAVE_ANDROID_OS
+//FIXME use "sigprocmask" or something
+#define sigmask(sig)    (1UL << ((sig) - 1))
+#define sigcontext_struct sigcontext
+#endif
+
 #ifdef SVR4
 #include <sys/ucontext.h>
 #endif /* SVR4 */
@@ -74,30 +80,16 @@
 # include <asm/ptrace_offsets.h>
 #endif /* !IA64 */
 
-#if HAVE_ASM_REG_H
-# if defined (SPARC) || defined (SPARC64)
-#  define fpq kernel_fpq
-#  define fq kernel_fq
-#  define fpu kernel_fpu
-# endif
-# include <asm/reg.h>
-# if defined (SPARC) || defined (SPARC64)
-#  undef fpq
-#  undef fq
-#  undef fpu
-# endif
 #if defined (LINUX) && defined (SPARC64)
-# define r_pc r_tpc
 # undef PTRACE_GETREGS
 # define PTRACE_GETREGS PTRACE_GETREGS64
 # undef PTRACE_SETREGS
 # define PTRACE_SETREGS PTRACE_SETREGS64
 #endif /* LINUX && SPARC64 */
-#endif /* HAVE_ASM_REG_H */
 
-#if defined (SPARC) || defined (SPARC64)
+#if defined (SPARC) || defined (SPARC64) || defined (MIPS)
 typedef struct {
-	struct regs		si_regs;
+	struct pt_regs		si_regs;
 	int			si_mask;
 } m_siginfo_t;
 #elif defined HAVE_ASM_SIGCONTEXT_H
@@ -105,7 +97,7 @@
 #include <asm/sigcontext.h>
 #endif /* !IA64 && !X86_64 */
 #else /* !HAVE_ASM_SIGCONTEXT_H */
-#ifdef I386
+#if defined I386 && !defined HAVE_STRUCT_SIGCONTEXT_STRUCT
 struct sigcontext_struct {
 	unsigned short gs, __gsh;
 	unsigned short fs, __fsh;
@@ -131,7 +123,7 @@
 	unsigned long cr2;
 };
 #else /* !I386 */
-#ifdef M68K
+#if defined M68K && !defined HAVE_STRUCT_SIGCONTEXT
 struct sigcontext
 {
 	unsigned long sc_mask;
@@ -213,10 +205,16 @@
 #ifdef SA_INTERRUPT
 	{ SA_INTERRUPT,	"SA_INTERRUPT"	},
 #endif
-#ifdef SA_NOMASK
+#ifdef SA_NODEFER
+	{ SA_NODEFER,	"SA_NODEFER"	},
+#endif
+#if defined SA_NOMASK && SA_NODEFER != SA_NOMASK
 	{ SA_NOMASK,	"SA_NOMASK"	},
 #endif
-#ifdef SA_ONESHOT
+#ifdef SA_RESETHAND
+	{ SA_RESETHAND,	"SA_RESETHAND"	},
+#endif
+#if defined SA_ONESHOT && SA_ONESHOT != SA_RESETHAND
 	{ SA_ONESHOT,	"SA_ONESHOT"	},
 #endif
 #ifdef SA_SIGINFO
@@ -240,6 +238,9 @@
 #ifdef _SA_BSDCALL
 	{ _SA_BSDCALL,	"_SA_BSDCALL"	},
 #endif
+#ifdef SA_NOPTRACE
+	{ SA_NOPTRACE,	"SA_NOPTRACE"	},
+#endif
 	{ 0,		NULL		},
 };
 
@@ -316,18 +317,17 @@
 #define copy_sigset(tcp, addr, s) copy_sigset_len(tcp, addr, s, sizeof(sigset_t))
 #endif
 
-static char *
-sprintsigmask(s, mask, rt)
-char *s;
-sigset_t *mask;
-int rt; /* set might include realtime sigs */
+static const char *
+sprintsigmask(const char *str, sigset_t *mask, int rt)
+/* set might include realtime sigs */
 {
 	int i, nsigs;
 	int maxsigs;
-	char *format;
+	const char *format;
+	char *s;
 	static char outstr[8 * sizeof(sigset_t) * 8];
 
-	strcpy(outstr, s);
+	strcpy(outstr, str);
 	s = outstr + strlen(outstr);
 	nsigs = 0;
 	maxsigs = nsignals;
@@ -398,6 +398,19 @@
 	tprintf("%s", signame(nr));
 }
 
+void
+print_sigset(struct tcb *tcp, long addr, int rt)
+{
+	sigset_t ss;
+
+	if (!addr)
+		tprintf("NULL");
+	else if (copy_sigset(tcp, addr, &ss) < 0)
+		tprintf("%#lx", addr);
+	else
+		printsigmask(&ss, rt);
+}
+
 #ifdef LINUX
 
 #ifndef ILL_ILLOPC
@@ -436,14 +449,19 @@
 #define POLL_ERR        4       /* i/o error */
 #define POLL_PRI        5       /* high priority input available */
 #define POLL_HUP        6       /* device disconnected */
+#define SI_KERNEL	0x80	/* sent by kernel */
 #define SI_USER         0       /* sent by kill, sigsend, raise */
 #define SI_QUEUE        -1      /* sent by sigqueue */
 #define SI_TIMER        -2      /* sent by timer expiration */
 #define SI_MESGQ        -3      /* sent by real time mesq state change */
 #define SI_ASYNCIO      -4      /* sent by AIO completion */
-#define SI_SIGIO	-5	/* Sent by SIGIO */
-#define SI_TKILL	-6	/* Sent by tkill */
-#endif
+#define SI_SIGIO	-5	/* sent by SIGIO */
+#define SI_TKILL	-6	/* sent by tkill */
+#define SI_ASYNCNL	-60     /* sent by asynch name lookup completion */
+
+#define SI_FROMUSER(sip)	((sip)->si_code <= 0)
+
+#endif /* LINUX */
 
 #if __GLIBC_MINOR__ < 1 && !defined(HAVE_ANDROID_OS)
 /* Type for data associated with a signal.  */
@@ -532,33 +550,39 @@
 #if defined (SVR4) || defined (LINUX)
 
 static const struct xlat siginfo_codes[] = {
-#ifdef SI_NOINFO
-	{ SI_NOINFO,	"SI_NOINFO"	},
+#ifdef SI_KERNEL
+	{ SI_KERNEL,	"SI_KERNEL"	},
 #endif
 #ifdef SI_USER
 	{ SI_USER,	"SI_USER"	},
 #endif
-#ifdef SI_LWP
-	{ SI_LWP,	"SI_LWP"	},
-#endif
 #ifdef SI_QUEUE
 	{ SI_QUEUE,	"SI_QUEUE"	},
 #endif
 #ifdef SI_TIMER
 	{ SI_TIMER,	"SI_TIMER"	},
 #endif
-#ifdef SI_ASYNCIO
-	{ SI_ASYNCIO,	"SI_ASYNCIO"	},
-#endif
 #ifdef SI_MESGQ
 	{ SI_MESGQ,	"SI_MESGQ"	},
 #endif
+#ifdef SI_ASYNCIO
+	{ SI_ASYNCIO,	"SI_ASYNCIO"	},
+#endif
 #ifdef SI_SIGIO
 	{ SI_SIGIO,	"SI_SIGIO"	},
 #endif
 #ifdef SI_TKILL
 	{ SI_TKILL,	"SI_TKILL"	},
 #endif
+#ifdef SI_ASYNCNL
+	{ SI_ASYNCNL,	"SI_ASYNCNL"	},
+#endif
+#ifdef SI_NOINFO
+	{ SI_NOINFO,	"SI_NOINFO"	},
+#endif
+#ifdef SI_LWP
+	{ SI_LWP,	"SI_LWP"	},
+#endif
 	{ 0,		NULL		},
 };
 
@@ -642,9 +666,7 @@
 };
 
 void
-printsiginfo(sip, verbose)
-siginfo_t *sip;
-int verbose;
+printsiginfo(siginfo_t *sip, int verbose)
 {
 	const char *code;
 
@@ -705,23 +727,36 @@
 		}
 #ifdef SI_FROMUSER
 		if (SI_FROMUSER(sip)) {
-			tprintf(", si_pid=%ld, si_uid=%ld",
-				sip->si_pid, sip->si_uid);
-#ifdef SI_QUEUE
+			tprintf(", si_pid=%lu, si_uid=%lu",
+				(unsigned long) sip->si_pid,
+				(unsigned long) sip->si_uid);
 			switch (sip->si_code) {
-			case SI_QUEUE:
+#ifdef SI_USER
+			case SI_USER:
+				break;
+#endif
+#ifdef SI_TKILL
+			case SI_TKILL:
+				break;
+#endif
 #ifdef SI_TIMER
 			case SI_TIMER:
-#endif /* SI_QUEUE */
-			case SI_ASYNCIO:
-#ifdef SI_MESGQ
-			case SI_MESGQ:
-#endif /* SI_MESGQ */
-				tprintf(", si_value=%d",
-					sip->si_value.sival_int);
+				tprintf(", si_value=%d", sip->si_int);
 				break;
+#endif
+#ifdef LINUX
+			default:
+				if (!sip->si_ptr)
+					break;
+				if (!verbose)
+					tprintf(", ...");
+				else
+					tprintf(", si_value={int=%u, ptr=%#lx}",
+						sip->si_int,
+						(unsigned long) sip->si_ptr);
+				break;
+#endif
 			}
-#endif /* SI_QUEUE */
 		}
 		else
 #endif /* SI_FROMUSER */
@@ -758,13 +793,16 @@
 				break;
 #ifdef LINUX
 			default:
-			        tprintf(", si_pid=%lu, si_uid=%lu, ",
-					(unsigned long) sip->si_pid,
-					(unsigned long) sip->si_uid);
+				if (sip->si_pid || sip->si_uid)
+				        tprintf(", si_pid=%lu, si_uid=%lu",
+						(unsigned long) sip->si_pid,
+						(unsigned long) sip->si_uid);
+				if (!sip->si_ptr)
+					break;
 				if (!verbose)
-					tprintf("...");
+					tprintf(", ...");
 				else {
-					tprintf("si_value={int=%u, ptr=%#lx}",
+					tprintf(", si_value={int=%u, ptr=%#lx}",
 						sip->si_int,
 						(unsigned long) sip->si_ptr);
 				}
@@ -781,7 +819,7 @@
 #ifdef LINUX
 
 static void
-parse_sigset_t (const char *str, sigset_t *set)
+parse_sigset_t(const char *str, sigset_t *set)
 {
 	const char *p;
 	unsigned int digit;
@@ -828,7 +866,7 @@
 	int sfd;
 	char sname[32];
 	char buf[2048];
-	char *s;
+	const char *s;
 	int i;
 	sigset_t ignored, caught;
 #endif
@@ -902,7 +940,7 @@
 #ifdef SUNOS4
 	void (*u_signal)();
 
-	if (upeek(tcp->pid, uoff(u_signal[0]) + sig*sizeof(u_signal),
+	if (upeek(tcp, uoff(u_signal[0]) + sig*sizeof(u_signal),
 	    (long *) &u_signal) < 0) {
 		return 0;
 	}
@@ -1030,11 +1068,6 @@
 		long_to_sigset(tcp->u_arg[0], &sigm);
 		printsigmask(&sigm, 0);
 #ifndef USE_PROCFS
-#ifdef HAVE_ANDROID_OS
-//FIXME use "sigprocmask" or something
-#define sigmask(sig)    (1UL << ((sig) - 1))
-#endif 
-
 		if ((tcp->u_arg[0] & sigmask(SIGTRAP))) {
 			/* Mark attempt to block SIGTRAP */
 			tcp->flags |= TCB_SIGTRAPPED;
@@ -1053,12 +1086,14 @@
 	return 0;
 }
 
+#if defined(SUNOS4) || defined(FREEBSD)
 int
 sys_sigblock(tcp)
 struct tcb *tcp;
 {
 	return sys_sigsetmask(tcp);
 }
+#endif /* SUNOS4 || FREEBSD */
 
 #endif /* !SVR4 */
 
@@ -1104,23 +1139,28 @@
 	else if (umove(tcp, addr, &sa) < 0)
 		tprintf("{...}");
 	else {
-		switch ((long) sa.SA_HANDLER) {
-		case (long) SIG_ERR:
-			tprintf("{SIG_ERR}");
-			break;
-		case (long) SIG_DFL:
-			tprintf("{SIG_DFL}");
-			break;
-		case (long) SIG_IGN:
+		/* Architectures using function pointers, like
+		 * hppa, may need to manipulate the function pointer
+		 * to compute the result of a comparison. However,
+		 * the SA_HANDLER function pointer exists only in
+		 * the address space of the traced process, and can't
+		 * be manipulated by strace. In order to prevent the
+		 * compiler from generating code to manipulate
+		 * SA_HANDLER we cast the function pointers to long. */
+		if ((long)sa.SA_HANDLER == (long)SIG_ERR)
+			tprintf("{SIG_ERR, ");
+		else if ((long)sa.SA_HANDLER == (long)SIG_DFL)
+			tprintf("{SIG_DFL, ");
+		else if ((long)sa.SA_HANDLER == (long)SIG_IGN) {
 #ifndef USE_PROCFS
 			if (tcp->u_arg[0] == SIGTRAP) {
 				tcp->flags |= TCB_SIGTRAPPED;
 				kill(tcp->pid, SIGSTOP);
 			}
 #endif /* !USE_PROCFS */
-			tprintf("{SIG_IGN}");
-			break;
-		default:
+			tprintf("{SIG_IGN, ");
+		}
+		else {
 #ifndef USE_PROCFS
 			if (tcp->u_arg[0] == SIGTRAP) {
 				tcp->flags |= TCB_SIGTRAPPED;
@@ -1160,13 +1200,13 @@
 		printsignal(tcp->u_arg[0]);
 		tprintf(", ");
 		switch (tcp->u_arg[1]) {
-		case (int) SIG_ERR:
+		case (long) SIG_ERR:
 			tprintf("SIG_ERR");
 			break;
-		case (int) SIG_DFL:
+		case (long) SIG_DFL:
 			tprintf("SIG_DFL");
 			break;
-		case (int) SIG_IGN:
+		case (long) SIG_IGN:
 #ifndef USE_PROCFS
 			if (tcp->u_arg[0] == SIGTRAP) {
 				tcp->flags |= TCB_SIGTRAPPED;
@@ -1186,21 +1226,23 @@
 		}
 		return 0;
 	}
-	else {
+	else if (!syserror(tcp)) {
 		switch (tcp->u_rval) {
-		    case (int) SIG_ERR:
+		    case (long) SIG_ERR:
 			tcp->auxstr = "SIG_ERR"; break;
-		    case (int) SIG_DFL:
+		    case (long) SIG_DFL:
 			tcp->auxstr = "SIG_DFL"; break;
-		    case (int) SIG_IGN:
+		    case (long) SIG_IGN:
 			tcp->auxstr = "SIG_IGN"; break;
 		    default:
 			tcp->auxstr = NULL;
 		}
 		return RVAL_HEX | RVAL_STR;
 	}
+	return 0;
 }
 
+#ifdef SVR4
 int
 sys_sighold(tcp)
 struct tcb *tcp;
@@ -1210,20 +1252,16 @@
 	}
 	return 0;
 }
+#endif /* SVR4 */
 
 #endif /* HAVE_SIGACTION */
 
-#ifdef HAVE_ANDROID_OS
-#define sigcontext_struct sigcontext
-#endif
-//#ifndef HAVE_ANDROID_OS
 #ifdef LINUX
 
 int
-sys_sigreturn(tcp)
-struct tcb *tcp;
+sys_sigreturn(struct tcb *tcp)
 {
-#ifdef ARM
+#if defined(ARM)
 	struct pt_regs regs;
 	struct sigcontext_struct sc;
 
@@ -1254,7 +1292,7 @@
 
 	if (entering(tcp)) {
 		tcp->u_arg[0] = 0;
-		if (upeek(tcp->pid,PT_GPR15,&usp)<0)
+		if (upeek(tcp,PT_GPR15,&usp)<0)
 			return 0;
 		if (umove(tcp, usp+__SIGNAL_FRAMESIZE, &sc) < 0)
 			return 0;
@@ -1268,14 +1306,13 @@
 		return RVAL_NONE | RVAL_STR;
 	}
 	return 0;
-#else
-#ifdef I386
+#elif defined(I386)
 	long esp;
 	struct sigcontext_struct sc;
 
 	if (entering(tcp)) {
 		tcp->u_arg[0] = 0;
-		if (upeek(tcp->pid, 4*UESP, &esp) < 0)
+		if (upeek(tcp, 4*UESP, &esp) < 0)
 			return 0;
 		if (umove(tcp, esp, &sc) < 0)
 			return 0;
@@ -1292,8 +1329,7 @@
 		return RVAL_NONE | RVAL_STR;
 	}
 	return 0;
-#else /* !I386 */
-#ifdef IA64
+#elif defined(IA64)
 	struct sigcontext sc;
 	long sp;
 
@@ -1301,7 +1337,7 @@
 		/* offset of sigcontext in the kernel's sigframe structure: */
 #		define SIGFRAME_SC_OFFSET	0x90
 		tcp->u_arg[0] = 0;
-		if (upeek(tcp->pid, PT_R12, &sp) < 0)
+		if (upeek(tcp, PT_R12, &sp) < 0)
 			return 0;
 		if (umove(tcp, sp + 16 + SIGFRAME_SC_OFFSET, &sc) < 0)
 			return 0;
@@ -1319,15 +1355,23 @@
 		return RVAL_NONE | RVAL_STR;
 	}
 	return 0;
-#else /* !IA64 */
-#ifdef POWERPC
+#elif defined(POWERPC)
 	long esp;
 	struct sigcontext_struct sc;
 
 	if (entering(tcp)) {
 		tcp->u_arg[0] = 0;
-		if (upeek(tcp->pid, sizeof(unsigned long)*PT_R1, &esp) < 0)
+		if (upeek(tcp, sizeof(unsigned long)*PT_R1, &esp) < 0)
 			return 0;
+		/* Skip dummy stack frame. */
+#ifdef POWERPC64
+		if (current_personality == 0)
+			esp += 128;
+		else
+			esp += 64;
+#else
+		esp += 64;
+#endif
 		if (umove(tcp, esp, &sc) < 0)
 			return 0;
 		tcp->u_arg[0] = 1;
@@ -1343,14 +1387,13 @@
 		return RVAL_NONE | RVAL_STR;
 	}
 	return 0;
-#else /* !POWERPC */
-#ifdef M68K
+#elif defined(M68K)
 	long usp;
 	struct sigcontext sc;
 
 	if (entering(tcp)) {
 		tcp->u_arg[0] = 0;
-		if (upeek(tcp->pid, 4*PT_USP, &usp) < 0)
+		if (upeek(tcp, 4*PT_USP, &usp) < 0)
 			return 0;
 		if (umove(tcp, usp, &sc) < 0)
 			return 0;
@@ -1367,14 +1410,13 @@
 		return RVAL_NONE | RVAL_STR;
 	}
 	return 0;
-#else /* !M68K */
-#ifdef ALPHA
+#elif defined(ALPHA)
 	long fp;
 	struct sigcontext_struct sc;
 
 	if (entering(tcp)) {
 		tcp->u_arg[0] = 0;
-		if (upeek(tcp->pid, REG_FP, &fp) < 0)
+		if (upeek(tcp, REG_FP, &fp) < 0)
 			return 0;
 		if (umove(tcp, fp, &sc) < 0)
 			return 0;
@@ -1391,10 +1433,9 @@
 		return RVAL_NONE | RVAL_STR;
 	}
 	return 0;
-#else
-#if defined (SPARC) || defined (SPARC64)
+#elif defined (SPARC) || defined (SPARC64)
 	long i1;
-	struct regs regs;
+	struct pt_regs regs;
 	m_siginfo_t si;
 
 	if(ptrace(PTRACE_GETREGS, tcp->pid, (char *)&regs, 0) < 0) {
@@ -1403,7 +1444,7 @@
 	}
 	if(entering(tcp)) {
 		tcp->u_arg[0] = 0;
-		i1 = regs.r_o1;
+		i1 = regs.u_regs[U_REG_O1];
 		if(umove(tcp, i1, &si) < 0) {
 			perror("sigreturn: umove ");
 			return 0;
@@ -1420,24 +1461,134 @@
 		return RVAL_NONE | RVAL_STR;
 	}
 	return 0;
-#else
-#ifdef MIPS
+#elif defined (LINUX_MIPSN32) || defined (LINUX_MIPSN64)
+	/* This decodes rt_sigreturn.  The 64-bit ABIs do not have
+	   sigreturn.  */
 	long sp;
-	struct sigcontext sc;
+	struct ucontext uc;
 
 	if(entering(tcp)) {
-	  	tcp->u_arg[0] = 0;
-		if (upeek(tcp->pid, REG_SP, &sp) < 0)
-		  	return 0;
-		if (umove(tcp, sp, &sc) < 0)
-		  	return 0;
+		tcp->u_arg[0] = 0;
+		if (upeek(tcp, REG_SP, &sp) < 0)
+			return 0;
+		/* There are six words followed by a 128-byte siginfo.  */
+		sp = sp + 6 * 4 + 128;
+		if (umove(tcp, sp, &uc) < 0)
+			return 0;
 		tcp->u_arg[0] = 1;
-		tcp->u_arg[1] = sc.sc_sigset;
+		tcp->u_arg[1] = *(long *) &uc.uc_sigmask;
 	} else {
-	  	tcp->u_rval = tcp->u_error = 0;
+		sigset_t sigm;
+		long_to_sigset(tcp->u_arg[1], &sigm);
+		tcp->u_rval = tcp->u_error = 0;
 		if(tcp->u_arg[0] == 0)
-		  	return 0;
-		tcp->auxstr = sprintsigmask("mask now ", tcp->u_arg[1]);
+			return 0;
+		tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
+		return RVAL_NONE | RVAL_STR;
+	}
+	return 0;
+#elif defined(MIPS)
+	long sp;
+	struct pt_regs regs;
+	m_siginfo_t si;
+
+	if(ptrace(PTRACE_GETREGS, tcp->pid, (char *)&regs, 0) < 0) {
+		perror("sigreturn: PTRACE_GETREGS ");
+		return 0;
+	}
+	if(entering(tcp)) {
+		tcp->u_arg[0] = 0;
+		sp = regs.regs[29];
+		if (umove(tcp, sp, &si) < 0)
+		tcp->u_arg[0] = 1;
+		tcp->u_arg[1] = si.si_mask;
+	} else {
+		sigset_t sigm;
+		long_to_sigset(tcp->u_arg[1], &sigm);
+		tcp->u_rval = tcp->u_error = 0;
+		if(tcp->u_arg[0] == 0)
+			return 0;
+		tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
+		return RVAL_NONE | RVAL_STR;
+	}
+	return 0;
+#elif defined(CRISV10) || defined(CRISV32)
+	struct sigcontext sc;
+
+	if (entering(tcp)) {
+		long regs[PT_MAX+1];
+
+		tcp->u_arg[0] = 0;
+
+		if (ptrace(PTRACE_GETREGS, tcp->pid, NULL, (long)regs) < 0) {
+			perror("sigreturn: PTRACE_GETREGS");
+			return 0;
+		}
+		if (umove(tcp, regs[PT_USP], &sc) < 0)
+			return 0;
+		tcp->u_arg[0] = 1;
+		tcp->u_arg[1] = sc.oldmask;
+	} else {
+		sigset_t sigm;
+		long_to_sigset(tcp->u_arg[1], &sigm);
+		tcp->u_rval = tcp->u_error = 0;
+
+		if (tcp->u_arg[0] == 0)
+			return 0;
+		tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
+		return RVAL_NONE | RVAL_STR;
+	}
+	return 0;
+#elif defined(TILE)
+	struct ucontext uc;
+	long sp;
+
+	/* offset of ucontext in the kernel's sigframe structure */
+#	define SIGFRAME_UC_OFFSET C_ABI_SAVE_AREA_SIZE + sizeof(struct siginfo)
+
+	if (entering(tcp)) {
+		tcp->u_arg[0] = 0;
+		if (upeek(tcp, PTREGS_OFFSET_SP, &sp) < 0)
+			return 0;
+		if (umove(tcp, sp + SIGFRAME_UC_OFFSET, &uc) < 0)
+			return 0;
+		tcp->u_arg[0] = 1;
+		memcpy(tcp->u_arg + 1, &uc.uc_sigmask, sizeof(uc.uc_sigmask));
+	}
+	else {
+		sigset_t sigm;
+
+		memcpy(&sigm, tcp->u_arg + 1, sizeof (sigm));
+		tcp->u_rval = tcp->u_error = 0;
+		if (tcp->u_arg[0] == 0)
+			return 0;
+		tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
+		return RVAL_NONE | RVAL_STR;
+	}
+	return 0;
+#elif defined(MICROBLAZE)
+	struct sigcontext sc;
+
+	/* TODO: Verify that this is correct...  */
+	if (entering(tcp)) {
+		long sp;
+
+		tcp->u_arg[0] = 0;
+
+		/* Read r1, the stack pointer.  */
+		if (upeek(tcp, 1 * 4, &sp) < 0)
+			return 0;
+		if (umove(tcp, sp, &sc) < 0)
+			return 0;
+		tcp->u_arg[0] = 1;
+		tcp->u_arg[1] = sc.oldmask;
+	} else {
+		sigset_t sigm;
+		long_to_sigset(tcp->u_arg[1], &sigm);
+		tcp->u_rval = tcp->u_error = 0;
+		if (tcp->u_arg[0] == 0)
+			return 0;
+		tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
 		return RVAL_NONE | RVAL_STR;
 	}
 	return 0;
@@ -1445,14 +1596,7 @@
 #warning No sys_sigreturn() for this architecture
 #warning         (no problem, just a reminder :-)
 	return 0;
-#endif /* MIPS */
-#endif /* SPARC || SPARC64 */
-#endif /* ALPHA */
-#endif /* !M68K */
-#endif /* !POWERPC */
-#endif /* !IA64 */
-#endif /* !I386 */
-#endif /* S390 */
+#endif
 }
 
 int
@@ -1468,24 +1612,17 @@
 }
 
 int
-sys_sigsuspend(tcp)
-struct tcb *tcp;
+sys_sigsuspend(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		sigset_t sigm;
 		long_to_sigset(tcp->u_arg[2], &sigm);
-#if 0
-		/* first two are not really arguments, but print them anyway */
-		/* nevermind, they are an anachronism now, too bad... */
-		tprintf("%d, %#x, ", tcp->u_arg[0], tcp->u_arg[1]);
-#endif
 		printsigmask(&sigm, 0);
 	}
 	return 0;
 }
 
 #endif /* LINUX */
-//#endif /* HAVE_ANDROID_OS */
 
 #if defined(SVR4) || defined(FREEBSD)
 
@@ -1665,8 +1802,6 @@
 		return RVAL_HEX | RVAL_STR;
 	}
 #else /* !ALPHA */
-	sigset_t sigset;
-
 	if (entering(tcp)) {
 #ifdef SVR4
 		if (tcp->u_arg[0] == 0)
@@ -1675,24 +1810,16 @@
 #endif /* SVR4 */
 		printxval(sigprocmaskcmds, tcp->u_arg[0], "SIG_???");
 		tprintf(", ");
-		if (!tcp->u_arg[1])
-			tprintf("NULL, ");
-		else if (copy_sigset(tcp, tcp->u_arg[1], &sigset) < 0)
-			tprintf("%#lx, ", tcp->u_arg[1]);
-		else {
-			printsigmask(&sigset, 0);
-			tprintf(", ");
-		}
+		print_sigset(tcp, tcp->u_arg[1], 0);
+		tprintf(", ");
 	}
 	else {
 		if (!tcp->u_arg[2])
 			tprintf("NULL");
 		else if (syserror(tcp))
 			tprintf("%#lx", tcp->u_arg[2]);
-		else if (copy_sigset(tcp, tcp->u_arg[2], &sigset) < 0)
-			tprintf("[?]");
 		else
-			printsigmask(&sigset, 0);
+			print_sigset(tcp, tcp->u_arg[2], 0);
 	}
 #endif /* !ALPHA */
 	return 0;
@@ -1705,17 +1832,25 @@
 struct tcb *tcp;
 {
 	if (entering(tcp)) {
-		tprintf("%ld, %s", tcp->u_arg[0], signame(tcp->u_arg[1]));
+		/*
+		 * Sign-extend a 32-bit value when that's what it is.
+		 */
+		long pid = tcp->u_arg[0];
+		if (personality_wordsize[current_personality] < sizeof pid)
+			pid = (long) (int) pid;
+		tprintf("%ld, %s", pid, signame(tcp->u_arg[1]));
 	}
 	return 0;
 }
 
+#if defined(FREEBSD) || defined(SUNOS4)
 int
 sys_killpg(tcp)
 struct tcb *tcp;
 {
 	return sys_kill(tcp);
 }
+#endif /* FREEBSD || SUNOS4 */
 
 #ifdef LINUX
 int
@@ -1747,6 +1882,7 @@
 	return 0;
 }
 
+#ifdef SVR4
 int sys_sigwait(tcp)
 struct tcb *tcp;
 {
@@ -1766,6 +1902,7 @@
 	}
 	return 0;
 }
+#endif /* SVR4 */
 
 #ifdef LINUX
 
@@ -1807,25 +1944,29 @@
 /* Structure describing the action to be taken when a signal arrives.  */
 struct new_sigaction
 {
-	union
-	{
-		__sighandler_t __sa_handler;
-		void (*__sa_sigaction) (int, siginfo_t *, void *);
-	}
-	__sigaction_handler;
+	__sighandler_t __sa_handler;
 	unsigned long sa_flags;
 	void (*sa_restorer) (void);
-	unsigned long int sa_mask[2];
+	/* Kernel treats sa_mask as an array of longs. */
+	unsigned long sa_mask[NSIG / sizeof(long) ? NSIG / sizeof(long) : 1];
+};
+/* Same for i386-on-x86_64 and similar cases */
+struct new_sigaction32
+{
+	uint32_t __sa_handler;
+	uint32_t sa_flags;
+	uint32_t sa_restorer;
+	uint32_t sa_mask[2 * (NSIG / sizeof(long) ? NSIG / sizeof(long) : 1)];
 };
 
 
-	int
-sys_rt_sigaction(tcp)
-	struct tcb *tcp;
+int
+sys_rt_sigaction(struct tcb *tcp)
 {
 	struct new_sigaction sa;
 	sigset_t sigset;
 	long addr;
+	int r;
 
 	if (entering(tcp)) {
 		printsignal(tcp->u_arg[0]);
@@ -1833,46 +1974,86 @@
 		addr = tcp->u_arg[1];
 	} else
 		addr = tcp->u_arg[2];
-	if (addr == 0)
+
+	if (addr == 0) {
 		tprintf("NULL");
-	else if (!verbose(tcp))
-		tprintf("%#lx", addr);
-	else if (umove(tcp, addr, &sa) < 0)
-		tprintf("{...}");
-	else {
-		switch ((long) sa.__sigaction_handler.__sa_handler) {
-			case (long) SIG_ERR:
-				tprintf("{SIG_ERR}");
-				break;
-			case (long) SIG_DFL:
-				tprintf("{SIG_DFL}");
-				break;
-			case (long) SIG_IGN:
-				tprintf("{SIG_IGN}");
-				break;
-			default:
-				tprintf("{%#lx, ",
-						(long) sa.__sigaction_handler.__sa_handler);
-				sigemptyset(&sigset);
-#ifdef LINUXSPARC
-				if (tcp->u_arg[4] <= sizeof(sigset))
-					memcpy(&sigset, &sa.sa_mask, tcp->u_arg[4]);
-#else
-				if (tcp->u_arg[3] <= sizeof(sigset))
-					memcpy(&sigset, &sa.sa_mask, tcp->u_arg[3]);
-#endif
-				else
-					memcpy(&sigset, &sa.sa_mask, sizeof(sigset));
-				printsigmask(&sigset, 1);
-				tprintf(", ");
-				printflags(sigact_flags, sa.sa_flags, "SA_???");
-#ifdef SA_RESTORER
-				if (sa.sa_flags & SA_RESTORER)
-					tprintf(", %p", sa.sa_restorer);
-#endif
-				tprintf("}");
-		}
+		goto after_sa;
 	}
+	if (!verbose(tcp)) {
+		tprintf("%#lx", addr);
+		goto after_sa;
+	}
+#if SUPPORTED_PERSONALITIES > 1
+	if (personality_wordsize[current_personality] != sizeof(sa.sa_flags)
+	 && personality_wordsize[current_personality] == 4
+	) {
+		struct new_sigaction32 sa32;
+		r = umove(tcp, addr, &sa32);
+		if (r >= 0) {
+			memset(&sa, 0, sizeof(sa));
+			sa.__sa_handler = (void*)(unsigned long)sa32.__sa_handler;
+			sa.sa_flags     = sa32.sa_flags;
+			sa.sa_restorer  = (void*)(unsigned long)sa32.sa_restorer;
+			/* Kernel treats sa_mask as an array of longs.
+			 * For 32-bit process, "long" is uint32_t, thus, for example,
+			 * 32th bit in sa_mask will end up as bit 0 in sa_mask[1].
+			 * But for (64-bit) kernel, 32th bit in sa_mask is
+			 * 32th bit in 0th (64-bit) long!
+			 * For little-endian, it's the same.
+			 * For big-endian, we swap 32-bit words.
+			 */
+			sa.sa_mask[0] = sa32.sa_mask[0] + ((long)(sa32.sa_mask[1]) << 32);
+		}
+	} else
+#endif
+	{
+		r = umove(tcp, addr, &sa);
+	}
+	if (r < 0) {
+		tprintf("{...}");
+		goto after_sa;
+	}
+	/* Architectures using function pointers, like
+	 * hppa, may need to manipulate the function pointer
+	 * to compute the result of a comparison. However,
+	 * the SA_HANDLER function pointer exists only in
+	 * the address space of the traced process, and can't
+	 * be manipulated by strace. In order to prevent the
+	 * compiler from generating code to manipulate
+	 * SA_HANDLER we cast the function pointers to long. */
+	if ((long)sa.__sa_handler == (long)SIG_ERR)
+		tprintf("{SIG_ERR, ");
+	else if ((long)sa.__sa_handler == (long)SIG_DFL)
+		tprintf("{SIG_DFL, ");
+	else if ((long)sa.__sa_handler == (long)SIG_IGN)
+		tprintf("{SIG_IGN, ");
+	else
+		tprintf("{%#lx, ", (long) sa.__sa_handler);
+	/* Questionable code below.
+	 * Kernel won't handle sys_rt_sigaction
+	 * with wrong sigset size (just returns EINVAL)
+	 * therefore tcp->u_arg[3(4)] _must_ be NSIG / 8 here,
+	 * and we always use smaller memcpy. */
+	sigemptyset(&sigset);
+#ifdef LINUXSPARC
+	if (tcp->u_arg[4] <= sizeof(sigset))
+		memcpy(&sigset, &sa.sa_mask, tcp->u_arg[4]);
+#else
+	if (tcp->u_arg[3] <= sizeof(sigset))
+		memcpy(&sigset, &sa.sa_mask, tcp->u_arg[3]);
+#endif
+	else
+		memcpy(&sigset, &sa.sa_mask, sizeof(sigset));
+	printsigmask(&sigset, 1);
+	tprintf(", ");
+	printflags(sigact_flags, sa.sa_flags, "SA_???");
+#ifdef SA_RESTORER
+	if (sa.sa_flags & SA_RESTORER)
+		tprintf(", %p", sa.sa_restorer);
+#endif
+	tprintf("}");
+
+ after_sa:
 	if (entering(tcp))
 		tprintf(", ");
 	else
@@ -1881,14 +2062,13 @@
 #elif defined(ALPHA)
 		tprintf(", %lu, %#lx", tcp->u_arg[3], tcp->u_arg[4]);
 #else
-		tprintf(", %lu", addr = tcp->u_arg[3]);
+		tprintf(", %lu", tcp->u_arg[3]);
 #endif
 	return 0;
 }
 
-	int
-sys_rt_sigpending(tcp)
-	struct tcb *tcp;
+int
+sys_rt_sigpending(struct tcb *tcp)
 {
 	sigset_t sigset;
 
@@ -1903,9 +2083,9 @@
 	}
 	return 0;
 }
-	int
-sys_rt_sigsuspend(tcp)
-	struct tcb *tcp;
+
+int
+sys_rt_sigsuspend(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		sigset_t sigm;
@@ -1916,9 +2096,9 @@
 	}
 	return 0;
 }
-	int
-sys_rt_sigqueueinfo(tcp)
-	struct tcb *tcp;
+
+int
+sys_rt_sigqueueinfo(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		siginfo_t si;
@@ -1928,13 +2108,12 @@
 		if (umove(tcp, tcp->u_arg[2], &si) < 0)
 			tprintf("%#lx", tcp->u_arg[2]);
 		else
-			printsiginfo(&si, verbose (tcp));
+			printsiginfo(&si, verbose(tcp));
 	}
 	return 0;
 }
 
-int sys_rt_sigtimedwait(tcp)
-	struct tcb *tcp;
+int sys_rt_sigtimedwait(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		sigset_t sigset;
@@ -1945,22 +2124,68 @@
 		else
 			printsigmask(&sigset, 1);
 		tprintf(", ");
+		/* This is the only "return" parameter, */
+		if (tcp->u_arg[1] != 0)
+			return 0;
+		/* ... if it's NULL, can decode all on entry */
+		tprintf("NULL, ");
 	}
-	else {
+	else if (tcp->u_arg[1] != 0) {
+		/* syscall exit, and u_arg[1] wasn't NULL */
 		if (syserror(tcp))
-			tprintf("%#lx", tcp->u_arg[0]);
+			tprintf("%#lx, ", tcp->u_arg[1]);
 		else {
 			siginfo_t si;
 			if (umove(tcp, tcp->u_arg[1], &si) < 0)
-				tprintf("%#lx", tcp->u_arg[1]);
-			else
-				printsiginfo(&si, verbose (tcp));
-			/* XXX For now */
-			tprintf(", %#lx", tcp->u_arg[2]);
-			tprintf(", %d", (int) tcp->u_arg[3]);
+				tprintf("%#lx, ", tcp->u_arg[1]);
+			else {
+				printsiginfo(&si, verbose(tcp));
+				tprintf(", ");
+			}
 		}
 	}
+	else {
+		/* syscall exit, and u_arg[1] was NULL */
+		return 0;
+	}
+	print_timespec(tcp, tcp->u_arg[2]);
+	tprintf(", %d", (int) tcp->u_arg[3]);
 	return 0;
 };
 
+int
+sys_restart_syscall(struct tcb *tcp)
+{
+	if (entering(tcp))
+		tprintf("<... resuming interrupted call ...>");
+	return 0;
+}
+
+static int
+do_signalfd(struct tcb *tcp, int flags_arg)
+{
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		print_sigset(tcp, tcp->u_arg[1], 1);
+		tprintf(", %lu", tcp->u_arg[2]);
+		if (flags_arg >= 0) {
+			tprintf(", ");
+			printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
+		}
+	}
+	return 0;
+}
+
+int
+sys_signalfd(struct tcb *tcp)
+{
+	return do_signalfd(tcp, -1);
+}
+
+int
+sys_signalfd4(struct tcb *tcp)
+{
+	return do_signalfd(tcp, 3);
+}
 #endif /* LINUX */
diff --git a/signalent.sh b/signalent.sh
deleted file mode 100644
index f1c0a1f..0000000
--- a/signalent.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-# Copyright (c) 1996 Rick Sladkey <jrs@world.std.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#	$Id: signalent.sh,v 1.1.1.1 1999/02/19 00:22:28 wichert Exp $
-
-cat $* |
-	sed -n -e 's/\/\*.*\*\// /' -e 's/^#[ 	]*define[ 	][ 	]*SIG\([^_ 	]*\)[ 	][ 	]*\([0-9][0-9]*\)[ 	]*$/\1 \2/p' |
-	sort +1n |
-	awk '
-	BEGIN {
-		tabs = "\t\t\t\t\t\t\t\t"
-		signal = -1;
-	}
-	$2 <= 256 {
-		if (signal == $2)
-			next
-		while (++signal < $2) {
-			n = "\"SIG_" signal "\""
-			s = "\t" n ","
-			s = s substr(tabs, 1, 16/8 - int((length(n) + 1)/8))
-			s = s "/* " signal " */"
-			print s
-		}
-		if (signal == $2)
-			n = "\"SIG" $1 "\""
-		n = "\"SIG" $1 "\""
-		s = "\t" n ","
-		s = s substr(tabs, 1, 16/8 - int((length(n) + 1)/8))
-		s = s "/* " signal " */"
-		print s
-	}
-	'
diff --git a/sock.c b/sock.c
index 902ccfe..e7c72b5 100644
--- a/sock.c
+++ b/sock.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: sock.c,v 1.11 2005/06/01 19:02:37 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -47,8 +47,6 @@
 #endif
 #include <net/if.h>
 
-extern const struct xlat addrfams[];
-
 static const struct xlat iffflags[] = {
 	{ IFF_UP,		"IFF_UP"		},
 	{ IFF_BROADCAST,	"IFF_BROADCAST"		},
@@ -84,9 +82,7 @@
 }
 
 int
-sock_ioctl(tcp, code, arg)
-struct tcb *tcp;
-long code, arg;
+sock_ioctl(struct tcb *tcp, long code, long arg)
 {
 	struct ifreq ifr;
 	struct ifconf ifc;
@@ -95,8 +91,8 @@
 
 	if (entering(tcp)) {
 		if (code == SIOCGIFCONF) {
-			umove(tcp, tcp->u_arg[2], &ifc);
-			if (ifc.ifc_buf == NULL)
+			if (umove(tcp, tcp->u_arg[2], &ifc) >= 0
+			    && ifc.ifc_buf == NULL)
 				tprintf(", {%d -> ", ifc.ifc_len);
 			else
 				tprintf(", {");
@@ -136,23 +132,38 @@
 		return 1;
 #ifdef LINUX
 	case SIOCGIFNAME:
+	case SIOCSIFNAME:
 	case SIOCGIFINDEX:
 	case SIOCGIFADDR:
+	case SIOCSIFADDR:
 	case SIOCGIFDSTADDR:
+	case SIOCSIFDSTADDR:
 	case SIOCGIFBRDADDR:
+	case SIOCSIFBRDADDR:
 	case SIOCGIFNETMASK:
+	case SIOCSIFNETMASK:
 	case SIOCGIFFLAGS:
+	case SIOCSIFFLAGS:
 	case SIOCGIFMETRIC:
+	case SIOCSIFMETRIC:
 	case SIOCGIFMTU:
+	case SIOCSIFMTU:
 	case SIOCGIFSLAVE:
+	case SIOCSIFSLAVE:
 	case SIOCGIFHWADDR:
-		umove(tcp, tcp->u_arg[2], &ifr);
-                if (syserror(tcp)) {
-			if (code == SIOCGIFNAME)
+	case SIOCSIFHWADDR:
+	case SIOCGIFTXQLEN:
+	case SIOCSIFTXQLEN:
+	case SIOCGIFMAP:
+	case SIOCSIFMAP:
+		if (umove(tcp, tcp->u_arg[2], &ifr) < 0)
+			tprintf(", %#lx", tcp->u_arg[2]);
+		else if (syserror(tcp)) {
+			if (code == SIOCGIFNAME || code == SIOCSIFNAME)
 				tprintf(", {ifr_index=%d, ifr_name=???}", ifr.ifr_ifindex);
 			else
 				tprintf(", {ifr_name=\"%s\", ???}", ifr.ifr_name);
-		} else if (code == SIOCGIFNAME)
+		} else if (code == SIOCGIFNAME || code == SIOCSIFNAME)
 			tprintf(", {ifr_index=%d, ifr_name=\"%s\"}",
 				ifr.ifr_ifindex, ifr.ifr_name);
 		else {
@@ -162,20 +173,24 @@
 				tprintf("ifr_index=%d", ifr.ifr_ifindex);
 				break;
 			case SIOCGIFADDR:
+			case SIOCSIFADDR:
 				str = "ifr_addr";
 			case SIOCGIFDSTADDR:
-				if (str == NULL)
+			case SIOCSIFDSTADDR:
+				if (!str)
 					str = "ifr_dstaddr";
 			case SIOCGIFBRDADDR:
-				if (str == NULL)
+			case SIOCSIFBRDADDR:
+				if (!str)
 					str = "ifr_broadaddr";
 			case SIOCGIFNETMASK:
-				if (str == NULL)
+			case SIOCSIFNETMASK:
+				if (!str)
 					str = "ifr_netmask";
 				tprintf("%s={", str);
 				printxval(addrfams,
 					  ifr.ifr_addr.sa_family,
-                    			  "AF_???");
+					  "AF_???");
 				tprintf(", ");
 				print_addr(tcp, ((long) tcp->u_arg[2]
 						 + offsetof (struct ifreq,
@@ -184,6 +199,7 @@
 				tprintf("}");
 				break;
 			case SIOCGIFHWADDR:
+			case SIOCSIFHWADDR:
 				/* XXX Are there other hardware addresses
 				   than 6-byte MACs?  */
 				bytes = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
@@ -192,26 +208,49 @@
 					bytes[3], bytes[4], bytes[5]);
 				break;
 			case SIOCGIFFLAGS:
+			case SIOCSIFFLAGS:
 				tprintf("ifr_flags=");
 				printflags(iffflags, ifr.ifr_flags, "IFF_???");
 				break;
 			case SIOCGIFMETRIC:
+			case SIOCSIFMETRIC:
 				tprintf("ifr_metric=%d", ifr.ifr_metric);
 				break;
 			case SIOCGIFMTU:
+			case SIOCSIFMTU:
 				tprintf("ifr_mtu=%d", ifr.ifr_mtu);
 				break;
 			case SIOCGIFSLAVE:
+			case SIOCSIFSLAVE:
 				tprintf("ifr_slave=\"%s\"", ifr.ifr_slave);
 				break;
+			case SIOCGIFTXQLEN:
+			case SIOCSIFTXQLEN:
+				tprintf("ifr_qlen=%d", ifr.ifr_qlen);
+				break;
+			case SIOCGIFMAP:
+			case SIOCSIFMAP:
+				tprintf("ifr_map={mem_start=%#lx, "
+					"mem_end=%#lx, base_addr=%#x, "
+					"irq=%u, dma=%u, port=%u}",
+					ifr.ifr_map.mem_start,
+					ifr.ifr_map.mem_end,
+					(unsigned) ifr.ifr_map.base_addr,
+					(unsigned) ifr.ifr_map.irq,
+					(unsigned) ifr.ifr_map.dma,
+					(unsigned) ifr.ifr_map.port);
+				break;
 			}
 			tprintf("}");
 		}
 		return 1;
 	case SIOCGIFCONF:
-		umove(tcp, tcp->u_arg[2], &ifc);
+		if (umove(tcp, tcp->u_arg[2], &ifc) < 0) {
+			tprintf("???}");
+			return 1;
+		}
 		tprintf("%d, ", ifc.ifc_len);
-                if (syserror(tcp)) {
+		if (syserror(tcp)) {
 			tprintf("%lx", (unsigned long) ifc.ifc_buf);
 		} else if (ifc.ifc_buf == NULL) {
 			tprintf("NULL");
@@ -219,8 +258,12 @@
 			int i;
 			unsigned nifra = ifc.ifc_len / sizeof(struct ifreq);
 			struct ifreq ifra[nifra];
-			umoven(tcp, (unsigned long) ifc.ifc_buf, sizeof(ifra),
-			       (char *) ifra);
+
+			if (umoven(tcp, (unsigned long) ifc.ifc_buf,
+				sizeof(ifra), (char *) ifra) < 0) {
+				tprintf("%lx}", (unsigned long) ifc.ifc_buf);
+				return 1;
+			}
 			tprintf("{");
 			for (i = 0; i < nifra; ++i ) {
 				if (i > 0)
diff --git a/strace-graph b/strace-graph
index 8f9247f..6a04ac2 100755
--- a/strace-graph
+++ b/strace-graph
@@ -33,7 +33,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id: strace-graph,v 1.2 1999/08/30 23:26:53 wichert Exp $
+#	$Id$
 
 my %unfinished;
 
@@ -115,7 +115,7 @@
 	    return (undef, $in);
 	}
     }
-}    
+}
 
 sub parse_one {
     my ($in) = @_;
@@ -188,19 +188,19 @@
 	unless (length($in) == 0 or $in =~ s/^, //) {
 	    print STDERR "$0: $ARGV: $.: missing comma.\n";
 	    return undef;
-	}	    
+	}
     }
     return @args;
 }
-	    
+
 
 my $depth = "";
 
 # process info, indexed by pid.
-# fields: 
+# fields:
 #    parent         pid number
 #    seq            forks and execs for this pid, in sequence  (array)
- 
+
 #  filename and argv (from latest exec)
 #  basename (derived from filename)
 # argv[0] is modified to add the basename if it differs from the 0th argument.
@@ -229,7 +229,7 @@
 	push @$seq, ['EXEC', $filename, $argv];
 
 	$pr{$pid}{seq} = $seq;
-    } elsif ($call eq 'fork') {
+    } elsif ($call eq 'fork' || $call eq 'clone' || $call eq 'vfork') {
 	return if $result == 0;
 
 	my $seq = $pr{$pid}{seq};
@@ -308,9 +308,9 @@
 	} elsif ($$elem[0] eq 'FORK') {
 	    if ($i == 1) {
                 if ($lead =~ /-$/) {
- 		    display_pid_trace($$elem[1], "$lead--+--");
+		    display_pid_trace($$elem[1], "$lead--+--");
                 } else {
- 		    display_pid_trace($$elem[1], "$lead  +--");
+		    display_pid_trace($$elem[1], "$lead  +--");
                 }
 	    } elsif ($i == @seq) {
 		display_pid_trace($$elem[1], "$lead  `--");
@@ -336,4 +336,3 @@
 
     display_pid_trace($startpid, "");
 }
-    
diff --git a/strace.1 b/strace.1
index ba6b11c..ec03e9a 100644
--- a/strace.1
+++ b/strace.1
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: strace.1,v 1.12 2004/08/31 07:47:47 roland Exp $
+.\"	$Id$
 .\"
 .de CW
 .sp
@@ -37,13 +37,13 @@
 .fi
 .sp
 ..
-.TH STRACE 1 "2003-01-21"
+.TH STRACE 1 "2010-03-30"
 .SH NAME
 strace \- trace system calls and signals
 .SH SYNOPSIS
 .B strace
 [
-.B \-dffhiqrtttTvxx
+.B \-CdDffhiqrtttTvxx
 ]
 [
 .BI \-a column
@@ -84,6 +84,9 @@
 .B strace
 .B \-c
 [
+.B \-D
+]
+[
 .BI \-e expr
 ]
 \&...
@@ -147,6 +150,28 @@
 --- SIGINT (Interrupt) ---
 +++ killed by SIGINT +++
 .CE
+If a system call is being executed and meanwhile another one is being called
+from a different thread/process then
+.B strace
+will try to preserve the order of those events and mark the ongoing call as
+being
+.IR unfinished .
+When the call returns it will be marked as
+.IR resumed .
+.CW
+[pid 28772] select(4, [3], NULL, NULL, NULL <unfinished ...>
+[pid 28779] clock_gettime(CLOCK_REALTIME, {1130322148, 939977000}) = 0
+[pid 28772] <... select resumed> )      = 1 (in [3])
+.CE
+Interruption of a (restartable) system call by a signal delivery is processed
+differently as kernel terminates the system call and also arranges its
+immediate reexecution after the signal handler completes.
+.CW
+read(0, 0x7ffff72cf5cf, 1)              = ? ERESTARTSYS (To be restarted)
+--- SIGALRM (Alarm clock) @ 0 (0) ---
+rt_sigreturn(0xe)                       = 0
+read(0, ""..., 1)                       = 0
+.CE
 Arguments are printed in symbolic form with a passion.
 This example shows the shell performing ``>>xyzzy'' output redirection:
 .CW
@@ -220,7 +245,25 @@
 .B \-c
 Count time, calls, and errors for each system call and report a summary on
 program exit.  On Linux, this attempts to show system time (CPU time spent
-running in the kernel) independent of wall clock time.
+running in the kernel) independent of wall clock time.  If
+.B \-c
+is used with
+.B \-f
+or
+.B \-F
+(below), only aggregate totals for all traced processes are kept.
+.TP
+.B \-C
+Like
+.B \-c
+but also print regular output while processes are running.
+.TP
+.B \-D
+(Not available on SVR4 and FreeBSD.)
+Run tracer process as a detached grandchild, not as parent of the
+tracee.  This reduces the visible effect of
+.B strace
+by keeping the tracee a direct child of the calling process.
 .TP
 .B \-d
 Show some debugging output of
@@ -231,7 +274,9 @@
 Trace child processes as they are created by currently traced
 processes as a result of the
 .BR fork (2)
-system call.  The new process is
+system call.
+.IP
+On non-Linux platforms the new process is
 attached to as soon as its pid is known (through the return value of
 .BR fork (2)
 in the parent process). This means that such children may run
@@ -239,13 +284,17 @@
 .BR vfork (2)),
 until the parent is scheduled again to complete its
 .RB ( v ) fork (2)
-call.
+call.  On Linux the child is traced from its first instruction with no delay.
 If the parent process decides to
 .BR wait (2)
 for a child that is currently
 being traced, it is suspended until an appropriate child process either
 terminates or incurs a signal that would cause it to terminate (as
 determined from the child's current signal disposition).
+.IP
+On SunOS 4.x the tracing of
+.BR vfork s
+is accomplished with some dynamic linking trickery.
 .TP
 .B \-ff
 If the
@@ -254,18 +303,13 @@
 option is in effect, each processes trace is written to
 .I filename.pid
 where pid is the numeric process id of each process.
+This is incompatible with
+.BR \-c ,
+since no per-process counts are kept.
 .TP
 .B \-F
-Attempt to follow
-.BR vfork s.
-(On SunOS 4.x, this is accomplished with
-some dynamic linking trickery.)
-Otherwise,
-.BR vfork s
-will
-not be followed even if
-.B \-f
-has been given.
+This option is now obsolete and it has the same functionality as
+.BR \-f .
 .TP
 .B \-h
 Print the help summary.
@@ -342,13 +386,13 @@
 qualifier is
 .BR trace .
 Using an exclamation mark negates the set of values.  For example,
-.B \-eopen
+.BR \-e "\ " open
 means literally
-.B "\-e trace=open"
+.BR \-e "\ " trace = open
 which in turn means trace only the
 .B open
 system call.  By contrast,
-.B "\-etrace=!open"
+.BR \-e "\ " trace "=!" open
 means to trace every system call except
 .BR open .
 In addition, the special values
@@ -361,90 +405,101 @@
 expansion even inside quoted arguments.  If so, you must escape
 the exclamation point with a backslash.
 .TP
-.BI "\-e trace=" set
+\fB\-e\ trace\fR=\fIset\fR
 Trace only the specified set of system calls.  The
 .B \-c
 option is useful for determining which system calls might be useful
 to trace.  For example,
-.B trace=open,close,read,write
+.BR trace = open,close,read,write
 means to only
 trace those four system calls.  Be careful when making inferences
 about the user/kernel boundary if only a subset of system calls
 are being monitored.  The default is
-.BR trace=all .
+.BR trace = all .
 .TP
-.B "\-e trace=file"
+.BR "\-e\ trace" = file
 Trace all system calls which take a file name as an argument.  You
 can think of this as an abbreviation for
-.BR "\-e\ trace=open,stat,chmod,unlink," ...
+.BR "\-e\ trace" = open , stat , chmod , unlink ,...
 which is useful to seeing what files the process is referencing.
 Furthermore, using the abbreviation will ensure that you don't
 accidentally forget to include a call like
 .B lstat
 in the list.  Betchya woulda forgot that one.
 .TP
-.B "\-e trace=process"
+.BR "\-e\ trace" = process
 Trace all system calls which involve process management.  This
 is useful for watching the fork, wait, and exec steps of a process.
 .TP
-.B "\-e trace=network"
+.BR "\-e\ trace" = network
 Trace all the network related system calls.
 .TP
-.B "\-e trace=signal"
+.BR "\-e\ trace" = signal
 Trace all signal related system calls.
 .TP
-.B "\-e trace=ipc"
+.BR "\-e\ trace" = ipc
 Trace all IPC related system calls.
 .TP
-.BI "\-e abbrev=" set
+.BR "\-e\ trace" = desc
+Trace all file descriptor related system calls.
+.TP
+\fB\-e\ abbrev\fR=\fIset\fR
 Abbreviate the output from printing each member of large structures.
 The default is
-.BR abbrev=all .
+.BR abbrev = all .
 The
 .B \-v
 option has the effect of
-.BR abbrev=none .
+.BR abbrev = none .
 .TP
-.BI "\-e verbose=" set
+\fB\-e\ verbose\fR=\fIset\fR
 Dereference structures for the specified set of system calls.  The
 default is
-.BR verbose=all .
+.BR verbose = all .
 .TP
-.BI "\-e raw=" set
+\fB\-e\ raw\fR=\fIset\fR
 Print raw, undecoded arguments for the specified set of system calls.
 This option has the effect of causing all arguments to be printed
 in hexadecimal.  This is mostly useful if you don't trust the
 decoding or you need to know the actual numeric value of an
 argument.
 .TP
-.BI "\-e signal=" set
+\fB\-e\ signal\fR=\fIset\fR
 Trace only the specified subset of signals.  The default is
-.BR signal=all .
+.BR signal = all .
 For example,
-.B signal=!SIGIO
+.B signal "=!" SIGIO
 (or
-.BR signal=!io )
+.BR signal "=!" io )
 causes SIGIO signals not to be traced.
 .TP
-.BI "\-e read=" set
+\fB\-e\ read\fR=\fIset\fR
 Perform a full hexadecimal and ASCII dump of all the data read from
 file descriptors listed in the specified set.  For example, to see
-all input activity on file descriptors 3 and 5 use
-.BR "\-e read=3,5" .
+all input activity on file descriptors
+.I 3
+and
+.I 5
+use
+\fB\-e\ read\fR=\fI3\fR,\fI5\fR.
 Note that this is independent from the normal tracing of the
 .BR read (2)
 system call which is controlled by the option
-.BR "\-e trace=read" .
+.BR -e "\ " trace = read .
 .TP
-.BI "\-e write=" set
+\fB\-e\ write\fR=\fIset\fR
 Perform a full hexadecimal and ASCII dump of all the data written to
 file descriptors listed in the specified set.  For example, to see
-all output activity on file descriptors 3 and 5 use
-.BR "\-e write=3,5" .
+all output activity on file descriptors
+.I 3
+and
+.I 5
+use
+\fB\-e\ write\fR=\fI3\fR,\fI5\fR.
 Note that this is independent from the normal tracing of the
 .BR write (2)
 system call which is controlled by the option
-.BR "\-e trace=write" .
+.BR -e "\ " trace = write .
 .TP
 .BI "\-o " filename
 Write the trace output to the file
@@ -508,7 +563,7 @@
 .BR name ,
 and
 .B nothing
-(default
+(default is
 .BR time ).
 .TP
 .BI "\-u " username
@@ -520,9 +575,9 @@
 Unless this option is used setuid and setgid programs are executed
 without effective privileges.
 .TP
-.BI "\-E " var=val
+\fB\-E\ \fIvar\fR=\fIval\fR
 Run command with
-.IR var=val
+.IR var = val
 in its list of environment variables.
 .TP
 .BI "\-E " var
@@ -530,6 +585,25 @@
 .IR var
 from the inherited list of environment variables before passing it on to
 the command.
+.SH DIAGNOSTICS
+When
+.I command
+exits,
+.B strace
+exits with the same exit status.
+If
+.I command
+is terminated by a signal,
+.B strace
+terminates itself with the same signal, so that
+.B strace
+can be used as a wrapper process transparent to the invoking parent process.
+.LP
+When using
+.BR \-p ,
+the exit status of
+.B strace
+is zero unless there was an unexpected error in doing the tracing.
 .SH "SETUID INSTALLATION"
 If
 .B strace
@@ -557,11 +631,10 @@
 .B strace
 for ordinary lusers to use.
 .SH "SEE ALSO"
-.BR ptrace (2),
-.BR proc (4),
+.BR ltrace (1),
 .BR time (1),
-.BR trace (1),
-.BR truss (1)
+.BR ptrace (2),
+.BR proc (5)
 .SH NOTES
 It is a pity that so much tracing clutter is produced by systems
 employing shared libraries.
@@ -651,10 +724,17 @@
 .B strace
 to Irix
 and tired of writing about himself in the third person.
+.SH BUGS
+The SIGTRAP signal is used internally by the kernel implementation of
+system call tracing.  When a traced process receives a SIGTRAP signal not
+associated with tracing, strace will not report that signal correctly.
+This signal is not normally used by programs, but could be via a hard-coded
+break instruction or via
+.BR kill (2).
 .SH PROBLEMS
 Problems with
 .B strace
 should be reported via the Debian Bug Tracking System,
 or to the
 .B strace
-mailing list at <strace-devel@lists.sourceforge.net>.
+mailing list at <strace\-devel@lists.sourceforge.net>.
diff --git a/strace.c b/strace.c
index a0d0d20..a94a19b 100644
--- a/strace.c
+++ b/strace.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: strace.c,v 1.66 2005/06/07 23:21:31 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -38,7 +38,10 @@
 #include <sys/param.h>
 #include <fcntl.h>
 #include <sys/resource.h>
+#ifdef HAVE_ANDROID_OS
+#define wait4 __wait4
 #include <sys/wait.h>
+#endif
 #include <sys/stat.h>
 #include <pwd.h>
 #include <grp.h>
@@ -46,6 +49,21 @@
 #include <limits.h>
 #include <dirent.h>
 
+#ifdef LINUX
+# include <asm/unistd.h>
+# if defined __NR_tgkill
+#  define my_tgkill(pid, tid, sig) syscall (__NR_tgkill, (pid), (tid), (sig))
+# elif defined __NR_tkill
+#  define my_tgkill(pid, tid, sig) syscall (__NR_tkill, (tid), (sig))
+# else
+   /* kill() may choose arbitrarily the target task of the process group
+      while we later wait on a that specific TID.  PID process waits become
+      TID task specific waits for a process under ptrace(2).  */
+#  warning "Neither tkill(2) nor tgkill(2) available, risk of strace hangs!"
+#  define my_tgkill(pid, tid, sig) kill ((tid), (sig))
+# endif
+#endif
+
 #if defined(IA64) && defined(LINUX)
 # include <asm/ptrace_offsets.h>
 #endif
@@ -62,58 +80,73 @@
 #endif
 #endif
 #endif
+extern char **environ;
+extern int optind;
+extern char *optarg;
 
-#ifdef HAVE_ANDROID_OS
-#define wait4 __wait4
-#endif
 
-int debug = 0, followfork = 0, followvfork = 0, interactive = 0;
-int rflag = 0, tflag = 0, dtime = 0, cflag = 0;
-int iflag = 0, xflag = 0, qflag = 0;
-int pflag_seen = 0;
+int debug = 0, followfork = 0;
+unsigned int ptrace_setoptions = 0;
+int dtime = 0, xflag = 0, qflag = 0;
+cflag_t cflag = CFLAG_NONE;
+static int iflag = 0, interactive = 0, pflag_seen = 0, rflag = 0, tflag = 0;
+/*
+ * daemonized_tracer supports -D option.
+ * With this option, strace forks twice.
+ * Unlike normal case, with -D *grandparent* process exec's,
+ * becoming a traced process. Child exits (this prevents traced process
+ * from having children it doesn't expect to have), and grandchild
+ * attaches to grandparent similarly to strace -p PID.
+ * This allows for more transparent interaction in cases
+ * when process and its parent are communicating via signals,
+ * wait() etc. Without -D, strace process gets lodged in between,
+ * disrupting parent<->child link.
+ */
+static bool daemonized_tracer = 0;
 
 /* Sometimes we want to print only succeeding syscalls. */
 int not_failing_only = 0;
 
-char *username = NULL;
+static int exit_code = 0;
+static int strace_child = 0;
+
+static char *username = NULL;
 uid_t run_uid;
 gid_t run_gid;
 
 int acolumn = DEFAULT_ACOLUMN;
 int max_strlen = DEFAULT_STRLEN;
-char *outfname = NULL;
+static char *outfname = NULL;
 FILE *outf;
+static int curcol;
 struct tcb **tcbtab;
 unsigned int nprocs, tcbtabsize;
-char *progname;
+const char *progname;
 extern char **environ;
 
-static int trace P((void));
-static void cleanup P((void));
-static void interrupt P((int sig));
+static int detach(struct tcb *tcp, int sig);
+static int trace(void);
+static void cleanup(void);
+static void interrupt(int sig);
 static sigset_t empty_set, blocked_set;
 
 #ifdef HAVE_SIG_ATOMIC_T
 static volatile sig_atomic_t interrupted;
 #else /* !HAVE_SIG_ATOMIC_T */
-#ifdef __STDC__
 static volatile int interrupted;
-#else /* !__STDC__ */
-static int interrupted;
-#endif /* !__STDC__ */
 #endif /* !HAVE_SIG_ATOMIC_T */
 
 #ifdef USE_PROCFS
 
-static struct tcb *pfd2tcb P((int pfd));
-static void reaper P((int sig));
-static void rebuild_pollv P((void));
+static struct tcb *pfd2tcb(int pfd);
+static void reaper(int sig);
+static void rebuild_pollv(void);
 static struct pollfd *pollv;
 
 #ifndef HAVE_POLLABLE_PROCFS
 
-static void proc_poll_open P((void));
-static void proc_poller P((int pfd));
+static void proc_poll_open(void);
+static void proc_poller(int pfd);
 
 struct proc_pollfd {
 	int fd;
@@ -139,12 +172,13 @@
 int exitval;
 {
 	fprintf(ofp, "\
-usage: strace [-dffhiqrtttTvVxx] [-a column] [-e expr] ... [-o file]\n\
+usage: strace [-CdDffhiqrtttTvVxx] [-a column] [-e expr] ... [-o file]\n\
               [-p pid] ... [-s strsize] [-u username] [-E var=val] ...\n\
               [command [arg ...]]\n\
-   or: strace -c [-e expr] ... [-O overhead] [-S sortby] [-E var=val] ...\n\
+   or: strace -c [-D] [-e expr] ... [-O overhead] [-S sortby] [-E var=val] ...\n\
               [command [arg ...]]\n\
 -c -- count time, calls, and errors for each syscall and report summary\n\
+-C -- like -c but also print regular output while processes are running\n\
 -f -- follow forks, -ff -- with output into separate files\n\
 -F -- attempt to follow vforks, -h -- print help message\n\
 -i -- print instruction pointer at time of syscall\n\
@@ -159,6 +193,7 @@
 -o file -- send trace output to FILE instead of stderr\n\
 -O overhead -- set overhead for tracing syscalls to OVERHEAD usecs\n\
 -p pid -- trace process with process id PID, may be repeated\n\
+-D -- run tracer process as a detached grandchild, not as parent\n\
 -s strsize -- limit length of print strings to STRSIZE chars (default %d)\n\
 -S sortby -- sort syscall counts by: time, calls, name, nothing (default %s)\n\
 -u username -- run command as username handling setuid and/or setgid\n\
@@ -180,51 +215,622 @@
 #endif /* MIPS */
 #endif /* SVR4 */
 
-int
-main(argc, argv)
-int argc;
-char *argv[];
+/* Glue for systems without a MMU that cannot provide fork() */
+#ifdef HAVE_FORK
+# define strace_vforked 0
+#else
+# define strace_vforked 1
+# define fork()         vfork()
+#endif
+
+static int
+set_cloexec_flag(int fd)
 {
-	extern int optind;
-	extern char *optarg;
+	int     flags, newflags;
+
+	if ((flags = fcntl(fd, F_GETFD, 0)) < 0)
+	{
+		fprintf(stderr, "%s: fcntl F_GETFD: %s\n",
+			progname, strerror(errno));
+		return -1;
+	}
+
+	newflags = flags | FD_CLOEXEC;
+	if (flags == newflags)
+		return 0;
+
+	if (fcntl(fd, F_SETFD, newflags) < 0)
+	{
+		fprintf(stderr, "%s: fcntl F_SETFD: %s\n",
+			progname, strerror(errno));
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+ * When strace is setuid executable, we have to swap uids
+ * before and after filesystem and process management operations.
+ */
+static void
+swap_uid(void)
+{
+#ifndef SVR4
+	int euid = geteuid(), uid = getuid();
+
+	if (euid != uid && setreuid(euid, uid) < 0)
+	{
+		fprintf(stderr, "%s: setreuid: %s\n",
+			progname, strerror(errno));
+		exit(1);
+	}
+#endif
+}
+
+#if _LFS64_LARGEFILE
+# define fopen_for_output fopen64
+#else
+# define fopen_for_output fopen
+#endif
+
+static FILE *
+strace_fopen(const char *path, const char *mode)
+{
+	FILE *fp;
+
+	swap_uid();
+	if ((fp = fopen_for_output(path, mode)) == NULL)
+		fprintf(stderr, "%s: can't fopen '%s': %s\n",
+			progname, path, strerror(errno));
+	swap_uid();
+	if (fp && set_cloexec_flag(fileno(fp)) < 0)
+	{
+		fclose(fp);
+		fp = NULL;
+	}
+	return fp;
+}
+
+static int popen_pid = -1;
+
+#ifndef _PATH_BSHELL
+# define _PATH_BSHELL "/bin/sh"
+#endif
+
+/*
+ * We cannot use standard popen(3) here because we have to distinguish
+ * popen child process from other processes we trace, and standard popen(3)
+ * does not export its child's pid.
+ */
+static FILE *
+strace_popen(const char *command)
+{
+	int     fds[2];
+
+	swap_uid();
+	if (pipe(fds) < 0)
+	{
+		fprintf(stderr, "%s: pipe: %s\n",
+			progname, strerror(errno));
+		swap_uid();
+		return NULL;
+	}
+
+	if (set_cloexec_flag(fds[1]) < 0)
+	{
+		close(fds[0]);
+		close(fds[1]);
+		swap_uid();
+		return NULL;
+	}
+
+	if ((popen_pid = fork()) == -1)
+	{
+		fprintf(stderr, "%s: fork: %s\n",
+			progname, strerror(errno));
+		close(fds[0]);
+		close(fds[1]);
+		swap_uid();
+		return NULL;
+	}
+
+	if (popen_pid)
+	{
+		/* parent */
+		close(fds[0]);
+		swap_uid();
+		return fdopen(fds[1], "w");
+	} else
+	{
+		/* child */
+		close(fds[1]);
+		if (fds[0] && (dup2(fds[0], 0) || close(fds[0])))
+		{
+			fprintf(stderr, "%s: dup2: %s\n",
+				progname, strerror(errno));
+			_exit(1);
+		}
+		execl(_PATH_BSHELL, "sh", "-c", command, NULL);
+		fprintf(stderr, "%s: execl: %s: %s\n",
+			progname, _PATH_BSHELL, strerror(errno));
+		_exit(1);
+	}
+}
+
+static int
+newoutf(struct tcb *tcp)
+{
+	if (outfname && followfork > 1) {
+		char name[520 + sizeof(int) * 3];
+		FILE *fp;
+
+		sprintf(name, "%.512s.%u", outfname, tcp->pid);
+		if ((fp = strace_fopen(name, "w")) == NULL)
+			return -1;
+		tcp->outf = fp;
+	}
+	return 0;
+}
+
+static void
+startup_attach(void)
+{
+	int tcbi;
+	struct tcb *tcp;
+
+	/*
+	 * Block user interruptions as we would leave the traced
+	 * process stopped (process state T) if we would terminate in
+	 * between PTRACE_ATTACH and wait4 () on SIGSTOP.
+	 * We rely on cleanup () from this point on.
+	 */
+	if (interactive)
+		sigprocmask(SIG_BLOCK, &blocked_set, NULL);
+
+	if (daemonized_tracer) {
+		pid_t pid = fork();
+		if (pid < 0) {
+			_exit(1);
+		}
+		if (pid) { /* parent */
+			/*
+			 * Wait for child to attach to straced process
+			 * (our parent). Child SIGKILLs us after it attached.
+			 * Parent's wait() is unblocked by our death,
+			 * it proceeds to exec the straced program.
+			 */
+			pause();
+			_exit(0); /* paranoia */
+		}
+	}
+
+	for (tcbi = 0; tcbi < tcbtabsize; tcbi++) {
+		tcp = tcbtab[tcbi];
+		if (!(tcp->flags & TCB_INUSE) || !(tcp->flags & TCB_ATTACHED))
+			continue;
+#ifdef LINUX
+		if (tcp->flags & TCB_CLONE_THREAD)
+			continue;
+#endif
+		/* Reinitialize the output since it may have changed. */
+		tcp->outf = outf;
+		if (newoutf(tcp) < 0)
+			exit(1);
+
+#ifdef USE_PROCFS
+		if (proc_open(tcp, 1) < 0) {
+			fprintf(stderr, "trouble opening proc file\n");
+			droptcb(tcp);
+			continue;
+		}
+#else /* !USE_PROCFS */
+# ifdef LINUX
+		if (followfork && !daemonized_tracer) {
+			char procdir[sizeof("/proc/%d/task") + sizeof(int) * 3];
+			DIR *dir;
+
+			sprintf(procdir, "/proc/%d/task", tcp->pid);
+			dir = opendir(procdir);
+			if (dir != NULL) {
+				unsigned int ntid = 0, nerr = 0;
+				struct dirent *de;
+				int tid;
+				while ((de = readdir(dir)) != NULL) {
+					if (de->d_fileno == 0)
+						continue;
+					tid = atoi(de->d_name);
+					if (tid <= 0)
+						continue;
+					++ntid;
+					if (ptrace(PTRACE_ATTACH, tid, (char *) 1, 0) < 0)
+						++nerr;
+					else if (tid != tcbtab[tcbi]->pid) {
+						tcp = alloctcb(tid);
+						tcp->flags |= TCB_ATTACHED|TCB_CLONE_THREAD|TCB_FOLLOWFORK;
+						tcbtab[tcbi]->nchildren++;
+						tcbtab[tcbi]->nclone_threads++;
+						tcp->parent = tcbtab[tcbi];
+					}
+					if (interactive) {
+						sigprocmask(SIG_SETMASK, &empty_set, NULL);
+						if (interrupted)
+							return;
+						sigprocmask(SIG_BLOCK, &blocked_set, NULL);
+					}
+				}
+				closedir(dir);
+				ntid -= nerr;
+				if (ntid == 0) {
+					perror("attach: ptrace(PTRACE_ATTACH, ...)");
+					droptcb(tcp);
+					continue;
+				}
+				if (!qflag) {
+					fprintf(stderr, ntid > 1
+? "Process %u attached with %u threads - interrupt to quit\n"
+: "Process %u attached - interrupt to quit\n",
+						tcbtab[tcbi]->pid, ntid);
+				}
+				continue;
+			} /* if (opendir worked) */
+		} /* if (-f) */
+# endif
+		if (ptrace(PTRACE_ATTACH, tcp->pid, (char *) 1, 0) < 0) {
+			perror("attach: ptrace(PTRACE_ATTACH, ...)");
+			droptcb(tcp);
+			continue;
+		}
+		/* INTERRUPTED is going to be checked at the top of TRACE.  */
+
+		if (daemonized_tracer) {
+			/*
+			 * It is our grandparent we trace, not a -p PID.
+			 * Don't want to just detach on exit, so...
+			 */
+			tcp->flags &= ~TCB_ATTACHED;
+			/*
+			 * Make parent go away.
+			 * Also makes grandparent's wait() unblock.
+			 */
+			kill(getppid(), SIGKILL);
+		}
+
+#endif /* !USE_PROCFS */
+		if (!qflag)
+			fprintf(stderr,
+				"Process %u attached - interrupt to quit\n",
+				tcp->pid);
+	}
+
+	if (interactive)
+		sigprocmask(SIG_SETMASK, &empty_set, NULL);
+}
+
+static void
+startup_child (char **argv)
+{
+	struct stat statbuf;
+	const char *filename;
+	char pathname[MAXPATHLEN];
+	int pid = 0;
+	struct tcb *tcp;
+
+	filename = argv[0];
+	if (strchr(filename, '/')) {
+		if (strlen(filename) > sizeof pathname - 1) {
+			errno = ENAMETOOLONG;
+			perror("strace: exec");
+			exit(1);
+		}
+		strcpy(pathname, filename);
+	}
+#ifdef USE_DEBUGGING_EXEC
+	/*
+	 * Debuggers customarily check the current directory
+	 * first regardless of the path but doing that gives
+	 * security geeks a panic attack.
+	 */
+	else if (stat(filename, &statbuf) == 0)
+		strcpy(pathname, filename);
+#endif /* USE_DEBUGGING_EXEC */
+	else {
+		const char *path;
+		int m, n, len;
+
+		for (path = getenv("PATH"); path && *path; path += m) {
+			if (strchr(path, ':')) {
+				n = strchr(path, ':') - path;
+				m = n + 1;
+			}
+			else
+				m = n = strlen(path);
+			if (n == 0) {
+				if (!getcwd(pathname, MAXPATHLEN))
+					continue;
+				len = strlen(pathname);
+			}
+			else if (n > sizeof pathname - 1)
+				continue;
+			else {
+				strncpy(pathname, path, n);
+				len = n;
+			}
+			if (len && pathname[len - 1] != '/')
+				pathname[len++] = '/';
+			strcpy(pathname + len, filename);
+			if (stat(pathname, &statbuf) == 0 &&
+			    /* Accept only regular files
+			       with some execute bits set.
+			       XXX not perfect, might still fail */
+			    S_ISREG(statbuf.st_mode) &&
+			    (statbuf.st_mode & 0111))
+				break;
+		}
+	}
+	if (stat(pathname, &statbuf) < 0) {
+		fprintf(stderr, "%s: %s: command not found\n",
+			progname, filename);
+		exit(1);
+	}
+	strace_child = pid = fork();
+	if (pid < 0) {
+		perror("strace: fork");
+		cleanup();
+		exit(1);
+	}
+	if ((pid != 0 && daemonized_tracer) /* parent: to become a traced process */
+	 || (pid == 0 && !daemonized_tracer) /* child: to become a traced process */
+	) {
+		pid = getpid();
+#ifdef USE_PROCFS
+		if (outf != stderr) close (fileno (outf));
+#ifdef MIPS
+		/* Kludge for SGI, see proc_open for details. */
+		sa.sa_handler = foobar;
+		sa.sa_flags = 0;
+		sigemptyset(&sa.sa_mask);
+		sigaction(SIGINT, &sa, NULL);
+#endif /* MIPS */
+#ifndef FREEBSD
+		pause();
+#else /* FREEBSD */
+		kill(pid, SIGSTOP); /* stop HERE */
+#endif /* FREEBSD */
+#else /* !USE_PROCFS */
+		if (outf!=stderr)
+			close(fileno (outf));
+
+		if (!daemonized_tracer) {
+			if (ptrace(PTRACE_TRACEME, 0, (char *) 1, 0) < 0) {
+				perror("strace: ptrace(PTRACE_TRACEME, ...)");
+				exit(1);
+			}
+			if (debug)
+				kill(pid, SIGSTOP);
+		}
+
+		if (username != NULL || geteuid() == 0) {
+			uid_t run_euid = run_uid;
+			gid_t run_egid = run_gid;
+
+			if (statbuf.st_mode & S_ISUID)
+				run_euid = statbuf.st_uid;
+			if (statbuf.st_mode & S_ISGID)
+				run_egid = statbuf.st_gid;
+
+			/*
+			 * It is important to set groups before we
+			 * lose privileges on setuid.
+			 */
+			if (username != NULL) {
+				if (initgroups(username, run_gid) < 0) {
+					perror("initgroups");
+					exit(1);
+				}
+				if (setregid(run_gid, run_egid) < 0) {
+					perror("setregid");
+					exit(1);
+				}
+				if (setreuid(run_uid, run_euid) < 0) {
+					perror("setreuid");
+					exit(1);
+				}
+			}
+		}
+		else
+			setreuid(run_uid, run_uid);
+
+		if (!daemonized_tracer) {
+			/*
+			 * Induce an immediate stop so that the parent
+			 * will resume us with PTRACE_SYSCALL and display
+			 * this execve call normally.
+			 * Unless of course we're on a no-MMU system where
+			 * we vfork()-ed, so we cannot stop the child.
+			 */
+			if (!strace_vforked)
+				kill(getpid(), SIGSTOP);
+		} else {
+			struct sigaction sv_sigchld;
+			sigaction(SIGCHLD, NULL, &sv_sigchld);
+			/*
+			 * Make sure it is not SIG_IGN, otherwise wait
+			 * will not block.
+			 */
+			signal(SIGCHLD, SIG_DFL);
+			/*
+			 * Wait for grandchild to attach to us.
+			 * It kills child after that, and wait() unblocks.
+			 */
+			alarm(3);
+			wait(NULL);
+			alarm(0);
+			sigaction(SIGCHLD, &sv_sigchld, NULL);
+		}
+#endif /* !USE_PROCFS */
+
+		execv(pathname, argv);
+		perror("strace: exec");
+		_exit(1);
+	}
+
+	/* We are the tracer.  */
+	tcp = alloctcb(daemonized_tracer ? getppid() : pid);
+	if (daemonized_tracer) {
+		/* We want subsequent startup_attach() to attach to it.  */
+		tcp->flags |= TCB_ATTACHED;
+	}
+#ifdef USE_PROCFS
+	if (proc_open(tcp, 0) < 0) {
+		fprintf(stderr, "trouble opening proc file\n");
+		cleanup();
+		exit(1);
+	}
+#endif /* USE_PROCFS */
+}
+
+#ifdef LINUX
+/*
+ * Test whether the kernel support PTRACE_O_TRACECLONE et al options.
+ * First fork a new child, call ptrace with PTRACE_SETOPTIONS on it,
+ * and then see which options are supported by the kernel.
+ */
+static int
+test_ptrace_setoptions(void)
+{
+	int pid, expected_grandchild = 0, found_grandchild = 0;
+	const unsigned int test_options = PTRACE_O_TRACECLONE |
+					  PTRACE_O_TRACEFORK |
+					  PTRACE_O_TRACEVFORK;
+
+	if ((pid = fork()) < 0)
+		return -1;
+	else if (pid == 0) {
+		if (ptrace(PTRACE_TRACEME, 0, (char *)1, 0) < 0)
+			_exit(1);
+		kill(getpid(), SIGSTOP);
+		_exit(fork() < 0);
+	}
+
+	while (1) {
+		int status, tracee_pid;
+
+		tracee_pid = wait(&status);
+		if (tracee_pid == -1) {
+			if (errno == EINTR)
+				continue;
+			else if (errno == ECHILD)
+				break;
+			perror("test_ptrace_setoptions");
+			return -1;
+		}
+		if (tracee_pid != pid) {
+			found_grandchild = tracee_pid;
+			if (ptrace(PTRACE_CONT, tracee_pid, 0, 0) < 0 &&
+			    errno != ESRCH)
+				kill(tracee_pid, SIGKILL);
+		}
+		else if (WIFSTOPPED(status)) {
+			switch (WSTOPSIG(status)) {
+			case SIGSTOP:
+				if (ptrace(PTRACE_SETOPTIONS, pid,
+					   NULL, test_options) < 0) {
+					kill(pid, SIGKILL);
+					return -1;
+				}
+				break;
+			case SIGTRAP:
+				if (status >> 16 == PTRACE_EVENT_FORK) {
+					long msg = 0;
+
+					if (ptrace(PTRACE_GETEVENTMSG, pid,
+						   NULL, (long) &msg) == 0)
+						expected_grandchild = msg;
+				}
+				break;
+			}
+			if (ptrace(PTRACE_SYSCALL, pid, 0, 0) < 0 &&
+			    errno != ESRCH)
+				kill(pid, SIGKILL);
+		}
+	}
+	if (expected_grandchild && expected_grandchild == found_grandchild)
+		ptrace_setoptions |= test_options;
+	return 0;
+}
+#endif
+
+int
+main(int argc, char *argv[])
+{
 	struct tcb *tcp;
 	int c, pid = 0;
+	int optF = 0;
 	struct sigaction sa;
 
 	static char buf[BUFSIZ];
 
+	progname = argv[0] ? argv[0] : "strace";
+
 	/* Allocate the initial tcbtab.  */
 	tcbtabsize = argc;	/* Surely enough for all -p args.  */
-	tcbtab = (struct tcb **) malloc (tcbtabsize * sizeof tcbtab[0]);
-	tcbtab[0] = (struct tcb *) calloc (tcbtabsize, sizeof *tcbtab[0]);
+	if ((tcbtab = calloc(tcbtabsize, sizeof tcbtab[0])) == NULL) {
+		fprintf(stderr, "%s: out of memory\n", progname);
+		exit(1);
+	}
+	if ((tcbtab[0] = calloc(tcbtabsize, sizeof tcbtab[0][0])) == NULL) {
+		fprintf(stderr, "%s: out of memory\n", progname);
+		exit(1);
+	}
 	for (tcp = tcbtab[0]; tcp < &tcbtab[0][tcbtabsize]; ++tcp)
 		tcbtab[tcp - tcbtab[0]] = &tcbtab[0][tcp - tcbtab[0]];
 
-	progname = argv[0];
 	outf = stderr;
 	interactive = 1;
+	set_sortby(DEFAULT_SORTBY);
+	set_personality(DEFAULT_PERSONALITY);
 	qualify("trace=all");
 	qualify("abbrev=all");
 	qualify("verbose=all");
 	qualify("signal=all");
-	set_sortby(DEFAULT_SORTBY);
-	set_personality(DEFAULT_PERSONALITY);
 	while ((c = getopt(argc, argv,
-		"+cdfFhiqrtTvVxza:e:o:O:p:s:S:u:E:")) != EOF) {
+		"+cCdfFhiqrtTvVxz"
+#ifndef USE_PROCFS
+		"D"
+#endif
+		"a:e:o:O:p:s:S:u:E:")) != EOF) {
 		switch (c) {
 		case 'c':
-			cflag++;
-			dtime++;
+			if (cflag == CFLAG_BOTH) {
+				fprintf(stderr, "%s: -c and -C are mutually exclusive options\n",
+					progname);
+				exit(1);
+			}
+			cflag = CFLAG_ONLY_STATS;
+			break;
+		case 'C':
+			if (cflag == CFLAG_ONLY_STATS) {
+				fprintf(stderr, "%s: -c and -C are mutually exclusive options\n",
+					progname);
+				exit(1);
+			}
+			cflag = CFLAG_BOTH;
 			break;
 		case 'd':
 			debug++;
 			break;
+#ifndef USE_PROCFS
+		case 'D':
+			daemonized_tracer = 1;
+			break;
+#endif
+		case 'F':
+			optF = 1;
+			break;
 		case 'f':
 			followfork++;
 			break;
-		case 'F':
-			followvfork++;
-			break;
 		case 'h':
 			usage(stdout, 0);
 			break;
@@ -279,11 +885,7 @@
 				fprintf(stderr, "%s: I'm sorry, I can't let you do that, Dave.\n", progname);
 				break;
 			}
-			if ((tcp = alloctcb(pid)) == NULL) {
-				fprintf(stderr, "%s: out of memory\n",
-					progname);
-				exit(1);
-			}
+			tcp = alloc_tcb(pid, 0);
 			tcp->flags |= TCB_ATTACHED;
 			pflag_seen++;
 			break;
@@ -315,9 +917,26 @@
 		}
 	}
 
-	if (optind == argc && !pflag_seen)
+	if ((optind == argc) == !pflag_seen)
 		usage(stderr, 1);
 
+	if (pflag_seen && daemonized_tracer) {
+		fprintf(stderr,
+			"%s: -D and -p are mutually exclusive options\n",
+			progname);
+		exit(1);
+	}
+
+	if (!followfork)
+		followfork = optF;
+
+	if (followfork > 1 && cflag) {
+		fprintf(stderr,
+			"%s: (-c or -C) and -ff are mutually exclusive options\n",
+			progname);
+		exit(1);
+	}
+
 	/* See if they want to run as another user. */
 	if (username != NULL) {
 		struct passwd *pent;
@@ -330,7 +949,7 @@
 		}
 		if ((pent = getpwnam(username)) == NULL) {
 			fprintf(stderr, "%s: cannot find user `%s'\n",
-				progname, optarg);
+				progname, username);
 			exit(1);
 		}
 		run_uid = pent->pw_uid;
@@ -341,14 +960,22 @@
 		run_gid = getgid();
 	}
 
-#ifndef SVR4
-	setreuid(geteuid(), getuid());
+#ifdef LINUX
+	if (followfork) {
+		if (test_ptrace_setoptions() < 0) {
+			fprintf(stderr,
+				"Test for options supported by PTRACE_SETOPTIONS "
+				"failed, giving up using this feature.\n");
+			ptrace_setoptions = 0;
+		}
+		if (debug)
+			fprintf(stderr, "ptrace_setoptions = %#x\n",
+				ptrace_setoptions);
+	}
 #endif
 
 	/* Check if they want to redirect the output. */
 	if (outfname) {
-		long f;
-
 		/* See if they want to pipe the output. */
 		if (outfname[0] == '|' || outfname[0] == '!') {
 			/*
@@ -362,39 +989,14 @@
 				exit(1);
 			}
 
-#ifdef HAVE_ANDROID_OS
-                        fprintf(stderr,"output to a pipe not supported on android.\n");
-                        exit(-1);
-#else
-			if ((outf = popen(outfname + 1, "w")) == NULL) {
-				fprintf(stderr, "%s: can't popen '%s': %s\n",
-					progname, outfname + 1,
-					strerror(errno));
+			if ((outf = strace_popen(outfname + 1)) == NULL)
 				exit(1);
-			}
-#endif
 		}
-		else if ((outf = fopen(outfname, "w")) == NULL) {
-			fprintf(stderr, "%s: can't fopen '%s': %s\n",
-				progname, outfname, strerror(errno));
+		else if (followfork <= 1 &&
+			 (outf = strace_fopen(outfname, "w")) == NULL)
 			exit(1);
-		}
-
-		if ((f=fcntl(fileno(outf), F_GETFD)) < 0 ) {
-			perror("failed to get flags for outputfile");
-			exit(1);
-		}
-
-		if (fcntl(fileno(outf), F_SETFD, f|FD_CLOEXEC) < 0 ) {
-			perror("failed to set flags for outputfile");
-			exit(1);
-		}
 	}
 
-#ifndef SVR4
-	setreuid(geteuid(), getuid());
-#endif
-
 	if (!outfname || outfname[0] == '|' || outfname[0] == '!')
 		setvbuf(outf, buf, _IOLBF, BUFSIZ);
 	if (outfname && optind < argc) {
@@ -402,248 +1004,20 @@
 		qflag = 1;
 	}
 
-	for (c = 0; c < tcbtabsize; c++) {
-		tcp = tcbtab[c];
-		/* Reinitialize the output since it may have changed. */
-		tcp->outf = outf;
-		if (!(tcp->flags & TCB_INUSE) || !(tcp->flags & TCB_ATTACHED))
-			continue;
-#ifdef USE_PROCFS
-		if (proc_open(tcp, 1) < 0) {
-			fprintf(stderr, "trouble opening proc file\n");
-			droptcb(tcp);
-			continue;
-		}
-#else /* !USE_PROCFS */
-# ifdef LINUX
-		if (tcp->flags & TCB_CLONE_THREAD)
-			continue;
-		if (followfork) {
-			char procdir[MAXPATHLEN];
-			DIR *dir;
-			sprintf(procdir, "/proc/%d/task", tcp->pid);
-			dir = opendir(procdir);
-			if (dir != NULL) {
-				unsigned int ntid = 0, nerr = 0;
-				struct dirent *de;
-				int tid;
-				while ((de = readdir(dir)) != NULL) {
-					if (de->d_fileno == 0 ||
-					    de->d_name[0] == '.')
-						continue;
-					tid = atoi(de->d_name);
-					if (tid <= 0)
-						continue;
-					++ntid;
-					if (ptrace(PTRACE_ATTACH, tid,
-						   (char *) 1, 0) < 0)
-						++nerr;
-					else if (tid != tcbtab[c]->pid) {
-						if (nprocs == tcbtabsize &&
-						    expand_tcbtab())
-							tcp = NULL;
-						else
-							tcp = alloctcb(tid);
-						if (tcp == NULL) {
-							fprintf(stderr, "%s: out of memory\n",
-								progname);
-							exit(1);
-						}
-						tcp->flags |= TCB_ATTACHED|TCB_CLONE_THREAD|TCB_CLONE_DETACHED|TCB_FOLLOWFORK;
-						tcbtab[c]->nchildren++;
-						tcbtab[c]->nclone_threads++;
-						tcbtab[c]->nclone_detached++;
-						tcp->parent = tcbtab[c];
-					}
-				}
-				closedir(dir);
-				if (nerr == ntid) {
-					perror("attach: ptrace(PTRACE_ATTACH, ...)");
-					droptcb(tcp);
-					continue;
-				}
-				if (!qflag) {
-					ntid -= nerr;
-					if (ntid > 1)
-						fprintf(stderr, "\
-Process %u attached with %u threads - interrupt to quit\n",
-							tcp->pid, ntid);
-					else
-						fprintf(stderr, "\
-Process %u attached - interrupt to quit\n",
-							tcp->pid);
-				}
-				continue;
-			}
-		}
-# endif
-		if (ptrace(PTRACE_ATTACH, tcp->pid, (char *) 1, 0) < 0) {
-			perror("attach: ptrace(PTRACE_ATTACH, ...)");
-			droptcb(tcp);
-			continue;
-		}
-#endif /* !USE_PROCFS */
-		if (!qflag)
-			fprintf(stderr,
-				"Process %u attached - interrupt to quit\n",
-				tcp->pid);
-	}
+	/* Valid states here:
+	   optind < argc	pflag_seen	outfname	interactive
+	   1			0		0		1
+	   0			1		0		1
+	   1			0		1		0
+	   0			1		1		1
+	 */
 
-	if (!pflag_seen) {
-		struct stat statbuf;
-		char *filename;
-		char pathname[MAXPATHLEN];
-
-		filename = argv[optind];
-		if (strchr(filename, '/')) {
-			if (strlen(filename) > sizeof pathname - 1) {
-				errno = ENAMETOOLONG;
-				perror("strace: exec");
-				exit(1);
-			}
-			strcpy(pathname, filename);
-		}
-#ifdef USE_DEBUGGING_EXEC
-		/*
-		 * Debuggers customarily check the current directory
-		 * first regardless of the path but doing that gives
-		 * security geeks a panic attack.
-		 */
-		else if (stat(filename, &statbuf) == 0)
-			strcpy(pathname, filename);
-#endif /* USE_DEBUGGING_EXEC */
-		else {
-			char *path;
-			int m, n, len;
-
-			for (path = getenv("PATH"); path && *path; path += m) {
-				if (strchr(path, ':')) {
-					n = strchr(path, ':') - path;
-					m = n + 1;
-				}
-				else
-					m = n = strlen(path);
-				if (n == 0) {
-					getcwd(pathname, MAXPATHLEN);
-					len = strlen(pathname);
-				}
-				else if (n > sizeof pathname - 1)
-					continue;
-				else {
-					strncpy(pathname, path, n);
-					len = n;
-				}
-				if (len && pathname[len - 1] != '/')
-					pathname[len++] = '/';
-				strcpy(pathname + len, filename);
-				if (stat(pathname, &statbuf) == 0 &&
-				    /* Accept only regular files
-				       with some execute bits set.
-				       XXX not perfect, might still fail */
-				    S_ISREG(statbuf.st_mode) &&
-				    (statbuf.st_mode & 0111))
-					break;
-			}
-		}
-		if (stat(pathname, &statbuf) < 0) {
-			fprintf(stderr, "%s: %s: command not found\n",
-				progname, filename);
-			exit(1);
-		}
-		switch (pid = fork()) {
-		case -1:
-			perror("strace: fork");
-			cleanup();
-			exit(1);
-			break;
-		case 0: {
-#ifdef USE_PROCFS
-		        if (outf != stderr) close (fileno (outf));
-#ifdef MIPS
-			/* Kludge for SGI, see proc_open for details. */
-			sa.sa_handler = foobar;
-			sa.sa_flags = 0;
-			sigemptyset(&sa.sa_mask);
-			sigaction(SIGINT, &sa, NULL);
-#endif /* MIPS */
-#ifndef FREEBSD
-			pause();
-#else /* FREEBSD */
-			kill(getpid(), SIGSTOP); /* stop HERE */
-#endif /* FREEBSD */
-#else /* !USE_PROCFS */
-			if (outf!=stderr)
-				close(fileno (outf));
-
-			if (ptrace(PTRACE_TRACEME, 0, (char *) 1, 0) < 0) {
-				perror("strace: ptrace(PTRACE_TRACEME, ...)");
-				return -1;
-			}
-			if (debug)
-				kill(getpid(), SIGSTOP);
-
-			if (username != NULL || geteuid() == 0) {
-				uid_t run_euid = run_uid;
-				gid_t run_egid = run_gid;
-
-				if (statbuf.st_mode & S_ISUID)
-					run_euid = statbuf.st_uid;
-				if (statbuf.st_mode & S_ISGID)
-					run_egid = statbuf.st_gid;
-
-				/*
-				 * It is important to set groups before we
-				 * lose privileges on setuid.
-				 */
-				if (username != NULL) {
-#ifndef HAVE_ANDROID_OS
-					if (initgroups(username, run_gid) < 0) {
-						perror("initgroups");
-						exit(1);
-					}
-#endif /* HAVE_ANDROID_OS */
-					if (setregid(run_gid, run_egid) < 0) {
-						perror("setregid");
-						exit(1);
-					}
-					if (setreuid(run_uid, run_euid) < 0) {
-						perror("setreuid");
-						exit(1);
-					}
-				}
-			}
-			else
-				setreuid(run_uid, run_uid);
-
-			/*
-			 * Induce an immediate stop so that the parent
-			 * will resume us with PTRACE_SYSCALL and display
-			 * this execve call normally.
-			 */
-			kill(getpid(), SIGSTOP);
-#endif /* !USE_PROCFS */
-
-			execv(pathname, &argv[optind]);
-			perror("strace: exec");
-			_exit(1);
-			break;
-		}
-		default:
-			if ((tcp = alloctcb(pid)) == NULL) {
-				fprintf(stderr, "tcb table full\n");
-				cleanup();
-				exit(1);
-			}
-#ifdef USE_PROCFS
-			if (proc_open(tcp, 0) < 0) {
-				fprintf(stderr, "trouble opening proc file\n");
-				cleanup();
-				exit(1);
-			}
-#endif /* USE_PROCFS */
-			break;
-		}
-	}
+	/* STARTUP_CHILD must be called before the signal handlers get
+	   installed below as they are inherited into the spawned process.
+	   Also we do not need to be protected by them as during interruption
+	   in the STARTUP_CHILD mode we kill the spawned process anyway.  */
+	if (!pflag_seen)
+		startup_child(&argv[optind]);
 
 	sigemptyset(&empty_set);
 	sigemptyset(&blocked_set);
@@ -682,39 +1056,27 @@
 	sigaction(SIGCHLD, &sa, NULL);
 #endif /* USE_PROCFS */
 
+	if (pflag_seen || daemonized_tracer)
+		startup_attach();
+
 	if (trace() < 0)
 		exit(1);
 	cleanup();
-	exit(0);
+	fflush(NULL);
+	if (exit_code > 0xff) {
+		/* Child was killed by a signal, mimic that.  */
+		exit_code &= 0xff;
+		signal(exit_code, SIG_DFL);
+		raise(exit_code);
+		/* Paranoia - what if this signal is not fatal?
+		   Exit with 128 + signo then.  */
+		exit_code += 128;
+	}
+	exit(exit_code);
 }
 
 void
-newoutf(tcp)
-struct tcb *tcp;
-{
-	char name[MAXPATHLEN];
-	FILE *fp;
-
-	if (outfname && followfork > 1) {
-		sprintf(name, "%s.%u", outfname, tcp->pid);
-#ifndef SVR4
-		setreuid(geteuid(), getuid());
-#endif
-		fp = fopen(name, "w");
-#ifndef SVR4
-		setreuid(geteuid(), getuid());
-#endif
-		if (fp == NULL) {
-			perror("fopen");
-			return;
-		}
-		tcp->outf = fp;
-	}
-	return;
-}
-
-int
-expand_tcbtab()
+expand_tcbtab(void)
 {
 	/* Allocate some more TCBs and expand the table.
 	   We don't want to relocate the TCBs because our
@@ -727,26 +1089,26 @@
 						    sizeof *newtcbs);
 	int i;
 	if (newtab == NULL || newtcbs == NULL) {
-		if (newtab != NULL)
-			free(newtab);
-		return 1;
+		fprintf(stderr, "%s: expand_tcbtab: out of memory\n",
+			progname);
+		cleanup();
+		exit(1);
 	}
 	for (i = tcbtabsize; i < 2 * tcbtabsize; ++i)
 		newtab[i] = &newtcbs[i - tcbtabsize];
 	tcbtabsize *= 2;
 	tcbtab = newtab;
-
-	return 0;
 }
 
-
 struct tcb *
-alloctcb(pid)
-int pid;
+alloc_tcb(int pid, int command_options_parsed)
 {
 	int i;
 	struct tcb *tcp;
 
+	if (nprocs == tcbtabsize)
+		expand_tcbtab();
+
 	for (i = 0; i < tcbtabsize; i++) {
 		tcp = tcbtab[i];
 		if ((tcp->flags & TCB_INUSE) == 0) {
@@ -755,26 +1117,29 @@
 			tcp->nchildren = 0;
 			tcp->nzombies = 0;
 #ifdef TCB_CLONE_THREAD
-			tcp->nclone_threads = tcp->nclone_detached = 0;
+			tcp->nclone_threads = 0;
 			tcp->nclone_waiting = 0;
 #endif
 			tcp->flags = TCB_INUSE | TCB_STARTUP;
 			tcp->outf = outf; /* Initialise to current out file */
+			tcp->curcol = 0;
 			tcp->stime.tv_sec = 0;
 			tcp->stime.tv_usec = 0;
 			tcp->pfd = -1;
 			nprocs++;
+			if (command_options_parsed)
+				newoutf(tcp);
 			return tcp;
 		}
 	}
-	return NULL;
+	fprintf(stderr, "%s: bug in alloc_tcb\n", progname);
+	cleanup();
+	exit(1);
 }
 
 #ifdef USE_PROCFS
 int
-proc_open(tcp, attaching)
-struct tcb *tcp;
-int attaching;
+proc_open(struct tcb *tcp, int attaching)
 {
 	char proc[32];
 	long arg;
@@ -795,12 +1160,7 @@
 		perror("strace: open(\"/proc/...\", ...)");
 		return -1;
 	}
-	if ((arg = fcntl(tcp->pfd, F_GETFD)) < 0) {
-		perror("F_GETFD");
-		return -1;
-	}
-	if (fcntl(tcp->pfd, F_SETFD, arg|FD_CLOEXEC) < 0) {
-		perror("F_SETFD");
+	if (set_cloexec_flag(tcp->pfd) < 0) {
 		return -1;
 	}
 	sprintf(proc, "/proc/%d/status", tcp->pid);
@@ -808,12 +1168,7 @@
 		perror("strace: open(\"/proc/...\", ...)");
 		return -1;
 	}
-	if ((arg = fcntl(tcp->pfd_stat, F_GETFD)) < 0) {
-		perror("F_GETFD");
-		return -1;
-	}
-	if (fcntl(tcp->pfd_stat, F_SETFD, arg|FD_CLOEXEC) < 0) {
-		perror("F_SETFD");
+	if (set_cloexec_flag(tcp->pfd_stat) < 0) {
 		return -1;
 	}
 	sprintf(proc, "/proc/%d/as", tcp->pid);
@@ -821,32 +1176,23 @@
 		perror("strace: open(\"/proc/...\", ...)");
 		return -1;
 	}
-	if ((arg = fcntl(tcp->pfd_as, F_GETFD)) < 0) {
-		perror("F_GETFD");
-		return -1;
-	}
-	if (fcntl(tcp->pfd_as, F_SETFD, arg|FD_CLOEXEC) < 0) {
-		perror("F_SETFD");
+	if (set_cloexec_flag(tcp->pfd_as) < 0) {
 		return -1;
 	}
 #else
 	/* Open the process pseudo-file in /proc. */
 #ifndef FREEBSD
 	sprintf(proc, "/proc/%d", tcp->pid);
-	if ((tcp->pfd = open(proc, O_RDWR|O_EXCL)) < 0) {
+	tcp->pfd = open(proc, O_RDWR|O_EXCL);
 #else /* FREEBSD */
 	sprintf(proc, "/proc/%d/mem", tcp->pid);
-	if ((tcp->pfd = open(proc, O_RDWR)) < 0) {
+	tcp->pfd = open(proc, O_RDWR);
 #endif /* FREEBSD */
+	if (tcp->pfd < 0) {
 		perror("strace: open(\"/proc/...\", ...)");
 		return -1;
 	}
-	if ((arg = fcntl(tcp->pfd, F_GETFD)) < 0) {
-		perror("F_GETFD");
-		return -1;
-	}
-	if (fcntl(tcp->pfd, F_SETFD, arg|FD_CLOEXEC) < 0) {
-		perror("F_SETFD");
+	if (set_cloexec_flag(tcp->pfd) < 0) {
 		return -1;
 	}
 #endif
@@ -914,12 +1260,12 @@
 	/* just unset the PF_LINGER flag for the Run-on-Last-Close. */
 	if (ioctl(tcp->pfd, PIOCGFL, &arg) < 0) {
 	        perror("PIOCGFL");
-	        return -1;
+		return -1;
 	}
 	arg &= ~PF_LINGER;
 	if (ioctl(tcp->pfd, PIOCSFL, arg) < 0) {
-	        perror("PIOCSFL");
-	        return -1;
+		perror("PIOCSFL");
+		return -1;
 	}
 #endif /* FREEBSD */
 #endif /* !PIOCSET */
@@ -1081,24 +1427,37 @@
 #endif /* USE_PROCFS */
 
 struct tcb *
-pid2tcb(pid)
-int pid;
+pid2tcb(int pid)
+{
+	int i;
+
+	if (pid <= 0)
+		return NULL;
+
+	for (i = 0; i < tcbtabsize; i++) {
+		struct tcb *tcp = tcbtab[i];
+		if (tcp->pid == pid && (tcp->flags & TCB_INUSE))
+			return tcp;
+	}
+
+	return NULL;
+}
+
+#ifdef USE_PROCFS
+
+static struct tcb *
+first_used_tcb(void)
 {
 	int i;
 	struct tcb *tcp;
-
 	for (i = 0; i < tcbtabsize; i++) {
 		tcp = tcbtab[i];
-		if (pid && tcp->pid != pid)
-			continue;
 		if (tcp->flags & TCB_INUSE)
 			return tcp;
 	}
 	return NULL;
 }
 
-#ifdef USE_PROCFS
-
 static struct tcb *
 pfd2tcb(pfd)
 int pfd;
@@ -1139,15 +1498,20 @@
 	if (tcp->parent != NULL) {
 		tcp->parent->nchildren--;
 #ifdef TCB_CLONE_THREAD
-		if (tcp->flags & TCB_CLONE_DETACHED)
-			tcp->parent->nclone_detached--;
 		if (tcp->flags & TCB_CLONE_THREAD)
 			tcp->parent->nclone_threads--;
 #endif
-#ifdef TCB_CLONE_DETACHED
-		if (!(tcp->flags & TCB_CLONE_DETACHED))
+		tcp->parent->nzombies++;
+#ifdef LINUX
+		/* Update `tcp->parent->parent->nchildren' and the other fields
+		   like NCLONE_DETACHED, only for zombie group leader that has
+		   already reported and been short-circuited at the top of this
+		   function.  The same condition as at the top of DETACH.  */
+		if ((tcp->flags & TCB_CLONE_THREAD) &&
+		    tcp->parent->nclone_threads == 0 &&
+		    (tcp->parent->flags & TCB_EXITING))
+			droptcb(tcp->parent);
 #endif
-			tcp->parent->nzombies++;
 		tcp->parent = NULL;
 	}
 
@@ -1195,123 +1559,19 @@
 		tcp->parent->nclone_waiting--;
 #endif
 
-	if (ptrace(PTRACE_SYSCALL, tcp->pid, (char *) 1, 0) < 0) {
-		perror("resume: ptrace(PTRACE_SYSCALL, ...)");
+	if (ptrace_restart(PTRACE_SYSCALL, tcp, 0) < 0)
 		return -1;
-	}
 
 	if (!qflag)
 		fprintf(stderr, "Process %u resumed\n", tcp->pid);
 	return 0;
 }
 
-#endif /* !USE_PROCFS */
-
-/* detach traced process; continue with sig */
-
 static int
-detach(tcp, sig)
-struct tcb *tcp;
-int sig;
+resume_from_tcp (struct tcb *tcp)
 {
 	int error = 0;
-#ifdef LINUX
-	int status, resumed;
-#endif
-
-	if (tcp->flags & TCB_BPTSET)
-		sig = SIGKILL;
-
-#ifdef LINUX
-	/*
-	 * Linux wrongly insists the child be stopped
-	 * before detaching.  Arghh.  We go through hoops
-	 * to make a clean break of things.
-	 */
-#if defined(SPARC)
-#undef PTRACE_DETACH
-#define PTRACE_DETACH PTRACE_SUNDETACH
-#endif
-	if ((error = ptrace(PTRACE_DETACH, tcp->pid, (char *) 1, sig)) == 0) {
-		/* On a clear day, you can see forever. */
-	}
-	else if (errno != ESRCH) {
-		/* Shouldn't happen. */
-		perror("detach: ptrace(PTRACE_DETACH, ...)");
-	}
-	else if (kill(tcp->pid, 0) < 0) {
-		if (errno != ESRCH)
-			perror("detach: checking sanity");
-	}
-	else if (kill(tcp->pid, SIGSTOP) < 0) {
-		if (errno != ESRCH)
-			perror("detach: stopping child");
-	}
-	else {
-		for (;;) {
-#ifdef __WALL
-			if (wait4(tcp->pid, &status, __WALL, NULL) < 0) {
-				if (errno == ECHILD) /* Already gone.  */
-					break;
-				if (errno != EINVAL) {
-					perror("detach: waiting");
-					break;
-				}
-#endif /* __WALL */
-				/* No __WALL here.  */
-				if (waitpid(tcp->pid, &status, 0) < 0) {
-					if (errno != ECHILD) {
-						perror("detach: waiting");
-						break;
-					}
-#ifdef __WCLONE
-					/* If no processes, try clones.  */
-					if (wait4(tcp->pid, &status, __WCLONE,
-						  NULL) < 0) {
-						if (errno != ECHILD)
-							perror("detach: waiting");
-						break;
-					}
-#endif /* __WCLONE */
-				}
-#ifdef __WALL
-			}
-#endif
-			if (!WIFSTOPPED(status)) {
-				/* Au revoir, mon ami. */
-				break;
-			}
-			if (WSTOPSIG(status) == SIGSTOP) {
-				if ((error = ptrace(PTRACE_DETACH,
-				    tcp->pid, (char *) 1, sig)) < 0) {
-					if (errno != ESRCH)
-						perror("detach: ptrace(PTRACE_DETACH, ...)");
-					/* I died trying. */
-				}
-				break;
-			}
-			if ((error = ptrace(PTRACE_CONT, tcp->pid, (char *) 1,
-			    WSTOPSIG(status) == SIGTRAP ?
-			    0 : WSTOPSIG(status))) < 0) {
-				if (errno != ESRCH)
-					perror("detach: ptrace(PTRACE_CONT, ...)");
-				break;
-			}
-		}
-	}
-#endif /* LINUX */
-
-#if defined(SUNOS4)
-	/* PTRACE_DETACH won't respect `sig' argument, so we post it here. */
-	if (sig && kill(tcp->pid, sig) < 0)
-		perror("detach: kill");
-	sig = 0;
-	if ((error = ptrace(PTRACE_DETACH, tcp->pid, (char *) 1, sig)) < 0)
-		perror("detach: ptrace(PTRACE_DETACH, ...)");
-#endif /* SUNOS4 */
-
-#ifndef USE_PROCFS
-	resumed = 0;
+	int resumed = 0;
 
 	/* XXX This won't always be quite right (but it never was).
 	   A waiter with argument 0 or < -1 is waiting for any pid in
@@ -1332,7 +1592,7 @@
 	if (tcp->parent &&
 	    (tcp->parent->flags & TCB_SUSPENDED) &&
 	    (tcp->parent->waitpid <= 0 || tcp->parent->waitpid == tcp->pid)) {
- 		error = resume(tcp->parent);
+		error = resume(tcp->parent);
 		++resumed;
 	}
 #ifdef TCB_CLONE_THREAD
@@ -1369,32 +1629,156 @@
 	}
 #endif
 
+	return error;
+}
+
 #endif /* !USE_PROCFS */
 
+/* detach traced process; continue with sig
+   Never call DETACH twice on the same process as both unattached and
+   attached-unstopped processes give the same ESRCH.  For unattached process we
+   would SIGSTOP it and wait for its SIGSTOP notification forever.  */
+
+static int
+detach(tcp, sig)
+struct tcb *tcp;
+int sig;
+{
+	int error = 0;
+#ifdef LINUX
+	int status, catch_sigstop;
+	struct tcb *zombie = NULL;
+
+	/* If the group leader is lingering only because of this other
+	   thread now dying, then detach the leader as well.  */
+	if ((tcp->flags & TCB_CLONE_THREAD) &&
+	    tcp->parent->nclone_threads == 1 &&
+	    (tcp->parent->flags & TCB_EXITING))
+		zombie = tcp->parent;
+#endif
+
+	if (tcp->flags & TCB_BPTSET)
+		clearbpt(tcp);
+
+#ifdef LINUX
+	/*
+	 * Linux wrongly insists the child be stopped
+	 * before detaching.  Arghh.  We go through hoops
+	 * to make a clean break of things.
+	 */
+#if defined(SPARC)
+#undef PTRACE_DETACH
+#define PTRACE_DETACH PTRACE_SUNDETACH
+#endif
+	/*
+	 * On TCB_STARTUP we did PTRACE_ATTACH but still did not get the
+	 * expected SIGSTOP.  We must catch exactly one as otherwise the
+	 * detached process would be left stopped (process state T).
+	 */
+	catch_sigstop = (tcp->flags & TCB_STARTUP);
+	if ((error = ptrace(PTRACE_DETACH, tcp->pid, (char *) 1, sig)) == 0) {
+		/* On a clear day, you can see forever. */
+	}
+	else if (errno != ESRCH) {
+		/* Shouldn't happen. */
+		perror("detach: ptrace(PTRACE_DETACH, ...)");
+	}
+	else if (my_tgkill((tcp->flags & TCB_CLONE_THREAD ? tcp->parent->pid
+							  : tcp->pid),
+			   tcp->pid, 0) < 0) {
+		if (errno != ESRCH)
+			perror("detach: checking sanity");
+	}
+	else if (!catch_sigstop && my_tgkill((tcp->flags & TCB_CLONE_THREAD
+					      ? tcp->parent->pid : tcp->pid),
+					     tcp->pid, SIGSTOP) < 0) {
+		if (errno != ESRCH)
+			perror("detach: stopping child");
+	}
+	else
+		catch_sigstop = 1;
+	if (catch_sigstop) {
+		for (;;) {
+#ifdef __WALL
+			if (wait4(tcp->pid, &status, __WALL, NULL) < 0) {
+				if (errno == ECHILD) /* Already gone.  */
+					break;
+				if (errno != EINVAL) {
+					perror("detach: waiting");
+					break;
+				}
+#endif /* __WALL */
+				/* No __WALL here.  */
+				if (waitpid(tcp->pid, &status, 0) < 0) {
+					if (errno != ECHILD) {
+						perror("detach: waiting");
+						break;
+					}
+#ifdef __WCLONE
+					/* If no processes, try clones.  */
+					if (wait4(tcp->pid, &status, __WCLONE,
+						  NULL) < 0) {
+						if (errno != ECHILD)
+							perror("detach: waiting");
+						break;
+					}
+#endif /* __WCLONE */
+				}
+#ifdef __WALL
+			}
+#endif
+			if (!WIFSTOPPED(status)) {
+				/* Au revoir, mon ami. */
+				break;
+			}
+			if (WSTOPSIG(status) == SIGSTOP) {
+				ptrace_restart(PTRACE_DETACH, tcp, sig);
+				break;
+			}
+			error = ptrace_restart(PTRACE_CONT, tcp,
+					WSTOPSIG(status) == SIGTRAP ? 0
+					: WSTOPSIG(status));
+			if (error < 0)
+				break;
+		}
+	}
+#endif /* LINUX */
+
+#if defined(SUNOS4)
+	/* PTRACE_DETACH won't respect `sig' argument, so we post it here. */
+	if (sig && kill(tcp->pid, sig) < 0)
+		perror("detach: kill");
+	sig = 0;
+	error = ptrace_restart(PTRACE_DETACH, tcp, sig);
+#endif /* SUNOS4 */
+
+#ifndef USE_PROCFS
+	error |= resume_from_tcp (tcp);
+#endif
+
 	if (!qflag)
 		fprintf(stderr, "Process %u detached\n", tcp->pid);
 
 	droptcb(tcp);
+
+#ifdef LINUX
+	if (zombie != NULL) {
+		/* TCP no longer exists therefore you must not detach () it.  */
+		droptcb(zombie);
+	}
+#endif
+
 	return error;
 }
 
 #ifdef USE_PROCFS
 
-static void
-reaper(sig)
-int sig;
+static void reaper(int sig)
 {
 	int pid;
 	int status;
 
 	while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
-#if 0
-		struct tcb *tcp;
-
-		tcp = pid2tcb(pid);
-		if (tcp)
-			droptcb(tcp);
-#endif
 	}
 }
 
@@ -1415,8 +1799,8 @@
 				"cleanup: looking at pid %u\n", tcp->pid);
 		if (tcp_last &&
 		    (!outfname || followfork < 2 || tcp_last == tcp)) {
-			tprintf(" <unfinished ...>\n");
-			tcp_last = NULL;
+			tprintf(" <unfinished ...>");
+			printtrailer();
 		}
 		if (tcp->flags & TCB_ATTACHED)
 			detach(tcp, 0);
@@ -1520,7 +1904,6 @@
 static void
 proc_poll_open()
 {
-	int arg;
 	int i;
 
 	if (pipe(proc_poll_pipe) < 0) {
@@ -1528,12 +1911,7 @@
 		exit(1);
 	}
 	for (i = 0; i < 2; i++) {
-		if ((arg = fcntl(proc_poll_pipe[i], F_GETFD)) < 0) {
-			perror("F_GETFD");
-			exit(1);
-		}
-		if (fcntl(proc_poll_pipe[i], F_SETFD, arg|FD_CLOEXEC) < 0) {
-			perror("F_SETFD");
+		if (set_cloexec_flag(proc_poll_pipe[i]) < 0) {
 			exit(1);
 		}
 	}
@@ -1588,7 +1966,7 @@
 	switch (fork()) {
 	case -1:
 		perror("fork");
-		_exit(0);
+		_exit(1);
 	case 0:
 		break;
 	default:
@@ -1612,7 +1990,7 @@
 
 	if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
 		perror("getrlimit(RLIMIT_NOFILE, ...)");
-		_exit(0);
+		_exit(1);
 	}
 	n = rl.rlim_cur;
 	for (i = 0; i < n; i++) {
@@ -1624,10 +2002,10 @@
 	pollinfo.pid = getpid();
 	for (;;) {
 #ifndef FREEBSD
-	        if (ioctl(pfd, PIOCWSTOP, NULL) < 0)
-#else /* FREEBSD */
-	        if (ioctl(pfd, PIOCWSTOP, &pfs) < 0)
-#endif /* FREEBSD */
+		if (ioctl(pfd, PIOCWSTOP, NULL) < 0)
+#else
+		if (ioctl(pfd, PIOCWSTOP, &pfs) < 0)
+#endif
 		{
 			switch (errno) {
 			case EINTR:
@@ -1717,7 +2095,7 @@
 #ifndef HAVE_POLLABLE_PROCFS
 			if (proc_poll_pipe[0] == -1) {
 #endif
-				tcp = pid2tcb(0);
+				tcp = first_used_tcb();
 				if (!tcp)
 					continue;
 				pfd = tcp->pfd;
@@ -1789,7 +2167,7 @@
 			if (proc_poll_pipe[0] != -1)
 				ioctl_result = IOCTL_STATUS (tcp);
 			else
-			  	ioctl_result = IOCTL_WSTOP (tcp);
+				ioctl_result = IOCTL_WSTOP (tcp);
 #endif /* FREEBSD */
 			ioctl_errno = errno;
 #ifndef HAVE_POLLABLE_PROCFS
@@ -1838,6 +2216,7 @@
 
 		/* set current output file */
 		outf = tcp->outf;
+		curcol = tcp->curcol;
 
 		if (cflag) {
 			struct timeval stime;
@@ -1883,43 +2262,48 @@
 			}
 			break;
 		case PR_SIGNALLED:
-			if (!cflag && (qual_flags[what] & QUAL_SIGNAL)) {
+			if (cflag != CFLAG_ONLY_STATS
+			    && (qual_flags[what] & QUAL_SIGNAL)) {
 				printleader(tcp);
 				tprintf("--- %s (%s) ---",
 					signame(what), strsignal(what));
-				printtrailer(tcp);
+				printtrailer();
 #ifdef PR_INFO
 				if (tcp->status.PR_INFO.si_signo == what) {
 					printleader(tcp);
 					tprintf("    siginfo=");
 					printsiginfo(&tcp->status.PR_INFO, 1);
-					printtrailer(tcp);
+					printtrailer();
 				}
 #endif
 			}
 			break;
 		case PR_FAULTED:
-			if (!cflag && (qual_flags[what] & QUAL_FAULT)) {
+			if (cflag != CFLAGS_ONLY_STATS
+			    && (qual_flags[what] & QUAL_FAULT)) {
 				printleader(tcp);
 				tprintf("=== FAULT %d ===", what);
-				printtrailer(tcp);
+				printtrailer();
 			}
 			break;
 #ifdef FREEBSD
 		case 0: /* handle case we polled for nothing */
-		  	continue;
+			continue;
 #endif
 		default:
 			fprintf(stderr, "odd stop %d\n", tcp->status.PR_WHY);
 			exit(1);
 			break;
 		}
+		/* Remember current print column before continuing. */
+		tcp->curcol = curcol;
 		arg = 0;
 #ifndef FREEBSD
-		if (IOCTL (tcp->pfd, PIOCRUN, &arg) < 0) {
+		if (IOCTL (tcp->pfd, PIOCRUN, &arg) < 0)
 #else
-		if (IOCTL (tcp->pfd, PIOCRUN, 0) < 0) {
+		if (IOCTL (tcp->pfd, PIOCRUN, 0) < 0)
 #endif
+		{
 			perror("PIOCRUN");
 			exit(1);
 		}
@@ -1941,57 +2325,43 @@
 {
 	/* We need to locate our records of all the clone threads
 	   related to TCP, either its children or siblings.  */
-	struct tcb *leader = ((tcp->flags & TCB_CLONE_THREAD)
-			      ? tcp->parent
-			      : tcp->nclone_detached > 0
-			      ? tcp : NULL);
+	struct tcb *leader = NULL;
+
+	if (tcp->flags & TCB_CLONE_THREAD)
+		leader = tcp->parent;
 
 	if (sig < 0) {
-		if (leader != NULL && leader != tcp &&
-		    !(leader->flags & TCB_GROUP_EXITING))
+		if (leader != NULL && leader != tcp
+		 && !(leader->flags & TCB_GROUP_EXITING)
+		 && !(tcp->flags & TCB_STARTUP)
+		) {
 			fprintf(stderr,
 				"PANIC: handle_group_exit: %d leader %d\n",
 				tcp->pid, leader ? leader->pid : -1);
+		}
+		/* TCP no longer exists therefore you must not detach() it.  */
+#ifndef USE_PROCFS
+		resume_from_tcp(tcp);
+#endif
 		droptcb(tcp);	/* Already died.  */
 	}
 	else {
+		/* Mark that we are taking the process down.  */
+		tcp->flags |= TCB_EXITING | TCB_GROUP_EXITING;
 		if (tcp->flags & TCB_ATTACHED) {
-		  	if (leader != NULL && leader != tcp) {
-				if (leader->flags & TCB_ATTACHED) {
-					/* We need to detach the leader so
-					   that the process death will be
-					   reported to its real parent.
-					   But we kill it first to prevent
-					   it doing anything before we kill
-					   the whole process in a moment.
-					   We can use PTRACE_KILL on a
-					   thread that's not already
-					   stopped.  Then the value we pass
-					   in PTRACE_DETACH just sets the
-					   death signal reported to the
-					   real parent.  */
-					ptrace(PTRACE_KILL, leader->pid, 0, 0);
-					if (debug)
-						fprintf(stderr,
-							" [%d exit %d kills %d]\n",
-							tcp->pid, sig, leader->pid);
-					detach(leader, sig);
-				}
-				else
-					leader->flags |= TCB_GROUP_EXITING;
-			}
 			detach(tcp, sig);
-		}
-		else if (ptrace(PTRACE_CONT, tcp->pid, (char *) 1, sig) < 0) {
-			perror("strace: ptrace(PTRACE_CONT, ...)");
-			cleanup();
-			return -1;
-		}
-		else {
-			if (leader != NULL)
-				leader->flags |= TCB_GROUP_EXITING;
 			if (leader != NULL && leader != tcp)
-				droptcb(tcp);
+				leader->flags |= TCB_GROUP_EXITING;
+		} else {
+			if (ptrace_restart(PTRACE_CONT, tcp, sig) < 0) {
+				cleanup();
+				return -1;
+			}
+			if (leader != NULL) {
+				leader->flags |= TCB_GROUP_EXITING;
+				if (leader != tcp)
+					droptcb(tcp);
+			}
 			/* The leader will report to us as parent now,
 			   and then we'll get to the SIG==-1 case.  */
 			return 0;
@@ -2002,6 +2372,31 @@
 }
 #endif
 
+#ifdef LINUX
+static int
+handle_ptrace_event(int status, struct tcb *tcp)
+{
+	if (status >> 16 == PTRACE_EVENT_VFORK ||
+	    status >> 16 == PTRACE_EVENT_CLONE ||
+	    status >> 16 == PTRACE_EVENT_FORK) {
+		long childpid;
+
+		if (do_ptrace(PTRACE_GETEVENTMSG, tcp, NULL, &childpid) < 0) {
+			if (errno != ESRCH) {
+				fprintf(stderr, "\
+%s: handle_ptrace_event: ptrace cannot get new child's pid\n",
+					progname);
+				cleanup();
+				exit(1);
+			}
+			return -1;
+		}
+		return handle_new_child(tcp, childpid, 0);
+	}
+	return 1;
+}
+#endif
+
 static int
 trace()
 {
@@ -2017,6 +2412,8 @@
 #endif /* LINUX */
 
 	while (nprocs != 0) {
+		if (interrupted)
+			return 0;
 		if (interactive)
 			sigprocmask(SIG_SETMASK, &empty_set, NULL);
 #ifdef LINUX
@@ -2049,9 +2446,6 @@
 		if (interactive)
 			sigprocmask(SIG_BLOCK, &blocked_set, NULL);
 
-		if (interrupted)
-			return 0;
-
 		if (pid == -1) {
 			switch (wait_errno) {
 			case EINTR:
@@ -2063,12 +2457,6 @@
 				 * version of SunOS sometimes reports
 				 * ECHILD before sending us SIGCHILD.
 				 */
-#if 0
-				if (nprocs == 0)
-					return 0;
-				fprintf(stderr, "strace: proc miscount\n");
-				exit(1);
-#endif
 				return 0;
 			default:
 				errno = wait_errno;
@@ -2076,13 +2464,18 @@
 				return -1;
 			}
 		}
+		if (pid == popen_pid) {
+			if (WIFEXITED(status) || WIFSIGNALED(status))
+				popen_pid = -1;
+			continue;
+		}
 		if (debug)
 			fprintf(stderr, " [wait(%#x) = %u]\n", status, pid);
 
 		/* Look up `pid' in our table. */
 		if ((tcp = pid2tcb(pid)) == NULL) {
 #ifdef LINUX
-			if (followfork || followvfork) {
+			if (followfork) {
 				/* This is needed to go with the CLONE_PTRACE
 				   changes in process.c/util.c: we might see
 				   the child's initial trap before we see the
@@ -2092,13 +2485,8 @@
 				   will we have the association of parent and
 				   child so that we know how to do clearbpt
 				   in the child.  */
-				if ((tcp = alloctcb(pid)) == NULL) {
-					fprintf(stderr, " [tcb table full]\n");
-					kill(pid, SIGKILL); /* XXX */
-					return 0;
-				}
+				tcp = alloctcb(pid);
 				tcp->flags |= TCB_ATTACHED | TCB_SUSPENDED;
-				newoutf(tcp);
 				if (!qflag)
 					fprintf(stderr, "\
 Process %d attached (waiting for parent)\n",
@@ -2117,6 +2505,7 @@
 		}
 		/* set current output file */
 		outf = tcp->outf;
+		curcol = tcp->curcol;
 		if (cflag) {
 #ifdef LINUX
 			tv_sub(&tcp->dtime, &ru.ru_stime, &tcp->stime);
@@ -2136,7 +2525,9 @@
 			continue;
 		}
 		if (WIFSIGNALED(status)) {
-			if (!cflag
+			if (pid == strace_child)
+				exit_code = 0x100 | WTERMSIG(status);
+			if (cflag != CFLAG_ONLY_STATS
 			    && (qual_flags[WTERMSIG(status)] & QUAL_SIGNAL)) {
 				printleader(tcp);
 				tprintf("+++ killed by %s %s+++",
@@ -2145,7 +2536,7 @@
 					WCOREDUMP(status) ? "(core dumped) " :
 #endif
 					"");
-				printtrailer(tcp);
+				printtrailer();
 			}
 #ifdef TCB_GROUP_EXITING
 			handle_group_exit(tcp, -1);
@@ -2155,20 +2546,22 @@
 			continue;
 		}
 		if (WIFEXITED(status)) {
+			if (pid == strace_child)
+				exit_code = WEXITSTATUS(status);
 			if (debug)
-				fprintf(stderr, "pid %u exited\n", pid);
-			if ((tcp->flags & TCB_ATTACHED)
+				fprintf(stderr, "pid %u exited with %d\n", pid, WEXITSTATUS(status));
+			if ((tcp->flags & (TCB_ATTACHED|TCB_STARTUP)) == TCB_ATTACHED
 #ifdef TCB_GROUP_EXITING
-			    && !(tcp->parent && (tcp->parent->flags &
-						 TCB_GROUP_EXITING))
+			    && !(tcp->parent && (tcp->parent->flags & TCB_GROUP_EXITING))
+			    && !(tcp->flags & TCB_GROUP_EXITING)
 #endif
-				)
+			) {
 				fprintf(stderr,
-					"PANIC: attached pid %u exited\n",
-					pid);
+					"PANIC: attached pid %u exited with %d\n",
+					pid, WEXITSTATUS(status));
+			}
 			if (tcp == tcp_last) {
-				if ((tcp->flags & (TCB_INSYSCALL|TCB_REPRINT))
-				    == TCB_INSYSCALL)
+				if ((tcp->flags & (TCB_INSYSCALL|TCB_REPRINT)) == TCB_INSYSCALL)
 					tprintf(" <unfinished ... exit status %d>\n",
 						WEXITSTATUS(status));
 				tcp_last = NULL;
@@ -2189,41 +2582,45 @@
 			fprintf(stderr, "pid %u stopped, [%s]\n",
 				pid, signame(WSTOPSIG(status)));
 
-		if (tcp->flags & TCB_STARTUP) {
+		if (ptrace_setoptions && (status >> 16)) {
+			if (handle_ptrace_event(status, tcp) != 1)
+				goto tracing;
+		}
+
+		/*
+		 * Interestingly, the process may stop
+		 * with STOPSIG equal to some other signal
+		 * than SIGSTOP if we happend to attach
+		 * just before the process takes a signal.
+		 * A no-MMU vforked child won't send up a signal,
+		 * so skip the first (lost) execve notification.
+		 */
+		if ((tcp->flags & TCB_STARTUP) &&
+		    (WSTOPSIG(status) == SIGSTOP || strace_vforked)) {
 			/*
 			 * This flag is there to keep us in sync.
 			 * Next time this process stops it should
 			 * really be entering a system call.
 			 */
 			tcp->flags &= ~TCB_STARTUP;
-			if (tcp->flags & TCB_ATTACHED) {
-				/*
-				 * Interestingly, the process may stop
-				 * with STOPSIG equal to some other signal
-				 * than SIGSTOP if we happend to attach
-				 * just before the process takes a signal.
-				 */
-				if (!WIFSTOPPED(status)) {
-					fprintf(stderr,
-						"pid %u not stopped\n", pid);
-					detach(tcp, WSTOPSIG(status));
-					continue;
-				}
-			}
-			else {
-#ifdef SUNOS4
-				/* A child of us stopped at exec */
-				if (WSTOPSIG(status) == SIGTRAP && followvfork)
-					fixvfork(tcp);
-#endif /* SUNOS4 */
-			}
 			if (tcp->flags & TCB_BPTSET) {
+				/*
+				 * One example is a breakpoint inherited from
+				 * parent through fork ().
+				 */
 				if (clearbpt(tcp) < 0) /* Pretty fatal */ {
 					droptcb(tcp);
 					cleanup();
 					return -1;
 				}
 			}
+#ifdef LINUX
+			if (followfork && (tcp->parent == NULL) && ptrace_setoptions)
+				if (ptrace(PTRACE_SETOPTIONS, tcp->pid,
+					   NULL, ptrace_setoptions) < 0 &&
+				    errno != ESRCH)
+					ptrace_setoptions = 0;
+#endif
 			goto tracing;
 		}
 
@@ -2235,43 +2632,43 @@
 				 * Hope we are back in control now.
 				 */
 				tcp->flags &= ~(TCB_INSYSCALL | TCB_SIGTRAPPED);
-				if (ptrace(PTRACE_SYSCALL,
-						pid, (char *) 1, 0) < 0) {
-					perror("trace: ptrace(PTRACE_SYSCALL, ...)");
+				if (ptrace_restart(PTRACE_SYSCALL, tcp, 0) < 0) {
 					cleanup();
 					return -1;
 				}
 				continue;
 			}
-			if (!cflag
+			if (cflag != CFLAG_ONLY_STATS
 			    && (qual_flags[WSTOPSIG(status)] & QUAL_SIGNAL)) {
-				unsigned long addr = 0, pc = 0;
-#ifdef PT_GETSIGINFO
-#				define PSR_RI	41
-				struct siginfo si;
-				unsigned long psr;
+				siginfo_t si;
+#if defined(PT_CR_IPSR) && defined(PT_CR_IIP)
+				long pc = 0;
+				long psr = 0;
 
-				upeek(pid, PT_CR_IPSR, &psr);
-				upeek(pid, PT_CR_IIP, &pc);
+				upeek(tcp, PT_CR_IPSR, &psr);
+				upeek(tcp, PT_CR_IIP, &pc);
 
+# define PSR_RI	41
 				pc += (psr >> PSR_RI) & 0x3;
-				ptrace(PT_GETSIGINFO, pid, 0, (long) &si);
-				addr = (unsigned long) si.si_addr;
-#elif defined PTRACE_GETSIGINFO
-				if (WSTOPSIG(status) == SIGSEGV ||
-				    WSTOPSIG(status) == SIGBUS) {
-					siginfo_t si;
-					if (ptrace(PTRACE_GETSIGINFO, pid,
-						   0, &si) == 0)
-						addr = (unsigned long)
-							si.si_addr;
-				}
+# define PC_FORMAT_STR	" @ %lx"
+# define PC_FORMAT_ARG	pc
+#else
+# define PC_FORMAT_STR	"%s"
+# define PC_FORMAT_ARG	""
 #endif
 				printleader(tcp);
-				tprintf("--- %s (%s) @ %lx (%lx) ---",
-					signame(WSTOPSIG(status)),
-					strsignal(WSTOPSIG(status)), pc, addr);
-				printtrailer(tcp);
+				if (ptrace(PTRACE_GETSIGINFO, pid, 0, &si) == 0) {
+					tprintf("--- ");
+					printsiginfo(&si, verbose(tcp));
+					tprintf(" (%s)" PC_FORMAT_STR " ---",
+						strsignal(WSTOPSIG(status)),
+						PC_FORMAT_ARG);
+				} else
+					tprintf("--- %s by %s" PC_FORMAT_STR " ---",
+						strsignal(WSTOPSIG(status)),
+						signame(WSTOPSIG(status)),
+						PC_FORMAT_ARG);
+				printtrailer();
 			}
 			if (((tcp->flags & TCB_ATTACHED) ||
 			     tcp->nclone_threads > 0) &&
@@ -2283,19 +2680,35 @@
 #endif
 				continue;
 			}
-			if (ptrace(PTRACE_SYSCALL, pid, (char *) 1,
-				   WSTOPSIG(status)) < 0) {
-				perror("trace: ptrace(PTRACE_SYSCALL, ...)");
+			if (ptrace_restart(PTRACE_SYSCALL, tcp, WSTOPSIG(status)) < 0) {
 				cleanup();
 				return -1;
 			}
 			tcp->flags &= ~TCB_SUSPENDED;
 			continue;
 		}
-		if (trace_syscall(tcp) < 0) {
-			if (tcp->flags & TCB_ATTACHED)
+		/* we handled the STATUS, we are permitted to interrupt now. */
+		if (interrupted)
+			return 0;
+		if (trace_syscall(tcp) < 0 && !tcp->ptrace_errno) {
+			/* ptrace() failed in trace_syscall() with ESRCH.
+			 * Likely a result of process disappearing mid-flight.
+			 * Observed case: exit_group() terminating
+			 * all processes in thread group. In this case, threads
+			 * "disappear" in an unpredictable moment without any
+			 * notification to strace via wait().
+			 */
+			if (tcp->flags & TCB_ATTACHED) {
+				if (tcp_last) {
+					/* Do we have dangling line "syscall(param, param"?
+					 * Finish the line then. We cannot
+					 */
+					tcp_last->flags |= TCB_REPRINT;
+					tprintf(" <unfinished ...>");
+					printtrailer();
+				}
 				detach(tcp, 0);
-			else {
+			} else {
 				ptrace(PTRACE_KILL,
 					tcp->pid, (char *) 1, SIGTERM);
 				droptcb(tcp);
@@ -2312,8 +2725,7 @@
 #endif
 			if (tcp->flags & TCB_ATTACHED)
 				detach(tcp, 0);
-			else if (ptrace(PTRACE_CONT, pid, (char *) 1, 0) < 0) {
-				perror("strace: ptrace(PTRACE_CONT, ...)");
+			else if (ptrace_restart(PTRACE_CONT, tcp, 0) < 0) {
 				cleanup();
 				return -1;
 			}
@@ -2325,8 +2737,9 @@
 			continue;
 		}
 	tracing:
-		if (ptrace(PTRACE_SYSCALL, pid, (char *) 1, 0) < 0) {
-			perror("trace: ptrace(PTRACE_SYSCALL, ...)");
+		/* Remember current print column before continuing. */
+		tcp->curcol = curcol;
+		if (ptrace_restart(PTRACE_SYSCALL, tcp, 0) < 0) {
 			cleanup();
 			return -1;
 		}
@@ -2336,34 +2749,21 @@
 
 #endif /* !USE_PROCFS */
 
-static int curcol;
-
-#ifdef __STDC__
 #include <stdarg.h>
-#define VA_START(a, b) va_start(a, b)
-#else
-#include <varargs.h>
-#define VA_START(a, b) va_start(a)
-#endif
 
 void
-#ifdef __STDC__
 tprintf(const char *fmt, ...)
-#else
-tprintf(fmt, va_alist)
-char *fmt;
-va_dcl
-#endif
 {
 	va_list args;
 
-	VA_START(args, fmt);
+	va_start(args, fmt);
 	if (outf) {
 		int n = vfprintf(outf, fmt, args);
-		if (n < 0 && outf != stderr)
-			perror(outfname == NULL
-			       ? "<writing to pipe>" : outfname);
-		else
+		if (n < 0) {
+			if (outf != stderr)
+				perror(outfname == NULL
+				       ? "<writing to pipe>" : outfname);
+		} else
 			curcol += n;
 	}
 	va_end(args);
@@ -2374,9 +2774,18 @@
 printleader(tcp)
 struct tcb *tcp;
 {
-	if (tcp_last && (!outfname || followfork < 2 || tcp_last == tcp)) {
-		tcp_last->flags |= TCB_REPRINT;
-		tprintf(" <unfinished ...>\n");
+	if (tcp_last) {
+		if (tcp_last->ptrace_errno) {
+			if (tcp_last->flags & TCB_INSYSCALL) {
+				tprintf(" <unavailable>)");
+				tabto(acolumn);
+			}
+			tprintf("= ? <unavailable>\n");
+			tcp_last->ptrace_errno = 0;
+		} else if (!outfname || followfork < 2 || tcp_last == tcp) {
+			tcp_last->flags |= TCB_REPRINT;
+			tprintf(" <unfinished ...>\n");
+		}
 	}
 	curcol = 0;
 	if ((followfork == 1 || pflag_seen > 1) && outfname)
@@ -2423,8 +2832,7 @@
 }
 
 void
-printtrailer(tcp)
-struct tcb *tcp;
+printtrailer(void)
 {
 	tprintf("\n");
 	tcp_last = NULL;
@@ -2432,8 +2840,9 @@
 
 #ifdef HAVE_MP_PROCFS
 
-int mp_ioctl (int fd, int cmd, void *arg, int size) {
-
+int
+mp_ioctl(int fd, int cmd, void *arg, int size)
+{
 	struct iovec iov[2];
 	int n = 1;
 
@@ -2445,7 +2854,7 @@
 		iov[1].iov_len = size;
 	}
 
-	return writev (fd, iov, n);
+	return writev(fd, iov, n);
 }
 
 #endif
diff --git a/strace.spec b/strace.spec
index 1e94fa5..51333ab 100644
--- a/strace.spec
+++ b/strace.spec
@@ -1,14 +1,16 @@
-Summary: Tracks and displays system calls associated with a running process.
+Summary: Tracks and displays system calls associated with a running process
 Name: strace
-Version: 4.5.12
-Release: 1
+Version: 4.6
+Release: 1%{?dist}
 License: BSD
 Group: Development/Debuggers
 URL: http://sourceforge.net/projects/strace/
-Source0: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-root
+Source: http://downloads.sourceforge.net/strace/%{name}-%{version}.tar.xz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define strace64_arches ppc64
+BuildRequires: libacl-devel, libaio-devel, time
+
+%define strace64_arches ppc64 sparc64
 
 %description
 The strace program intercepts and records the system calls called and
@@ -44,26 +46,35 @@
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_mandir}/man1
-mkdir -p %{buildroot}%{_bindir}
-%makeinstall man1dir=%{buildroot}%{_mandir}/man1
+make DESTDIR=%{buildroot} install
 
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}%{_bindir}/strace-graph
 
-%ifarch %{strace64_arches}
-ln %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64
+%define copy64 ln
+%if 0%{?rhel}
+%if 0%{?rhel} < 6
 %endif
+%define copy64 cp -p
+%endif
+
+%ifarch %{strace64_arches}
+%{copy64} %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64
+%endif
+
+%check
+make check
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+%doc CREDITS ChangeLog ChangeLog-CVS COPYRIGHT NEWS PORTING README
 %{_bindir}/strace
 %{_mandir}/man1/*
 
@@ -73,8 +84,111 @@
 %{_bindir}/strace64
 %endif
 
-
 %changelog
+* Mon Mar 14 2011 Dmitry V. Levin <ldv@altlinux.org> - 4.6-1
+- New upstream release.
+  + fixed a corner case in waitpid handling (#663547).
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.5.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Apr 13 2010 Roland McGrath <roland@redhat.com> - 4.5.20-1
+- New upstream release, work mostly by Andreas Schwab and Dmitry V. Levin.
+  + fixed potential stack buffer overflow in select decoder (#556678);
+  + fixed FTBFS (#539044).
+
+* Wed Oct 21 2009 Roland McGrath <roland@redhat.com> - 4.5.19-1
+- New upstream release, work mostly by Dmitry V. Levin <ldv@altlinux.org>
+  + exit/kill strace with traced process exitcode/signal (#105371);
+  + fixed build on ARM EABI (#507576);
+  + fixed display of 32-bit argv array on 64-bit architectures (#519480);
+  + fixed display of 32-bit fcntl(F_SETLK) on 64-bit architectures (#471169);
+  + fixed several bugs in strings decoder, including potential heap
+    memory corruption (#470529, #478324, #511035).
+
+* Thu Aug 28 2008 Roland McGrath <roland@redhat.com> - 4.5.18-1
+- build fix for newer kernel headers (#457291)
+- fix CLONE_VFORK handling (#455078)
+- Support new Linux/PPC system call subpage_prot and PROT_SAO flag.
+- In sigaction system call, display sa_flags value along with SIG_DFL/SIG_IGN.
+
+* Mon Jul 21 2008 Roland McGrath <roland@redhat.com> - 4.5.17-1
+- handle O_CLOEXEC, MSG_CMSG_CLOEXEC (#365781)
+- fix biarch stat64 decoding (#222275)
+- fix spurious "..." in printing of environment strings (#358241)
+- improve prctl decoding (#364401)
+- fix hang wait on exited child with exited child (#354261)
+- fix biarch fork/vfork (-f) tracing (#447475)
+- fix biarch printing of negative argument kill (#430585)
+- fix biarch decoding of error return values (#447587)
+- fix -f tracing of CLONE_VFORK (#455078)
+- fix ia64 register clobberation in -f tracing (#453438)
+- print SO_NODEFER, SA_RESETHAND instead of SA_NOMASK, SA_ONESHOT (#455821)
+- fix futex argument decoding (#448628, #448629)
+
+* Fri Aug  3 2007 Roland McGrath <roland@redhat.com> - 4.5.16-1
+- fix multithread issues (#240962, #240961, #247907)
+- fix spurious SIGSTOP on early interrupt (#240986)
+- fix utime for biarch (#247185)
+- fix -u error message (#247170)
+- better futex syscall printing (##241467)
+- fix argv/envp printing with small -s settings, and for biarch
+- new syscalls: getcpu, eventfd, timerfd, signalfd, epoll_pwait,
+  move_pages, utimensat
+
+* Tue Jan 16 2007 Roland McGrath <roland@redhat.com> - 4.5.15-1
+- biarch fixes (#179740, #192193, #171626, #173050, #218433, #218043)
+- fix -ff -o behavior (#204950, #218435, #193808, #219423)
+- better quotactl printing (#118696)
+- *at, inotify*, pselect6, ppoll and unshare syscalls (#178633, #191275)
+- glibc-2.5 build fixes (#209856)
+- memory corruption fixes (#200621
+- fix race in child setup under -f (#180293)
+- show ipc key values in hex (#198179, #192182)
+- disallow -c with -ff (#187847)
+- Resolves: RHBZ #179740, RHBZ #192193, RHBZ #204950, RHBZ #218435
+- Resolves: RHBZ #193808, RHBZ #219423, RHBZ #171626, RHBZ #173050
+- Resolves: RHBZ #218433, RHBZ #218043, RHBZ #118696, RHBZ #178633
+- Resolves: RHBZ #191275, RHBZ #209856, RHBZ #200621, RHBZ #180293
+- Resolves: RHBZ #198179, RHBZ #198182, RHBZ #187847
+
+* Mon Nov 20 2006 Jakub Jelinek <jakub@redhat.com> - 4.5.14-4
+- Fix ia64 syscall decoding (#206768)
+- Fix build with glibc-2.4.90-33 and up on all arches but ia64
+- Fix build against 2.6.18+ headers
+
+* Tue Aug 22 2006 Roland McGrath <roland@redhat.com> - 4.5.14-3
+- Fix bogus decoding of syscalls >= 300 (#201462, #202620).
+
+* Fri Jul 14 2006 Jesse Keating <jkeating@redhat.com> - 4.5.14-2
+- rebuild
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 4.5.14-1.2
+- bump again for long double bug on ppc{,64}
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 4.5.14-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Mon Jan 16 2006 Roland McGrath <roland@redhat.com> - 4.5.14-1
+- Fix biarch decoding of socket syscalls (#174354).
+- Fix biarch -e support (#173986).
+- Accept numeric syscalls in -e (#174798).
+- Fix ipc syscall decoding (#164755).
+- Improve msgrcv printing (#164757).
+- Man page updates (#165375).
+- Improve mount syscall printing (#165377).
+- Correct printing of restarting syscalls (#165469).
+
+* Wed Aug  3 2005 Roland McGrath <roland@redhat.com> - 4.5.13-1
+- Fix setsockopt decoding on 64-bit (#162449).
+- Fix typos in socket option name strings (#161578).
+- Display more IPV6 socket options by name (#162450).
+- Don't display inappropriate syscalls for -e trace=file (#159340).
+- New selector type -e trace=desc for file-descriptor using calls (#159400).
+- Fix 32-bit old_mmap syscall decoding on x86-64 (#162467, #164215).
+- Fix errors detaching from multithreaded process on interrupt (#161919).
+- Note 4.5.12 fix for crash handling bad signal numbers (#162739).
+
 * Wed Jun  8 2005 Roland McGrath <roland@redhat.com> - 4.5.12-1
 - Fix known syscall recognition for IA32 processes on x86-64 (#158934).
 - Fix bad output for ptrace on x86-64 (#159787).
@@ -319,7 +433,7 @@
 - strace 3.1 patches carried along for now.
 
 * Sun May 16 1999 Jeff Johnson <jbj@redhat.com>
-- don't rely on (broken!) rpm %patch (#2735)
+- don't rely on (broken!) rpm %%patch (#2735)
 
 * Tue Apr 06 1999 Preston Brown <pbrown@redhat.com>
 - strip binary
diff --git a/strace/linux/alpha/errnoent.h b/strace/linux/alpha/errnoent.h
deleted file mode 100644
index 4ffaff9..0000000
--- a/strace/linux/alpha/errnoent.h
+++ /dev/null
@@ -1,516 +0,0 @@
-	"ERRNO_0", /* 0 */
-	"EPERM", /* 1 */
-	"ENOENT", /* 2 */
-	"ESRCH", /* 3 */
-	"EINTR", /* 4 */
-	"EIO", /* 5 */
-	"ENXIO", /* 6 */
-	"E2BIG", /* 7 */
-	"ENOEXEC", /* 8 */
-	"EBADF", /* 9 */
-	"ECHILD", /* 10 */
-	"EDEADLK", /* 11 */
-	"ENOMEM", /* 12 */
-	"EACCES", /* 13 */
-	"EFAULT", /* 14 */
-	"ENOTBLK", /* 15 */
-	"EBUSY", /* 16 */
-	"EEXIST", /* 17 */
-	"EXDEV", /* 18 */
-	"ENODEV", /* 19 */
-	"ENOTDIR", /* 20 */
-	"EISDIR", /* 21 */
-	"EINVAL", /* 22 */
-	"ENFILE", /* 23 */
-	"EMFILE", /* 24 */
-	"ENOTTY", /* 25 */
-	"ETXTBSY", /* 26 */
-	"EFBIG", /* 27 */
-	"ENOSPC", /* 28 */
-	"ESPIPE", /* 29 */
-	"EROFS", /* 30 */
-	"EMLINK", /* 31 */
-	"EPIPE", /* 32 */
-	"EDOM", /* 33 */
-	"ERANGE", /* 34 */
-	"EAGAIN", /* 35 */
-	"EINPROGRESS", /* 36 */
-	"EALREADY", /* 37 */
-	"ENOTSOCK", /* 38 */
-	"EDESTADDRREQ", /* 39 */
-	"EMSGSIZE", /* 40 */
-	"EPROTOTYPE", /* 41 */
-	"ENOPROTOOPT", /* 42 */
-	"EPROTONOSUPPORT", /* 43 */
-	"ESOCKTNOSUPPORT", /* 44 */
-	"EOPNOTSUPP", /* 45 */
-	"EPFNOSUPPORT", /* 46 */
-	"EAFNOSUPPORT", /* 47 */
-	"EADDRINUSE", /* 48 */
-	"EADDRNOTAVAIL", /* 49 */
-	"ENETDOWN", /* 50 */
-	"ENETUNREACH", /* 51 */
-	"ENETRESET", /* 52 */
-	"ECONNABORTED", /* 53 */
-	"ECONNRESET", /* 54 */
-	"ENOBUFS", /* 55 */
-	"EISCONN", /* 56 */
-	"ENOTCONN", /* 57 */
-	"ESHUTDOWN", /* 58 */
-	"ETOOMANYREFS", /* 59 */
-	"ETIMEDOUT", /* 60 */
-	"ECONNREFUSED", /* 61 */
-	"ELOOP", /* 62 */
-	"ENAMETOOLONG", /* 63 */
-	"EHOSTDOWN", /* 64 */
-	"EHOSTUNREACH", /* 65 */
-	"ENOTEMPTY", /* 66 */
-	"ERRNO_67", /* 67 */
-	"EUSERS", /* 68 */
-	"EDQUOT", /* 69 */
-	"ESTALE", /* 70 */
-	"EREMOTE", /* 71 */
-	"ERRNO_72", /* 72 */
-	"ERRNO_73", /* 73 */
-	"ERRNO_74", /* 74 */
-	"ERRNO_75", /* 75 */
-	"ERRNO_76", /* 76 */
-	"ENOLCK", /* 77 */
-	"ENOSYS", /* 78 */
-	"ERRNO_79", /* 79 */
-	"ENOMSG", /* 80 */
-	"EIDRM", /* 81 */
-	"ENOSR", /* 82 */
-	"ETIME", /* 83 */
-	"EBADMSG", /* 84 */
-	"EPROTO", /* 85 */
-	"ENODATA", /* 86 */
-	"ENOSTR", /* 87 */
-	"ECHRNG", /* 88 */
-	"EL2NSYNC", /* 89 */
-	"EL3HLT", /* 90 */
-	"EL3RST", /* 91 */
-	"ENOPKG", /* 92 */
-	"ELNRNG", /* 93 */
-	"EUNATCH", /* 94 */
-	"ENOCSI", /* 95 */
-	"EL2HLT", /* 96 */
-	"EBADE", /* 97 */
-	"EBADR", /* 98 */
-	"EXFULL", /* 99 */
-	"ENOANO", /* 100 */
-	"EBADRQC", /* 101 */
-	"EBADSLT", /* 102 */
-	"EDEADLOCK", /* 103 */
-	"EBFONT", /* 104 */
-	"ENONET", /* 105 */
-	"ENOLINK", /* 106 */
-	"EADV", /* 107 */
-	"ESRMNT", /* 108 */
-	"ECOMM", /* 109 */
-	"EMULTIHOP", /* 110 */
-	"EDOTDOT", /* 111 */
-	"EOVERFLOW", /* 112 */
-	"ENOTUNIQ", /* 113 */
-	"EBADFD", /* 114 */
-	"EREMCHG", /* 115 */
-	"EILSEQ", /* 116 */
-	"EUCLEAN", /* 117 */
-	"ENOTNAM", /* 118 */
-	"ENAVAIL", /* 119 */
-	"EISNAM", /* 120 */
-	"EREMOTEIO", /* 121 */
-	"ELIBACC", /* 122 */
-	"ELIBBAD", /* 123 */
-	"ELIBSCN", /* 124 */
-	"ELIBMAX", /* 125 */
-	"ELIBEXEC", /* 126 */
-	"ERESTART", /* 127 */
-	"ESTRPIPE", /* 128 */
-	"ERRNO_129", /* 129 */
-	"ERRNO_130", /* 130 */
-	"ERRNO_131", /* 131 */
-	"ERRNO_132", /* 132 */
-	"ERRNO_133", /* 133 */
-	"ERRNO_134", /* 134 */
-	"ERRNO_135", /* 135 */
-	"ERRNO_136", /* 136 */
-	"ERRNO_137", /* 137 */
-	"ERRNO_138", /* 138 */
-	"ERRNO_139", /* 139 */
-	"ERRNO_140", /* 140 */
-	"ERRNO_141", /* 141 */
-	"ERRNO_142", /* 142 */
-	"ERRNO_143", /* 143 */
-	"ERRNO_144", /* 144 */
-	"ERRNO_145", /* 145 */
-	"ERRNO_146", /* 146 */
-	"ERRNO_147", /* 147 */
-	"ERRNO_148", /* 148 */
-	"ERRNO_149", /* 149 */
-	"ERRNO_150", /* 150 */
-	"ERRNO_151", /* 151 */
-	"ERRNO_152", /* 152 */
-	"ERRNO_153", /* 153 */
-	"ERRNO_154", /* 154 */
-	"ERRNO_155", /* 155 */
-	"ERRNO_156", /* 156 */
-	"ERRNO_157", /* 157 */
-	"ERRNO_158", /* 158 */
-	"ERRNO_159", /* 159 */
-	"ERRNO_160", /* 160 */
-	"ERRNO_161", /* 161 */
-	"ERRNO_162", /* 162 */
-	"ERRNO_163", /* 163 */
-	"ERRNO_164", /* 164 */
-	"ERRNO_165", /* 165 */
-	"ERRNO_166", /* 166 */
-	"ERRNO_167", /* 167 */
-	"ERRNO_168", /* 168 */
-	"ERRNO_169", /* 169 */
-	"ERRNO_170", /* 170 */
-	"ERRNO_171", /* 171 */
-	"ERRNO_172", /* 172 */
-	"ERRNO_173", /* 173 */
-	"ERRNO_174", /* 174 */
-	"ERRNO_175", /* 175 */
-	"ERRNO_176", /* 176 */
-	"ERRNO_177", /* 177 */
-	"ERRNO_178", /* 178 */
-	"ERRNO_179", /* 179 */
-	"ERRNO_180", /* 180 */
-	"ERRNO_181", /* 181 */
-	"ERRNO_182", /* 182 */
-	"ERRNO_183", /* 183 */
-	"ERRNO_184", /* 184 */
-	"ERRNO_185", /* 185 */
-	"ERRNO_186", /* 186 */
-	"ERRNO_187", /* 187 */
-	"ERRNO_188", /* 188 */
-	"ERRNO_189", /* 189 */
-	"ERRNO_190", /* 190 */
-	"ERRNO_191", /* 191 */
-	"ERRNO_192", /* 192 */
-	"ERRNO_193", /* 193 */
-	"ERRNO_194", /* 194 */
-	"ERRNO_195", /* 195 */
-	"ERRNO_196", /* 196 */
-	"ERRNO_197", /* 197 */
-	"ERRNO_198", /* 198 */
-	"ERRNO_199", /* 199 */
-	"ERRNO_200", /* 200 */
-	"ERRNO_201", /* 201 */
-	"ERRNO_202", /* 202 */
-	"ERRNO_203", /* 203 */
-	"ERRNO_204", /* 204 */
-	"ERRNO_205", /* 205 */
-	"ERRNO_206", /* 206 */
-	"ERRNO_207", /* 207 */
-	"ERRNO_208", /* 208 */
-	"ERRNO_209", /* 209 */
-	"ERRNO_210", /* 210 */
-	"ERRNO_211", /* 211 */
-	"ERRNO_212", /* 212 */
-	"ERRNO_213", /* 213 */
-	"ERRNO_214", /* 214 */
-	"ERRNO_215", /* 215 */
-	"ERRNO_216", /* 216 */
-	"ERRNO_217", /* 217 */
-	"ERRNO_218", /* 218 */
-	"ERRNO_219", /* 219 */
-	"ERRNO_220", /* 220 */
-	"ERRNO_221", /* 221 */
-	"ERRNO_222", /* 222 */
-	"ERRNO_223", /* 223 */
-	"ERRNO_224", /* 224 */
-	"ERRNO_225", /* 225 */
-	"ERRNO_226", /* 226 */
-	"ERRNO_227", /* 227 */
-	"ERRNO_228", /* 228 */
-	"ERRNO_229", /* 229 */
-	"ERRNO_230", /* 230 */
-	"ERRNO_231", /* 231 */
-	"ERRNO_232", /* 232 */
-	"ERRNO_233", /* 233 */
-	"ERRNO_234", /* 234 */
-	"ERRNO_235", /* 235 */
-	"ERRNO_236", /* 236 */
-	"ERRNO_237", /* 237 */
-	"ERRNO_238", /* 238 */
-	"ERRNO_239", /* 239 */
-	"ERRNO_240", /* 240 */
-	"ERRNO_241", /* 241 */
-	"ERRNO_242", /* 242 */
-	"ERRNO_243", /* 243 */
-	"ERRNO_244", /* 244 */
-	"ERRNO_245", /* 245 */
-	"ERRNO_246", /* 246 */
-	"ERRNO_247", /* 247 */
-	"ERRNO_248", /* 248 */
-	"ERRNO_249", /* 249 */
-	"ERRNO_250", /* 250 */
-	"ERRNO_251", /* 251 */
-	"ERRNO_252", /* 252 */
-	"ERRNO_253", /* 253 */
-	"ERRNO_254", /* 254 */
-	"ERRNO_255", /* 255 */
-	"ERRNO_256", /* 256 */
-	"ERRNO_257", /* 257 */
-	"ERRNO_258", /* 258 */
-	"ERRNO_259", /* 259 */
-	"ERRNO_260", /* 260 */
-	"ERRNO_261", /* 261 */
-	"ERRNO_262", /* 262 */
-	"ERRNO_263", /* 263 */
-	"ERRNO_264", /* 264 */
-	"ERRNO_265", /* 265 */
-	"ERRNO_266", /* 266 */
-	"ERRNO_267", /* 267 */
-	"ERRNO_268", /* 268 */
-	"ERRNO_269", /* 269 */
-	"ERRNO_270", /* 270 */
-	"ERRNO_271", /* 271 */
-	"ERRNO_272", /* 272 */
-	"ERRNO_273", /* 273 */
-	"ERRNO_274", /* 274 */
-	"ERRNO_275", /* 275 */
-	"ERRNO_276", /* 276 */
-	"ERRNO_277", /* 277 */
-	"ERRNO_278", /* 278 */
-	"ERRNO_279", /* 279 */
-	"ERRNO_280", /* 280 */
-	"ERRNO_281", /* 281 */
-	"ERRNO_282", /* 282 */
-	"ERRNO_283", /* 283 */
-	"ERRNO_284", /* 284 */
-	"ERRNO_285", /* 285 */
-	"ERRNO_286", /* 286 */
-	"ERRNO_287", /* 287 */
-	"ERRNO_288", /* 288 */
-	"ERRNO_289", /* 289 */
-	"ERRNO_290", /* 290 */
-	"ERRNO_291", /* 291 */
-	"ERRNO_292", /* 292 */
-	"ERRNO_293", /* 293 */
-	"ERRNO_294", /* 294 */
-	"ERRNO_295", /* 295 */
-	"ERRNO_296", /* 296 */
-	"ERRNO_297", /* 297 */
-	"ERRNO_298", /* 298 */
-	"ERRNO_299", /* 299 */
-	"ERRNO_300", /* 300 */
-	"ERRNO_301", /* 301 */
-	"ERRNO_302", /* 302 */
-	"ERRNO_303", /* 303 */
-	"ERRNO_304", /* 304 */
-	"ERRNO_305", /* 305 */
-	"ERRNO_306", /* 306 */
-	"ERRNO_307", /* 307 */
-	"ERRNO_308", /* 308 */
-	"ERRNO_309", /* 309 */
-	"ERRNO_310", /* 310 */
-	"ERRNO_311", /* 311 */
-	"ERRNO_312", /* 312 */
-	"ERRNO_313", /* 313 */
-	"ERRNO_314", /* 314 */
-	"ERRNO_315", /* 315 */
-	"ERRNO_316", /* 316 */
-	"ERRNO_317", /* 317 */
-	"ERRNO_318", /* 318 */
-	"ERRNO_319", /* 319 */
-	"ERRNO_320", /* 320 */
-	"ERRNO_321", /* 321 */
-	"ERRNO_322", /* 322 */
-	"ERRNO_323", /* 323 */
-	"ERRNO_324", /* 324 */
-	"ERRNO_325", /* 325 */
-	"ERRNO_326", /* 326 */
-	"ERRNO_327", /* 327 */
-	"ERRNO_328", /* 328 */
-	"ERRNO_329", /* 329 */
-	"ERRNO_330", /* 330 */
-	"ERRNO_331", /* 331 */
-	"ERRNO_332", /* 332 */
-	"ERRNO_333", /* 333 */
-	"ERRNO_334", /* 334 */
-	"ERRNO_335", /* 335 */
-	"ERRNO_336", /* 336 */
-	"ERRNO_337", /* 337 */
-	"ERRNO_338", /* 338 */
-	"ERRNO_339", /* 339 */
-	"ERRNO_340", /* 340 */
-	"ERRNO_341", /* 341 */
-	"ERRNO_342", /* 342 */
-	"ERRNO_343", /* 343 */
-	"ERRNO_344", /* 344 */
-	"ERRNO_345", /* 345 */
-	"ERRNO_346", /* 346 */
-	"ERRNO_347", /* 347 */
-	"ERRNO_348", /* 348 */
-	"ERRNO_349", /* 349 */
-	"ERRNO_350", /* 350 */
-	"ERRNO_351", /* 351 */
-	"ERRNO_352", /* 352 */
-	"ERRNO_353", /* 353 */
-	"ERRNO_354", /* 354 */
-	"ERRNO_355", /* 355 */
-	"ERRNO_356", /* 356 */
-	"ERRNO_357", /* 357 */
-	"ERRNO_358", /* 358 */
-	"ERRNO_359", /* 359 */
-	"ERRNO_360", /* 360 */
-	"ERRNO_361", /* 361 */
-	"ERRNO_362", /* 362 */
-	"ERRNO_363", /* 363 */
-	"ERRNO_364", /* 364 */
-	"ERRNO_365", /* 365 */
-	"ERRNO_366", /* 366 */
-	"ERRNO_367", /* 367 */
-	"ERRNO_368", /* 368 */
-	"ERRNO_369", /* 369 */
-	"ERRNO_370", /* 370 */
-	"ERRNO_371", /* 371 */
-	"ERRNO_372", /* 372 */
-	"ERRNO_373", /* 373 */
-	"ERRNO_374", /* 374 */
-	"ERRNO_375", /* 375 */
-	"ERRNO_376", /* 376 */
-	"ERRNO_377", /* 377 */
-	"ERRNO_378", /* 378 */
-	"ERRNO_379", /* 379 */
-	"ERRNO_380", /* 380 */
-	"ERRNO_381", /* 381 */
-	"ERRNO_382", /* 382 */
-	"ERRNO_383", /* 383 */
-	"ERRNO_384", /* 384 */
-	"ERRNO_385", /* 385 */
-	"ERRNO_386", /* 386 */
-	"ERRNO_387", /* 387 */
-	"ERRNO_388", /* 388 */
-	"ERRNO_389", /* 389 */
-	"ERRNO_390", /* 390 */
-	"ERRNO_391", /* 391 */
-	"ERRNO_392", /* 392 */
-	"ERRNO_393", /* 393 */
-	"ERRNO_394", /* 394 */
-	"ERRNO_395", /* 395 */
-	"ERRNO_396", /* 396 */
-	"ERRNO_397", /* 397 */
-	"ERRNO_398", /* 398 */
-	"ERRNO_399", /* 399 */
-	"ERRNO_400", /* 400 */
-	"ERRNO_401", /* 401 */
-	"ERRNO_402", /* 402 */
-	"ERRNO_403", /* 403 */
-	"ERRNO_404", /* 404 */
-	"ERRNO_405", /* 405 */
-	"ERRNO_406", /* 406 */
-	"ERRNO_407", /* 407 */
-	"ERRNO_408", /* 408 */
-	"ERRNO_409", /* 409 */
-	"ERRNO_410", /* 410 */
-	"ERRNO_411", /* 411 */
-	"ERRNO_412", /* 412 */
-	"ERRNO_413", /* 413 */
-	"ERRNO_414", /* 414 */
-	"ERRNO_415", /* 415 */
-	"ERRNO_416", /* 416 */
-	"ERRNO_417", /* 417 */
-	"ERRNO_418", /* 418 */
-	"ERRNO_419", /* 419 */
-	"ERRNO_420", /* 420 */
-	"ERRNO_421", /* 421 */
-	"ERRNO_422", /* 422 */
-	"ERRNO_423", /* 423 */
-	"ERRNO_424", /* 424 */
-	"ERRNO_425", /* 425 */
-	"ERRNO_426", /* 426 */
-	"ERRNO_427", /* 427 */
-	"ERRNO_428", /* 428 */
-	"ERRNO_429", /* 429 */
-	"ERRNO_430", /* 430 */
-	"ERRNO_431", /* 431 */
-	"ERRNO_432", /* 432 */
-	"ERRNO_433", /* 433 */
-	"ERRNO_434", /* 434 */
-	"ERRNO_435", /* 435 */
-	"ERRNO_436", /* 436 */
-	"ERRNO_437", /* 437 */
-	"ERRNO_438", /* 438 */
-	"ERRNO_439", /* 439 */
-	"ERRNO_440", /* 440 */
-	"ERRNO_441", /* 441 */
-	"ERRNO_442", /* 442 */
-	"ERRNO_443", /* 443 */
-	"ERRNO_444", /* 444 */
-	"ERRNO_445", /* 445 */
-	"ERRNO_446", /* 446 */
-	"ERRNO_447", /* 447 */
-	"ERRNO_448", /* 448 */
-	"ERRNO_449", /* 449 */
-	"ERRNO_450", /* 450 */
-	"ERRNO_451", /* 451 */
-	"ERRNO_452", /* 452 */
-	"ERRNO_453", /* 453 */
-	"ERRNO_454", /* 454 */
-	"ERRNO_455", /* 455 */
-	"ERRNO_456", /* 456 */
-	"ERRNO_457", /* 457 */
-	"ERRNO_458", /* 458 */
-	"ERRNO_459", /* 459 */
-	"ERRNO_460", /* 460 */
-	"ERRNO_461", /* 461 */
-	"ERRNO_462", /* 462 */
-	"ERRNO_463", /* 463 */
-	"ERRNO_464", /* 464 */
-	"ERRNO_465", /* 465 */
-	"ERRNO_466", /* 466 */
-	"ERRNO_467", /* 467 */
-	"ERRNO_468", /* 468 */
-	"ERRNO_469", /* 469 */
-	"ERRNO_470", /* 470 */
-	"ERRNO_471", /* 471 */
-	"ERRNO_472", /* 472 */
-	"ERRNO_473", /* 473 */
-	"ERRNO_474", /* 474 */
-	"ERRNO_475", /* 475 */
-	"ERRNO_476", /* 476 */
-	"ERRNO_477", /* 477 */
-	"ERRNO_478", /* 478 */
-	"ERRNO_479", /* 479 */
-	"ERRNO_480", /* 480 */
-	"ERRNO_481", /* 481 */
-	"ERRNO_482", /* 482 */
-	"ERRNO_483", /* 483 */
-	"ERRNO_484", /* 484 */
-	"ERRNO_485", /* 485 */
-	"ERRNO_486", /* 486 */
-	"ERRNO_487", /* 487 */
-	"ERRNO_488", /* 488 */
-	"ERRNO_489", /* 489 */
-	"ERRNO_490", /* 490 */
-	"ERRNO_491", /* 491 */
-	"ERRNO_492", /* 492 */
-	"ERRNO_493", /* 493 */
-	"ERRNO_494", /* 494 */
-	"ERRNO_495", /* 495 */
-	"ERRNO_496", /* 496 */
-	"ERRNO_497", /* 497 */
-	"ERRNO_498", /* 498 */
-	"ERRNO_499", /* 499 */
-	"ERRNO_500", /* 500 */
-	"ERRNO_501", /* 501 */
-	"ERRNO_502", /* 502 */
-	"ERRNO_503", /* 503 */
-	"ERRNO_504", /* 504 */
-	"ERRNO_505", /* 505 */
-	"ERRNO_506", /* 506 */
-	"ERRNO_507", /* 507 */
-	"ERRNO_508", /* 508 */
-	"ERRNO_509", /* 509 */
-	"ERRNO_510", /* 510 */
-	"ERRNO_511", /* 511 */
-	"ERESTARTSYS", /* 512 */
-	"ERESTARTNOINTR", /* 513 */
-	"ERESTARTNOHAND", /* 514 */
-	"ENOIOCTLCMD", /* 515 */
diff --git a/strace/linux/alpha/ioctlent.h b/strace/linux/alpha/ioctlent.h
deleted file mode 100644
index 3cfdb5b..0000000
--- a/strace/linux/alpha/ioctlent.h
+++ /dev/null
@@ -1,852 +0,0 @@
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_DOS",	0x4d2},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_DOS",	0x4d3},
-	{"linux/umsdos_fs.h",	"UMSDOS_RMDIR_DOS",	0x4d4},
-	{"linux/umsdos_fs.h",	"UMSDOS_STAT_DOS",	0x4d5},
-	{"linux/umsdos_fs.h",	"UMSDOS_CREAT_EMD",	0x4d6},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_EMD",	0x4d7},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_EMD",	0x4d8},
-	{"linux/umsdos_fs.h",	"UMSDOS_GETVERSION",	0x4d9},
-	{"linux/umsdos_fs.h",	"UMSDOS_INIT_EMD",	0x4da},
-	{"linux/umsdos_fs.h",	"UMSDOS_DOS_SETUP",	0x4db},
-	{"linux/umsdos_fs.h",	"UMSDOS_RENAME_DOS",	0x4dc},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKPG",	0x1269},
-	{"linux/elevator.h",	"BLKELVGET",	0x126a},
-	{"linux/fs.h",	"BLKELVGET",	0x126a},
-	{"linux/elevator.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/fs.h",	"BLKGETSIZE64",	0x1272},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGREP",	0x4503},
-	{"linux/input.h",	"EVIOCSREP",	0x4503},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCSKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCGKEY",	0x4505},
-	{"linux/input.h",	"EVIOCGBUS",	0x4507},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCSGAIN",	0x4582},
-	{"linux/input.h",	"EVIOCSAUTOCENTER",	0x4583},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
-	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
-	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
-	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
-	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
-	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
-	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
-	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
-	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
-	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
-	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
-	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
-	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
-	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
-	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
-	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
-	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
-	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
-	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
-	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
-	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
-	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
-	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
-	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
-	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
-	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
-	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
-	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
-	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
-	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
-	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
-	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
-	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
-	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
-	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
-	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
-	{"asm/ioctls.h",	"TIOCGHAYESESP",	0x545e},
-	{"asm/ioctls.h",	"TIOCSHAYESESP",	0x545f},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/watchdog.h",	"WDIOC_SETTIMEOUT",	0x5706},
-	{"linux/watchdog.h",	"WDIOC_GETTIMEOUT",	0x5707},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_GETTHIST",	0x6164},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETFLAGS",	0x6601},
-	{"asm/ioctls.h",	"FIOCLEX",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETFLAGS",	0x6602},
-	{"asm/ioctls.h",	"FIONCLEX",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"asm/sockios.h",	"FIOGETOWN",	0x667b},
-	{"asm/sockios.h",	"FIOSETOWN",	0x667c},
-	{"asm/ioctls.h",	"FIOASYNC",	0x667d},
-	{"asm/ioctls.h",	"FIONBIO",	0x667e},
-	{"asm/ioctls.h",	"FIONREAD",	0x667f},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/i8k.h",	"I8K_BIOS_VERSION",	0x6980},
-	{"linux/i8k.h",	"I8K_MACHINE_ID",	0x6981},
-	{"linux/i8k.h",	"I8K_POWER_STATUS",	0x6982},
-	{"linux/i8k.h",	"I8K_FN_STATUS",	0x6983},
-	{"linux/i8k.h",	"I8K_GET_TEMP",	0x6984},
-	{"linux/i8k.h",	"I8K_GET_SPEED",	0x6985},
-	{"linux/i8k.h",	"I8K_GET_FAN",	0x6986},
-	{"linux/i8k.h",	"I8K_SET_FAN",	0x6987},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID2",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO_V2",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETMOUNT",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETPID",	0x7004},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLOSE_JOURNALF",	0x7006},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/intermezzo_fs.h",	"PRESTO_SET_FSETROOT",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_FSETROOT",	0x7008},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETOPT",	0x7009},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETOPT",	0x700a},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_KMLSIZE",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_RECNO",	0x700c},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETATTR",	0x7010},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CREATE",	0x7011},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_LINK",	0x7012},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_UNLINK",	0x7013},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SYMLINK",	0x7014},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKDIR",	0x7015},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RMDIR",	0x7016},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKNOD",	0x7017},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RENAME",	0x7018},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CLOSE",	0x701a},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_IOPEN",	0x701b},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETEXTATTR",	0x701c},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_DELEXTATTR",	0x701d},
-	{"linux/intermezzo_fs.h",	"PRESTO_MARK",	0x7020},
-	{"linux/intermezzo_fs.h",	"PRESTO_RELEASE_PERMIT",	0x7021},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_ALL_FSETROOTS",	0x7022},
-	{"linux/intermezzo_fs.h",	"PRESTO_BACKFETCH_LML",	0x7023},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT",	0x7024},
-	{"linux/intermezzo_fs.h",	"PRESTO_CANCEL_LML",	0x7025},
-	{"linux/intermezzo_fs.h",	"PRESTO_RESET_FSET",	0x7026},
-	{"linux/intermezzo_fs.h",	"PRESTO_COMPLETE_CLOSES",	0x7027},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_BEGIN",	0x7030},
-	{"linux/intermezzo_fs.h",	"PRESTO_DO_REINT",	0x7031},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_END",	0x7032},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"OLD_PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"asm/sockios.h",	"SIOCATMARK",	0x7307},
-	{"asm/sockios.h",	"SIOCSPGRP",	0x7308},
-	{"asm/sockios.h",	"SIOCGPGRP",	0x7309},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"asm/ioctls.h",	"TIOCGETP",	0x7408},
-	{"asm/ioctls.h",	"TIOCSETP",	0x7409},
-	{"asm/ioctls.h",	"TIOCSETN",	0x740a},
-	{"asm/ioctls.h",	"TIOCSETC",	0x7411},
-	{"asm/ioctls.h",	"TIOCGETC",	0x7412},
-	{"asm/ioctls.h",	"TCGETS",	0x7413},
-	{"asm/ioctls.h",	"TCSETS",	0x7414},
-	{"asm/ioctls.h",	"TCSETSW",	0x7415},
-	{"asm/ioctls.h",	"TCSETSF",	0x7416},
-	{"asm/ioctls.h",	"TCGETA",	0x7417},
-	{"asm/ioctls.h",	"TCSETA",	0x7418},
-	{"asm/ioctls.h",	"TCSETAW",	0x7419},
-	{"asm/ioctls.h",	"TCSETAF",	0x741c},
-	{"asm/ioctls.h",	"TCSBRK",	0x741d},
-	{"asm/ioctls.h",	"TCXONC",	0x741e},
-	{"asm/ioctls.h",	"TCFLSH",	0x741f},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"asm/ioctls.h",	"TIOCSWINSZ",	0x7467},
-	{"asm/ioctls.h",	"TIOCGWINSZ",	0x7468},
-	{"asm/ioctls.h",	"TIOCSTART",	0x746e},
-	{"asm/ioctls.h",	"TIOCSTOP",	0x746f},
-	{"asm/ioctls.h",	"TIOCOUTQ",	0x7473},
-	{"asm/ioctls.h",	"TIOCGLTC",	0x7474},
-	{"asm/ioctls.h",	"TIOCSLTC",	0x7475},
-	{"asm/ioctls.h",	"TIOCSPGRP",	0x7476},
-	{"asm/ioctls.h",	"TIOCGPGRP",	0x7477},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/sonypi.h",	"SONYPI_IOCSBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION_OLD",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION_OLD",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1CAP",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1REM",	0x7603},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2CAP",	0x7604},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2REM",	0x7605},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/sonypi.h",	"SONYPI_IOCGBATFLAGS",	0x7607},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/sonypi.h",	"SONYPI_IOCGBLUE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/sonypi.h",	"SONYPI_IOCSBLUE",	0x7609},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"OSIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/dn.h",	"OSIOCGNETADDR",	0x89e1},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/lvm.h",	"VG_CREATE_OLD",	0xfe00},
-	{"linux/lvm.h",	"VG_REMOVE",	0xfe01},
-	{"linux/lvm.h",	"VG_EXTEND",	0xfe03},
-	{"linux/lvm.h",	"VG_REDUCE",	0xfe04},
-	{"linux/lvm.h",	"VG_STATUS",	0xfe05},
-	{"linux/lvm.h",	"VG_STATUS_GET_COUNT",	0xfe06},
-	{"linux/lvm.h",	"VG_STATUS_GET_NAMELIST",	0xfe07},
-	{"linux/lvm.h",	"VG_SET_EXTENDABLE",	0xfe08},
-	{"linux/lvm.h",	"VG_RENAME",	0xfe09},
-	{"linux/lvm.h",	"VG_CREATE",	0xfe0a},
-	{"linux/lvm.h",	"LV_CREATE",	0xfe20},
-	{"linux/lvm.h",	"LV_REMOVE",	0xfe21},
-	{"linux/lvm.h",	"LV_ACTIVATE",	0xfe22},
-	{"linux/lvm.h",	"LV_DEACTIVATE",	0xfe23},
-	{"linux/lvm.h",	"LV_EXTEND",	0xfe24},
-	{"linux/lvm.h",	"LV_REDUCE",	0xfe25},
-	{"linux/lvm.h",	"LV_STATUS_BYNAME",	0xfe26},
-	{"linux/lvm.h",	"LV_STATUS_BYINDEX",	0xfe27},
-	{"linux/lvm.h",	"LV_SET_ACCESS",	0xfe28},
-	{"linux/lvm.h",	"LV_SET_ALLOCATION",	0xfe29},
-	{"linux/lvm.h",	"LV_SET_STATUS",	0xfe2a},
-	{"linux/lvm.h",	"LE_REMAP",	0xfe2b},
-	{"linux/lvm.h",	"LV_SNAPSHOT_USE_RATE",	0xfe2c},
-	{"linux/lvm.h",	"LV_STATUS_BYDEV",	0xfe2e},
-	{"linux/lvm.h",	"LV_RENAME",	0xfe2f},
-	{"linux/lvm.h",	"LV_BMAP",	0xfe30},
-	{"linux/lvm.h",	"PV_STATUS",	0xfe40},
-	{"linux/lvm.h",	"PV_CHANGE",	0xfe41},
-	{"linux/lvm.h",	"PV_FLUSH",	0xfe42},
-	{"linux/lvm.h",	"PE_LOCK_UNLOCK",	0xfe50},
-	{"linux/lvm.h",	"LVM_GET_IOP_VERSION",	0xfe98},
-	{"linux/lvm.h",	"LVM_RESET",	0xfe99},
-	{"linux/lvm.h",	"LVM_LOCK_LVM",	0xff00},
diff --git a/strace/linux/alpha/signalent.h b/strace/linux/alpha/signalent.h
deleted file mode 100644
index 2b507e3..0000000
--- a/strace/linux/alpha/signalent.h
+++ /dev/null
@@ -1,32 +0,0 @@
-	"SIG_0",	/* 0 */
-	"SIGHUP",	/* 1 */
-	"SIGINT",	/* 2 */
-	"SIGQUIT",	/* 3 */
-	"SIGILL",	/* 4 */
-	"SIGTRAP",	/* 5 */
-	"SIGABRT",	/* 6 */
-	"SIGEMT",	/* 7 */
-	"SIGFPE",	/* 8 */
-	"SIGKILL",	/* 9 */
-	"SIGBUS",	/* 10 */
-	"SIGSEGV",	/* 11 */
-	"SIGSYS",	/* 12 */
-	"SIGPIPE",	/* 13 */
-	"SIGALRM",	/* 14 */
-	"SIGTERM",	/* 15 */
-	"SIGURG",	/* 16 */
-	"SIGSTOP",	/* 17 */
-	"SIGTSTP",	/* 18 */
-	"SIGCONT",	/* 19 */
-	"SIGCHLD",	/* 20 */
-	"SIGTTIN",	/* 21 */
-	"SIGTTOU",	/* 22 */
-	"SIGIO",	/* 23 */
-	"SIGXCPU",	/* 24 */
-	"SIGXFSZ",	/* 25 */
-	"SIGVTALRM",	/* 26 */
-	"SIGPROF",	/* 27 */
-	"SIGWINCH",	/* 28 */
-	"SIGINFO",	/* 29 */
-	"SIGUSR1",	/* 30 */
-	"SIGUSR2",	/* 31 */
diff --git a/strace/linux/alpha/syscallent.h b/strace/linux/alpha/syscallent.h
deleted file mode 100644
index 98c17ad..0000000
--- a/strace/linux/alpha/syscallent.h
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
- * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscallent.h,v 1.15 2005/05/09 08:02:05 roland Exp $
- */
-
-	{ 6,	0,	printargs,		"osf_syscall"		}, /* 0, not implemented */
-	{ 1,	TP,	sys_exit,		"exit"			}, /* 1 */
-	{ 0,	TP,	sys_fork,		"fork"			}, /* 2 */
-	{ 3,	TF,	sys_read,		"read"			}, /* 3 */
-	{ 3,	TF,	sys_write,		"write"			}, /* 4 */
-	{ 5,	0,	printargs,		"osf_old_open"		}, /* 5, not implemented */
-	{ 1,	0,	sys_close,		"close"			}, /* 6 */
-	{ 4,	TP,	sys_osf_wait4,		"osf_wait4"		}, /* 7 */
-	{ 5,	0,	printargs,		"osf_old_creat"		}, /* 8, not implemented */
-	{ 2,	TF,	sys_link,		"link"			}, /* 9 */
-	{ 1,	TF,	sys_unlink,		"unlink"		}, /* 10 */
-	{ 5,	0,	printargs,		"osf_execve"		}, /* 11, not implemented */
-	{ 1,	TF,	sys_chdir,		"chdir"			}, /* 12 */
-	{ 1,	TF,	sys_fchdir,		"fchdir"		}, /* 13 */
-	{ 3,	TF,	sys_mknod,		"mknod"			}, /* 14 */
-	{ 2,	TF,	sys_chmod,		"chmod"			}, /* 15 */
-	{ 3,	TF,	sys_chown,		"chown"			}, /* 16 */
-	{ 1,	0,	sys_brk,		"brk"			}, /* 17 */
-	{ 5,	0,	printargs,		"osf_getfsstat"		}, /* 18, not implemented */
-	{ 3,	TF,	sys_lseek,		"lseek"			}, /* 19 */
-	{ 0,	0,	sys_getpid,		"getxpid"		}, /* 20 */
-	{ 4,	0,	printargs,		"osf_mount"		}, /* 21 */
-	{ 2,	0,	sys_umount2,		"umount"		}, /* 22 */
-	{ 1,	0,	sys_setuid,		"setuid"		}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getxuid"		}, /* 24 */
-	{ 5,	0,	printargs,		"exec_with_loader"	}, /* 25, not implemented */
-	{ 4,	0,	sys_ptrace,		"ptrace"		}, /* 26 */
-	{ 5,	0,	printargs,		"osf_nrecvmsg"		}, /* 27, not implemented */
-	{ 5,	0,	printargs,		"osf_nsendmsg"		}, /* 28, not implemented */
-	{ 5,	0,	printargs,		"osf_nrecvfrom"		}, /* 29, not implemented */
-	{ 5,	0,	printargs,		"osf_naccept"		}, /* 30, not implemented */
-	{ 5,	0,	printargs,		"osf_ngetpeername"	}, /* 31, not implemented */
-	{ 5,	0,	printargs,		"osf_ngetsockname"	}, /* 32, not implemented */
-	{ 2,	TF,	sys_access,		"access"		}, /* 33 */
-	{ 5,	0,	printargs,		"osf_chflags"		}, /* 34, not implemented */
-	{ 5,	0,	printargs,		"osf_fchflags"		}, /* 35, not implemented */
-	{ 0,	0,	sys_sync,		"sync"			}, /* 36 */
-	{ 2,	TS,	sys_kill,		"kill"			}, /* 37 */
-	{ 5,	0,	printargs,		"osf_old_stat"		}, /* 38, not implemented */
-	{ 2,	0,	sys_setpgid,		"setpgid"		}, /* 39 */
-	{ 5,	0,	printargs,		"osf_old_lstat"		}, /* 40, not implemented */
-	{ 1,	0,	sys_dup,		"dup"			}, /* 41 */
-	{ 1,	0,	sys_pipe,		"pipe"			}, /* 42 */
-	{ 5,	0,	printargs,		"osf_set_program_attributes"	}, /* 43 */
-	{ 5,	0,	printargs,		"osf_profil"		}, /* 44, not implemented */
-	{ 3,	TF,	sys_open,		"open"			}, /* 45 */
-	{ 5,	0,	printargs,		"osf_old_sigaction"	}, /* 46, not implemented */
-	{ 1,	0,	sys_getgid,		"getxgid"		}, /* 47 */
-	{ 3,	TS,	printargs,		"osf_sigprocmask"	}, /* 48 */
-	{ 5,	0,	printargs,		"osf_getlogin"		}, /* 49, not implemented */
-	{ 5,	0,	printargs,		"osf_setlogin"		}, /* 50, not implemented */
-	{ 1,	TF,	sys_acct,		"acct"			}, /* 51 */
-	{ 1,	TS,	sys_sigpending,		"sigpending"		}, /* 52 */
-	{ 5,	0,	printargs,		"SYS_53"		}, /* 53 */
-	{ 3,	0,	sys_ioctl,		"ioctl"			}, /* 54 */
-	{ 5,	0,	printargs,		"osf_reboot"		}, /* 55, not implemented */
-	{ 5,	0,	printargs,		"osf_revoke"		}, /* 56, not implemented */
-	{ 2,	TF,	sys_symlink,		"symlink"		}, /* 57 */
-	{ 3,	TF,	sys_readlink,		"readlink"		}, /* 58 */
-	{ 3,	TF|TP,	sys_execve,		"execve"		}, /* 59 */
-	{ 1,	0,	sys_umask,		"umask"			}, /* 60 */
-	{ 1,	TF,	sys_chroot,		"chroot"		}, /* 61 */
-	{ 5,	0,	printargs,		"osf_old_fstat"		}, /* 62, not implemented */
-	{ 0,	0,	sys_getpgrp,		"getpgrp"		}, /* 63 */
-	{ 0,	0,	sys_getpagesize,	"getpagesize"		}, /* 64 */
-	{ 5,	0,	printargs,		"osf_mremap"		}, /* 65, not implemented */
-	{ 0,	TP,	sys_fork,		"vfork"			}, /* 66 */
-	{ 2,	TF,	sys_stat,		"stat"			}, /* 67 */
-	{ 2,	TF,	sys_lstat,		"lstat"			}, /* 68 */
-	{ 5,	0,	printargs,		"osf_sbrk"		}, /* 69, not implemented */
-	{ 5,	0,	printargs,		"osf_sstk"		}, /* 70, not implemented */
-	{ 6,	0,	sys_mmap,		"mmap"			}, /* 71 */
-	{ 5,	0,	printargs,		"osf_old_vadvise"	}, /* 72, not implemented */
-	{ 2,	0,	sys_munmap,		"munmap"		}, /* 73 */
-	{ 3,	0,	sys_mprotect,		"mprotect"		}, /* 74 */
-	{ 0,	0,	sys_madvise,		"madvise"		}, /* 75 */
-	{ 0,	0,	sys_vhangup,		"vhangup"		}, /* 76 */
-	{ 5,	0,	printargs,		"osf_kmodcall"		}, /* 77, not implemented */
-	{ 5,	0,	printargs,		"osf_mincore"		}, /* 78, not implemented */
-	{ 2,	0,	sys_getgroups,		"getgroups"		}, /* 79 */
-	{ 2,	0,	sys_setgroups,		"setgroups"		}, /* 80 */
-	{ 5,	0,	printargs,		"osf_old_getpgrp"	}, /* 81, not implemented */
-	{ 2,	0,	sys_setpgrp,		"setpgrp"		}, /* 82 */
-	{ 3,	0,	sys_osf_setitimer,	"osf_setitimer"		}, /* 83 */
-	{ 5,	0,	printargs,		"osf_old_wait"		}, /* 84, not implemented */
-	{ 5,	0,	printargs,		"osf_table"		}, /* 85, not implemented */
-	{ 2,	0,	sys_osf_getitimer,	"osf_getitimer"		}, /* 86 */
-	{ 2,	0,	sys_gethostname,	"gethostname"		}, /* 87 */
-	{ 2,	0,	sys_sethostname,	"sethostname"		}, /* 88 */
-	{ 0,	0,	sys_getdtablesize,	"getdtablesize"		}, /* 89 */
-	{ 2,	0,	sys_dup2,		"dup2"			}, /* 90 */
-	{ 2,	0,	sys_fstat,		"fstat"			}, /* 91 */
-	{ 3,	0,	sys_fcntl,		"fcntl"			}, /* 92 */
-	{ 5,	0,	sys_osf_select,		"osf_select"		}, /* 93 */
-	{ 3,	0,	sys_poll,		"poll"			}, /* 94 */
-	{ 1,	0,	sys_fsync,		"fsync"			}, /* 95 */
-	{ 3,	0,	sys_setpriority,	"setpriority"		}, /* 96 */
-	{ 3,	TN,	sys_socket,		"socket"		}, /* 97 */
-	{ 3,	TN,	sys_connect,		"connect"		}, /* 98 */
-	{ 3,	TN,	sys_accept,		"accept"		}, /* 99 */
-	{ 2,	0,	sys_getpriority,	"osf_getpriority"	}, /* 100 */
-	{ 4,	TN,	sys_send,		"send"			}, /* 101 */
-	{ 4,	TN,	sys_recv,		"recv"			}, /* 102 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"		}, /* 103 */
-	{ 3,	TN,	sys_bind,		"bind"			}, /* 104 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"		}, /* 105 */
-	{ 2,	TN,	sys_listen,		"listen"		}, /* 106 */
-	{ 5,	0,	printargs,		"osf_plock"		}, /* 107, not implemented */
-	{ 5,	0,	printargs,		"osf_old_sigvec"	}, /* 108, not implemented */
-	{ 5,	0,	printargs,		"osf_old_sigblock"	}, /* 109, not implemented */
-	{ 5,	0,	printargs,		"osf_old_sigsetmask"	}, /* 110, not implemented */
-	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"		}, /* 111 */
-	{ 5,	0,	printargs,		"sigstack"		}, /* 112 */
-	{ 3,	TN,	sys_recvmsg,		"recvmsg"		}, /* 113 */
-	{ 3,	TN,	sys_sendmsg,		"sendmsg"		}, /* 114 */
-	{ 5,	0,	printargs,		"osf_old_vtrace"	}, /* 115, not implemented */
-	{ 2,	0,	sys_osf_gettimeofday,	"osf_gettimeofday"	}, /* 116 */
-	{ 2,	0,	sys_osf_getrusage,	"osf_getrusage"		}, /* 117 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"		}, /* 118 */
-	{ 5,	0,	printargs,		"SYS_119"		}, /* 119 */
-	{ 3,	0,	sys_readv,		"readv"			}, /* 120 */
-	{ 3,	0,	sys_writev,		"writev"		}, /* 121 */
-	{ 2,	0,	sys_osf_settimeofday,	"osf_settimeofday"	}, /* 122 */
-	{ 3,	0,	sys_fchown,		"fchown"		}, /* 123 */
-	{ 2,	0,	sys_fchmod,		"fchmod"		}, /* 124 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"		}, /* 125 */
-	{ 2,	0,	sys_setreuid,		"setreuid"		}, /* 126 */
-	{ 2,	0,	sys_setregid,		"setregid"		}, /* 127 */
-	{ 2,	TF,	sys_rename,		"rename"		}, /* 128 */
-	{ 2,	TF,	sys_truncate,		"truncate"		}, /* 129 */
-	{ 2,	0,	sys_ftruncate,		"ftruncate"		}, /* 130 */
-	{ 2,	0,	sys_flock,		"flock"			}, /* 131 */
-	{ 1,	0,	sys_setgid,		"setgid"		}, /* 132 */
-	{ 6,	TN,	sys_sendto,		"sendto"		}, /* 133 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"		}, /* 134 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"		}, /* 135 */
-	{ 2,	TF,	sys_mkdir,		"mkdir"			}, /* 136 */
-	{ 1,	TF,	sys_rmdir,		"rmdir"			}, /* 137 */
-	{ 2,	0,	sys_osf_utimes,		"osf_utimes"		}, /* 138 */
-	{ 5,	0,	printargs,		"osf_old_sigreturn"	}, /* 139 */
-	{ 5,	0,	printargs,		"osf_adjtime"		}, /* 140, not implemented */
-	{ 3,	TN,	sys_getpeername,	"getpeername"		}, /* 141 */
-	{ 5,	0,	printargs,		"osf_gethostid"		}, /* 142, not implemented */
-	{ 5,	0,	printargs,		"osf_sethostid"		}, /* 143, not implemented */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"		}, /* 144 */
-	{ 2,	0,	sys_setrlimit,		"setrlimit"		}, /* 145 */
-	{ 5,	0,	printargs,		"osf_old_killpg"	}, /* 146, not implemented */
-	{ 0,	0,	sys_setsid,		"setsid"		}, /* 147 */
-	{ 4,	0,	sys_quotactl,		"quotactl"		}, /* 148 */
-	{ 5,	0,	printargs,		"osf_oldquota"		}, /* 149, not implemented */
-	{ 3,	TN,	sys_getsockname,	"getsockname"		}, /* 150 */
-	{ 5,	0,	printargs,		"SYS_151"		}, /* 151 */
-	{ 5,	0,	printargs,		"SYS_152"		}, /* 152 */
-	{ 5,	0,	printargs,		"osf_pid_block"		}, /* 153, not implemented */
-	{ 5,	0,	printargs,		"osf_pid_unblock"	}, /* 154, not implemented */
-	{ 5,	0,	printargs,		"SYS_155"		}, /* 155 */
-	{ 3,	TS,	sys_sigaction,		"sigaction"		}, /* 156 */
-	{ 5,	0,	printargs,		"osf_sigwaitprim"	}, /* 157, not implemented */
-	{ 5,	0,	printargs,		"osf_nfssvc"		}, /* 158, not implemented */
-	{ 4,	0,	printargs,		"osf_getdirentries"	}, /* 159 */
-	{ 3,	0,	osf_statfs,		"osf_statfs"		}, /* 160 */
-	{ 3,	0,	osf_fstatfs,		"osf_fstatfs"		}, /* 161 */
-	{ 5,	0,	printargs,		"SYS_162"		}, /* 162 */
-	{ 5,	0,	printargs,		"osf_asynch_daemon"	}, /* 163, not implemented */
-	{ 5,	0,	printargs,		"osf_getfh"		}, /* 164, not implemented */
-	{ 2,	0,	printargs,		"osf_getdomainname"	}, /* 165 */
-	{ 2,	0,	sys_setdomainname,	"setdomainname"		}, /* 166 */
-	{ 5,	0,	printargs,		"SYS_167"		}, /* 167 */
-	{ 5,	0,	printargs,		"SYS_168"		}, /* 168 */
-	{ 5,	0,	printargs,		"osf_exportfs"		}, /* 169, not implemented */
-	{ 5,	0,	printargs,		"SYS_170"		}, /* 170 */
-	{ 5,	0,	printargs,		"SYS_171"		}, /* 171 */
-	{ 5,	0,	printargs,		"SYS_172"		}, /* 172 */
-	{ 5,	0,	printargs,		"SYS_173"		}, /* 173 */
-	{ 5,	0,	printargs,		"SYS_174"		}, /* 174 */
-	{ 5,	0,	printargs,		"SYS_175"		}, /* 175 */
-	{ 5,	0,	printargs,		"SYS_176"		}, /* 176 */
-	{ 5,	0,	printargs,		"SYS_177"		}, /* 177 */
-	{ 5,	0,	printargs,		"SYS_178"		}, /* 178 */
-	{ 5,	0,	printargs,		"SYS_179"		}, /* 179 */
-	{ 5,	0,	printargs,		"SYS_180"		}, /* 180 */
-	{ 5,	0,	printargs,		"osf_alt_plock"		}, /* 181, not implemented */
-	{ 5,	0,	printargs,		"SYS_182"		}, /* 182 */
-	{ 5,	0,	printargs,		"SYS_183"		}, /* 183 */
-	{ 5,	0,	printargs,		"osf_getmnt"		}, /* 184, not implemented */
-	{ 5,	0,	printargs,		"SYS_185"		}, /* 185 */
-	{ 5,	0,	printargs,		"SYS_186"		}, /* 186 */
-	{ 5,	0,	printargs,		"osf_alt_sigpending"	}, /* 187, not implemented */
-	{ 5,	0,	printargs,		"osf_alt_setsid"	}, /* 188, not implemented */
-	{ 5,	0,	printargs,		"SYS_189"		}, /* 189 */
-	{ 5,	0,	printargs,		"SYS_190"		}, /* 190 */
-	{ 5,	0,	printargs,		"SYS_191"		}, /* 191 */
-	{ 5,	0,	printargs,		"SYS_192"		}, /* 192 */
-	{ 5,	0,	printargs,		"SYS_193"		}, /* 193 */
-	{ 5,	0,	printargs,		"SYS_194"		}, /* 194 */
-	{ 5,	0,	printargs,		"SYS_195"		}, /* 195 */
-	{ 5,	0,	printargs,		"SYS_196"		}, /* 196 */
-	{ 5,	0,	printargs,		"SYS_197"		}, /* 197 */
-	{ 5,	0,	printargs,		"SYS_198"		}, /* 198 */
-	{ 4,	0,	printargs,		"osf_swapon"		}, /* 199 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"		}, /* 200 */
-	{ 4,	TI,	sys_msgget,		"msgget"		}, /* 201 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"		}, /* 202 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"		}, /* 203 */
-	{ 4,	TI,	sys_semctl,		"semctl"		}, /* 204 */
-	{ 4,	TI,	sys_semget,		"semget"		}, /* 205 */
-	{ 4,	TI,	printargs,		"semop"			}, /* 206 */
-	{ 1,	0,	printargs,		"osf_utsname"		}, /* 207 */
-	{ 3,	TF,	sys_chown,		"lchown"		}, /* 208 */
-	{ 3,	TI,	printargs,		"osf_shmat"		}, /* 209 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"		}, /* 210 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"			}, /* 211 */
-	{ 4,	TI,	sys_shmget,		"shmget"		}, /* 212 */
-	{ 5,	0,	printargs,		"osf_mvalid"		}, /* 213, not implemented */
-	{ 5,	0,	printargs,		"osf_getaddressconf"	}, /* 214, not implemented */
-	{ 5,	0,	printargs,		"osf_msleep"		}, /* 215, not implemented */
-	{ 5,	0,	printargs,		"osf_mwakeup"		}, /* 216, not implemented */
-	{ 3,	0,	sys_msync,		"msync"			}, /* 217 */
-	{ 5,	0,	printargs,		"osf_signal"		}, /* 218, not implemented */
-	{ 5,	0,	printargs,		"osf_utc_gettime"	}, /* 219, not implemented */
-	{ 5,	0,	printargs,		"osf_utc_adjtime"	}, /* 220, not implemented */
-	{ 5,	0,	printargs,		"SYS_221"		}, /* 221 */
-	{ 5,	0,	printargs,		"osf_security"		}, /* 222, not implemented */
-	{ 5,	0,	printargs,		"osf_kloadcall"		}, /* 223, not implemented */
-	{ 5,	0,	printargs,		"SYS_224"		}, /* 224 */
-	{ 5,	0,	printargs,		"SYS_225"		}, /* 225 */
-	{ 5,	0,	printargs,		"SYS_226"		}, /* 226 */
-	{ 5,	0,	printargs,		"SYS_227"		}, /* 227 */
-	{ 5,	0,	printargs,		"SYS_228"		}, /* 228 */
-	{ 5,	0,	printargs,		"SYS_229"		}, /* 229 */
-	{ 5,	0,	printargs,		"SYS_230"		}, /* 230 */
-	{ 5,	0,	printargs,		"SYS_231"		}, /* 231 */
-	{ 5,	0,	printargs,		"SYS_232"		}, /* 232 */
-	{ 1,	0,	sys_getpgid,		"getpgid"		}, /* 233 */
-	{ 1,	0,	sys_getsid,		"getsid"		}, /* 234 */
-	{ 5,	0,	sys_sigaltstack,	"sigaltstack"		}, /* 235 */
-	{ 5,	0,	printargs,		"osf_waitid"		}, /* 236, not implemented */
-	{ 5,	0,	printargs,		"osf_priocntlset"	}, /* 237, not implemented */
-	{ 5,	0,	printargs,		"osf_sigsendset"	}, /* 238, not implemented */
-	{ 5,	0,	printargs,		"osf_set_speculative"	}, /* 239, not implemented */
-	{ 5,	0,	printargs,		"osf_msfs_syscall"	}, /* 240, not implemented */
-	{ 5,	0,	printargs,		"osf_sysinfo"		}, /* 241 */
-	{ 5,	0,	printargs,		"osf_uadmin"		}, /* 242, not implemented */
-	{ 5,	0,	printargs,		"osf_fuser"		}, /* 243, not implemented */
-	{ 2,	0,	printargs,		"osf_proplist_syscall"	}, /* 244 */
-	{ 5,	0,	printargs,		"osf_ntp_adjtime"	}, /* 245, not implemented */
-	{ 5,	0,	printargs,		"osf_ntp_gettime"	}, /* 246, not implemented */
-	{ 5,	0,	printargs,		"osf_pathconf"		}, /* 247, not implemented */
-	{ 5,	0,	printargs,		"osf_fpathconf"		}, /* 248, not implemented */
-	{ 5,	0,	printargs,		"SYS_249"		}, /* 249 */
-	{ 5,	0,	printargs,		"osf_uswitch"		}, /* 250, not implemented */
-	{ 2,	0,	printargs,		"osf_usleep_thread"	}, /* 251 */
-	{ 5,	0,	printargs,		"osf_audcntl"		}, /* 252, not implemented */
-	{ 5,	0,	printargs,		"osf_audgen"		}, /* 253, not implemented */
-	{ 5,	0,	sys_sysfs,		"sysfs"			}, /* 254 */
-	{ 5,	0,	printargs,		"osf_subsysinfo"	}, /* 255, not implemented */
-	{ 5,	0,	printargs,		"osf_getsysinfo"	}, /* 256 */
-	{ 5,	0,	printargs,		"osf_setsysinfo"	}, /* 257 */
-	{ 5,	0,	printargs,		"osf_afs_syscall"	}, /* 258, not implemented */
-	{ 5,	0,	printargs,		"osf_swapctl"		}, /* 259, not implemented */
-	{ 5,	0,	printargs,		"osf_memcntl"		}, /* 260, not implemented */
-	{ 5,	0,	printargs,		"osf_fdatasync"		}, /* 261, not implemented */
-	{ 5,	0,	printargs,		"SYS_262"		}, /* 262 */
-	{ 5,	0,	printargs,		"SYS_263"		}, /* 263 */
-	{ 5,	0,	printargs,		"SYS_264"		}, /* 264 */
-	{ 5,	0,	printargs,		"SYS_265"		}, /* 265 */
-	{ 5,	0,	printargs,		"SYS_266"		}, /* 266 */
-	{ 5,	0,	printargs,		"SYS_267"		}, /* 267 */
-	{ 5,	0,	printargs,		"SYS_268"		}, /* 268 */
-	{ 5,	0,	printargs,		"SYS_269"		}, /* 269 */
-	{ 5,	0,	printargs,		"SYS_270"		}, /* 270 */
-	{ 5,	0,	printargs,		"SYS_271"		}, /* 271 */
-	{ 5,	0,	printargs,		"SYS_272"		}, /* 272 */
-	{ 5,	0,	printargs,		"SYS_273"		}, /* 273 */
-	{ 5,	0,	printargs,		"SYS_274"		}, /* 274 */
-	{ 5,	0,	printargs,		"SYS_275"		}, /* 275 */
-	{ 5,	0,	printargs,		"SYS_276"		}, /* 276 */
-	{ 5,	0,	printargs,		"SYS_277"		}, /* 277 */
-	{ 5,	0,	printargs,		"SYS_278"		}, /* 278 */
-	{ 5,	0,	printargs,		"SYS_279"		}, /* 279 */
-	{ 5,	0,	printargs,		"SYS_280"		}, /* 280 */
-	{ 5,	0,	printargs,		"SYS_281"		}, /* 281 */
-	{ 5,	0,	printargs,		"SYS_282"		}, /* 282 */
-	{ 5,	0,	printargs,		"SYS_283"		}, /* 283 */
-	{ 5,	0,	printargs,		"SYS_284"		}, /* 284 */
-	{ 5,	0,	printargs,		"SYS_285"		}, /* 285 */
-	{ 5,	0,	printargs,		"SYS_286"		}, /* 286 */
-	{ 5,	0,	printargs,		"SYS_287"		}, /* 287 */
-	{ 5,	0,	printargs,		"SYS_288"		}, /* 288 */
-	{ 5,	0,	printargs,		"SYS_289"		}, /* 289 */
-	{ 5,	0,	printargs,		"SYS_290"		}, /* 290 */
-	{ 5,	0,	printargs,		"SYS_291"		}, /* 291 */
-	{ 5,	0,	printargs,		"SYS_292"		}, /* 292 */
-	{ 5,	0,	printargs,		"SYS_293"		}, /* 293 */
-	{ 5,	0,	printargs,		"SYS_294"		}, /* 294 */
-	{ 5,	0,	printargs,		"SYS_295"		}, /* 295 */
-	{ 5,	0,	printargs,		"SYS_296"		}, /* 296 */
-	{ 5,	0,	printargs,		"SYS_297"		}, /* 297 */
-	{ 5,	0,	printargs,		"SYS_298"		}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"		}, /* 299 */
-	{ 0,	0,	sys_bdflush,		"bdflush"		}, /* 300 */
-	{ 3,	0,	printargs,		"sethae"		}, /* 301 */
-	{ 5,	TF,	sys_mount,		"mount"			}, /* 302 */
-	{ 1,	0,	sys_adjtimex,		"adjtimex32"		}, /* 303 */
-	{ 1,	0,	sys_swapoff,		"swapoff"		}, /* 304 */
-	{ 3,	0,	sys_getdents,		"getdents"		}, /* 305 */
-	{ 2,	0,	sys_create_module,	"create_module"		}, /* 306 */
-	{ 4,	0,	sys_init_module,	"init_module"		}, /* 307 */
-	{ 1,	0,	sys_delete_module,	"delete_module"		}, /* 308 */
-	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"	}, /* 309 */
-	{ 3,	0,	sys_syslog,		"syslog"		}, /* 310 */
-	{ 3,	0,	sys_reboot,		"reboot"		}, /* 311 */
-	{ 5,	TP,	sys_clone,		"clone"			}, /* 312 */
-	{ 1,	0,	sys_uselib,		"uselib"		}, /* 313 */
-	{ 2,	0,	sys_mlock,		"mlock"			}, /* 314 */
-	{ 2,	0,	sys_munlock,		"munlock"		}, /* 315 */
-	{ 1,	0,	sys_mlockall,		"mlockall"		}, /* 316 */
-	{ 0,	0,	sys_munlockall,		"munlockall"		}, /* 317 */
-	{ 1,	0,	sys_sysinfo,		"sysinfo"		}, /* 318 */
-	{ 1,	0,	sys_sysctl,		"sysctl"		}, /* 319 */
-	{ 0,	0,	sys_idle,		"idle"			}, /* 320 */
-	{ 1,	0,	sys_umount,		"oldumount"		}, /* 321 */
-	{ 1,	0,	sys_swapon,		"swapon"		}, /* 322 */
-	{ 1,	0,	sys_times,		"times"			}, /* 323 */
-	{ 1,	0,	sys_personality,	"personality"		}, /* 324 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"		}, /* 325 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"		}, /* 326 */
-	{ 2,	0,	sys_ustat,		"ustat"			}, /* 327 */
-	{ 2,	TF,	sys_statfs,		"statfs"		}, /* 328 */
-	{ 2,	0,	sys_fstatfs,		"fstatfs"		}, /* 329 */
-	{ 2,	0,	sys_sched_setparam,	"sched_setparam"	}, /* 330 */
-	{ 2,	0,	sys_sched_getparam,	"sched_getparam"	}, /* 331 */
-	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"	}, /* 332 */
-	{ 2,	0,	sys_sched_getscheduler,	"sched_getscheduler"	}, /* 333 */
-	{ 0,	0,	sys_sched_yield,	"sched_yield"		}, /* 334 */
-	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"	}, /* 335 */
-	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"	}, /* 336 */
-	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"	}, /* 337 */
-	{ 5,	0,	sys_afs_syscall,	"afs_syscall"		}, /* 338 */
-	{ 1,	0,	sys_uname,		"uname"			}, /* 339 */
-	{ 2,	0,	sys_nanosleep,		"nanosleep"		}, /* 340 */
-	{ 5,	0,	sys_mremap,		"mremap"		}, /* 341 */
-	{ 5,	0,	printargs,		"nfsservctl"		}, /* 342 */
-	{ 3,	0,	sys_setresuid,		"setresuid"		}, /* 343 */
-	{ 3,	0,	sys_getresuid,		"getresuid"		}, /* 344 */
-	{ 5,	0,	printargs,		"pciconfig_read"	}, /* 345 */
-	{ 5,	0,	printargs,		"pciconfig_write"	}, /* 346 */
-	{ 5,	0,	sys_query_module,	"query_module"		}, /* 347 */
-	{ 5,	0,	printargs,		"prctl"			}, /* 348 */
-	{ 5,	TF,	sys_pread,		"pread"			}, /* 349 */
-	{ 5,	TF,	sys_pwrite,		"pwrite"		}, /* 350 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"		}, /* 351 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"		}, /* 352 */
-	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"	}, /* 353 */
-	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"		}, /* 354 */
-	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"	}, /* 355 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,	"rt_sigqueueinfo"	}, /* 356 */
-	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"		}, /* 357 */
-	{ 5,	0,	sys_select,		"select"		}, /* 358 */
-	{ 2,	0,	sys_gettimeofday,	"gettimeofday"		}, /* 359 */
-	{ 3,	0,	sys_settimeofday,	"settimeofday"		}, /* 360 */
-	{ 2,	0,	sys_getitimer,		"getitimer"		}, /* 361 */
-	{ 3,	0,	sys_setitimer,		"setitimer"		}, /* 362 */
-	{ 2,	0,	sys_utimes,		"utimes"		}, /* 363 */
-	{ 2,	0,	sys_getrusage,		"getrusage"		}, /* 364 */
-	{ 4,	TP,	sys_wait4,		"wait4"			}, /* 365 */
-	{ 1,	0,	sys_adjtimex,		"adjtimex"		}, /* 366 */
-	{ 2,	0,	sys_getcwd,		"getcwd"		}, /* 367 */
-	{ 2,	0,	sys_capget,		"capget"		}, /* 368 */
-	{ 2,	0,	sys_capset,		"capset"		}, /* 369 */
-	{ 4,	TF,	sys_sendfile,		"sendfile"		}, /* 370 */
-	{ 3,	0,	printargs,		"setresgid"		}, /* 371 */
-	{ 3,	0,	printargs,		"getresgid"		}, /* 372 */
-	{ 4,	0,	printargs,		"dipc"			}, /* 373, not implemented */
-	{ 2,	TF,	printargs,		"pivot_root"		}, /* 374 */
-	{ 3,	0,	printargs,		"mincore"		}, /* 375 */
-	{ 4,	0,	printargs,		"pciconfig_iobase"	}, /* 376 */
-	{ 4,	0,	sys_getdents64,		"getdents64"		}, /* 377 */
-	{ 0,	0,	printargs,		"gettid"		}, /* 378 */
-	{ 4,	0,	sys_readahead,		"readahead"		}, /* 379 */
-	{ 5,	0,	printargs,		"SYS_380"		}, /* 380 */
-	{ 2,	TS,	sys_kill,		"tkill"			}, /* 381 */
-	{ 5,	TF,	sys_setxattr,		"setxattr"		}, /* 382 */
-	{ 5,	TF,	sys_setxattr,		"lsetxattr"		}, /* 383 */
-	{ 5,	0,	sys_fsetxattr,		"fsetxattr"		}, /* 384 */
-	{ 4,	TF,	sys_getxattr,		"getxattr"		}, /* 385 */
-	{ 4,	TF,	sys_getxattr,		"lgetxattr"		}, /* 386 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"		}, /* 387 */
-	{ 3,	TF,	sys_listxattr,		"listxattr"		}, /* 388 */
-	{ 3,	TF,	sys_listxattr,		"llistxattr"		}, /* 389 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"		}, /* 390 */
-	{ 2,	TF,	sys_removexattr,	"removexattr"		}, /* 391 */
-	{ 2,	TF,	sys_removexattr,	"lremovexattr"		}, /* 392 */
-	{ 2,	0,	sys_fremovexattr,	"fremovexattr"		}, /* 393 */
-	{ 5,	0,	sys_futex,		"futex"			}, /* 394 */
-	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity"	}, /* 395 */
-	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity"	}, /* 396 */
-	{ 5,	0,	printargs,		"tuxcall"		}, /* 397 */
-	{ 2,	0,	sys_io_setup,		"io_setup"		}, /* 398 */
-	{ 1,	0,	sys_io_destroy,		"io_destroy"		}, /* 399 */
-	{ 5,	0,	sys_io_getevents,		"io_getevents"		}, /* 400 */
-	{ 3,	0,	sys_io_submit,		"io_submit"		}, /* 401 */
-	{ 3,	0,	sys_io_cancel,		"io_cancel"		}, /* 402 */
-	{ 5,	0,	printargs,		"SYS_403"		}, /* 403 */
-	{ 5,	0,	printargs,		"SYS_404"		}, /* 404 */
-	{ 1,	TP,	sys_exit,		"exit_group"		}, /* 405 */
-	{ 4,	0,	printargs,		"lookup_dcookie"	}, /* 406 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"		}, /* 407 */
-	{ 4,	0,	sys_epoll_ctl,		"epoll_ctl"		}, /* 408 */
-	{ 4,	0,	sys_epoll_wait,		"epoll_wait"		}, /* 409 */
-	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"	}, /* 410 */
-	{ 1,	0,	printargs,		"set_tid_address"	}, /* 411 */
-	{ 0,	0,	printargs,		"restart_syscall"	}, /* 412 */
-	{ 4,	0,	printargs,		"fadvise"		}, /* 413 */
-	{ 3,	0,	sys_timer_create,	"timer_create"		}, /* 414 */
-	{ 4,	0,	sys_timer_settime,	"timer_settime"		}, /* 415 */
-	{ 2,	0,	sys_timer_gettime,	"timer_gettime"		}, /* 416 */
-	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"	}, /* 417 */
-	{ 1,	0,	sys_timer_delete,	"timer_delete"		}, /* 418 */
-	{ 2,	0,	sys_clock_settime,	"clock_settime"		}, /* 419 */
-	{ 2,	0,	sys_clock_gettime,	"clock_gettime"		}, /* 420 */
-	{ 2,	0,	sys_clock_getres,	"clock_getres"		}, /* 421 */
-	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"	}, /* 422 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"		}, /* 423 */
-	{ 3,	TS,	sys_tgkill,		"tgkill"		}, /* 424 */
-	{ 2,	TF,	sys_stat64,		"stat64"		}, /* 425 */
-	{ 2,	TF,	sys_lstat64,		"lstat64"		}, /* 426 */
-	{ 2,	0,	sys_fstat64,		"fstat64"		}, /* 427 */
-	{ 5,	0,	printargs,		"vserver"		}, /* 428 ??? */
-	{ 5,	0,	printargs,		"mbind"			}, /* 429 ??? */
-	{ 5,	0,	printargs,		"get_mempolicy"		}, /* 430 ??? */
-	{ 5,	0,	printargs,		"set_mempolicy"		}, /* 431 ??? */
-	{ 4,	0,	sys_mq_open,		"mq_open"		}, /* 432 */
-	{ 1,	0,	sys_mq_unlink,		"mq_unlink"		}, /* 433 */
-	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"		}, /* 434 */
-	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive"	}, /* 435 */
-	{ 2,	0,	sys_mq_notify,		"mq_notify"		}, /* 436 */
-	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"		}, /* 437 */
-	{ 4,	0,	printargs,		"waitid"		}, /* 438 */
diff --git a/strace/linux/dummy.h b/strace/linux/dummy.h
deleted file mode 100644
index a56cd05..0000000
--- a/strace/linux/dummy.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: dummy.h,v 1.17 2004/04/16 21:48:44 roland Exp $
- */
-
-/* still unfinished */
-#define	sys_ioperm		printargs
-#define	sys_syslog		printargs
-#define	sys_iopl		printargs
-#define	sys_vm86old		printargs
-#define	sys_get_kernel_syms	printargs
-#define	sys_bdflush		printargs
-#define	sys_sysfs		printargs
-#define	sys_afs_syscall		printargs
-
-/* machine-specific */
-#ifndef I386
-#define	sys_modify_ldt		printargs
-#define sys_get_thread_area	printargs
-#define sys_set_thread_area	printargs
-#endif
-
-#define sys_sched_yield		printargs
-#define sys_sched_get_priority_max sys_sched_get_priority_min
-#define sys_sched_rr_get_interval printargs
-
-/* like another call */
-#define	sys_uselib		sys_chdir
-#define	sys_umount		sys_chdir
-#define	sys_swapon		sys_chdir
-#define	sys_swapoff		sys_chdir
-#define	sys_delete_module	sys_chdir
-#define	sys_fchdir		sys_close
-#define	sys_setfsuid		sys_setuid
-#define	sys_setfsgid		sys_setgid
-#define sys_nanosleep		sys_adjtime
-#define	sys_acct		sys_chdir
-#define sys_fdatasync		sys_close
-#define sys_mlock		sys_munmap
-#define sys_munlock		sys_munmap
-#define sys_clock_getres	sys_clock_gettime
-#define sys_mq_unlink		sys_unlink
-
-/* printargs does the right thing */
-#define	sys_setup		printargs
-#define	sys_getpid		printargs
-#define	sys_getuid		printargs
-#define	sys_pause		printargs
-#define	sys_sync		printargs
-#define	sys_getgid		printargs
-#define	sys_geteuid		printargs
-#define	sys_getegid		printargs
-#define	sys_getppid		printargs
-#define	sys_getpgrp		printargs
-#define	sys_setsid		printargs
-#define	sys_vhangup		printargs
-#define	sys_idle		printargs
-#define	sys_getpgid		printargs
-#define sys_munlockall		printargs
-#define sys_timer_getoverrun	printargs
-#define sys_timer_delete	printargs
-
-/* subcall entry points */
-#define	sys_socketcall		printargs
-#define	sys_ipc			printargs
-
-/* unimplemented */
-#define	sys_stty		printargs
-#define	sys_gtty		printargs
-#define	sys_ftime		printargs
-#define	sys_prof		printargs
-#define	sys_phys		printargs
-#define	sys_lock		printargs
-#define	sys_mpx			printargs
-#define	sys_ulimit		printargs
-#define	sys_profil		printargs
-#define	sys_ustat		printargs
-#define	sys_break		printargs
-
-/* deprecated */
-#define	sys_olduname		printargs
-#define	sys_oldolduname		printargs
-
-/* no library support */
-#ifndef HAVE_SENDMSG
-#define sys_sendmsg		printargs
-#define sys_recvmsg		printargs
-#endif
-
-#ifndef SYS_getpmsg
-#define sys_getpmsg		printargs
-#endif
-#ifndef SYS_putpmsg
-#define sys_putpmsg		printargs
-#endif
-
-#ifndef HAVE_STRUCT___OLD_KERNEL_STAT
-#define sys_oldstat		printargs
-#define sys_oldfstat		printargs
-#define sys_oldlstat		printargs
-#endif
-
-#if DONE
-#define sys_oldselect		printargs
-#define	sys_msync		printargs
-#define	sys_flock		printargs
-#define	sys_getdents		printargs
-#define	sys_stime		printargs
-#define	sys_time		printargs
-#define	sys_times		printargs
-#define	sys_mount		printargs
-#define	sys_nice		printargs
-#define	sys_mprotect		printargs
-#define	sys_sigprocmask		printargs
-#define	sys_adjtimex		printargs
-#define	sys_sysinfo		printargs
-#define	sys_ipc			printargs
-#define	sys_setdomainname	printargs
-#define	sys_statfs		printargs
-#define	sys_fstatfs		printargs
-#define	sys_ptrace		printargs
-#define	sys_sigreturn		printargs
-#define	sys_fsync		printargs
-#define	sys_alarm		printargs
-#define	sys_socketcall		printargs
-#define	sys_sigsuspend		printargs
-#define	sys_utime		printargs
-#define	sys_brk			printargs
-#define	sys_mmap		printargs
-#define	sys_munmap		printargs
-#define	sys_select		printargs
-#define	sys_setuid		printargs
-#define	sys_setgid		printargs
-#define	sys_setreuid		printargs
-#define	sys_setregid		printargs
-#define	sys_getgroups		printargs
-#define	sys_setgroups		printargs
-#define	sys_setrlimit		printargs
-#define	sys_getrlimit		printargs
-#define	sys_getrusage		printargs
-#define	sys_getpriority		printargs
-#define	sys_setpriority		printargs
-#define	sys_setpgid		printargs
-#define	sys_access		printargs
-#define	sys_sethostname		printargs
-#define	sys_readdir		printargs
-#define	sys_waitpid		printargs
-#define	sys_wait4		printargs
-#define	sys_execve		printargs
-#define	sys_fork		printargs
-#define	sys_uname		printargs
-#define	sys_pipe		printargs
-#define	sys_siggetmask		printargs
-#define	sys_sigsetmask		printargs
-#define	sys_exit		printargs
-#define	sys_kill		printargs
-#define	sys_signal		printargs
-#define	sys_sigaction		printargs
-#define	sys_sigpending		printargs
-#define	sys_fcntl		printargs
-#define	sys_dup			printargs
-#define	sys_dup2		printargs
-#define	sys_close		printargs
-#define	sys_ioctl		printargs
-#define	sys_read		printargs
-#define	sys_write		printargs
-#define	sys_open		printargs
-#define	sys_creat		printargs
-#define	sys_link		printargs
-#define	sys_unlink		printargs
-#define	sys_chdir		printargs
-#define	sys_mknod		printargs
-#define	sys_chmod		printargs
-#define	sys_chown		printargs
-#define	sys_lseek		printargs
-#define	sys_rename		printargs
-#define	sys_mkdir		printargs
-#define	sys_rmdir		printargs
-#define	sys_umask		printargs
-#define	sys_chroot		printargs
-#define	sys_gettimeofday	printargs
-#define	sys_settimeofday	printargs
-#define	sys_symlink		printargs
-#define	sys_readlink		printargs
-#define	sys_truncate		printargs
-#define	sys_ftruncate		printargs
-#define	sys_fchmod		printargs
-#define	sys_fchown		printargs
-#define	sys_setitimer		printargs
-#define	sys_getitimer		printargs
-#define	sys_stat		printargs
-#define	sys_lstat		printargs
-#define	sys_fstat		printargs
-#define	sys_personality		printargs
-#define sys_poll		printargs
-#define	sys_create_module	printargs
-#define	sys_init_module		printargs
-#define	sys_quotactl		printargs
-#define sys_mlockall		printargs
-#define	sys_reboot		printargs
-#endif
diff --git a/strace/linux/errnoent.h b/strace/linux/errnoent.h
deleted file mode 100644
index 68b2adc..0000000
--- a/strace/linux/errnoent.h
+++ /dev/null
@@ -1,529 +0,0 @@
-	"ERRNO_0", /* 0 */
-	"EPERM", /* 1 */
-	"ENOENT", /* 2 */
-	"ESRCH", /* 3 */
-	"EINTR", /* 4 */
-	"EIO", /* 5 */
-	"ENXIO", /* 6 */
-	"E2BIG", /* 7 */
-	"ENOEXEC", /* 8 */
-	"EBADF", /* 9 */
-	"ECHILD", /* 10 */
-	"EAGAIN", /* 11 */
-	"ENOMEM", /* 12 */
-	"EACCES", /* 13 */
-	"EFAULT", /* 14 */
-	"ENOTBLK", /* 15 */
-	"EBUSY", /* 16 */
-	"EEXIST", /* 17 */
-	"EXDEV", /* 18 */
-	"ENODEV", /* 19 */
-	"ENOTDIR", /* 20 */
-	"EISDIR", /* 21 */
-	"EINVAL", /* 22 */
-	"ENFILE", /* 23 */
-	"EMFILE", /* 24 */
-	"ENOTTY", /* 25 */
-	"ETXTBSY", /* 26 */
-	"EFBIG", /* 27 */
-	"ENOSPC", /* 28 */
-	"ESPIPE", /* 29 */
-	"EROFS", /* 30 */
-	"EMLINK", /* 31 */
-	"EPIPE", /* 32 */
-	"EDOM", /* 33 */
-	"ERANGE", /* 34 */
-	"EDEADLK", /* 35 */
-	"ENAMETOOLONG", /* 36 */
-	"ENOLCK", /* 37 */
-	"ENOSYS", /* 38 */
-	"ENOTEMPTY", /* 39 */
-	"ELOOP", /* 40 */
-	"ERRNO_41", /* 41 */
-	"ENOMSG", /* 42 */
-	"EIDRM", /* 43 */
-	"ECHRNG", /* 44 */
-	"EL2NSYNC", /* 45 */
-	"EL3HLT", /* 46 */
-	"EL3RST", /* 47 */
-	"ELNRNG", /* 48 */
-	"EUNATCH", /* 49 */
-	"ENOCSI", /* 50 */
-	"EL2HLT", /* 51 */
-	"EBADE", /* 52 */
-	"EBADR", /* 53 */
-	"EXFULL", /* 54 */
-	"ENOANO", /* 55 */
-	"EBADRQC", /* 56 */
-	"EBADSLT", /* 57 */
-	"ERRNO_58", /* 58 */
-	"EBFONT", /* 59 */
-	"ENOSTR", /* 60 */
-	"ENODATA", /* 61 */
-	"ETIME", /* 62 */
-	"ENOSR", /* 63 */
-	"ENONET", /* 64 */
-	"ENOPKG", /* 65 */
-	"EREMOTE", /* 66 */
-	"ENOLINK", /* 67 */
-	"EADV", /* 68 */
-	"ESRMNT", /* 69 */
-	"ECOMM", /* 70 */
-	"EPROTO", /* 71 */
-	"EMULTIHOP", /* 72 */
-	"EDOTDOT", /* 73 */
-	"EBADMSG", /* 74 */
-	"EOVERFLOW", /* 75 */
-	"ENOTUNIQ", /* 76 */
-	"EBADFD", /* 77 */
-	"EREMCHG", /* 78 */
-	"ELIBACC", /* 79 */
-	"ELIBBAD", /* 80 */
-	"ELIBSCN", /* 81 */
-	"ELIBMAX", /* 82 */
-	"ELIBEXEC", /* 83 */
-	"EILSEQ", /* 84 */
-	"ERESTART", /* 85 */
-	"ESTRPIPE", /* 86 */
-	"EUSERS", /* 87 */
-	"ENOTSOCK", /* 88 */
-	"EDESTADDRREQ", /* 89 */
-	"EMSGSIZE", /* 90 */
-	"EPROTOTYPE", /* 91 */
-	"ENOPROTOOPT", /* 92 */
-	"EPROTONOSUPPORT", /* 93 */
-	"ESOCKTNOSUPPORT", /* 94 */
-	"EOPNOTSUPP", /* 95 */
-	"EPFNOSUPPORT", /* 96 */
-	"EAFNOSUPPORT", /* 97 */
-	"EADDRINUSE", /* 98 */
-	"EADDRNOTAVAIL", /* 99 */
-	"ENETDOWN", /* 100 */
-	"ENETUNREACH", /* 101 */
-	"ENETRESET", /* 102 */
-	"ECONNABORTED", /* 103 */
-	"ECONNRESET", /* 104 */
-	"ENOBUFS", /* 105 */
-	"EISCONN", /* 106 */
-	"ENOTCONN", /* 107 */
-	"ESHUTDOWN", /* 108 */
-	"ETOOMANYREFS", /* 109 */
-	"ETIMEDOUT", /* 110 */
-	"ECONNREFUSED", /* 111 */
-	"EHOSTDOWN", /* 112 */
-	"EHOSTUNREACH", /* 113 */
-	"EALREADY", /* 114 */
-	"EINPROGRESS", /* 115 */
-	"ESTALE", /* 116 */
-	"EUCLEAN", /* 117 */
-	"ENOTNAM", /* 118 */
-	"ENAVAIL", /* 119 */
-	"EISNAM", /* 120 */
-	"EREMOTEIO", /* 121 */
-	"EDQUOT", /* 122 */
-	"ENOMEDIUM", /* 123 */
-	"EMEDIUMTYPE", /* 124 */
-	"ERRNO_125", /* 125 */
-	"ERRNO_126", /* 126 */
-	"ERRNO_127", /* 127 */
-	"ERRNO_128", /* 128 */
-	"ERRNO_129", /* 129 */
-	"ERRNO_130", /* 130 */
-	"ERRNO_131", /* 131 */
-	"ERRNO_132", /* 132 */
-	"ERRNO_133", /* 133 */
-	"ERRNO_134", /* 134 */
-	"ERRNO_135", /* 135 */
-	"ERRNO_136", /* 136 */
-	"ERRNO_137", /* 137 */
-	"ERRNO_138", /* 138 */
-	"ERRNO_139", /* 139 */
-	"ERRNO_140", /* 140 */
-	"ERRNO_141", /* 141 */
-	"ERRNO_142", /* 142 */
-	"ERRNO_143", /* 143 */
-	"ERRNO_144", /* 144 */
-	"ERRNO_145", /* 145 */
-	"ERRNO_146", /* 146 */
-	"ERRNO_147", /* 147 */
-	"ERRNO_148", /* 148 */
-	"ERRNO_149", /* 149 */
-	"ERRNO_150", /* 150 */
-	"ERRNO_151", /* 151 */
-	"ERRNO_152", /* 152 */
-	"ERRNO_153", /* 153 */
-	"ERRNO_154", /* 154 */
-	"ERRNO_155", /* 155 */
-	"ERRNO_156", /* 156 */
-	"ERRNO_157", /* 157 */
-	"ERRNO_158", /* 158 */
-	"ERRNO_159", /* 159 */
-	"ERRNO_160", /* 160 */
-	"ERRNO_161", /* 161 */
-	"ERRNO_162", /* 162 */
-	"ERRNO_163", /* 163 */
-	"ERRNO_164", /* 164 */
-	"ERRNO_165", /* 165 */
-	"ERRNO_166", /* 166 */
-	"ERRNO_167", /* 167 */
-	"ERRNO_168", /* 168 */
-	"ERRNO_169", /* 169 */
-	"ERRNO_170", /* 170 */
-	"ERRNO_171", /* 171 */
-	"ERRNO_172", /* 172 */
-	"ERRNO_173", /* 173 */
-	"ERRNO_174", /* 174 */
-	"ERRNO_175", /* 175 */
-	"ERRNO_176", /* 176 */
-	"ERRNO_177", /* 177 */
-	"ERRNO_178", /* 178 */
-	"ERRNO_179", /* 179 */
-	"ERRNO_180", /* 180 */
-	"ERRNO_181", /* 181 */
-	"ERRNO_182", /* 182 */
-	"ERRNO_183", /* 183 */
-	"ERRNO_184", /* 184 */
-	"ERRNO_185", /* 185 */
-	"ERRNO_186", /* 186 */
-	"ERRNO_187", /* 187 */
-	"ERRNO_188", /* 188 */
-	"ERRNO_189", /* 189 */
-	"ERRNO_190", /* 190 */
-	"ERRNO_191", /* 191 */
-	"ERRNO_192", /* 192 */
-	"ERRNO_193", /* 193 */
-	"ERRNO_194", /* 194 */
-	"ERRNO_195", /* 195 */
-	"ERRNO_196", /* 196 */
-	"ERRNO_197", /* 197 */
-	"ERRNO_198", /* 198 */
-	"ERRNO_199", /* 199 */
-	"ERRNO_200", /* 200 */
-	"ERRNO_201", /* 201 */
-	"ERRNO_202", /* 202 */
-	"ERRNO_203", /* 203 */
-	"ERRNO_204", /* 204 */
-	"ERRNO_205", /* 205 */
-	"ERRNO_206", /* 206 */
-	"ERRNO_207", /* 207 */
-	"ERRNO_208", /* 208 */
-	"ERRNO_209", /* 209 */
-	"ERRNO_210", /* 210 */
-	"ERRNO_211", /* 211 */
-	"ERRNO_212", /* 212 */
-	"ERRNO_213", /* 213 */
-	"ERRNO_214", /* 214 */
-	"ERRNO_215", /* 215 */
-	"ERRNO_216", /* 216 */
-	"ERRNO_217", /* 217 */
-	"ERRNO_218", /* 218 */
-	"ERRNO_219", /* 219 */
-	"ERRNO_220", /* 220 */
-	"ERRNO_221", /* 221 */
-	"ERRNO_222", /* 222 */
-	"ERRNO_223", /* 223 */
-	"ERRNO_224", /* 224 */
-	"ERRNO_225", /* 225 */
-	"ERRNO_226", /* 226 */
-	"ERRNO_227", /* 227 */
-	"ERRNO_228", /* 228 */
-	"ERRNO_229", /* 229 */
-	"ERRNO_230", /* 230 */
-	"ERRNO_231", /* 231 */
-	"ERRNO_232", /* 232 */
-	"ERRNO_233", /* 233 */
-	"ERRNO_234", /* 234 */
-	"ERRNO_235", /* 235 */
-	"ERRNO_236", /* 236 */
-	"ERRNO_237", /* 237 */
-	"ERRNO_238", /* 238 */
-	"ERRNO_239", /* 239 */
-	"ERRNO_240", /* 240 */
-	"ERRNO_241", /* 241 */
-	"ERRNO_242", /* 242 */
-	"ERRNO_243", /* 243 */
-	"ERRNO_244", /* 244 */
-	"ERRNO_245", /* 245 */
-	"ERRNO_246", /* 246 */
-	"ERRNO_247", /* 247 */
-	"ERRNO_248", /* 248 */
-	"ERRNO_249", /* 249 */
-	"ERRNO_250", /* 250 */
-	"ERRNO_251", /* 251 */
-	"ERRNO_252", /* 252 */
-	"ERRNO_253", /* 253 */
-	"ERRNO_254", /* 254 */
-	"ERRNO_255", /* 255 */
-	"ERRNO_256", /* 256 */
-	"ERRNO_257", /* 257 */
-	"ERRNO_258", /* 258 */
-	"ERRNO_259", /* 259 */
-	"ERRNO_260", /* 260 */
-	"ERRNO_261", /* 261 */
-	"ERRNO_262", /* 262 */
-	"ERRNO_263", /* 263 */
-	"ERRNO_264", /* 264 */
-	"ERRNO_265", /* 265 */
-	"ERRNO_266", /* 266 */
-	"ERRNO_267", /* 267 */
-	"ERRNO_268", /* 268 */
-	"ERRNO_269", /* 269 */
-	"ERRNO_270", /* 270 */
-	"ERRNO_271", /* 271 */
-	"ERRNO_272", /* 272 */
-	"ERRNO_273", /* 273 */
-	"ERRNO_274", /* 274 */
-	"ERRNO_275", /* 275 */
-	"ERRNO_276", /* 276 */
-	"ERRNO_277", /* 277 */
-	"ERRNO_278", /* 278 */
-	"ERRNO_279", /* 279 */
-	"ERRNO_280", /* 280 */
-	"ERRNO_281", /* 281 */
-	"ERRNO_282", /* 282 */
-	"ERRNO_283", /* 283 */
-	"ERRNO_284", /* 284 */
-	"ERRNO_285", /* 285 */
-	"ERRNO_286", /* 286 */
-	"ERRNO_287", /* 287 */
-	"ERRNO_288", /* 288 */
-	"ERRNO_289", /* 289 */
-	"ERRNO_290", /* 290 */
-	"ERRNO_291", /* 291 */
-	"ERRNO_292", /* 292 */
-	"ERRNO_293", /* 293 */
-	"ERRNO_294", /* 294 */
-	"ERRNO_295", /* 295 */
-	"ERRNO_296", /* 296 */
-	"ERRNO_297", /* 297 */
-	"ERRNO_298", /* 298 */
-	"ERRNO_299", /* 299 */
-	"ERRNO_300", /* 300 */
-	"ERRNO_301", /* 301 */
-	"ERRNO_302", /* 302 */
-	"ERRNO_303", /* 303 */
-	"ERRNO_304", /* 304 */
-	"ERRNO_305", /* 305 */
-	"ERRNO_306", /* 306 */
-	"ERRNO_307", /* 307 */
-	"ERRNO_308", /* 308 */
-	"ERRNO_309", /* 309 */
-	"ERRNO_310", /* 310 */
-	"ERRNO_311", /* 311 */
-	"ERRNO_312", /* 312 */
-	"ERRNO_313", /* 313 */
-	"ERRNO_314", /* 314 */
-	"ERRNO_315", /* 315 */
-	"ERRNO_316", /* 316 */
-	"ERRNO_317", /* 317 */
-	"ERRNO_318", /* 318 */
-	"ERRNO_319", /* 319 */
-	"ERRNO_320", /* 320 */
-	"ERRNO_321", /* 321 */
-	"ERRNO_322", /* 322 */
-	"ERRNO_323", /* 323 */
-	"ERRNO_324", /* 324 */
-	"ERRNO_325", /* 325 */
-	"ERRNO_326", /* 326 */
-	"ERRNO_327", /* 327 */
-	"ERRNO_328", /* 328 */
-	"ERRNO_329", /* 329 */
-	"ERRNO_330", /* 330 */
-	"ERRNO_331", /* 331 */
-	"ERRNO_332", /* 332 */
-	"ERRNO_333", /* 333 */
-	"ERRNO_334", /* 334 */
-	"ERRNO_335", /* 335 */
-	"ERRNO_336", /* 336 */
-	"ERRNO_337", /* 337 */
-	"ERRNO_338", /* 338 */
-	"ERRNO_339", /* 339 */
-	"ERRNO_340", /* 340 */
-	"ERRNO_341", /* 341 */
-	"ERRNO_342", /* 342 */
-	"ERRNO_343", /* 343 */
-	"ERRNO_344", /* 344 */
-	"ERRNO_345", /* 345 */
-	"ERRNO_346", /* 346 */
-	"ERRNO_347", /* 347 */
-	"ERRNO_348", /* 348 */
-	"ERRNO_349", /* 349 */
-	"ERRNO_350", /* 350 */
-	"ERRNO_351", /* 351 */
-	"ERRNO_352", /* 352 */
-	"ERRNO_353", /* 353 */
-	"ERRNO_354", /* 354 */
-	"ERRNO_355", /* 355 */
-	"ERRNO_356", /* 356 */
-	"ERRNO_357", /* 357 */
-	"ERRNO_358", /* 358 */
-	"ERRNO_359", /* 359 */
-	"ERRNO_360", /* 360 */
-	"ERRNO_361", /* 361 */
-	"ERRNO_362", /* 362 */
-	"ERRNO_363", /* 363 */
-	"ERRNO_364", /* 364 */
-	"ERRNO_365", /* 365 */
-	"ERRNO_366", /* 366 */
-	"ERRNO_367", /* 367 */
-	"ERRNO_368", /* 368 */
-	"ERRNO_369", /* 369 */
-	"ERRNO_370", /* 370 */
-	"ERRNO_371", /* 371 */
-	"ERRNO_372", /* 372 */
-	"ERRNO_373", /* 373 */
-	"ERRNO_374", /* 374 */
-	"ERRNO_375", /* 375 */
-	"ERRNO_376", /* 376 */
-	"ERRNO_377", /* 377 */
-	"ERRNO_378", /* 378 */
-	"ERRNO_379", /* 379 */
-	"ERRNO_380", /* 380 */
-	"ERRNO_381", /* 381 */
-	"ERRNO_382", /* 382 */
-	"ERRNO_383", /* 383 */
-	"ERRNO_384", /* 384 */
-	"ERRNO_385", /* 385 */
-	"ERRNO_386", /* 386 */
-	"ERRNO_387", /* 387 */
-	"ERRNO_388", /* 388 */
-	"ERRNO_389", /* 389 */
-	"ERRNO_390", /* 390 */
-	"ERRNO_391", /* 391 */
-	"ERRNO_392", /* 392 */
-	"ERRNO_393", /* 393 */
-	"ERRNO_394", /* 394 */
-	"ERRNO_395", /* 395 */
-	"ERRNO_396", /* 396 */
-	"ERRNO_397", /* 397 */
-	"ERRNO_398", /* 398 */
-	"ERRNO_399", /* 399 */
-	"ERRNO_400", /* 400 */
-	"ERRNO_401", /* 401 */
-	"ERRNO_402", /* 402 */
-	"ERRNO_403", /* 403 */
-	"ERRNO_404", /* 404 */
-	"ERRNO_405", /* 405 */
-	"ERRNO_406", /* 406 */
-	"ERRNO_407", /* 407 */
-	"ERRNO_408", /* 408 */
-	"ERRNO_409", /* 409 */
-	"ERRNO_410", /* 410 */
-	"ERRNO_411", /* 411 */
-	"ERRNO_412", /* 412 */
-	"ERRNO_413", /* 413 */
-	"ERRNO_414", /* 414 */
-	"ERRNO_415", /* 415 */
-	"ERRNO_416", /* 416 */
-	"ERRNO_417", /* 417 */
-	"ERRNO_418", /* 418 */
-	"ERRNO_419", /* 419 */
-	"ERRNO_420", /* 420 */
-	"ERRNO_421", /* 421 */
-	"ERRNO_422", /* 422 */
-	"ERRNO_423", /* 423 */
-	"ERRNO_424", /* 424 */
-	"ERRNO_425", /* 425 */
-	"ERRNO_426", /* 426 */
-	"ERRNO_427", /* 427 */
-	"ERRNO_428", /* 428 */
-	"ERRNO_429", /* 429 */
-	"ERRNO_430", /* 430 */
-	"ERRNO_431", /* 431 */
-	"ERRNO_432", /* 432 */
-	"ERRNO_433", /* 433 */
-	"ERRNO_434", /* 434 */
-	"ERRNO_435", /* 435 */
-	"ERRNO_436", /* 436 */
-	"ERRNO_437", /* 437 */
-	"ERRNO_438", /* 438 */
-	"ERRNO_439", /* 439 */
-	"ERRNO_440", /* 440 */
-	"ERRNO_441", /* 441 */
-	"ERRNO_442", /* 442 */
-	"ERRNO_443", /* 443 */
-	"ERRNO_444", /* 444 */
-	"ERRNO_445", /* 445 */
-	"ERRNO_446", /* 446 */
-	"ERRNO_447", /* 447 */
-	"ERRNO_448", /* 448 */
-	"ERRNO_449", /* 449 */
-	"ERRNO_450", /* 450 */
-	"ERRNO_451", /* 451 */
-	"ERRNO_452", /* 452 */
-	"ERRNO_453", /* 453 */
-	"ERRNO_454", /* 454 */
-	"ERRNO_455", /* 455 */
-	"ERRNO_456", /* 456 */
-	"ERRNO_457", /* 457 */
-	"ERRNO_458", /* 458 */
-	"ERRNO_459", /* 459 */
-	"ERRNO_460", /* 460 */
-	"ERRNO_461", /* 461 */
-	"ERRNO_462", /* 462 */
-	"ERRNO_463", /* 463 */
-	"ERRNO_464", /* 464 */
-	"ERRNO_465", /* 465 */
-	"ERRNO_466", /* 466 */
-	"ERRNO_467", /* 467 */
-	"ERRNO_468", /* 468 */
-	"ERRNO_469", /* 469 */
-	"ERRNO_470", /* 470 */
-	"ERRNO_471", /* 471 */
-	"ERRNO_472", /* 472 */
-	"ERRNO_473", /* 473 */
-	"ERRNO_474", /* 474 */
-	"ERRNO_475", /* 475 */
-	"ERRNO_476", /* 476 */
-	"ERRNO_477", /* 477 */
-	"ERRNO_478", /* 478 */
-	"ERRNO_479", /* 479 */
-	"ERRNO_480", /* 480 */
-	"ERRNO_481", /* 481 */
-	"ERRNO_482", /* 482 */
-	"ERRNO_483", /* 483 */
-	"ERRNO_484", /* 484 */
-	"ERRNO_485", /* 485 */
-	"ERRNO_486", /* 486 */
-	"ERRNO_487", /* 487 */
-	"ERRNO_488", /* 488 */
-	"ERRNO_489", /* 489 */
-	"ERRNO_490", /* 490 */
-	"ERRNO_491", /* 491 */
-	"ERRNO_492", /* 492 */
-	"ERRNO_493", /* 493 */
-	"ERRNO_494", /* 494 */
-	"ERRNO_495", /* 495 */
-	"ERRNO_496", /* 496 */
-	"ERRNO_497", /* 497 */
-	"ERRNO_498", /* 498 */
-	"ERRNO_499", /* 499 */
-	"ERRNO_500", /* 500 */
-	"ERRNO_501", /* 501 */
-	"ERRNO_502", /* 502 */
-	"ERRNO_503", /* 503 */
-	"ERRNO_504", /* 504 */
-	"ERRNO_505", /* 505 */
-	"ERRNO_506", /* 506 */
-	"ERRNO_507", /* 507 */
-	"ERRNO_508", /* 508 */
-	"ERRNO_509", /* 509 */
-	"ERRNO_510", /* 510 */
-	"ERRNO_511", /* 511 */
-	"ERESTARTSYS", /* 512 */
-	"ERESTARTNOINTR", /* 513 */
-	"ERESTARTNOHAND", /* 514 */
-	"ENOIOCTLCMD", /* 515 */
-	"ERRNO_516", /* 516 */
-	"ERRNO_517", /* 517 */
-	"ERRNO_518", /* 518 */
-	"ERRNO_519", /* 519 */
-	"ERRNO_520", /* 520 */
-	"EBADHANDLE", /* 521 */
-	"ENOTSYNC", /* 522 */
-	"EBADCOOKIE", /* 523 */
-	"ENOTSUPP", /* 524 */
-	"ETOOSMALL", /* 525 */
-	"ESERVERFAULT", /* 526 */
-	"EBADTYPE", /* 527 */
-	"EJUKEBOX", /* 528 */
diff --git a/strace/linux/hppa/errnoent.h b/strace/linux/hppa/errnoent.h
deleted file mode 100644
index 2c92633..0000000
--- a/strace/linux/hppa/errnoent.h
+++ /dev/null
@@ -1,254 +0,0 @@
-	"ERRNO_0", /* 0 */
-	"EPERM", /* 1 */
-	"ENOENT", /* 2 */
-	"ESRCH", /* 3 */
-	"EINTR", /* 4 */
-	"EIO", /* 5 */
-	"ENXIO", /* 6 */
-	"E2BIG", /* 7 */
-	"ENOEXEC", /* 8 */
-	"EBADF", /* 9 */
-	"ECHILD", /* 10 */
-	"EAGAIN", /* 11 */
-	"ENOMEM", /* 12 */
-	"EACCES", /* 13 */
-	"EFAULT", /* 14 */
-	"ENOTBLK", /* 15 */
-	"EBUSY", /* 16 */
-	"EEXIST", /* 17 */
-	"EXDEV", /* 18 */
-	"ENODEV", /* 19 */
-	"ENOTDIR", /* 20 */
-	"EISDIR", /* 21 */
-	"EINVAL", /* 22 */
-	"ENFILE", /* 23 */
-	"EMFILE", /* 24 */
-	"ENOTTY", /* 25 */
-	"ETXTBSY", /* 26 */
-	"EFBIG", /* 27 */
-	"ENOSPC", /* 28 */
-	"ESPIPE", /* 29 */
-	"EROFS", /* 30 */
-	"EMLINK", /* 31 */
-	"EPIPE", /* 32 */
-	"EDOM", /* 33 */
-	"ERANGE", /* 34 */
-	"ENOMSG", /* 35 */
-	"EIDRM", /* 36 */
-	"ECHRNG", /* 37 */
-	"EL2NSYNC", /* 38 */
-	"EL3HLT", /* 39 */
-	"EL3RST", /* 40 */
-	"ELNRNG", /* 41 */
-	"EUNATCH", /* 42 */
-	"ENOCSI", /* 43 */
-	"EL2HLT", /* 44 */
-	"EDEADLK", /* 45 */
-	"ENOLCK", /* 46 */
-	"EILSEQ", /* 47 */
-	"ERRNO_48", /* 48 */
-	"ERRNO_49", /* 49 */
-	"ENONET", /* 50 */
-	"ENODATA", /* 51 */
-	"ETIME", /* 52 */
-	"ENOSR", /* 53 */
-	"ENOSTR", /* 54 */
-	"ENOPKG", /* 55 */
-	"ERRNO_56", /* 56 */
-	"ENOLINK", /* 57 */
-	"EADV", /* 58 */
-	"ESRMNT", /* 59 */
-	"ECOMM", /* 60 */
-	"EPROTO", /* 61 */
-	"ERRNO_62", /* 62 */
-	"ERRNO_63", /* 63 */
-	"EMULTIHOP", /* 64 */
-	"ERRNO_65", /* 65 */
-	"EDOTDOT", /* 66 */
-	"EBADMSG", /* 67 */
-	"EUSERS", /* 68 */
-	"EDQUOT", /* 69 */
-	"ESTALE", /* 70 */
-	"EREMOTE", /* 71 */
-	"EOVERFLOW", /* 72 */
-	"ERRNO_73", /* 73 */
-	"ERRNO_74", /* 74 */
-	"ERRNO_75", /* 75 */
-	"ERRNO_76", /* 76 */
-	"ERRNO_77", /* 77 */
-	"ERRNO_78", /* 78 */
-	"ERRNO_79", /* 79 */
-	"ERRNO_80", /* 80 */
-	"ERRNO_81", /* 81 */
-	"ERRNO_82", /* 82 */
-	"ERRNO_83", /* 83 */
-	"ERRNO_84", /* 84 */
-	"ERRNO_85", /* 85 */
-	"ERRNO_86", /* 86 */
-	"ERRNO_87", /* 87 */
-	"ERRNO_88", /* 88 */
-	"ERRNO_89", /* 89 */
-	"ERRNO_90", /* 90 */
-	"ERRNO_91", /* 91 */
-	"ERRNO_92", /* 92 */
-	"ERRNO_93", /* 93 */
-	"ERRNO_94", /* 94 */
-	"ERRNO_95", /* 95 */
-	"ERRNO_96", /* 96 */
-	"ERRNO_97", /* 97 */
-	"ERRNO_98", /* 98 */
-	"ERRNO_99", /* 99 */
-	"ERRNO_100", /* 100 */
-	"ERRNO_101", /* 101 */
-	"ERRNO_102", /* 102 */
-	"ERRNO_103", /* 103 */
-	"ERRNO_104", /* 104 */
-	"ERRNO_105", /* 105 */
-	"ERRNO_106", /* 106 */
-	"ERRNO_107", /* 107 */
-	"ERRNO_108", /* 108 */
-	"ERRNO_109", /* 109 */
-	"ERRNO_110", /* 110 */
-	"ERRNO_111", /* 111 */
-	"ERRNO_112", /* 112 */
-	"ERRNO_113", /* 113 */
-	"ERRNO_114", /* 114 */
-	"ERRNO_115", /* 115 */
-	"ERRNO_116", /* 116 */
-	"ERRNO_117", /* 117 */
-	"ERRNO_118", /* 118 */
-	"ERRNO_119", /* 119 */
-	"ERRNO_120", /* 120 */
-	"ERRNO_121", /* 121 */
-	"ERRNO_122", /* 122 */
-	"ERRNO_123", /* 123 */
-	"ERRNO_124", /* 124 */
-	"ERRNO_125", /* 125 */
-	"ERRNO_126", /* 126 */
-	"ERRNO_127", /* 127 */
-	"ERRNO_128", /* 128 */
-	"ERRNO_129", /* 129 */
-	"ERRNO_130", /* 130 */
-	"ERRNO_131", /* 131 */
-	"ERRNO_132", /* 132 */
-	"ERRNO_133", /* 133 */
-	"ERRNO_134", /* 134 */
-	"ERRNO_135", /* 135 */
-	"ERRNO_136", /* 136 */
-	"ERRNO_137", /* 137 */
-	"ERRNO_138", /* 138 */
-	"ERRNO_139", /* 139 */
-	"ERRNO_140", /* 140 */
-	"ERRNO_141", /* 141 */
-	"ERRNO_142", /* 142 */
-	"ERRNO_143", /* 143 */
-	"ERRNO_144", /* 144 */
-	"ERRNO_145", /* 145 */
-	"ERRNO_146", /* 146 */
-	"ERRNO_147", /* 147 */
-	"ERRNO_148", /* 148 */
-	"ERRNO_149", /* 149 */
-	"ERRNO_150", /* 150 */
-	"ERRNO_151", /* 151 */
-	"ERRNO_152", /* 152 */
-	"ERRNO_153", /* 153 */
-	"ERRNO_154", /* 154 */
-	"ERRNO_155", /* 155 */
-	"ERRNO_156", /* 156 */
-	"ERRNO_157", /* 157 */
-	"ERRNO_158", /* 158 */
-	"ERRNO_159", /* 159 */
-	"EBADE", /* 160 */
-	"EBADR", /* 161 */
-	"EXFULL", /* 162 */
-	"ENOANO", /* 163 */
-	"EBADRQC", /* 164 */
-	"EBADSLT", /* 165 */
-	"EBFONT", /* 166 */
-	"ENOTUNIQ", /* 167 */
-	"EBADFD", /* 168 */
-	"EREMCHG", /* 169 */
-	"ELIBACC", /* 170 */
-	"ELIBBAD", /* 171 */
-	"ELIBSCN", /* 172 */
-	"ELIBMAX", /* 173 */
-	"ELIBEXEC", /* 174 */
-	"ERESTART", /* 175 */
-	"ESTRPIPE", /* 176 */
-	"EUCLEAN", /* 177 */
-	"ENOTNAM", /* 178 */
-	"ENAVAIL", /* 179 */
-	"EISNAM", /* 180 */
-	"EREMOTEIO", /* 181 */
-	"ENOMEDIUM", /* 182 */
-	"EMEDIUMTYPE", /* 183 */
-	"ERRNO_184", /* 184 */
-	"ERRNO_185", /* 185 */
-	"ERRNO_186", /* 186 */
-	"ERRNO_187", /* 187 */
-	"ERRNO_188", /* 188 */
-	"ERRNO_189", /* 189 */
-	"ERRNO_190", /* 190 */
-	"ERRNO_191", /* 191 */
-	"ERRNO_192", /* 192 */
-	"ERRNO_193", /* 193 */
-	"ERRNO_194", /* 194 */
-	"ERRNO_195", /* 195 */
-	"ERRNO_196", /* 196 */
-	"ERRNO_197", /* 197 */
-	"ERRNO_198", /* 198 */
-	"ERRNO_199", /* 199 */
-	"ERRNO_200", /* 200 */
-	"ERRNO_201", /* 201 */
-	"ERRNO_202", /* 202 */
-	"ERRNO_203", /* 203 */
-	"ERRNO_204", /* 204 */
-	"ERRNO_205", /* 205 */
-	"ERRNO_206", /* 206 */
-	"ERRNO_207", /* 207 */
-	"ERRNO_208", /* 208 */
-	"ERRNO_209", /* 209 */
-	"ERRNO_210", /* 210 */
-	"ERRNO_211", /* 211 */
-	"ERRNO_212", /* 212 */
-	"ERRNO_213", /* 213 */
-	"ERRNO_214", /* 214 */
-	"ENOSYM", /* 215 */
-	"ENOTSOCK", /* 216 */
-	"EDESTADDRREQ", /* 217 */
-	"EMSGSIZE", /* 218 */
-	"EPROTOTYPE", /* 219 */
-	"ENOPROTOOPT", /* 220 */
-	"EPROTONOSUPPORT", /* 221 */
-	"ESOCKTNOSUPPORT", /* 222 */
-	"EOPNOTSUPP", /* 223 */
-	"EPFNOSUPPORT", /* 224 */
-	"EAFNOSUPPORT", /* 225 */
-	"EADDRINUSE", /* 226 */
-	"EADDRNOTAVAIL", /* 227 */
-	"ENETDOWN", /* 228 */
-	"ENETUNREACH", /* 229 */
-	"ENETRESET", /* 230 */
-	"ECONNABORTED", /* 231 */
-	"ECONNRESET", /* 232 */
-	"ENOBUFS", /* 233 */
-	"EISCONN", /* 234 */
-	"ENOTCONN", /* 235 */
-	"ESHUTDOWN", /* 236 */
-	"ETOOMANYREFS", /* 237 */
-	"ETIMEDOUT", /* 238 */
-	"ECONNREFUSED", /* 239 */
-	"EREMOTERELEASE", /* 240 */
-	"EHOSTDOWN", /* 241 */
-	"EHOSTUNREACH", /* 242 */
-	"ERRNO_243", /* 243 */
-	"EALREADY", /* 244 */
-	"EINPROGRESS", /* 245 */
-	"EWOULDBLOCK", /* 246 */
-	"ENOTEMPTY", /* 247 */
-	"ENAMETOOLONG", /* 248 */
-	"ELOOP", /* 249 */
-	"ERRNO_250", /* 250 */
-	"ENOSYS", /* 251 */
-	"ENOTSUP", /* 252 */
-	"ECANCELLED", /* 253 */
diff --git a/strace/linux/hppa/ioctlent.h b/strace/linux/hppa/ioctlent.h
deleted file mode 100644
index 7ddaaf5..0000000
--- a/strace/linux/hppa/ioctlent.h
+++ /dev/null
@@ -1,779 +0,0 @@
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_DOS",	0x4d2},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_DOS",	0x4d3},
-	{"linux/umsdos_fs.h",	"UMSDOS_RMDIR_DOS",	0x4d4},
-	{"linux/umsdos_fs.h",	"UMSDOS_STAT_DOS",	0x4d5},
-	{"linux/umsdos_fs.h",	"UMSDOS_CREAT_EMD",	0x4d6},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_EMD",	0x4d7},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_EMD",	0x4d8},
-	{"linux/umsdos_fs.h",	"UMSDOS_GETVERSION",	0x4d9},
-	{"linux/umsdos_fs.h",	"UMSDOS_INIT_EMD",	0x4da},
-	{"linux/umsdos_fs.h",	"UMSDOS_DOS_SETUP",	0x4db},
-	{"linux/umsdos_fs.h",	"UMSDOS_RENAME_DOS",	0x4dc},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKPG",	0x1269},
-	{"linux/elevator.h",	"BLKELVGET",	0x126a},
-	{"linux/fs.h",	"BLKELVGET",	0x126a},
-	{"linux/elevator.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/fs.h",	"BLKGETSIZE64",	0x1272},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGREP",	0x4503},
-	{"linux/input.h",	"EVIOCSREP",	0x4503},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCSKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCGKEY",	0x4505},
-	{"linux/input.h",	"EVIOCGBUS",	0x4507},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCSGAIN",	0x4582},
-	{"linux/input.h",	"EVIOCSAUTOCENTER",	0x4583},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/watchdog.h",	"WDIOC_SETTIMEOUT",	0x5706},
-	{"linux/watchdog.h",	"WDIOC_GETTIMEOUT",	0x5707},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_GETTHIST",	0x6164},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETFLAGS",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/i8k.h",	"I8K_BIOS_VERSION",	0x6980},
-	{"linux/i8k.h",	"I8K_MACHINE_ID",	0x6981},
-	{"linux/i8k.h",	"I8K_POWER_STATUS",	0x6982},
-	{"linux/i8k.h",	"I8K_FN_STATUS",	0x6983},
-	{"linux/i8k.h",	"I8K_GET_TEMP",	0x6984},
-	{"linux/i8k.h",	"I8K_GET_SPEED",	0x6985},
-	{"linux/i8k.h",	"I8K_GET_FAN",	0x6986},
-	{"linux/i8k.h",	"I8K_SET_FAN",	0x6987},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID2",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO_V2",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETMOUNT",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETPID",	0x7004},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLOSE_JOURNALF",	0x7006},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/intermezzo_fs.h",	"PRESTO_SET_FSETROOT",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_FSETROOT",	0x7008},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETOPT",	0x7009},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETOPT",	0x700a},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_KMLSIZE",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_RECNO",	0x700c},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETATTR",	0x7010},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CREATE",	0x7011},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_LINK",	0x7012},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_UNLINK",	0x7013},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SYMLINK",	0x7014},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKDIR",	0x7015},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RMDIR",	0x7016},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKNOD",	0x7017},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RENAME",	0x7018},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CLOSE",	0x701a},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_IOPEN",	0x701b},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETEXTATTR",	0x701c},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_DELEXTATTR",	0x701d},
-	{"linux/intermezzo_fs.h",	"PRESTO_MARK",	0x7020},
-	{"linux/intermezzo_fs.h",	"PRESTO_RELEASE_PERMIT",	0x7021},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_ALL_FSETROOTS",	0x7022},
-	{"linux/intermezzo_fs.h",	"PRESTO_BACKFETCH_LML",	0x7023},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT",	0x7024},
-	{"linux/intermezzo_fs.h",	"PRESTO_CANCEL_LML",	0x7025},
-	{"linux/intermezzo_fs.h",	"PRESTO_RESET_FSET",	0x7026},
-	{"linux/intermezzo_fs.h",	"PRESTO_COMPLETE_CLOSES",	0x7027},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_BEGIN",	0x7030},
-	{"linux/intermezzo_fs.h",	"PRESTO_DO_REINT",	0x7031},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_END",	0x7032},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"OLD_PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/sonypi.h",	"SONYPI_IOCSBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION_OLD",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION_OLD",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1CAP",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1REM",	0x7603},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2CAP",	0x7604},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2REM",	0x7605},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/sonypi.h",	"SONYPI_IOCGBATFLAGS",	0x7607},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/sonypi.h",	"SONYPI_IOCGBLUE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/sonypi.h",	"SONYPI_IOCSBLUE",	0x7609},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"OSIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/dn.h",	"OSIOCGNETADDR",	0x89e1},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/lvm.h",	"VG_CREATE_OLD",	0xfe00},
-	{"linux/lvm.h",	"VG_REMOVE",	0xfe01},
-	{"linux/lvm.h",	"VG_EXTEND",	0xfe03},
-	{"linux/lvm.h",	"VG_REDUCE",	0xfe04},
-	{"linux/lvm.h",	"VG_STATUS",	0xfe05},
-	{"linux/lvm.h",	"VG_STATUS_GET_COUNT",	0xfe06},
-	{"linux/lvm.h",	"VG_STATUS_GET_NAMELIST",	0xfe07},
-	{"linux/lvm.h",	"VG_SET_EXTENDABLE",	0xfe08},
-	{"linux/lvm.h",	"VG_RENAME",	0xfe09},
-	{"linux/lvm.h",	"VG_CREATE",	0xfe0a},
-	{"linux/lvm.h",	"LV_CREATE",	0xfe20},
-	{"linux/lvm.h",	"LV_REMOVE",	0xfe21},
-	{"linux/lvm.h",	"LV_ACTIVATE",	0xfe22},
-	{"linux/lvm.h",	"LV_DEACTIVATE",	0xfe23},
-	{"linux/lvm.h",	"LV_EXTEND",	0xfe24},
-	{"linux/lvm.h",	"LV_REDUCE",	0xfe25},
-	{"linux/lvm.h",	"LV_STATUS_BYNAME",	0xfe26},
-	{"linux/lvm.h",	"LV_STATUS_BYINDEX",	0xfe27},
-	{"linux/lvm.h",	"LV_SET_ACCESS",	0xfe28},
-	{"linux/lvm.h",	"LV_SET_ALLOCATION",	0xfe29},
-	{"linux/lvm.h",	"LV_SET_STATUS",	0xfe2a},
-	{"linux/lvm.h",	"LE_REMAP",	0xfe2b},
-	{"linux/lvm.h",	"LV_SNAPSHOT_USE_RATE",	0xfe2c},
-	{"linux/lvm.h",	"LV_STATUS_BYDEV",	0xfe2e},
-	{"linux/lvm.h",	"LV_RENAME",	0xfe2f},
-	{"linux/lvm.h",	"LV_BMAP",	0xfe30},
-	{"linux/lvm.h",	"PV_STATUS",	0xfe40},
-	{"linux/lvm.h",	"PV_CHANGE",	0xfe41},
-	{"linux/lvm.h",	"PV_FLUSH",	0xfe42},
-	{"linux/lvm.h",	"PE_LOCK_UNLOCK",	0xfe50},
-	{"linux/lvm.h",	"LVM_GET_IOP_VERSION",	0xfe98},
-	{"linux/lvm.h",	"LVM_RESET",	0xfe99},
-	{"linux/lvm.h",	"LVM_LOCK_LVM",	0xff00},
diff --git a/strace/linux/hppa/signalent.h b/strace/linux/hppa/signalent.h
deleted file mode 100644
index 92e5565..0000000
--- a/strace/linux/hppa/signalent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-	"SIG_0",	/* 0 */
-	"SIGHUP",	/* 1 */
-	"SIGINT",	/* 2 */
-	"SIGQUIT",	/* 3 */
-	"SIGILL",	/* 4 */
-	"SIGTRAP",	/* 5 */
-	"SIGABRT",	/* 6 */
-	"SIGEMT",	/* 7 */
-	"SIGFPE",	/* 8 */
-	"SIGKILL",	/* 9 */
-	"SIGBUS",	/* 10 */
-	"SIGSEGV",	/* 11 */
-	"SIGSYS",	/* 12 */
-	"SIGPIPE",	/* 13 */
-	"SIGALRM",	/* 14 */
-	"SIGTERM",	/* 15 */
-	"SIGUSR1",	/* 16 */
-	"SIGUSR2",	/* 17 */
-	"SIGCHLD",	/* 18 */
-	"SIGPWR",	/* 19 */
-	"SIGVTALRM",	/* 20 */
-	"SIGPROF",	/* 21 */
-	"SIGIO",	/* 22 */
-	"SIGWINCH",	/* 23 */
-	"SIGSTOP",	/* 24 */
-	"SIGTSTP",	/* 25 */
-	"SIGCONT",	/* 26 */
-	"SIGTTIN",	/* 27 */
-	"SIGTTOU",	/* 28 */
-	"SIGURG",	/* 29 */
-	"SIGLOST",	/* 30 */
-	"SIGUNUSED",	/* 31 */
-	"SIG_32",	/* 32 */
-	"SIGXCPU",	/* 33 */
-	"SIGXFSZ",	/* 34 */
-	"SIG_35",	/* 35 */
-	"SIGSTKFLT",	/* 36 */
-	"SIGRTMIN",	/* 37 */
diff --git a/strace/linux/hppa/syscallent.h b/strace/linux/hppa/syscallent.h
deleted file mode 100644
index 60a5016..0000000
--- a/strace/linux/hppa/syscallent.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright (c) 2001 Hewlett-Packard, Matthew Wilcox
- *
- * $Id: syscallent.h,v 1.12 2005/05/09 08:02:04 roland Exp $
- *
- */
-
-	{ 5,	0,	printargs,		"SYS_0"			}, /* 0 */
-	{ 1,	TP,	sys_exit,		"exit"			}, /* 1 */
-	{ 0,	TP,	sys_fork,		"fork"			}, /* 2 */
-	{ 3,	TF,	sys_read,		"read"			}, /* 3 */
-	{ 3,	TF,	sys_write,		"write"			}, /* 4 */
-	{ 3,	TF,	sys_open,		"open"			}, /* 5 */
-	{ 1,	0,	sys_close,		"close"			}, /* 6 */
-	{ 3,	TP,	sys_waitpid,		"waitpid"		}, /* 7 */
-	{ 2,	TF,	sys_creat,		"creat"			}, /* 8 */
-	{ 2,	TF,	sys_link,		"link"			}, /* 9 */
-	{ 1,	TF,	sys_unlink,		"unlink"		}, /* 10 */
-	{ 3,	TF|TP,	sys_execve,		"execve"		}, /* 11 */
-	{ 1,	TF,	sys_chdir,		"chdir"			}, /* 12 */
-	{ 1,	0,	sys_time,		"time"			}, /* 13 */
-	{ 3,	TF,	sys_mknod,		"mknod"			}, /* 14 */
-	{ 2,	TF,	sys_chmod,		"chmod"			}, /* 15 */
-	{ 3,	TF,	sys_chown,		"lchown"		}, /* 16 */
-	{ 3,	TN,	sys_socket,		"socket"		}, /* 17 */
-	{ 2,	TF,	sys_stat,		"newstat"		}, /* 18 */
-	{ 3,	TF,	sys_lseek,		"lseek"			}, /* 19 */
-	{ 0,	0,	sys_getpid,		"getpid"		}, /* 20 */
-	{ 5,	TF,	sys_mount,		"mount"			}, /* 21 */
-	{ 3,	TN,	sys_bind,		"bind"			}, /* 22 */
-	{ 1,	0,	sys_setuid,		"setuid"		}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"		}, /* 24 */
-	{ 1,	0,	sys_stime,		"stime"			}, /* 25 */
-	{ 4,	0,	sys_ptrace,		"ptrace"		}, /* 26 */
-	{ 1,	0,	sys_alarm,		"alarm"			}, /* 27 */
-	{ 2,	0,	sys_fstat,		"newfstat"		}, /* 28 */
-	{ 0,	0,	sys_pause,		"pause"			}, /* 29 */
-	{ 2,	0,	sys_utime,		"utime"			}, /* 30 */
-	{ 3,	TN,	sys_connect,		"connect"		}, /* 31 */
-	{ 2,	TN,	sys_listen,		"listen"		}, /* 32 */
-	{ 2,	TF,	sys_access,		"access"		}, /* 33 */
-	{ 1,	0,	sys_nice,		"nice"			}, /* 34 */
-	{ 3,	TN,	sys_accept,		"accept"		}, /* 35 */
-	{ 0,	0,	sys_sync,		"sync"			}, /* 36 */
-	{ 2,	TS,	sys_kill,		"kill"			}, /* 37 */
-	{ 2,	TF,	sys_rename,		"rename"		}, /* 38 */
-	{ 2,	TF,	sys_mkdir,		"mkdir"			}, /* 39 */
-	{ 1,	TF,	sys_rmdir,		"rmdir"			}, /* 40 */
-	{ 1,	0,	sys_dup,		"dup"			}, /* 41 */
-	{ 1,	0,	sys_pipe,		"pipe"			}, /* 42 */
-	{ 1,	0,	sys_times,		"times"			}, /* 43 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"		}, /* 44 */
-	{ 1,	0,	sys_brk,		"brk"			}, /* 45 */
-	{ 1,	0,	sys_setgid,		"setgid"		}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"		}, /* 47 */
-	{ 2,	0,	sys_signal,		"signal"		}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"		}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"		}, /* 50 */
-	{ 1,	TF,	sys_acct,		"acct"			}, /* 51 */
-	{ 2,	0,	sys_umount2,		"umount2"		}, /* 52 */
-	{ 3,	TN,	sys_getpeername,	"lock"			}, /* 53 */
-	{ 3,	0,	sys_ioctl,		"ioctl"			}, /* 54 */
-	{ 3,	0,	sys_fcntl,		"fcntl"			}, /* 55 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"		}, /* 56 */
-	{ 2,	0,	sys_setpgid,		"setpgid"		}, /* 57 */
-	{ 4,	TN,	sys_send,		"send"			}, /* 58 */
-	{ 1,	0,	sys_uname,		"newuname"			}, /* 59 */
-	{ 1,	0,	sys_umask,		"umask"			}, /* 60 */
-	{ 1,	TF,	sys_chroot,		"chroot"		}, /* 61 */
-	{ 2,	0,	sys_ustat,		"ustat"			}, /* 62 */
-	{ 2,	0,	sys_dup2,		"dup2"			}, /* 63 */
-	{ 0,	0,	sys_getppid,		"getppid"		}, /* 64 */
-	{ 0,	0,	sys_getpgrp,		"getpgrp"		}, /* 65 */
-	{ 0,	0,	sys_setsid,		"setsid"		}, /* 66 */
-	{ 2,	TF,	sys_pivotroot,		"pivot_root"		}, /* 67 */
-	{ 5,	0,	printargs,		"sgetmask"		}, /* 68 */
-	{ 5,	0,	printargs,		"ssetmask"		}, /* 69 */
-	{ 2,	0,	sys_setreuid,		"setreuid"		}, /* 70 */
-	{ 2,	0,	sys_setregid,		"setregid"		}, /* 71 */
-	{ 3,	0,	sys_mincore,		"mincore"		}, /* 72 */
-	{ 1,	TS,	sys_sigpending,		"sigpending"		}, /* 73 */
-	{ 2,	0,	sys_sethostname,	"sethostname"		}, /* 74 */
-	{ 2,	0,	sys_setrlimit,		"setrlimit"		}, /* 75 */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"		}, /* 76 */
-	{ 2,	0,	sys_getrusage,		"getrusage"		}, /* 77 */
-	{ 2,	0,	sys_gettimeofday,	"gettimeofday"		}, /* 78 */
-	{ 2,	0,	sys_settimeofday,	"settimeofday"		}, /* 79 */
-	{ 2,	0,	sys_getgroups,		"getgroups"		}, /* 80 */
-	{ 2,	0,	sys_setgroups,		"setgroups"		}, /* 81 */
-	{ 6,	TN,	sys_sendto,		"sendto"		}, /* 82 */
-	{ 2,	TF,	sys_symlink,		"symlink"		}, /* 83 */
-	{ 2,	TF,	sys_lstat,		"newlstat"		}, /* 84 */
-	{ 3,	TF,	sys_readlink,		"readlink"		}, /* 85 */
-	{ 1,	0,	sys_uselib,		"uselib"		}, /* 86 */
-	{ 1,	0,	sys_swapon,		"swapon"		}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"		}, /* 88 */
-	{ 6,	0,	sys_mmap,		"mmap2"			}, /* 89 */
-	{ 6,	0,	sys_mmap,		"mmap"			}, /* 90 */
-	{ 2,	0,	sys_munmap,		"munmap"		}, /* 91 */
-	{ 2,	TF,	sys_truncate,		"truncate"		}, /* 92 */
-	{ 2,	0,	sys_ftruncate,		"ftruncate"		}, /* 93 */
-	{ 2,	0,	sys_fchmod,		"fchmod"		}, /* 94 */
-	{ 3,	0,	sys_fchown,		"fchown"		}, /* 95 */
-	{ 2,	0,	sys_getpriority,	"getpriority"		}, /* 96 */
-	{ 3,	0,	sys_setpriority,	"setpriority"		}, /* 97 */
-	{ 4,	TN,	sys_recv,		"recv"			}, /* 98 */
-	{ 2,	TF,	sys_statfs,		"statfs"		}, /* 99 */
-	{ 2,	0,	sys_fstatfs,		"fstatfs"		}, /* 100 */
-	{ 2,	TF,	sys_stat64,		"stat64"		}, /* 101 */
-	{ 5,	0,	printargs,		"SYS_102"		}, /* 102 */
-	{ 3,	0,	sys_syslog,		"syslog"		}, /* 103 */
-	{ 3,	0,	sys_setitimer,		"setitimer"		}, /* 104 */
-	{ 2,	0,	sys_getitimer,		"getitimer"		}, /* 105 */
-	{ 2,	0,	sys_capget,		"capget"		}, /* 106 */
-	{ 2,	0,	sys_capset,		"capset"		}, /* 107 */
-	{ 5,	TF,	sys_pread,		"pread"			}, /* 108 */
-	{ 5,	TF,	sys_pwrite,		"pwrite"		}, /* 109 */
-	{ 2,	0,	sys_getcwd,		"getcwd"		}, /* 110 */
-	{ 0,	0,	sys_vhangup,		"vhangup"		}, /* 111 */
-	{ 2,	TF,	sys_fstat64,		"fstat64"		}, /* 112 */
-	{ 0,	0,	sys_vfork,		"vfork"			}, /* 113 */
-	{ 4,	TP,	sys_wait4,		"wait4"			}, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"		}, /* 115 */
-	{ 1,	0,	sys_sysinfo,		"sysinfo"		}, /* 116 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"		}, /* 117 */
-	{ 1,	0,	sys_fsync,		"fsync"			}, /* 118 */
-	{ 3,	0,	sys_madvise,		"madvise"		}, /* 119 */
-	{ 5,	TP,	sys_clone,		"clone"			}, /* 120 */
-	{ 2,	0,	sys_setdomainname,	"setdomainname"		}, /* 121 */
-	{ 4,	TF,	sys_sendfile,		"sendfile"		}, /* 122 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"		}, /* 123 */
-	{ 1,	0,	sys_adjtimex,		"adjtimex"		}, /* 124 */
-	{ 3,	0,	sys_mprotect,		"mprotect"		}, /* 125 */
-	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"		}, /* 126 */
-	{ 2,	0,	sys_create_module,	"create_module"		}, /* 127 */
-	{ 4,	0,	sys_init_module,	"init_module"		}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"		}, /* 129 */
-	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"	}, /* 130 */
-	{ 4,	0,	sys_quotactl,		"quotactl"		}, /* 131 */
-	{ 1,	0,	sys_getpgid,		"getpgid"		}, /* 132 */
-	{ 1,	TF,	sys_fchdir,		"fchdir"		}, /* 133 */
-	{ 0,	0,	sys_bdflush,		"bdflush"		}, /* 134 */
-	{ 5,	0,	sys_sysfs,		"sysfs"			}, /* 135 */
-	{ 1,	0,	sys_personality,	"personality"		}, /* 136 */
-	{ 5,	0,	sys_afs_syscall,	"afs_syscall"		}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"		}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"		}, /* 139 */
-	{ 5,	TF,	sys_llseek,		"_llseek"		}, /* 140 */
-	{ 3,	0,	sys_getdents,		"getdents"		}, /* 141 */
-	{ 5,	0,	sys_select,		"_newselect"		}, /* 142 */
-	{ 2,	0,	sys_flock,		"flock"			}, /* 143 */
-	{ 3,	0,	sys_msync,		"msync"			}, /* 144 */
-	{ 3,	0,	sys_readv,		"readv"			}, /* 145 */
-	{ 3,	0,	sys_writev,		"writev"		}, /* 146 */
-	{ 1,	0,	sys_getsid,		"getsid"		}, /* 147 */
-	{ 1,	0,	sys_fdatasync,		"fdatasync"		}, /* 148 */
-	{ 1,	0,	sys_sysctl,		"_sysctl"		}, /* 149 */
-	{ 2,	0,	sys_mlock,		"mlock"			}, /* 150 */
-	{ 2,	0,	sys_munlock,		"munlock"		}, /* 151 */
-	{ 1,	0,	sys_mlockall,		"mlockall"		}, /* 152 */
-	{ 1,	0,	sys_munlockall,		"munlockall"		}, /* 153 */
-	{ 2,	0,	sys_sched_setparam,	"sched_setparam"	}, /* 154 */
-	{ 2,	0,	sys_sched_getparam,	"sched_getparam"	}, /* 155 */
-	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"	}, /* 156 */
-	{ 2,	0,	sys_sched_getscheduler,	"sched_getscheduler"	}, /* 157 */
-	{ 0,	0,	sys_sched_yield,	"sched_yield"		}, /* 158 */
-	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
-	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
-	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
-	{ 2,	0,	sys_nanosleep,		"nanosleep"		}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"		}, /* 163 */
-	{ 3,	0,	sys_setresuid,		"setresuid"		}, /* 164 */
-	{ 3,	0,	sys_setresuid,		"getresuid"		}, /* 165 */
-	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"		}, /* 166 */
-	{ 5,	0,	sys_query_module,	"query_module"		}, /* 167 */
-	{ 3,	0,	sys_poll,		"poll"			}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"		}, /* 169 */
-	{ 3,	0,	sys_setresgid,		"setresgid"		}, /* 170 */
-	{ 3,	0,	sys_setresgid,		"getresgid"		}, /* 171 */
-	{ 5,	0,	sys_prctl,		"prctl"			}, /* 172 */
-	{ 1,	TS,	sys_sigreturn,		"rt_sigreturn"		}, /* 173 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"		}, /* 174 */
-	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"	}, /* 175 */
-	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"		}, /* 176 */
-	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"	}, /* 177 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,	"rt_sigqueueinfo"	}, /* 178 */
-	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"		}, /* 179 */
-	{ 3,	TF,	sys_chown,		"chown"			}, /* 180 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"		}, /* 181 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"		}, /* 182 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"		}, /* 183 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"		}, /* 184 */
-	{ 4,	TI,	sys_semop,		"semop"			}, /* 185 */
-	{ 4,	TI,	sys_semget,		"semget"		}, /* 186 */
-	{ 4,	TI,	sys_semctl,		"semctl"		}, /* 187 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"		}, /* 188 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"		}, /* 189 */
-	{ 4,	TI,	sys_msgget,		"msgget"		}, /* 190 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"		}, /* 191 */
-	{ 4,	TI,	sys_shmat,		"shmat"			}, /* 192 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"			}, /* 193 */
-	{ 4,	TI,	sys_shmget,		"shmget"		}, /* 194 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"		}, /* 195 */
-	{ 5,	0,	sys_getpmsg,		"getpmsg"		}, /* 196 */
-	{ 5,	0,	sys_putpmsg,		"putpmsg"		}, /* 197 */
-	{ 2,	TF,	sys_lstat64,		"lstat64"		}, /* 198 */
-	{ 3,	TF,	sys_truncate64,		"truncate64"		}, /* 199 */
-	{ 3,	TF,	sys_ftruncate64,	"ftruncate64"		}, /* 200 */
-	{ 3,	0,	sys_getdents64,		"getdents64"		}, /* 201 */
-	{ 3,	0,	sys_fcntl,		"fcntl64"		}, /* 202 */
-	{ 5,	0,	printargs,		"attrctl"		}, /* 203 */
-	{ 5,	0,	printargs,		"acl_get"		}, /* 204 */
-	{ 5,	0,	printargs,		"acl_set"		}, /* 205 */
-	{ 0,	0,	printargs,		"gettid"		}, /* 206 */
-	{ 4,	0,	sys_readahead,		"readahead"		}, /* 207 */
-	{ 2,	TS,	sys_kill,		"tkill"			}, /* 208 */
-	{ 4,	TF,	sys_sendfile,		"sendfile64"		}, /* 209 */
-	{ 5,	0,	sys_futex,		"futex"			}, /* 210 */
-	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity"	}, /* 211 */
-	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity"	}, /* 212 */
-	{ 5,	0,	printargs,		"set_thread_area"	}, /* 213 */
-	{ 5,	0,	printargs,		"get_thread_area"	}, /* 214 */
-	{ 2,	0,	sys_io_setup,		"io_setup"		}, /* 215 */
-	{ 1,	0,	sys_io_destroy,		"io_destroy"		}, /* 216 */
-	{ 5,	0,	sys_io_getevents,		"io_getevents"		}, /* 217 */
-	{ 3,	0,	sys_io_submit,		"io_submit"		}, /* 218 */
-	{ 4,	0,	sys_io_cancel,		"io_cancel"		}, /* 219 */
-	{ 5,	0,	printargs,		"alloc_hugepages"	}, /* 220 */
-	{ 1,	0,	printargs,		"free_hugepages"	}, /* 221 */
-	{ 1,	TP,	sys_exit,		"exit_group"		}, /* 222 */
-	{ 4,	0,	printargs,		"lookup_dcookie"	}, /* 223 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"		}, /* 224 */
-	{ 4,	0,	sys_epoll_ctl,		"epoll_ctl"		}, /* 225 */
-	{ 4,	0,	sys_epoll_wait,		"epoll_wait"		}, /* 226 */
-	{ 5,	0,	printargs,		"remap_file_pages"	}, /* 227 */
-	{ 5,	0,	printargs,		"semtimedop"		}, /* 228 */
-	{ 5,	0,	printargs,		"mq_open"		}, /* 229 */
-	{ 5,	0,	printargs,		"mq_unlink"		}, /* 230 */
-	{ 5,	0,	printargs,		"mq_timedsend"		}, /* 231 */
-	{ 5,	0,	printargs,		"mq_timedreceive"		}, /* 232 */
-	{ 5,	0,	printargs,		"mq_notify"		}, /* 233 */
-	{ 5,	0,	printargs,		"mq_getsetattr"		}, /* 234 */
-	{ 4,	0,	printargs,		"waitid"		}, /* 235 */
-	{ 5,	0,	printargs,		"fadvise64_64"		}, /* 236 */
-	{ 5,	0,	printargs,		"set_tid_address"	}, /* 237 */
-	{ 5,	TF,	sys_setxattr,		"setxattr"		}, /* 238 */
-	{ 5,	TF,	sys_setxattr,		"lsetxattr"		}, /* 239 */
-	{ 5,	0,	sys_fsetxattr,		"fsetxattr"		}, /* 240 */
-	{ 4,	TF,	sys_getxattr,		"getxattr"		}, /* 241 */
-	{ 4,	TF,	sys_getxattr,		"lgetxattr"		}, /* 242 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"		}, /* 243 */
-	{ 5,	TF,	sys_listxattr,		"listxattr"		}, /* 244 */
-	{ 5,	TF,	sys_listxattr,		"llistxattr"		}, /* 245 */
-	{ 5,	0,	sys_flistxattr,		"flistxattr"		}, /* 246 */
-	{ 5,	TF,	sys_removexattr,	"removexattr"		}, /* 247 */
-	{ 5,	TF,	sys_removexattr,	"lremovexattr"		}, /* 248 */
-	{ 5,	0,	sys_fremovexattr,	"fremovexattr"		}, /* 249 */
-	{ 3,	0,	sys_timer_create,	"timer_create"		}, /* 250 */
-	{ 4,	0,	sys_timer_settime,	"timer_settime"		}, /* 251 */
-	{ 2,	0,	sys_timer_gettime,	"timer_gettime"		}, /* 252 */
-	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"	}, /* 253 */
-	{ 1,	0,	sys_timer_delete,	"timer_delete"		}, /* 254 */
-	{ 2,	0,	sys_clock_settime,	"clock_settime"		}, /* 255 */
-	{ 2,	0,	sys_clock_gettime,	"clock_gettime"		}, /* 256 */
-	{ 2,	0,	sys_clock_getres,	"clock_getres"		}, /* 257 */
-	{ 5,	0,	printargs,		"clock_nanosleep"	}, /* 258 */
-	{ 5,	0,	printargs,		"tgkill"		}, /* 259 */
-	{ 5,	0,	printargs,		"mbind"			}, /* 260 */
-	{ 5,	0,	printargs,		"get_mempolicy"		}, /* 261 */
-	{ 5,	0,	printargs,		"set_mempolicy"		}, /* 262 */
-	{ 5,	0,	printargs,		"SYS_263"		}, /* 263 */
-	{ 5,	0,	printargs,		"SYS_264"		}, /* 264 */
-	{ 5,	0,	printargs,		"SYS_265"		}, /* 265 */
-	{ 5,	0,	printargs,		"SYS_266"		}, /* 266 */
-	{ 5,	0,	printargs,		"SYS_267"		}, /* 267 */
-	{ 5,	0,	printargs,		"SYS_268"		}, /* 268 */
-	{ 5,	0,	printargs,		"SYS_269"		}, /* 269 */
-	{ 5,	0,	printargs,		"SYS_270"		}, /* 270 */
-	{ 5,	0,	printargs,		"SYS_271"		}, /* 271 */
-	{ 5,	0,	printargs,		"SYS_272"		}, /* 272 */
-	{ 5,	0,	printargs,		"SYS_273"		}, /* 273 */
-	{ 5,	0,	printargs,		"SYS_274"		}, /* 274 */
-	{ 5,	0,	printargs,		"SYS_275"		}, /* 275 */
-	{ 5,	0,	printargs,		"SYS_276"		}, /* 276 */
-	{ 5,	0,	printargs,		"SYS_277"		}, /* 277 */
-	{ 5,	0,	printargs,		"SYS_278"		}, /* 278 */
-	{ 5,	0,	printargs,		"SYS_279"		}, /* 279 */
-	{ 5,	0,	printargs,		"SYS_280"		}, /* 280 */
-	{ 5,	0,	printargs,		"SYS_281"		}, /* 281 */
-	{ 5,	0,	printargs,		"SYS_282"		}, /* 282 */
-	{ 5,	0,	printargs,		"SYS_283"		}, /* 283 */
-	{ 5,	0,	printargs,		"SYS_284"		}, /* 284 */
-	{ 5,	0,	printargs,		"SYS_285"		}, /* 285 */
-	{ 5,	0,	printargs,		"SYS_286"		}, /* 286 */
-	{ 5,	0,	printargs,		"SYS_287"		}, /* 287 */
-	{ 5,	0,	printargs,		"SYS_288"		}, /* 288 */
-	{ 5,	0,	printargs,		"SYS_289"		}, /* 289 */
-	{ 5,	0,	printargs,		"SYS_290"		}, /* 290 */
-	{ 5,	0,	printargs,		"SYS_291"		}, /* 291 */
-	{ 5,	0,	printargs,		"SYS_292"		}, /* 292 */
-	{ 5,	0,	printargs,		"SYS_293"		}, /* 293 */
-	{ 5,	0,	printargs,		"SYS_294"		}, /* 294 */
diff --git a/strace/linux/ia64/errnoent.h b/strace/linux/ia64/errnoent.h
deleted file mode 100644
index 180b506..0000000
--- a/strace/linux/ia64/errnoent.h
+++ /dev/null
@@ -1,125 +0,0 @@
-	"ERRNO_0", /* 0 */
-	"EPERM", /* 1 */
-	"ENOENT", /* 2 */
-	"ESRCH", /* 3 */
-	"EINTR", /* 4 */
-	"EIO", /* 5 */
-	"ENXIO", /* 6 */
-	"E2BIG", /* 7 */
-	"ENOEXEC", /* 8 */
-	"EBADF", /* 9 */
-	"ECHILD", /* 10 */
-	"EAGAIN", /* 11 */
-	"ENOMEM", /* 12 */
-	"EACCES", /* 13 */
-	"EFAULT", /* 14 */
-	"ENOTBLK", /* 15 */
-	"EBUSY", /* 16 */
-	"EEXIST", /* 17 */
-	"EXDEV", /* 18 */
-	"ENODEV", /* 19 */
-	"ENOTDIR", /* 20 */
-	"EISDIR", /* 21 */
-	"EINVAL", /* 22 */
-	"ENFILE", /* 23 */
-	"EMFILE", /* 24 */
-	"ENOTTY", /* 25 */
-	"ETXTBSY", /* 26 */
-	"EFBIG", /* 27 */
-	"ENOSPC", /* 28 */
-	"ESPIPE", /* 29 */
-	"EROFS", /* 30 */
-	"EMLINK", /* 31 */
-	"EPIPE", /* 32 */
-	"EDOM", /* 33 */
-	"ERANGE", /* 34 */
-	"EDEADLK", /* 35 */
-	"ENAMETOOLONG", /* 36 */
-	"ENOLCK", /* 37 */
-	"ENOSYS", /* 38 */
-	"ENOTEMPTY", /* 39 */
-	"ELOOP", /* 40 */
-	"ERRNO_41", /* 41 */
-	"ENOMSG", /* 42 */
-	"EIDRM", /* 43 */
-	"ECHRNG", /* 44 */
-	"EL2NSYNC", /* 45 */
-	"EL3HLT", /* 46 */
-	"EL3RST", /* 47 */
-	"ELNRNG", /* 48 */
-	"EUNATCH", /* 49 */
-	"ENOCSI", /* 50 */
-	"EL2HLT", /* 51 */
-	"EBADE", /* 52 */
-	"EBADR", /* 53 */
-	"EXFULL", /* 54 */
-	"ENOANO", /* 55 */
-	"EBADRQC", /* 56 */
-	"EBADSLT", /* 57 */
-	"ERRNO_58", /* 58 */
-	"EBFONT", /* 59 */
-	"ENOSTR", /* 60 */
-	"ENODATA", /* 61 */
-	"ETIME", /* 62 */
-	"ENOSR", /* 63 */
-	"ENONET", /* 64 */
-	"ENOPKG", /* 65 */
-	"EREMOTE", /* 66 */
-	"ENOLINK", /* 67 */
-	"EADV", /* 68 */
-	"ESRMNT", /* 69 */
-	"ECOMM", /* 70 */
-	"EPROTO", /* 71 */
-	"EMULTIHOP", /* 72 */
-	"EDOTDOT", /* 73 */
-	"EBADMSG", /* 74 */
-	"EOVERFLOW", /* 75 */
-	"ENOTUNIQ", /* 76 */
-	"EBADFD", /* 77 */
-	"EREMCHG", /* 78 */
-	"ELIBACC", /* 79 */
-	"ELIBBAD", /* 80 */
-	"ELIBSCN", /* 81 */
-	"ELIBMAX", /* 82 */
-	"ELIBEXEC", /* 83 */
-	"EILSEQ", /* 84 */
-	"ERESTART", /* 85 */
-	"ESTRPIPE", /* 86 */
-	"EUSERS", /* 87 */
-	"ENOTSOCK", /* 88 */
-	"EDESTADDRREQ", /* 89 */
-	"EMSGSIZE", /* 90 */
-	"EPROTOTYPE", /* 91 */
-	"ENOPROTOOPT", /* 92 */
-	"EPROTONOSUPPORT", /* 93 */
-	"ESOCKTNOSUPPORT", /* 94 */
-	"EOPNOTSUPP", /* 95 */
-	"EPFNOSUPPORT", /* 96 */
-	"EAFNOSUPPORT", /* 97 */
-	"EADDRINUSE", /* 98 */
-	"EADDRNOTAVAIL", /* 99 */
-	"ENETDOWN", /* 100 */
-	"ENETUNREACH", /* 101 */
-	"ENETRESET", /* 102 */
-	"ECONNABORTED", /* 103 */
-	"ECONNRESET", /* 104 */
-	"ENOBUFS", /* 105 */
-	"EISCONN", /* 106 */
-	"ENOTCONN", /* 107 */
-	"ESHUTDOWN", /* 108 */
-	"ETOOMANYREFS", /* 109 */
-	"ETIMEDOUT", /* 110 */
-	"ECONNREFUSED", /* 111 */
-	"EHOSTDOWN", /* 112 */
-	"EHOSTUNREACH", /* 113 */
-	"EALREADY", /* 114 */
-	"EINPROGRESS", /* 115 */
-	"ESTALE", /* 116 */
-	"EUCLEAN", /* 117 */
-	"ENOTNAM", /* 118 */
-	"ENAVAIL", /* 119 */
-	"EISNAM", /* 120 */
-	"EREMOTEIO", /* 121 */
-	"EDQUOT", /* 122 */
-	"ENOMEDIUM", /* 123 */
-	"EMEDIUMTYPE", /* 124 */
diff --git a/strace/linux/ia64/ioctlent.h b/strace/linux/ia64/ioctlent.h
deleted file mode 100644
index 8cd2acd..0000000
--- a/strace/linux/ia64/ioctlent.h
+++ /dev/null
@@ -1,1080 +0,0 @@
-	/* Generated by ioctlsort */
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKELVGET",	0x126a},
-	{"linux/fs.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKGETLASTSECT",	0x126c},
-	{"linux/fs.h",	"BLKSETLASTSECT",	0x126d},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/audit.h",	"AUIOCATTACH",	0x4065},
-	{"linux/audit.h",	"AUIOCDETACH",	0x4066},
-	{"linux/audit.h",	"AUIOCSUSPEND",	0x4067},
-	{"linux/audit.h",	"AUIOCRESUME",	0x4068},
-	{"linux/audit.h",	"AUIOCCLRPOLICY",	0x4069},
-	{"linux/audit.h",	"AUIOCSETPOLICY",	0x406a},
-	{"linux/audit.h",	"AUIOCIAMAUDITD",	0x406b},
-	{"linux/audit.h",	"AUIOCSETAUDITID",	0x406c},
-	{"linux/audit.h",	"AUIOCLOGIN",	0x406e},
-	{"linux/audit.h",	"AUIOCUSERMESSAGE",	0x406f},
-	{"linux/audit.h",	"AUIOCCLRFILTER",	0x4070},
-	{"linux/audit.h",	"AUIOCSETFILTER",	0x4071},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGREP",	0x4503},
-	{"linux/input.h",	"EVIOCSREP",	0x4503},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCSKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCGKEY",	0x4505},
-	{"linux/input.h",	"EVIOCGBUS",	0x4507},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCSGAIN",	0x4582},
-	{"linux/input.h",	"EVIOCSAUTOCENTER",	0x4583},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/fb.h",	"FBIOGET_VSCREENINFO",	0x4600},
-	{"linux/fb.h",	"FBIOPUT_VSCREENINFO",	0x4601},
-	{"linux/fb.h",	"FBIOGET_FSCREENINFO",	0x4602},
-	{"linux/fb.h",	"FBIOGETCMAP",	0x4604},
-	{"linux/fb.h",	"FBIOPUTCMAP",	0x4605},
-	{"linux/fb.h",	"FBIOPAN_DISPLAY",	0x4606},
-	{"linux/fb.h",	"FBIOGET_FCURSORINFO",	0x4607},
-	{"linux/fb.h",	"FBIOGET_VCURSORINFO",	0x4608},
-	{"linux/fb.h",	"FBIOPUT_VCURSORINFO",	0x4609},
-	{"linux/fb.h",	"FBIOGET_CURSORSTATE",	0x460a},
-	{"linux/fb.h",	"FBIOPUT_CURSORSTATE",	0x460b},
-	{"linux/fb.h",	"FBIOGET_CON2FBMAP",	0x460f},
-	{"linux/fb.h",	"FBIOPUT_CON2FBMAP",	0x4610},
-	{"linux/fb.h",	"FBIOBLANK",	0x4611},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/fb.h",	"FBIO_ALLOC",	0x4613},
-	{"linux/fb.h",	"FBIO_FREE",	0x4614},
-	{"linux/fb.h",	"FBIOGET_GLYPH",	0x4615},
-	{"linux/fb.h",	"FBIOGET_HWCINFO",	0x4616},
-	{"linux/fb.h",	"FBIOPUT_MODEINFO",	0x4617},
-	{"linux/fb.h",	"FBIOGET_DISPINFO",	0x4618},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/kd.h",	"KIOCSOUND",	0x4b2f},
-	{"linux/kd.h",	"KDMKTONE",	0x4b30},
-	{"linux/kd.h",	"KDGETLED",	0x4b31},
-	{"linux/kd.h",	"KDSETLED",	0x4b32},
-	{"linux/kd.h",	"KDGKBTYPE",	0x4b33},
-	{"linux/kd.h",	"KDADDIO",	0x4b34},
-	{"linux/kd.h",	"KDDELIO",	0x4b35},
-	{"linux/kd.h",	"KDENABIO",	0x4b36},
-	{"linux/kd.h",	"KDDISABIO",	0x4b37},
-	{"linux/kd.h",	"KDSETMODE",	0x4b3a},
-	{"linux/kd.h",	"KDGETMODE",	0x4b3b},
-	{"linux/kd.h",	"KDMAPDISP",	0x4b3c},
-	{"linux/kd.h",	"KDUNMAPDISP",	0x4b3d},
-	{"linux/kd.h",	"GIO_SCRNMAP",	0x4b40},
-	{"linux/kd.h",	"PIO_SCRNMAP",	0x4b41},
-	{"linux/kd.h",	"KDGKBMODE",	0x4b44},
-	{"linux/kd.h",	"KDSKBMODE",	0x4b45},
-	{"linux/kd.h",	"KDGKBENT",	0x4b46},
-	{"linux/kd.h",	"KDSKBENT",	0x4b47},
-	{"linux/kd.h",	"KDGKBSENT",	0x4b48},
-	{"linux/kd.h",	"KDSKBSENT",	0x4b49},
-	{"linux/kd.h",	"KDGKBDIACR",	0x4b4a},
-	{"linux/kd.h",	"KDSKBDIACR",	0x4b4b},
-	{"linux/kd.h",	"KDGETKEYCODE",	0x4b4c},
-	{"linux/kd.h",	"KDSETKEYCODE",	0x4b4d},
-	{"linux/kd.h",	"KDSIGACCEPT",	0x4b4e},
-	{"linux/kd.h",	"KDGHWCLK",	0x4b50},
-	{"linux/kd.h",	"KDSHWCLK",	0x4b51},
-	{"linux/kd.h",	"KDKBDREP",	0x4b52},
-	{"linux/kd.h",	"GIO_FONT",	0x4b60},
-	{"linux/kd.h",	"PIO_FONT",	0x4b61},
-	{"linux/kd.h",	"KDGKBMETA",	0x4b62},
-	{"linux/kd.h",	"KDSKBMETA",	0x4b63},
-	{"linux/kd.h",	"KDGKBLED",	0x4b64},
-	{"linux/kd.h",	"KDSKBLED",	0x4b65},
-	{"linux/kd.h",	"GIO_UNIMAP",	0x4b66},
-	{"linux/kd.h",	"PIO_UNIMAP",	0x4b67},
-	{"linux/kd.h",	"PIO_UNIMAPCLR",	0x4b68},
-	{"linux/kd.h",	"GIO_UNISCRNMAP",	0x4b69},
-	{"linux/kd.h",	"PIO_UNISCRNMAP",	0x4b6a},
-	{"linux/kd.h",	"GIO_FONTX",	0x4b6b},
-	{"linux/kd.h",	"PIO_FONTX",	0x4b6c},
-	{"linux/kd.h",	"PIO_FONTRESET",	0x4b6d},
-	{"linux/kd.h",	"GIO_CMAP",	0x4b70},
-	{"linux/kd.h",	"PIO_CMAP",	0x4b71},
-	{"linux/kd.h",	"KDFONTOP",	0x4b72},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"linux/cdrom.h",	"CDROMPAUSE",	0x5301},
-	{"linux/cdrom.h",	"CDROMRESUME",	0x5302},
-	{"linux/cdrom.h",	"CDROMPLAYMSF",	0x5303},
-	{"linux/cdrom.h",	"CDROMPLAYTRKIND",	0x5304},
-	{"linux/cdrom.h",	"CDROMREADTOCHDR",	0x5305},
-	{"linux/cdrom.h",	"CDROMREADTOCENTRY",	0x5306},
-	{"linux/cdrom.h",	"CDROMSTOP",	0x5307},
-	{"linux/cdrom.h",	"CDROMSTART",	0x5308},
-	{"linux/cdrom.h",	"CDROMEJECT",	0x5309},
-	{"linux/cdrom.h",	"CDROMVOLCTRL",	0x530a},
-	{"linux/cdrom.h",	"CDROMSUBCHNL",	0x530b},
-	{"linux/cdrom.h",	"CDROMREADMODE2",	0x530c},
-	{"linux/cdrom.h",	"CDROMREADMODE1",	0x530d},
-	{"linux/cdrom.h",	"CDROMREADAUDIO",	0x530e},
-	{"linux/cdrom.h",	"CDROMEJECT_SW",	0x530f},
-	{"linux/cdrom.h",	"CDROMMULTISESSION",	0x5310},
-	{"linux/cdrom.h",	"CDROM_GET_MCN",	0x5311},
-	{"linux/cdrom.h",	"CDROMRESET",	0x5312},
-	{"linux/cdrom.h",	"CDROMVOLREAD",	0x5313},
-	{"linux/cdrom.h",	"CDROMREADRAW",	0x5314},
-	{"linux/cdrom.h",	"CDROMREADCOOKED",	0x5315},
-	{"linux/cdrom.h",	"CDROMSEEK",	0x5316},
-	{"linux/cdrom.h",	"CDROMPLAYBLK",	0x5317},
-	{"linux/cdrom.h",	"CDROMREADALL",	0x5318},
-	{"linux/cdrom.h",	"CDROMCLOSETRAY",	0x5319},
-	{"linux/cdrom.h",	"CDROMGETSPINDOWN",	0x531d},
-	{"linux/cdrom.h",	"CDROMSETSPINDOWN",	0x531e},
-	{"linux/cdrom.h",	"CDROM_SET_OPTIONS",	0x5320},
-	{"linux/cdrom.h",	"CDROM_CLEAR_OPTIONS",	0x5321},
-	{"linux/cdrom.h",	"CDROM_SELECT_SPEED",	0x5322},
-	{"linux/cdrom.h",	"CDROM_SELECT_DISC",	0x5323},
-	{"linux/cdrom.h",	"CDROM_MEDIA_CHANGED",	0x5325},
-	{"linux/cdrom.h",	"CDROM_DRIVE_STATUS",	0x5326},
-	{"linux/cdrom.h",	"CDROM_DISC_STATUS",	0x5327},
-	{"linux/cdrom.h",	"CDROM_CHANGER_NSLOTS",	0x5328},
-	{"linux/cdrom.h",	"CDROM_LOCKDOOR",	0x5329},
-	{"linux/cdrom.h",	"CDROM_DEBUG",	0x5330},
-	{"linux/cdrom.h",	"CDROM_GET_CAPABILITY",	0x5331},
-	{"linux/cdrom.h",	"CDROMAUDIOBUFSIZ",	0x5382},
-	{"linux/cdrom.h",	"DVD_READ_STRUCT",	0x5390},
-	{"linux/cdrom.h",	"DVD_WRITE_STRUCT",	0x5391},
-	{"linux/cdrom.h",	"DVD_AUTH",	0x5392},
-	{"linux/cdrom.h",	"CDROM_SEND_PACKET",	0x5393},
-	{"linux/cdrom.h",	"CDROM_NEXT_WRITABLE",	0x5394},
-	{"linux/cdrom.h",	"CDROM_LAST_WRITTEN",	0x5395},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"asm/ioctls.h",	"TCGETS",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"asm/ioctls.h",	"TCSETS",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"asm/ioctls.h",	"TCSETSW",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"asm/ioctls.h",	"TCSETSF",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"asm/ioctls.h",	"TCGETA",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"asm/ioctls.h",	"TCSETA",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"asm/ioctls.h",	"TCSETAW",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"asm/ioctls.h",	"TCSETAF",	0x5408},
-	{"asm/ioctls.h",	"TCSBRK",	0x5409},
-	{"asm/ioctls.h",	"TCXONC",	0x540a},
-	{"asm/ioctls.h",	"TCFLSH",	0x540b},
-	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
-	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
-	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
-	{"asm/ioctls.h",	"TIOCGPGRP",	0x540f},
-	{"asm/ioctls.h",	"TIOCSPGRP",	0x5410},
-	{"asm/ioctls.h",	"TIOCOUTQ",	0x5411},
-	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
-	{"asm/ioctls.h",	"TIOCGWINSZ",	0x5413},
-	{"asm/ioctls.h",	"TIOCSWINSZ",	0x5414},
-	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
-	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
-	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
-	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
-	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
-	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
-	{"asm/ioctls.h",	"FIONREAD",	0x541b},
-	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
-	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
-	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
-	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
-	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
-	{"asm/ioctls.h",	"FIONBIO",	0x5421},
-	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
-	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
-	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
-	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
-	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
-	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
-	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
-	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
-	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
-	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
-	{"asm/ioctls.h",	"FIONCLEX",	0x5450},
-	{"asm/ioctls.h",	"FIOCLEX",	0x5451},
-	{"asm/ioctls.h",	"FIOASYNC",	0x5452},
-	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
-	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
-	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
-	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
-	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
-	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
-	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
-	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
-	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
-	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
-	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
-	{"asm/ioctls.h",	"TIOCGHAYESESP",	0x545e},
-	{"asm/ioctls.h",	"TIOCSHAYESESP",	0x545f},
-	{"asm/ioctls.h",	"FIOQSIZE",	0x5460},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/vt.h",	"VT_OPENQRY",	0x5600},
-	{"linux/vt.h",	"VT_GETMODE",	0x5601},
-	{"linux/vt.h",	"VT_SETMODE",	0x5602},
-	{"linux/vt.h",	"VT_GETSTATE",	0x5603},
-	{"linux/vt.h",	"VT_SENDSIG",	0x5604},
-	{"linux/vt.h",	"VT_RELDISP",	0x5605},
-	{"linux/vt.h",	"VT_ACTIVATE",	0x5606},
-	{"linux/vt.h",	"VT_WAITACTIVE",	0x5607},
-	{"linux/vt.h",	"VT_DISALLOCATE",	0x5608},
-	{"linux/vt.h",	"VT_RESIZE",	0x5609},
-	{"linux/vt.h",	"VT_RESIZEX",	0x560a},
-	{"linux/vt.h",	"VT_LOCKSWITCH",	0x560b},
-	{"linux/vt.h",	"VT_UNLOCKSWITCH",	0x560c},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_GETTHIST",	0x6164},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETFLAGS",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID2",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO_V2",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETMOUNT",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETPID",	0x7004},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLOSE_JOURNALF",	0x7006},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/intermezzo_fs.h",	"PRESTO_SET_FSETROOT",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_FSETROOT",	0x7008},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETOPT",	0x7009},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETOPT",	0x700a},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_KMLSIZE",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_RECNO",	0x700c},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETATTR",	0x7010},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CREATE",	0x7011},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_LINK",	0x7012},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_UNLINK",	0x7013},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SYMLINK",	0x7014},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKDIR",	0x7015},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RMDIR",	0x7016},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKNOD",	0x7017},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RENAME",	0x7018},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CLOSE",	0x701a},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_IOPEN",	0x701b},
-	{"linux/intermezzo_fs.h",	"PRESTO_MARK",	0x7020},
-	{"linux/intermezzo_fs.h",	"PRESTO_RELEASE_PERMIT",	0x7021},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_ALL_FSETROOTS",	0x7022},
-	{"linux/intermezzo_fs.h",	"PRESTO_BACKFETCH_LML",	0x7023},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT",	0x7024},
-	{"linux/intermezzo_fs.h",	"PRESTO_CANCEL_LML",	0x7025},
-	{"linux/intermezzo_fs.h",	"PRESTO_RESET_FSET",	0x7026},
-	{"linux/intermezzo_fs.h",	"PRESTO_COMPLETE_CLOSES",	0x7027},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_BEGIN",	0x7030},
-	{"linux/intermezzo_fs.h",	"PRESTO_DO_REINT",	0x7031},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_END",	0x7032},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/videotext.h",	"VTXIOCGETINFO",	0x7101},
-	{"linux/videotext.h",	"VTXIOCCLRPAGE",	0x7102},
-	{"linux/videotext.h",	"VTXIOCCLRFOUND",	0x7103},
-	{"linux/videotext.h",	"VTXIOCPAGEREQ",	0x7104},
-	{"linux/videotext.h",	"VTXIOCGETSTAT",	0x7105},
-	{"linux/videotext.h",	"VTXIOCGETPAGE",	0x7106},
-	{"linux/videotext.h",	"VTXIOCSTOPDAU",	0x7107},
-	{"linux/videotext.h",	"VTXIOCPUTPAGE",	0x7108},
-	{"linux/videotext.h",	"VTXIOCSETDISP",	0x7109},
-	{"linux/videotext.h",	"VTXIOCPUTSTAT",	0x710a},
-	{"linux/videotext.h",	"VTXIOCCLRCACHE",	0x710b},
-	{"linux/videotext.h",	"VTXIOCSETVIRT",	0x710c},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"OLD_PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/videotext.h",	"TUNIOCGETINFO",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/videotext.h",	"TUNIOCRESET",	0x7202},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"linux/videotext.h",	"TUNIOCSETFREQ",	0x7203},
-	{"linux/videotext.h",	"TUNIOCGETFREQ",	0x7204},
-	{"linux/videotext.h",	"TUNIOCSETCHAN",	0x7205},
-	{"linux/videotext.h",	"TUNIOCGETCHAN",	0x7206},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/sonypi.h",	"SONYPI_IOCSBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION_OLD",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION_OLD",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"asm/sockios.h",	"FIOSETOWN",	0x8901},
-	{"asm/sockios.h",	"SIOCSPGRP",	0x8902},
-	{"asm/sockios.h",	"FIOGETOWN",	0x8903},
-	{"asm/sockios.h",	"SIOCGPGRP",	0x8904},
-	{"asm/sockios.h",	"SIOCATMARK",	0x8905},
-	{"asm/sockios.h",	"SIOCGSTAMP",	0x8906},
-	{"linux/sockios.h",	"SIOCADDRT",	0x890b},
-	{"linux/sockios.h",	"SIOCDELRT",	0x890c},
-	{"linux/sockios.h",	"SIOCRTMSG",	0x890d},
-	{"linux/sockios.h",	"SIOCGIFNAME",	0x8910},
-	{"linux/sockios.h",	"SIOCSIFLINK",	0x8911},
-	{"linux/sockios.h",	"SIOCGIFCONF",	0x8912},
-	{"linux/sockios.h",	"SIOCGIFFLAGS",	0x8913},
-	{"linux/sockios.h",	"SIOCSIFFLAGS",	0x8914},
-	{"linux/sockios.h",	"SIOCGIFADDR",	0x8915},
-	{"linux/sockios.h",	"SIOCSIFADDR",	0x8916},
-	{"linux/sockios.h",	"SIOCGIFDSTADDR",	0x8917},
-	{"linux/sockios.h",	"SIOCSIFDSTADDR",	0x8918},
-	{"linux/sockios.h",	"SIOCGIFBRDADDR",	0x8919},
-	{"linux/sockios.h",	"SIOCSIFBRDADDR",	0x891a},
-	{"linux/sockios.h",	"SIOCGIFNETMASK",	0x891b},
-	{"linux/sockios.h",	"SIOCSIFNETMASK",	0x891c},
-	{"linux/sockios.h",	"SIOCGIFMETRIC",	0x891d},
-	{"linux/sockios.h",	"SIOCSIFMETRIC",	0x891e},
-	{"linux/sockios.h",	"SIOCGIFMEM",	0x891f},
-	{"linux/sockios.h",	"SIOCSIFMEM",	0x8920},
-	{"linux/sockios.h",	"SIOCGIFMTU",	0x8921},
-	{"linux/sockios.h",	"SIOCSIFMTU",	0x8922},
-	{"linux/sockios.h",	"SIOCSIFNAME",	0x8923},
-	{"linux/sockios.h",	"SIOCSIFHWADDR",	0x8924},
-	{"linux/sockios.h",	"SIOCGIFENCAP",	0x8925},
-	{"linux/sockios.h",	"SIOCSIFENCAP",	0x8926},
-	{"linux/sockios.h",	"SIOCGIFHWADDR",	0x8927},
-	{"linux/sockios.h",	"SIOCGIFSLAVE",	0x8929},
-	{"linux/sockios.h",	"SIOCSIFSLAVE",	0x8930},
-	{"linux/sockios.h",	"SIOCADDMULTI",	0x8931},
-	{"linux/sockios.h",	"SIOCDELMULTI",	0x8932},
-	{"linux/sockios.h",	"SIOCGIFINDEX",	0x8933},
-	{"linux/sockios.h",	"SIOCSIFPFLAGS",	0x8934},
-	{"linux/sockios.h",	"SIOCGIFPFLAGS",	0x8935},
-	{"linux/sockios.h",	"SIOCDIFADDR",	0x8936},
-	{"linux/sockios.h",	"SIOCSIFHWBROADCAST",	0x8937},
-	{"linux/sockios.h",	"SIOCGIFCOUNT",	0x8938},
-	{"linux/sockios.h",	"SIOCGIFBR",	0x8940},
-	{"linux/sockios.h",	"SIOCSIFBR",	0x8941},
-	{"linux/sockios.h",	"SIOCGIFTXQLEN",	0x8942},
-	{"linux/sockios.h",	"SIOCSIFTXQLEN",	0x8943},
-	{"linux/sockios.h",	"SIOCGIFDIVERT",	0x8944},
-	{"linux/sockios.h",	"SIOCSIFDIVERT",	0x8945},
-	{"linux/sockios.h",	"SIOCETHTOOL",	0x8946},
-	{"linux/sockios.h",	"SIOCGMIIPHY",	0x8947},
-	{"linux/sockios.h",	"SIOCGMIIREG",	0x8948},
-	{"linux/sockios.h",	"SIOCSMIIREG",	0x8949},
-	{"linux/sockios.h",	"SIOCDARP",	0x8953},
-	{"linux/sockios.h",	"SIOCGARP",	0x8954},
-	{"linux/sockios.h",	"SIOCSARP",	0x8955},
-	{"linux/sockios.h",	"SIOCDRARP",	0x8960},
-	{"linux/sockios.h",	"SIOCGRARP",	0x8961},
-	{"linux/sockios.h",	"SIOCSRARP",	0x8962},
-	{"linux/sockios.h",	"SIOCGIFMAP",	0x8970},
-	{"linux/sockios.h",	"SIOCSIFMAP",	0x8971},
-	{"linux/sockios.h",	"SIOCADDDLCI",	0x8980},
-	{"linux/sockios.h",	"SIOCDELDLCI",	0x8981},
-	{"linux/sockios.h",	"SIOCGIFVLAN",	0x8982},
-	{"linux/sockios.h",	"SIOCSIFVLAN",	0x8983},
-	{"linux/sockios.h",	"SIOCBONDENSLAVE",	0x8990},
-	{"linux/sockios.h",	"SIOCBONDRELEASE",	0x8991},
-	{"linux/sockios.h",	"SIOCBONDSETHWADDR",	0x8992},
-	{"linux/sockios.h",	"SIOCBONDSLAVEINFOQUERY",	0x8993},
-	{"linux/sockios.h",	"SIOCBONDINFOQUERY",	0x8994},
-	{"linux/sockios.h",	"SIOCBONDCHANGEACTIVE",	0x8995},
-	{"linux/dn.h",	"OSIOCSNETADDR",	0x89e0},
-	{"linux/sockios.h",	"SIOCPROTOPRIVATE",	0x89e0},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"OSIOCGNETADDR",	0x89e1},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/sockios.h",	"SIOCDEVPRIVATE",	0x89f0},
-	{"linux/wireless.h",	"SIOCIWFIRST",	0x8b00},
-	{"linux/wireless.h",	"SIOCSIWCOMMIT",	0x8b00},
-	{"linux/wireless.h",	"SIOCGIWNAME",	0x8b01},
-	{"linux/wireless.h",	"SIOCSIWNWID",	0x8b02},
-	{"linux/wireless.h",	"SIOCGIWNWID",	0x8b03},
-	{"linux/wireless.h",	"SIOCSIWFREQ",	0x8b04},
-	{"linux/wireless.h",	"SIOCGIWFREQ",	0x8b05},
-	{"linux/wireless.h",	"SIOCSIWMODE",	0x8b06},
-	{"linux/wireless.h",	"SIOCGIWMODE",	0x8b07},
-	{"linux/wireless.h",	"SIOCSIWSENS",	0x8b08},
-	{"linux/wireless.h",	"SIOCGIWSENS",	0x8b09},
-	{"linux/wireless.h",	"SIOCSIWRANGE",	0x8b0a},
-	{"linux/wireless.h",	"SIOCGIWRANGE",	0x8b0b},
-	{"linux/wireless.h",	"SIOCSIWPRIV",	0x8b0c},
-	{"linux/wireless.h",	"SIOCGIWPRIV",	0x8b0d},
-	{"linux/wireless.h",	"SIOCSIWSTATS",	0x8b0e},
-	{"linux/wireless.h",	"SIOCGIWSTATS",	0x8b0f},
-	{"linux/wireless.h",	"SIOCSIWSPY",	0x8b10},
-	{"linux/wireless.h",	"SIOCGIWSPY",	0x8b11},
-	{"linux/wireless.h",	"SIOCSIWAP",	0x8b14},
-	{"linux/wireless.h",	"SIOCGIWAP",	0x8b15},
-	{"linux/wireless.h",	"SIOCGIWAPLIST",	0x8b17},
-	{"linux/wireless.h",	"SIOCSIWSCAN",	0x8b18},
-	{"linux/wireless.h",	"SIOCGIWSCAN",	0x8b19},
-	{"linux/wireless.h",	"SIOCSIWESSID",	0x8b1a},
-	{"linux/wireless.h",	"SIOCGIWESSID",	0x8b1b},
-	{"linux/wireless.h",	"SIOCSIWNICKN",	0x8b1c},
-	{"linux/wireless.h",	"SIOCGIWNICKN",	0x8b1d},
-	{"linux/wireless.h",	"SIOCSIWRATE",	0x8b20},
-	{"linux/wireless.h",	"SIOCGIWRATE",	0x8b21},
-	{"linux/wireless.h",	"SIOCSIWRTS",	0x8b22},
-	{"linux/wireless.h",	"SIOCGIWRTS",	0x8b23},
-	{"linux/wireless.h",	"SIOCSIWFRAG",	0x8b24},
-	{"linux/wireless.h",	"SIOCGIWFRAG",	0x8b25},
-	{"linux/wireless.h",	"SIOCSIWTXPOW",	0x8b26},
-	{"linux/wireless.h",	"SIOCGIWTXPOW",	0x8b27},
-	{"linux/wireless.h",	"SIOCSIWRETRY",	0x8b28},
-	{"linux/wireless.h",	"SIOCGIWRETRY",	0x8b29},
-	{"linux/wireless.h",	"SIOCSIWENCODE",	0x8b2a},
-	{"linux/wireless.h",	"SIOCGIWENCODE",	0x8b2b},
-	{"linux/wireless.h",	"SIOCSIWPOWER",	0x8b2c},
-	{"linux/wireless.h",	"SIOCGIWPOWER",	0x8b2d},
-	{"linux/wireless.h",	"SIOCIWFIRSTPRIV",	0x8be0},
-	{"linux/wireless.h",	"SIOCIWLASTPRIV",	0x8bff},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/lvm.h",	"VG_CREATE_OLD",	0xfe00},
-	{"linux/lvm.h",	"VG_REMOVE",	0xfe01},
-	{"linux/lvm.h",	"VG_EXTEND",	0xfe03},
-	{"linux/lvm.h",	"VG_REDUCE",	0xfe04},
-	{"linux/lvm.h",	"VG_STATUS",	0xfe05},
-	{"linux/lvm.h",	"VG_STATUS_GET_COUNT",	0xfe06},
-	{"linux/lvm.h",	"VG_STATUS_GET_NAMELIST",	0xfe07},
-	{"linux/lvm.h",	"VG_SET_EXTENDABLE",	0xfe08},
-	{"linux/lvm.h",	"VG_RENAME",	0xfe09},
-	{"linux/lvm.h",	"VG_CREATE",	0xfe0a},
-	{"linux/lvm.h",	"LV_CREATE",	0xfe20},
-	{"linux/lvm.h",	"LV_REMOVE",	0xfe21},
-	{"linux/lvm.h",	"LV_ACTIVATE",	0xfe22},
-	{"linux/lvm.h",	"LV_DEACTIVATE",	0xfe23},
-	{"linux/lvm.h",	"LV_EXTEND",	0xfe24},
-	{"linux/lvm.h",	"LV_REDUCE",	0xfe25},
-	{"linux/lvm.h",	"LV_STATUS_BYNAME",	0xfe26},
-	{"linux/lvm.h",	"LV_STATUS_BYINDEX",	0xfe27},
-	{"linux/lvm.h",	"LV_SET_ACCESS",	0xfe28},
-	{"linux/lvm.h",	"LV_SET_ALLOCATION",	0xfe29},
-	{"linux/lvm.h",	"LV_SET_STATUS",	0xfe2a},
-	{"linux/lvm.h",	"LE_REMAP",	0xfe2b},
-	{"linux/lvm.h",	"LV_SNAPSHOT_USE_RATE",	0xfe2c},
-	{"linux/lvm.h",	"LV_STATUS_BYDEV",	0xfe2e},
-	{"linux/lvm.h",	"LV_RENAME",	0xfe2f},
-	{"linux/lvm.h",	"LV_BMAP",	0xfe30},
-	{"linux/lvm.h",	"PV_STATUS",	0xfe40},
-	{"linux/lvm.h",	"PV_CHANGE",	0xfe41},
-	{"linux/lvm.h",	"PV_FLUSH",	0xfe42},
-	{"linux/lvm.h",	"PE_LOCK_UNLOCK",	0xfe50},
-	{"linux/lvm.h",	"LVM_GET_IOP_VERSION",	0xfe98},
-	{"linux/lvm.h",	"LVM_RESET",	0xfe99},
-	{"linux/lvm.h",	"LVM_LOCK_LVM",	0xff00},
diff --git a/strace/linux/ia64/signalent.h b/strace/linux/ia64/signalent.h
deleted file mode 100644
index e791a64..0000000
--- a/strace/linux/ia64/signalent.h
+++ /dev/null
@@ -1,64 +0,0 @@
-	"SIG_0",	/* 0 */
-	"SIGHUP",	/* 1 */
-	"SIGINT",	/* 2 */
-	"SIGQUIT",	/* 3 */
-	"SIGILL",	/* 4 */
-	"SIGTRAP",	/* 5 */
-	"SIGABRT",	/* 6 */
-	"SIGBUS",	/* 7 */
-	"SIGFPE",	/* 8 */
-	"SIGKILL",	/* 9 */
-	"SIGUSR1",	/* 10 */
-	"SIGSEGV",	/* 11 */
-	"SIGUSR2",	/* 12 */
-	"SIGPIPE",	/* 13 */
-	"SIGALRM",	/* 14 */
-	"SIGTERM",	/* 15 */
-	"SIGSTKFLT",	/* 16 */
-	"SIGCHLD",	/* 17 */
-	"SIGCONT",	/* 18 */
-	"SIGSTOP",	/* 19 */
-	"SIGTSTP",	/* 20 */
-	"SIGTTIN",	/* 21 */
-	"SIGTTOU",	/* 22 */
-	"SIGURG",	/* 23 */
-	"SIGXCPU",	/* 24 */
-	"SIGXFSZ",	/* 25 */
-	"SIGVTALRM",	/* 26 */
-	"SIGPROF",	/* 27 */
-	"SIGWINCH",	/* 28 */
-	"SIGIO",	/* 29 */
-	"SIGPWR",	/* 30 */
-	"SIGSYS",	/* 31 */
-	"SIGRT0",	/* 32 */
-	"SIGRT1",	/* 33 */
-	"SIGRT2",	/* 34 */
-	"SIGRT3",	/* 35 */
-	"SIGRT4",	/* 36 */
-	"SIGRT5",	/* 37 */
-	"SIGRT6",	/* 38 */
-	"SIGRT7",	/* 39 */
-	"SIGRT8",	/* 40 */
-	"SIGRT9",	/* 41 */
-	"SIGRT10",	/* 42 */
-	"SIGRT11",	/* 43 */
-	"SIGRT12",	/* 44 */
-	"SIGRT13",	/* 45 */
-	"SIGRT14",	/* 46 */
-	"SIGRT15",	/* 47 */
-	"SIGRT16",	/* 48 */
-	"SIGRT17",	/* 49 */
-	"SIGRT18",	/* 50 */
-	"SIGRT19",	/* 51 */
-	"SIGRT20",	/* 52 */
-	"SIGRT21",	/* 53 */
-	"SIGRT22",	/* 54 */
-	"SIGRT23",	/* 55 */
-	"SIGRT24",	/* 56 */
-	"SIGRT25",	/* 57 */
-	"SIGRT26",	/* 58 */
-	"SIGRT27",	/* 59 */
-	"SIGRT28",	/* 60 */
-	"SIGRT29",	/* 61 */
-	"SIGRT30",	/* 62 */
-	"SIGRT31",	/* 63 */
diff --git a/strace/linux/ia64/syscallent.h b/strace/linux/ia64/syscallent.h
deleted file mode 100644
index 737e86f..0000000
--- a/strace/linux/ia64/syscallent.h
+++ /dev/null
@@ -1,1211 +0,0 @@
-/*
- * Copyright (c) 1999, 2001 Hewlett-Packard Co
- *	David Mosberger-Tang <davidm@hpl.hp.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscallent.h,v 1.18 2005/05/09 08:02:05 roland Exp $
- */
-
-/*
- * IA-32 syscalls that have pointer arguments which are incompatible
- * with 64-bit layout get redirected to printargs.
- */
-#define sys_getrlimit		printargs
-#define sys_afs_syscall		printargs
-#define sys_getpmsg		printargs
-#define sys_putpmsg		printargs
-#define sys_ugetrlimit		printargs
-#define sys_fork		printargs
-#define sys_waitpid		printargs
-#define sys_time		printargs
-#define sys_break		printargs
-#define sys_oldstat		printargs
-#define sys_lseek		printargs
-#define sys_stime		printargs
-#define sys_ptrace		printargs
-#define sys_alarm		printargs
-#define sys_oldfstat		printargs
-#define sys_pause		printargs
-#define sys_utime		printargs
-#define sys_stty		printargs
-#define sys_gtty		printargs
-#define sys_ftime		printargs
-#define sys_pipe		printargs
-#define sys_times		printargs
-#define sys_prof		printargs
-#define sys_signal		printargs
-#define sys_lock		printargs
-#define sys_ioctl		printargs
-#define sys_fcntl		printargs
-#define sys_mpx			printargs
-#define sys_ulimit		printargs
-#define sys_oldolduname		printargs
-#define sys_sigaction		printargs
-#define sys_sgetmask		printargs
-#define sys_ssetmask		printargs
-#define sys_sigsuspend		printargs
-#define sys_sigpending		printargs
-#define sys_setrlimit		printargs
-#define sys_getrusage		printargs
-#define sys_gettimeofday	printargs
-#define sys_settimeofday	printargs
-#define sys_getgroups		printargs
-#define sys_setgroups		printargs
-#define sys_select		printargs
-#define sys_oldlstat		printargs
-#define sys_readdir		printargs
-#define sys_profil		printargs
-#define sys_statfs		printargs
-#define sys_fstatfs		printargs
-#define sys_ioperm		printargs
-#define sys_socketcall		printargs
-#define sys_setitimer		printargs
-#define sys_getitimer		printargs
-#define sys_stat		printargs
-#define sys_lstat		printargs
-#define sys_fstat		printargs
-#define sys_olduname		printargs
-#define sys_iopl		printargs
-#define sys_idle		printargs
-#define sys_vm86old		printargs
-#define sys_wait4		printargs
-#define sys_sysinfo		printargs
-#define sys_ipc			printargs
-#define sys_sigreturn		printargs
-#define sys_uname		printargs
-#define sys_modify_ldt		printargs
-#define sys_adjtimex		printargs
-#define sys_sigprocmask		printargs
-#define sys_create_module	printargs
-#define sys_init_module		printargs
-#define sys_get_kernel_syms	printargs
-#define sys_quotactl		printargs
-#define sys_bdflush		printargs
-#define sys_personality		printargs
-#define sys_getdents		printargs
-#define sys__newselect		printargs
-#define sys_msync		printargs
-#define sys_readv		printargs
-#define sys_writev		printargs
-#define sys__sysctl		printargs
-#define sys_sched_rr_get_interval printargs
-#define sys_getresuid		printargs
-#define sys_vm86		printargs
-#define sys_query_module	printargs
-#define sys_nfsservctl		printargs
-#define sys_getresgid		printargs
-#define sys_rt_sigreturn	printargs
-#define sys_rt_sigaction	printargs
-#define sys_rt_sigprocmask	printargs
-#define sys_rt_sigtimedwait	printargs
-#define sys_rt_sigqueueinfo	printargs
-#define sys_rt_sigsuspend	printargs
-#define sys_pread		printargs
-#define sys_pwrite		printargs
-#define sys_sigaltstack		printargs
-#define sys_sendfile		printargs
-#define sys_vfork		printargs
-#define sys_truncate64		printargs
-#define sys_ftruncate64		printargs
-#define sys_stat64		printargs
-#define sys_lstat64		printargs
-#define sys_fstat64		printargs
-#define sys_fcntl64		printargs
-
-#include "../syscallent.h"
-
-#undef sys_getrlimit
-#undef sys_afs_syscall
-#undef sys_getpmsg
-#undef sys_putpmsg
-#undef sys_ugetrlimit
-#undef sys_fork
-#undef sys_waitpid
-#undef sys_time
-#undef sys_break
-#undef sys_oldstat
-#undef sys_lseek
-#undef sys_stime
-#undef sys_ptrace
-#undef sys_alarm
-#undef sys_oldfstat
-#undef sys_pause
-#undef sys_utime
-#undef sys_stty
-#undef sys_gtty
-#undef sys_ftime
-#undef sys_pipe
-#undef sys_times
-#undef sys_prof
-#undef sys_signal
-#undef sys_lock
-#undef sys_ioctl
-#undef sys_fcntl
-#undef sys_mpx
-#undef sys_ulimit
-#undef sys_oldolduname
-#undef sys_sigaction
-#undef sys_sgetmask
-#undef sys_ssetmask
-#undef sys_sigsuspend
-#undef sys_sigpending
-#undef sys_setrlimit
-#undef sys_getrusage
-#undef sys_gettimeofday
-#undef sys_settimeofday
-#undef sys_getgroups
-#undef sys_setgroups
-#undef sys_select
-#undef sys_oldlstat
-#undef sys_readdir
-#undef sys_profil
-#undef sys_statfs
-#undef sys_fstatfs
-#undef sys_ioperm
-#undef sys_socketcall
-#undef sys_setitimer
-#undef sys_getitimer
-#undef sys_stat
-#undef sys_lstat
-#undef sys_fstat
-#undef sys_olduname
-#undef sys_iopl
-#undef sys_idle
-#undef sys_vm86old
-#undef sys_wait4
-#undef sys_sysinfo
-#undef sys_ipc
-#undef sys_sigreturn
-#undef sys_uname
-#undef sys_modify_ldt
-#undef sys_adjtimex
-#undef sys_sigprocmask
-#undef sys_create_module
-#undef sys_init_module
-#undef sys_delete_module
-#undef sys_get_kernel_syms
-#undef sys_quotactl
-#undef sys_bdflush
-#undef sys_personality
-#undef sys_getdents
-#undef sys__newselect
-#undef sys_msync
-#undef sys_readv
-#undef sys_writev
-#undef sys__sysctl
-#undef sys_sched_rr_get_interval
-#undef sys_nanosleep
-#undef sys_getresuid
-#undef sys_vm86
-#undef sys_query_module
-#undef sys_nfsservctl
-#undef sys_getresgid
-#undef sys_rt_sigreturn
-#undef sys_rt_sigaction
-#undef sys_rt_sigprocmask
-#undef sys_rt_sigtimedwait
-#undef sys_rt_sigqueueinfo
-#undef sys_rt_sigsuspend
-#undef sys_pread
-#undef sys_pwrite
-#undef sys_sigaltstack
-#undef sys_sendfile
-#undef sys_vfork
-#undef sys_truncate64
-#undef sys_ftruncate64
-#undef sys_stat64
-#undef sys_lstat64
-#undef sys_fstat64
-#undef sys_fcntl64
-
-#include "../dummy.h"
-
-/* You must be careful to check ../syscallent.h so that this table
-   starts where that one leaves off.
-*/
-
-	{ 8,	0,	printargs,		"SYS_343"	}, /* 343 */
-	{ 8,	0,	printargs,		"SYS_344"	}, /* 344 */
-	{ 8,	0,	printargs,		"SYS_345"	}, /* 345 */
-	{ 8,	0,	printargs,		"SYS_346"	}, /* 346 */
-	{ 8,	0,	printargs,		"SYS_347"	}, /* 347 */
-	{ 8,	0,	printargs,		"SYS_348"	}, /* 348 */
-	{ 8,	0,	printargs,		"SYS_349"	}, /* 349 */
-	{ 8,	0,	printargs,		"SYS_350"	}, /* 350 */
-	{ 8,	0,	printargs,		"SYS_351"	}, /* 351 */
-	{ 8,	0,	printargs,		"SYS_352"	}, /* 352 */
-	{ 8,	0,	printargs,		"SYS_353"	}, /* 353 */
-	{ 8,	0,	printargs,		"SYS_354"	}, /* 354 */
-	{ 8,	0,	printargs,		"SYS_355"	}, /* 355 */
-	{ 8,	0,	printargs,		"SYS_356"	}, /* 356 */
-	{ 8,	0,	printargs,		"SYS_357"	}, /* 357 */
-	{ 8,	0,	printargs,		"SYS_358"	}, /* 358 */
-	{ 8,	0,	printargs,		"SYS_359"	}, /* 359 */
-	{ 8,	0,	printargs,		"SYS_360"	}, /* 360 */
-	{ 8,	0,	printargs,		"SYS_361"	}, /* 361 */
-	{ 8,	0,	printargs,		"SYS_362"	}, /* 362 */
-	{ 8,	0,	printargs,		"SYS_363"	}, /* 363 */
-	{ 8,	0,	printargs,		"SYS_364"	}, /* 364 */
-	{ 8,	0,	printargs,		"SYS_365"	}, /* 365 */
-	{ 8,	0,	printargs,		"SYS_366"	}, /* 366 */
-	{ 8,	0,	printargs,		"SYS_367"	}, /* 367 */
-	{ 8,	0,	printargs,		"SYS_368"	}, /* 368 */
-	{ 8,	0,	printargs,		"SYS_369"	}, /* 369 */
-	{ 8,	0,	printargs,		"SYS_370"	}, /* 370 */
-	{ 8,	0,	printargs,		"SYS_371"	}, /* 371 */
-	{ 8,	0,	printargs,		"SYS_372"	}, /* 372 */
-	{ 8,	0,	printargs,		"SYS_373"	}, /* 373 */
-	{ 8,	0,	printargs,		"SYS_374"	}, /* 374 */
-	{ 8,	0,	printargs,		"SYS_375"	}, /* 375 */
-	{ 8,	0,	printargs,		"SYS_376"	}, /* 376 */
-	{ 8,	0,	printargs,		"SYS_377"	}, /* 377 */
-	{ 8,	0,	printargs,		"SYS_378"	}, /* 378 */
-	{ 8,	0,	printargs,		"SYS_379"	}, /* 379 */
-	{ 8,	0,	printargs,		"SYS_380"	}, /* 380 */
-	{ 8,	0,	printargs,		"SYS_381"	}, /* 381 */
-	{ 8,	0,	printargs,		"SYS_382"	}, /* 382 */
-	{ 8,	0,	printargs,		"SYS_383"	}, /* 383 */
-	{ 8,	0,	printargs,		"SYS_384"	}, /* 384 */
-	{ 8,	0,	printargs,		"SYS_385"	}, /* 385 */
-	{ 8,	0,	printargs,		"SYS_386"	}, /* 386 */
-	{ 8,	0,	printargs,		"SYS_387"	}, /* 387 */
-	{ 8,	0,	printargs,		"SYS_388"	}, /* 388 */
-	{ 8,	0,	printargs,		"SYS_389"	}, /* 389 */
-	{ 8,	0,	printargs,		"SYS_390"	}, /* 390 */
-	{ 8,	0,	printargs,		"SYS_391"	}, /* 391 */
-	{ 8,	0,	printargs,		"SYS_392"	}, /* 392 */
-	{ 8,	0,	printargs,		"SYS_393"	}, /* 393 */
-	{ 8,	0,	printargs,		"SYS_394"	}, /* 394 */
-	{ 8,	0,	printargs,		"SYS_395"	}, /* 395 */
-	{ 8,	0,	printargs,		"SYS_396"	}, /* 396 */
-	{ 8,	0,	printargs,		"SYS_397"	}, /* 397 */
-	{ 8,	0,	printargs,		"SYS_398"	}, /* 398 */
-	{ 8,	0,	printargs,		"SYS_399"	}, /* 399 */
-	{ 8,	0,	printargs,		"SYS_400"	}, /* 400 */
-	{ 8,	0,	printargs,		"SYS_401"	}, /* 401 */
-	{ 8,	0,	printargs,		"SYS_402"	}, /* 402 */
-	{ 8,	0,	printargs,		"SYS_403"	}, /* 403 */
-	{ 8,	0,	printargs,		"SYS_404"	}, /* 404 */
-	{ 8,	0,	printargs,		"SYS_405"	}, /* 405 */
-	{ 8,	0,	printargs,		"SYS_406"	}, /* 406 */
-	{ 8,	0,	printargs,		"SYS_407"	}, /* 407 */
-	{ 8,	0,	printargs,		"SYS_408"	}, /* 408 */
-	{ 8,	0,	printargs,		"SYS_409"	}, /* 409 */
-	{ 8,	0,	printargs,		"SYS_410"	}, /* 410 */
-	{ 8,	0,	printargs,		"SYS_411"	}, /* 411 */
-	{ 8,	0,	printargs,		"SYS_412"	}, /* 412 */
-	{ 8,	0,	printargs,		"SYS_413"	}, /* 413 */
-	{ 8,	0,	printargs,		"SYS_414"	}, /* 414 */
-	{ 8,	0,	printargs,		"SYS_415"	}, /* 415 */
-	{ 8,	0,	printargs,		"SYS_416"	}, /* 416 */
-	{ 8,	0,	printargs,		"SYS_417"	}, /* 417 */
-	{ 8,	0,	printargs,		"SYS_418"	}, /* 418 */
-	{ 8,	0,	printargs,		"SYS_419"	}, /* 419 */
-	{ 8,	0,	printargs,		"SYS_420"	}, /* 420 */
-	{ 8,	0,	printargs,		"SYS_421"	}, /* 421 */
-	{ 8,	0,	printargs,		"SYS_422"	}, /* 422 */
-	{ 8,	0,	printargs,		"SYS_423"	}, /* 423 */
-	{ 8,	0,	printargs,		"SYS_424"	}, /* 424 */
-	{ 8,	0,	printargs,		"SYS_425"	}, /* 425 */
-	{ 8,	0,	printargs,		"SYS_426"	}, /* 426 */
-	{ 8,	0,	printargs,		"SYS_427"	}, /* 427 */
-	{ 8,	0,	printargs,		"SYS_428"	}, /* 428 */
-	{ 8,	0,	printargs,		"SYS_429"	}, /* 429 */
-	{ 8,	0,	printargs,		"SYS_430"	}, /* 430 */
-	{ 8,	0,	printargs,		"SYS_431"	}, /* 431 */
-	{ 8,	0,	printargs,		"SYS_432"	}, /* 432 */
-	{ 8,	0,	printargs,		"SYS_433"	}, /* 433 */
-	{ 8,	0,	printargs,		"SYS_434"	}, /* 434 */
-	{ 8,	0,	printargs,		"SYS_435"	}, /* 435 */
-	{ 8,	0,	printargs,		"SYS_436"	}, /* 436 */
-	{ 8,	0,	printargs,		"SYS_437"	}, /* 437 */
-	{ 8,	0,	printargs,		"SYS_438"	}, /* 438 */
-	{ 8,	0,	printargs,		"SYS_439"	}, /* 439 */
-	{ 8,	0,	printargs,		"SYS_440"	}, /* 440 */
-	{ 8,	0,	printargs,		"SYS_441"	}, /* 441 */
-	{ 8,	0,	printargs,		"SYS_442"	}, /* 442 */
-	{ 8,	0,	printargs,		"SYS_443"	}, /* 443 */
-	{ 8,	0,	printargs,		"SYS_444"	}, /* 444 */
-	{ 8,	0,	printargs,		"SYS_445"	}, /* 445 */
-	{ 8,	0,	printargs,		"SYS_446"	}, /* 446 */
-	{ 8,	0,	printargs,		"SYS_447"	}, /* 447 */
-	{ 8,	0,	printargs,		"SYS_448"	}, /* 448 */
-	{ 8,	0,	printargs,		"SYS_449"	}, /* 449 */
-	{ 8,	0,	printargs,		"SYS_450"	}, /* 450 */
-	{ 8,	0,	printargs,		"SYS_451"	}, /* 451 */
-	{ 8,	0,	printargs,		"SYS_452"	}, /* 452 */
-	{ 8,	0,	printargs,		"SYS_453"	}, /* 453 */
-	{ 8,	0,	printargs,		"SYS_454"	}, /* 454 */
-	{ 8,	0,	printargs,		"SYS_455"	}, /* 455 */
-	{ 8,	0,	printargs,		"SYS_456"	}, /* 456 */
-	{ 8,	0,	printargs,		"SYS_457"	}, /* 457 */
-	{ 8,	0,	printargs,		"SYS_458"	}, /* 458 */
-	{ 8,	0,	printargs,		"SYS_459"	}, /* 459 */
-	{ 8,	0,	printargs,		"SYS_460"	}, /* 460 */
-	{ 8,	0,	printargs,		"SYS_461"	}, /* 461 */
-	{ 8,	0,	printargs,		"SYS_462"	}, /* 462 */
-	{ 8,	0,	printargs,		"SYS_463"	}, /* 463 */
-	{ 8,	0,	printargs,		"SYS_464"	}, /* 464 */
-	{ 8,	0,	printargs,		"SYS_465"	}, /* 465 */
-	{ 8,	0,	printargs,		"SYS_466"	}, /* 466 */
-	{ 8,	0,	printargs,		"SYS_467"	}, /* 467 */
-	{ 8,	0,	printargs,		"SYS_468"	}, /* 468 */
-	{ 8,	0,	printargs,		"SYS_469"	}, /* 469 */
-	{ 8,	0,	printargs,		"SYS_470"	}, /* 470 */
-	{ 8,	0,	printargs,		"SYS_471"	}, /* 471 */
-	{ 8,	0,	printargs,		"SYS_472"	}, /* 472 */
-	{ 8,	0,	printargs,		"SYS_473"	}, /* 473 */
-	{ 8,	0,	printargs,		"SYS_474"	}, /* 474 */
-	{ 8,	0,	printargs,		"SYS_475"	}, /* 475 */
-	{ 8,	0,	printargs,		"SYS_476"	}, /* 476 */
-	{ 8,	0,	printargs,		"SYS_477"	}, /* 477 */
-	{ 8,	0,	printargs,		"SYS_478"	}, /* 478 */
-	{ 8,	0,	printargs,		"SYS_479"	}, /* 479 */
-	{ 8,	0,	printargs,		"SYS_480"	}, /* 480 */
-	{ 8,	0,	printargs,		"SYS_481"	}, /* 481 */
-	{ 8,	0,	printargs,		"SYS_482"	}, /* 482 */
-	{ 8,	0,	printargs,		"SYS_483"	}, /* 483 */
-	{ 8,	0,	printargs,		"SYS_484"	}, /* 484 */
-	{ 8,	0,	printargs,		"SYS_485"	}, /* 485 */
-	{ 8,	0,	printargs,		"SYS_486"	}, /* 486 */
-	{ 8,	0,	printargs,		"SYS_487"	}, /* 487 */
-	{ 8,	0,	printargs,		"SYS_488"	}, /* 488 */
-	{ 8,	0,	printargs,		"SYS_489"	}, /* 489 */
-	{ 8,	0,	printargs,		"SYS_490"	}, /* 490 */
-	{ 8,	0,	printargs,		"SYS_491"	}, /* 491 */
-	{ 8,	0,	printargs,		"SYS_492"	}, /* 492 */
-	{ 8,	0,	printargs,		"SYS_493"	}, /* 493 */
-	{ 8,	0,	printargs,		"SYS_494"	}, /* 494 */
-	{ 8,	0,	printargs,		"SYS_495"	}, /* 495 */
-	{ 8,	0,	printargs,		"SYS_496"	}, /* 496 */
-	{ 8,	0,	printargs,		"SYS_497"	}, /* 497 */
-	{ 8,	0,	printargs,		"SYS_498"	}, /* 498 */
-	{ 8,	0,	printargs,		"SYS_499"	}, /* 499 */
-	{ 8,	0,	printargs,		"SYS_500"	}, /* 500 */
-	{ 8,	0,	printargs,		"SYS_501"	}, /* 501 */
-	{ 8,	0,	printargs,		"SYS_502"	}, /* 502 */
-	{ 8,	0,	printargs,		"SYS_503"	}, /* 503 */
-	{ 8,	0,	printargs,		"SYS_504"	}, /* 504 */
-	{ 8,	0,	printargs,		"SYS_505"	}, /* 505 */
-	{ 8,	0,	printargs,		"SYS_506"	}, /* 506 */
-	{ 8,	0,	printargs,		"SYS_507"	}, /* 507 */
-	{ 8,	0,	printargs,		"SYS_508"	}, /* 508 */
-	{ 8,	0,	printargs,		"SYS_509"	}, /* 509 */
-	{ 8,	0,	printargs,		"SYS_510"	}, /* 510 */
-	{ 8,	0,	printargs,		"SYS_511"	}, /* 511 */
-	{ 8,	0,	printargs,		"SYS_512"	}, /* 512 */
-	{ 8,	0,	printargs,		"SYS_513"	}, /* 513 */
-	{ 8,	0,	printargs,		"SYS_514"	}, /* 514 */
-	{ 8,	0,	printargs,		"SYS_515"	}, /* 515 */
-	{ 8,	0,	printargs,		"SYS_516"	}, /* 516 */
-	{ 8,	0,	printargs,		"SYS_517"	}, /* 517 */
-	{ 8,	0,	printargs,		"SYS_518"	}, /* 518 */
-	{ 8,	0,	printargs,		"SYS_519"	}, /* 519 */
-	{ 8,	0,	printargs,		"SYS_520"	}, /* 520 */
-	{ 8,	0,	printargs,		"SYS_521"	}, /* 521 */
-	{ 8,	0,	printargs,		"SYS_522"	}, /* 522 */
-	{ 8,	0,	printargs,		"SYS_523"	}, /* 523 */
-	{ 8,	0,	printargs,		"SYS_524"	}, /* 524 */
-	{ 8,	0,	printargs,		"SYS_525"	}, /* 525 */
-	{ 8,	0,	printargs,		"SYS_526"	}, /* 526 */
-	{ 8,	0,	printargs,		"SYS_527"	}, /* 527 */
-	{ 8,	0,	printargs,		"SYS_528"	}, /* 528 */
-	{ 8,	0,	printargs,		"SYS_529"	}, /* 529 */
-	{ 8,	0,	printargs,		"SYS_530"	}, /* 530 */
-	{ 8,	0,	printargs,		"SYS_531"	}, /* 531 */
-	{ 8,	0,	printargs,		"SYS_532"	}, /* 532 */
-	{ 8,	0,	printargs,		"SYS_533"	}, /* 533 */
-	{ 8,	0,	printargs,		"SYS_534"	}, /* 534 */
-	{ 8,	0,	printargs,		"SYS_535"	}, /* 535 */
-	{ 8,	0,	printargs,		"SYS_536"	}, /* 536 */
-	{ 8,	0,	printargs,		"SYS_537"	}, /* 537 */
-	{ 8,	0,	printargs,		"SYS_538"	}, /* 538 */
-	{ 8,	0,	printargs,		"SYS_539"	}, /* 539 */
-	{ 8,	0,	printargs,		"SYS_540"	}, /* 540 */
-	{ 8,	0,	printargs,		"SYS_541"	}, /* 541 */
-	{ 8,	0,	printargs,		"SYS_542"	}, /* 542 */
-	{ 8,	0,	printargs,		"SYS_543"	}, /* 543 */
-	{ 8,	0,	printargs,		"SYS_544"	}, /* 544 */
-	{ 8,	0,	printargs,		"SYS_545"	}, /* 545 */
-	{ 8,	0,	printargs,		"SYS_546"	}, /* 546 */
-	{ 8,	0,	printargs,		"SYS_547"	}, /* 547 */
-	{ 8,	0,	printargs,		"SYS_548"	}, /* 548 */
-	{ 8,	0,	printargs,		"SYS_549"	}, /* 549 */
-	{ 8,	0,	printargs,		"SYS_550"	}, /* 550 */
-	{ 8,	0,	printargs,		"SYS_551"	}, /* 551 */
-	{ 8,	0,	printargs,		"SYS_552"	}, /* 552 */
-	{ 8,	0,	printargs,		"SYS_553"	}, /* 553 */
-	{ 8,	0,	printargs,		"SYS_554"	}, /* 554 */
-	{ 8,	0,	printargs,		"SYS_555"	}, /* 555 */
-	{ 8,	0,	printargs,		"SYS_556"	}, /* 556 */
-	{ 8,	0,	printargs,		"SYS_557"	}, /* 557 */
-	{ 8,	0,	printargs,		"SYS_558"	}, /* 558 */
-	{ 8,	0,	printargs,		"SYS_559"	}, /* 559 */
-	{ 8,	0,	printargs,		"SYS_560"	}, /* 560 */
-	{ 8,	0,	printargs,		"SYS_561"	}, /* 561 */
-	{ 8,	0,	printargs,		"SYS_562"	}, /* 562 */
-	{ 8,	0,	printargs,		"SYS_563"	}, /* 563 */
-	{ 8,	0,	printargs,		"SYS_564"	}, /* 564 */
-	{ 8,	0,	printargs,		"SYS_565"	}, /* 565 */
-	{ 8,	0,	printargs,		"SYS_566"	}, /* 566 */
-	{ 8,	0,	printargs,		"SYS_567"	}, /* 567 */
-	{ 8,	0,	printargs,		"SYS_568"	}, /* 568 */
-	{ 8,	0,	printargs,		"SYS_569"	}, /* 569 */
-	{ 8,	0,	printargs,		"SYS_570"	}, /* 570 */
-	{ 8,	0,	printargs,		"SYS_571"	}, /* 571 */
-	{ 8,	0,	printargs,		"SYS_572"	}, /* 572 */
-	{ 8,	0,	printargs,		"SYS_573"	}, /* 573 */
-	{ 8,	0,	printargs,		"SYS_574"	}, /* 574 */
-	{ 8,	0,	printargs,		"SYS_575"	}, /* 575 */
-	{ 8,	0,	printargs,		"SYS_576"	}, /* 576 */
-	{ 8,	0,	printargs,		"SYS_577"	}, /* 577 */
-	{ 8,	0,	printargs,		"SYS_578"	}, /* 578 */
-	{ 8,	0,	printargs,		"SYS_579"	}, /* 579 */
-	{ 8,	0,	printargs,		"SYS_580"	}, /* 580 */
-	{ 8,	0,	printargs,		"SYS_581"	}, /* 581 */
-	{ 8,	0,	printargs,		"SYS_582"	}, /* 582 */
-	{ 8,	0,	printargs,		"SYS_583"	}, /* 583 */
-	{ 8,	0,	printargs,		"SYS_584"	}, /* 584 */
-	{ 8,	0,	printargs,		"SYS_585"	}, /* 585 */
-	{ 8,	0,	printargs,		"SYS_586"	}, /* 586 */
-	{ 8,	0,	printargs,		"SYS_587"	}, /* 587 */
-	{ 8,	0,	printargs,		"SYS_588"	}, /* 588 */
-	{ 8,	0,	printargs,		"SYS_589"	}, /* 589 */
-	{ 8,	0,	printargs,		"SYS_590"	}, /* 590 */
-	{ 8,	0,	printargs,		"SYS_591"	}, /* 591 */
-	{ 8,	0,	printargs,		"SYS_592"	}, /* 592 */
-	{ 8,	0,	printargs,		"SYS_593"	}, /* 593 */
-	{ 8,	0,	printargs,		"SYS_594"	}, /* 594 */
-	{ 8,	0,	printargs,		"SYS_595"	}, /* 595 */
-	{ 8,	0,	printargs,		"SYS_596"	}, /* 596 */
-	{ 8,	0,	printargs,		"SYS_597"	}, /* 597 */
-	{ 8,	0,	printargs,		"SYS_598"	}, /* 598 */
-	{ 8,	0,	printargs,		"SYS_599"	}, /* 599 */
-	{ 8,	0,	printargs,		"SYS_600"	}, /* 600 */
-	{ 8,	0,	printargs,		"SYS_601"	}, /* 601 */
-	{ 8,	0,	printargs,		"SYS_602"	}, /* 602 */
-	{ 8,	0,	printargs,		"SYS_603"	}, /* 603 */
-	{ 8,	0,	printargs,		"SYS_604"	}, /* 604 */
-	{ 8,	0,	printargs,		"SYS_605"	}, /* 605 */
-	{ 8,	0,	printargs,		"SYS_606"	}, /* 606 */
-	{ 8,	0,	printargs,		"SYS_607"	}, /* 607 */
-	{ 8,	0,	printargs,		"SYS_608"	}, /* 608 */
-	{ 8,	0,	printargs,		"SYS_609"	}, /* 609 */
-	{ 8,	0,	printargs,		"SYS_610"	}, /* 610 */
-	{ 8,	0,	printargs,		"SYS_611"	}, /* 611 */
-	{ 8,	0,	printargs,		"SYS_612"	}, /* 612 */
-	{ 8,	0,	printargs,		"SYS_613"	}, /* 613 */
-	{ 8,	0,	printargs,		"SYS_614"	}, /* 614 */
-	{ 8,	0,	printargs,		"SYS_615"	}, /* 615 */
-	{ 8,	0,	printargs,		"SYS_616"	}, /* 616 */
-	{ 8,	0,	printargs,		"SYS_617"	}, /* 617 */
-	{ 8,	0,	printargs,		"SYS_618"	}, /* 618 */
-	{ 8,	0,	printargs,		"SYS_619"	}, /* 619 */
-	{ 8,	0,	printargs,		"SYS_620"	}, /* 620 */
-	{ 8,	0,	printargs,		"SYS_621"	}, /* 621 */
-	{ 8,	0,	printargs,		"SYS_622"	}, /* 622 */
-	{ 8,	0,	printargs,		"SYS_623"	}, /* 623 */
-	{ 8,	0,	printargs,		"SYS_624"	}, /* 624 */
-	{ 8,	0,	printargs,		"SYS_625"	}, /* 625 */
-	{ 8,	0,	printargs,		"SYS_626"	}, /* 626 */
-	{ 8,	0,	printargs,		"SYS_627"	}, /* 627 */
-	{ 8,	0,	printargs,		"SYS_628"	}, /* 628 */
-	{ 8,	0,	printargs,		"SYS_629"	}, /* 629 */
-	{ 8,	0,	printargs,		"SYS_630"	}, /* 630 */
-	{ 8,	0,	printargs,		"SYS_631"	}, /* 631 */
-	{ 8,	0,	printargs,		"SYS_632"	}, /* 632 */
-	{ 8,	0,	printargs,		"SYS_633"	}, /* 633 */
-	{ 8,	0,	printargs,		"SYS_634"	}, /* 634 */
-	{ 8,	0,	printargs,		"SYS_635"	}, /* 635 */
-	{ 8,	0,	printargs,		"SYS_636"	}, /* 636 */
-	{ 8,	0,	printargs,		"SYS_637"	}, /* 637 */
-	{ 8,	0,	printargs,		"SYS_638"	}, /* 638 */
-	{ 8,	0,	printargs,		"SYS_639"	}, /* 639 */
-	{ 8,	0,	printargs,		"SYS_640"	}, /* 640 */
-	{ 8,	0,	printargs,		"SYS_641"	}, /* 641 */
-	{ 8,	0,	printargs,		"SYS_642"	}, /* 642 */
-	{ 8,	0,	printargs,		"SYS_643"	}, /* 643 */
-	{ 8,	0,	printargs,		"SYS_644"	}, /* 644 */
-	{ 8,	0,	printargs,		"SYS_645"	}, /* 645 */
-	{ 8,	0,	printargs,		"SYS_646"	}, /* 646 */
-	{ 8,	0,	printargs,		"SYS_647"	}, /* 647 */
-	{ 8,	0,	printargs,		"SYS_648"	}, /* 648 */
-	{ 8,	0,	printargs,		"SYS_649"	}, /* 649 */
-	{ 8,	0,	printargs,		"SYS_650"	}, /* 650 */
-	{ 8,	0,	printargs,		"SYS_651"	}, /* 651 */
-	{ 8,	0,	printargs,		"SYS_652"	}, /* 652 */
-	{ 8,	0,	printargs,		"SYS_653"	}, /* 653 */
-	{ 8,	0,	printargs,		"SYS_654"	}, /* 654 */
-	{ 8,	0,	printargs,		"SYS_655"	}, /* 655 */
-	{ 8,	0,	printargs,		"SYS_656"	}, /* 656 */
-	{ 8,	0,	printargs,		"SYS_657"	}, /* 657 */
-	{ 8,	0,	printargs,		"SYS_658"	}, /* 658 */
-	{ 8,	0,	printargs,		"SYS_659"	}, /* 659 */
-	{ 8,	0,	printargs,		"SYS_660"	}, /* 660 */
-	{ 8,	0,	printargs,		"SYS_661"	}, /* 661 */
-	{ 8,	0,	printargs,		"SYS_662"	}, /* 662 */
-	{ 8,	0,	printargs,		"SYS_663"	}, /* 663 */
-	{ 8,	0,	printargs,		"SYS_664"	}, /* 664 */
-	{ 8,	0,	printargs,		"SYS_665"	}, /* 665 */
-	{ 8,	0,	printargs,		"SYS_666"	}, /* 666 */
-	{ 8,	0,	printargs,		"SYS_667"	}, /* 667 */
-	{ 8,	0,	printargs,		"SYS_668"	}, /* 668 */
-	{ 8,	0,	printargs,		"SYS_669"	}, /* 669 */
-	{ 8,	0,	printargs,		"SYS_670"	}, /* 670 */
-	{ 8,	0,	printargs,		"SYS_671"	}, /* 671 */
-	{ 8,	0,	printargs,		"SYS_672"	}, /* 672 */
-	{ 8,	0,	printargs,		"SYS_673"	}, /* 673 */
-	{ 8,	0,	printargs,		"SYS_674"	}, /* 674 */
-	{ 8,	0,	printargs,		"SYS_675"	}, /* 675 */
-	{ 8,	0,	printargs,		"SYS_676"	}, /* 676 */
-	{ 8,	0,	printargs,		"SYS_677"	}, /* 677 */
-	{ 8,	0,	printargs,		"SYS_678"	}, /* 678 */
-	{ 8,	0,	printargs,		"SYS_679"	}, /* 679 */
-	{ 8,	0,	printargs,		"SYS_680"	}, /* 680 */
-	{ 8,	0,	printargs,		"SYS_681"	}, /* 681 */
-	{ 8,	0,	printargs,		"SYS_682"	}, /* 682 */
-	{ 8,	0,	printargs,		"SYS_683"	}, /* 683 */
-	{ 8,	0,	printargs,		"SYS_684"	}, /* 684 */
-	{ 8,	0,	printargs,		"SYS_685"	}, /* 685 */
-	{ 8,	0,	printargs,		"SYS_686"	}, /* 686 */
-	{ 8,	0,	printargs,		"SYS_687"	}, /* 687 */
-	{ 8,	0,	printargs,		"SYS_688"	}, /* 688 */
-	{ 8,	0,	printargs,		"SYS_689"	}, /* 689 */
-	{ 8,	0,	printargs,		"SYS_690"	}, /* 690 */
-	{ 8,	0,	printargs,		"SYS_691"	}, /* 691 */
-	{ 8,	0,	printargs,		"SYS_692"	}, /* 692 */
-	{ 8,	0,	printargs,		"SYS_693"	}, /* 693 */
-	{ 8,	0,	printargs,		"SYS_694"	}, /* 694 */
-	{ 8,	0,	printargs,		"SYS_695"	}, /* 695 */
-	{ 8,	0,	printargs,		"SYS_696"	}, /* 696 */
-	{ 8,	0,	printargs,		"SYS_697"	}, /* 697 */
-	{ 8,	0,	printargs,		"SYS_698"	}, /* 698 */
-	{ 8,	0,	printargs,		"SYS_699"	}, /* 699 */
-	{ 8,	0,	printargs,		"SYS_700"	}, /* 700 */
-	{ 8,	0,	printargs,		"SYS_701"	}, /* 701 */
-	{ 8,	0,	printargs,		"SYS_702"	}, /* 702 */
-	{ 8,	0,	printargs,		"SYS_703"	}, /* 703 */
-	{ 8,	0,	printargs,		"SYS_704"	}, /* 704 */
-	{ 8,	0,	printargs,		"SYS_705"	}, /* 705 */
-	{ 8,	0,	printargs,		"SYS_706"	}, /* 706 */
-	{ 8,	0,	printargs,		"SYS_707"	}, /* 707 */
-	{ 8,	0,	printargs,		"SYS_708"	}, /* 708 */
-	{ 8,	0,	printargs,		"SYS_709"	}, /* 709 */
-	{ 8,	0,	printargs,		"SYS_710"	}, /* 710 */
-	{ 8,	0,	printargs,		"SYS_711"	}, /* 711 */
-	{ 8,	0,	printargs,		"SYS_712"	}, /* 712 */
-	{ 8,	0,	printargs,		"SYS_713"	}, /* 713 */
-	{ 8,	0,	printargs,		"SYS_714"	}, /* 714 */
-	{ 8,	0,	printargs,		"SYS_715"	}, /* 715 */
-	{ 8,	0,	printargs,		"SYS_716"	}, /* 716 */
-	{ 8,	0,	printargs,		"SYS_717"	}, /* 717 */
-	{ 8,	0,	printargs,		"SYS_718"	}, /* 718 */
-	{ 8,	0,	printargs,		"SYS_719"	}, /* 719 */
-	{ 8,	0,	printargs,		"SYS_720"	}, /* 720 */
-	{ 8,	0,	printargs,		"SYS_721"	}, /* 721 */
-	{ 8,	0,	printargs,		"SYS_722"	}, /* 722 */
-	{ 8,	0,	printargs,		"SYS_723"	}, /* 723 */
-	{ 8,	0,	printargs,		"SYS_724"	}, /* 724 */
-	{ 8,	0,	printargs,		"SYS_725"	}, /* 725 */
-	{ 8,	0,	printargs,		"SYS_726"	}, /* 726 */
-	{ 8,	0,	printargs,		"SYS_727"	}, /* 727 */
-	{ 8,	0,	printargs,		"SYS_728"	}, /* 728 */
-	{ 8,	0,	printargs,		"SYS_729"	}, /* 729 */
-	{ 8,	0,	printargs,		"SYS_730"	}, /* 730 */
-	{ 8,	0,	printargs,		"SYS_731"	}, /* 731 */
-	{ 8,	0,	printargs,		"SYS_732"	}, /* 732 */
-	{ 8,	0,	printargs,		"SYS_733"	}, /* 733 */
-	{ 8,	0,	printargs,		"SYS_734"	}, /* 734 */
-	{ 8,	0,	printargs,		"SYS_735"	}, /* 735 */
-	{ 8,	0,	printargs,		"SYS_736"	}, /* 736 */
-	{ 8,	0,	printargs,		"SYS_737"	}, /* 737 */
-	{ 8,	0,	printargs,		"SYS_738"	}, /* 738 */
-	{ 8,	0,	printargs,		"SYS_739"	}, /* 739 */
-	{ 8,	0,	printargs,		"SYS_740"	}, /* 740 */
-	{ 8,	0,	printargs,		"SYS_741"	}, /* 741 */
-	{ 8,	0,	printargs,		"SYS_742"	}, /* 742 */
-	{ 8,	0,	printargs,		"SYS_743"	}, /* 743 */
-	{ 8,	0,	printargs,		"SYS_744"	}, /* 744 */
-	{ 8,	0,	printargs,		"SYS_745"	}, /* 745 */
-	{ 8,	0,	printargs,		"SYS_746"	}, /* 746 */
-	{ 8,	0,	printargs,		"SYS_747"	}, /* 747 */
-	{ 8,	0,	printargs,		"SYS_748"	}, /* 748 */
-	{ 8,	0,	printargs,		"SYS_749"	}, /* 749 */
-	{ 8,	0,	printargs,		"SYS_750"	}, /* 750 */
-	{ 8,	0,	printargs,		"SYS_751"	}, /* 751 */
-	{ 8,	0,	printargs,		"SYS_752"	}, /* 752 */
-	{ 8,	0,	printargs,		"SYS_753"	}, /* 753 */
-	{ 8,	0,	printargs,		"SYS_754"	}, /* 754 */
-	{ 8,	0,	printargs,		"SYS_755"	}, /* 755 */
-	{ 8,	0,	printargs,		"SYS_756"	}, /* 756 */
-	{ 8,	0,	printargs,		"SYS_757"	}, /* 757 */
-	{ 8,	0,	printargs,		"SYS_758"	}, /* 758 */
-	{ 8,	0,	printargs,		"SYS_759"	}, /* 759 */
-	{ 8,	0,	printargs,		"SYS_760"	}, /* 760 */
-	{ 8,	0,	printargs,		"SYS_761"	}, /* 761 */
-	{ 8,	0,	printargs,		"SYS_762"	}, /* 762 */
-	{ 8,	0,	printargs,		"SYS_763"	}, /* 763 */
-	{ 8,	0,	printargs,		"SYS_764"	}, /* 764 */
-	{ 8,	0,	printargs,		"SYS_765"	}, /* 765 */
-	{ 8,	0,	printargs,		"SYS_766"	}, /* 766 */
-	{ 8,	0,	printargs,		"SYS_767"	}, /* 767 */
-	{ 8,	0,	printargs,		"SYS_768"	}, /* 768 */
-	{ 8,	0,	printargs,		"SYS_769"	}, /* 769 */
-	{ 8,	0,	printargs,		"SYS_770"	}, /* 770 */
-	{ 8,	0,	printargs,		"SYS_771"	}, /* 771 */
-	{ 8,	0,	printargs,		"SYS_772"	}, /* 772 */
-	{ 8,	0,	printargs,		"SYS_773"	}, /* 773 */
-	{ 8,	0,	printargs,		"SYS_774"	}, /* 774 */
-	{ 8,	0,	printargs,		"SYS_775"	}, /* 775 */
-	{ 8,	0,	printargs,		"SYS_776"	}, /* 776 */
-	{ 8,	0,	printargs,		"SYS_777"	}, /* 777 */
-	{ 8,	0,	printargs,		"SYS_778"	}, /* 778 */
-	{ 8,	0,	printargs,		"SYS_779"	}, /* 779 */
-	{ 8,	0,	printargs,		"SYS_780"	}, /* 780 */
-	{ 8,	0,	printargs,		"SYS_781"	}, /* 781 */
-	{ 8,	0,	printargs,		"SYS_782"	}, /* 782 */
-	{ 8,	0,	printargs,		"SYS_783"	}, /* 783 */
-	{ 8,	0,	printargs,		"SYS_784"	}, /* 784 */
-	{ 8,	0,	printargs,		"SYS_785"	}, /* 785 */
-	{ 8,	0,	printargs,		"SYS_786"	}, /* 786 */
-	{ 8,	0,	printargs,		"SYS_787"	}, /* 787 */
-	{ 8,	0,	printargs,		"SYS_788"	}, /* 788 */
-	{ 8,	0,	printargs,		"SYS_789"	}, /* 789 */
-	{ 8,	0,	printargs,		"SYS_790"	}, /* 790 */
-	{ 8,	0,	printargs,		"SYS_791"	}, /* 791 */
-	{ 8,	0,	printargs,		"SYS_792"	}, /* 792 */
-	{ 8,	0,	printargs,		"SYS_793"	}, /* 793 */
-	{ 8,	0,	printargs,		"SYS_794"	}, /* 794 */
-	{ 8,	0,	printargs,		"SYS_795"	}, /* 795 */
-	{ 8,	0,	printargs,		"SYS_796"	}, /* 796 */
-	{ 8,	0,	printargs,		"SYS_797"	}, /* 797 */
-	{ 8,	0,	printargs,		"SYS_798"	}, /* 798 */
-	{ 8,	0,	printargs,		"SYS_799"	}, /* 799 */
-	{ 8,	0,	printargs,		"SYS_800"	}, /* 800 */
-	{ 8,	0,	printargs,		"SYS_801"	}, /* 801 */
-	{ 8,	0,	printargs,		"SYS_802"	}, /* 802 */
-	{ 8,	0,	printargs,		"SYS_803"	}, /* 803 */
-	{ 8,	0,	printargs,		"SYS_804"	}, /* 804 */
-	{ 8,	0,	printargs,		"SYS_805"	}, /* 805 */
-	{ 8,	0,	printargs,		"SYS_806"	}, /* 806 */
-	{ 8,	0,	printargs,		"SYS_807"	}, /* 807 */
-	{ 8,	0,	printargs,		"SYS_808"	}, /* 808 */
-	{ 8,	0,	printargs,		"SYS_809"	}, /* 809 */
-	{ 8,	0,	printargs,		"SYS_810"	}, /* 810 */
-	{ 8,	0,	printargs,		"SYS_811"	}, /* 811 */
-	{ 8,	0,	printargs,		"SYS_812"	}, /* 812 */
-	{ 8,	0,	printargs,		"SYS_813"	}, /* 813 */
-	{ 8,	0,	printargs,		"SYS_814"	}, /* 814 */
-	{ 8,	0,	printargs,		"SYS_815"	}, /* 815 */
-	{ 8,	0,	printargs,		"SYS_816"	}, /* 816 */
-	{ 8,	0,	printargs,		"SYS_817"	}, /* 817 */
-	{ 8,	0,	printargs,		"SYS_818"	}, /* 818 */
-	{ 8,	0,	printargs,		"SYS_819"	}, /* 819 */
-	{ 8,	0,	printargs,		"SYS_820"	}, /* 820 */
-	{ 8,	0,	printargs,		"SYS_821"	}, /* 821 */
-	{ 8,	0,	printargs,		"SYS_822"	}, /* 822 */
-	{ 8,	0,	printargs,		"SYS_823"	}, /* 823 */
-	{ 8,	0,	printargs,		"SYS_824"	}, /* 824 */
-	{ 8,	0,	printargs,		"SYS_825"	}, /* 825 */
-	{ 8,	0,	printargs,		"SYS_826"	}, /* 826 */
-	{ 8,	0,	printargs,		"SYS_827"	}, /* 827 */
-	{ 8,	0,	printargs,		"SYS_828"	}, /* 828 */
-	{ 8,	0,	printargs,		"SYS_829"	}, /* 829 */
-	{ 8,	0,	printargs,		"SYS_830"	}, /* 830 */
-	{ 8,	0,	printargs,		"SYS_831"	}, /* 831 */
-	{ 8,	0,	printargs,		"SYS_832"	}, /* 832 */
-	{ 8,	0,	printargs,		"SYS_833"	}, /* 833 */
-	{ 8,	0,	printargs,		"SYS_834"	}, /* 834 */
-	{ 8,	0,	printargs,		"SYS_835"	}, /* 835 */
-	{ 8,	0,	printargs,		"SYS_836"	}, /* 836 */
-	{ 8,	0,	printargs,		"SYS_837"	}, /* 837 */
-	{ 8,	0,	printargs,		"SYS_838"	}, /* 838 */
-	{ 8,	0,	printargs,		"SYS_839"	}, /* 839 */
-	{ 8,	0,	printargs,		"SYS_840"	}, /* 840 */
-	{ 8,	0,	printargs,		"SYS_841"	}, /* 841 */
-	{ 8,	0,	printargs,		"SYS_842"	}, /* 842 */
-	{ 8,	0,	printargs,		"SYS_843"	}, /* 843 */
-	{ 8,	0,	printargs,		"SYS_844"	}, /* 844 */
-	{ 8,	0,	printargs,		"SYS_845"	}, /* 845 */
-	{ 8,	0,	printargs,		"SYS_846"	}, /* 846 */
-	{ 8,	0,	printargs,		"SYS_847"	}, /* 847 */
-	{ 8,	0,	printargs,		"SYS_848"	}, /* 848 */
-	{ 8,	0,	printargs,		"SYS_849"	}, /* 849 */
-	{ 8,	0,	printargs,		"SYS_850"	}, /* 850 */
-	{ 8,	0,	printargs,		"SYS_851"	}, /* 851 */
-	{ 8,	0,	printargs,		"SYS_852"	}, /* 852 */
-	{ 8,	0,	printargs,		"SYS_853"	}, /* 853 */
-	{ 8,	0,	printargs,		"SYS_854"	}, /* 854 */
-	{ 8,	0,	printargs,		"SYS_855"	}, /* 855 */
-	{ 8,	0,	printargs,		"SYS_856"	}, /* 856 */
-	{ 8,	0,	printargs,		"SYS_857"	}, /* 857 */
-	{ 8,	0,	printargs,		"SYS_858"	}, /* 858 */
-	{ 8,	0,	printargs,		"SYS_859"	}, /* 859 */
-	{ 8,	0,	printargs,		"SYS_860"	}, /* 860 */
-	{ 8,	0,	printargs,		"SYS_861"	}, /* 861 */
-	{ 8,	0,	printargs,		"SYS_862"	}, /* 862 */
-	{ 8,	0,	printargs,		"SYS_863"	}, /* 863 */
-	{ 8,	0,	printargs,		"SYS_864"	}, /* 864 */
-	{ 8,	0,	printargs,		"SYS_865"	}, /* 865 */
-	{ 8,	0,	printargs,		"SYS_866"	}, /* 866 */
-	{ 8,	0,	printargs,		"SYS_867"	}, /* 867 */
-	{ 8,	0,	printargs,		"SYS_868"	}, /* 868 */
-	{ 8,	0,	printargs,		"SYS_869"	}, /* 869 */
-	{ 8,	0,	printargs,		"SYS_870"	}, /* 870 */
-	{ 8,	0,	printargs,		"SYS_871"	}, /* 871 */
-	{ 8,	0,	printargs,		"SYS_872"	}, /* 872 */
-	{ 8,	0,	printargs,		"SYS_873"	}, /* 873 */
-	{ 8,	0,	printargs,		"SYS_874"	}, /* 874 */
-	{ 8,	0,	printargs,		"SYS_875"	}, /* 875 */
-	{ 8,	0,	printargs,		"SYS_876"	}, /* 876 */
-	{ 8,	0,	printargs,		"SYS_877"	}, /* 877 */
-	{ 8,	0,	printargs,		"SYS_878"	}, /* 878 */
-	{ 8,	0,	printargs,		"SYS_879"	}, /* 879 */
-	{ 8,	0,	printargs,		"SYS_880"	}, /* 880 */
-	{ 8,	0,	printargs,		"SYS_881"	}, /* 881 */
-	{ 8,	0,	printargs,		"SYS_882"	}, /* 882 */
-	{ 8,	0,	printargs,		"SYS_883"	}, /* 883 */
-	{ 8,	0,	printargs,		"SYS_884"	}, /* 884 */
-	{ 8,	0,	printargs,		"SYS_885"	}, /* 885 */
-	{ 8,	0,	printargs,		"SYS_886"	}, /* 886 */
-	{ 8,	0,	printargs,		"SYS_887"	}, /* 887 */
-	{ 8,	0,	printargs,		"SYS_888"	}, /* 888 */
-	{ 8,	0,	printargs,		"SYS_889"	}, /* 889 */
-	{ 8,	0,	printargs,		"SYS_890"	}, /* 890 */
-	{ 8,	0,	printargs,		"SYS_891"	}, /* 891 */
-	{ 8,	0,	printargs,		"SYS_892"	}, /* 892 */
-	{ 8,	0,	printargs,		"SYS_893"	}, /* 893 */
-	{ 8,	0,	printargs,		"SYS_894"	}, /* 894 */
-	{ 8,	0,	printargs,		"SYS_895"	}, /* 895 */
-	{ 8,	0,	printargs,		"SYS_896"	}, /* 896 */
-	{ 8,	0,	printargs,		"SYS_897"	}, /* 897 */
-	{ 8,	0,	printargs,		"SYS_898"	}, /* 898 */
-	{ 8,	0,	printargs,		"SYS_899"	}, /* 899 */
-	{ 8,	0,	printargs,		"SYS_900"	}, /* 900 */
-	{ 8,	0,	printargs,		"SYS_901"	}, /* 901 */
-	{ 8,	0,	printargs,		"SYS_902"	}, /* 902 */
-	{ 8,	0,	printargs,		"SYS_903"	}, /* 903 */
-	{ 8,	0,	printargs,		"SYS_904"	}, /* 904 */
-	{ 8,	0,	printargs,		"SYS_905"	}, /* 905 */
-	{ 8,	0,	printargs,		"SYS_906"	}, /* 906 */
-	{ 8,	0,	printargs,		"SYS_907"	}, /* 907 */
-	{ 8,	0,	printargs,		"SYS_908"	}, /* 908 */
-	{ 8,	0,	printargs,		"SYS_909"	}, /* 909 */
-	{ 8,	0,	printargs,		"SYS_910"	}, /* 910 */
-	{ 8,	0,	printargs,		"SYS_911"	}, /* 911 */
-	{ 8,	0,	printargs,		"SYS_912"	}, /* 912 */
-	{ 8,	0,	printargs,		"SYS_913"	}, /* 913 */
-	{ 8,	0,	printargs,		"SYS_914"	}, /* 914 */
-	{ 8,	0,	printargs,		"SYS_915"	}, /* 915 */
-	{ 8,	0,	printargs,		"SYS_916"	}, /* 916 */
-	{ 8,	0,	printargs,		"SYS_917"	}, /* 917 */
-	{ 8,	0,	printargs,		"SYS_918"	}, /* 918 */
-	{ 8,	0,	printargs,		"SYS_919"	}, /* 919 */
-	{ 8,	0,	printargs,		"SYS_920"	}, /* 920 */
-	{ 8,	0,	printargs,		"SYS_921"	}, /* 921 */
-	{ 8,	0,	printargs,		"SYS_922"	}, /* 922 */
-	{ 8,	0,	printargs,		"SYS_923"	}, /* 923 */
-	{ 8,	0,	printargs,		"SYS_924"	}, /* 924 */
-	{ 8,	0,	printargs,		"SYS_925"	}, /* 925 */
-	{ 8,	0,	printargs,		"SYS_926"	}, /* 926 */
-	{ 8,	0,	printargs,		"SYS_927"	}, /* 927 */
-	{ 8,	0,	printargs,		"SYS_928"	}, /* 928 */
-	{ 8,	0,	printargs,		"SYS_929"	}, /* 929 */
-	{ 8,	0,	printargs,		"SYS_930"	}, /* 930 */
-	{ 8,	0,	printargs,		"SYS_931"	}, /* 931 */
-	{ 8,	0,	printargs,		"SYS_932"	}, /* 932 */
-	{ 8,	0,	printargs,		"SYS_933"	}, /* 933 */
-	{ 8,	0,	printargs,		"SYS_934"	}, /* 934 */
-	{ 8,	0,	printargs,		"SYS_935"	}, /* 935 */
-	{ 8,	0,	printargs,		"SYS_936"	}, /* 936 */
-	{ 8,	0,	printargs,		"SYS_937"	}, /* 937 */
-	{ 8,	0,	printargs,		"SYS_938"	}, /* 938 */
-	{ 8,	0,	printargs,		"SYS_939"	}, /* 939 */
-	{ 8,	0,	printargs,		"SYS_940"	}, /* 940 */
-	{ 8,	0,	printargs,		"SYS_941"	}, /* 941 */
-	{ 8,	0,	printargs,		"SYS_942"	}, /* 942 */
-	{ 8,	0,	printargs,		"SYS_943"	}, /* 943 */
-	{ 8,	0,	printargs,		"SYS_944"	}, /* 944 */
-	{ 8,	0,	printargs,		"SYS_945"	}, /* 945 */
-	{ 8,	0,	printargs,		"SYS_946"	}, /* 946 */
-	{ 8,	0,	printargs,		"SYS_947"	}, /* 947 */
-	{ 8,	0,	printargs,		"SYS_948"	}, /* 948 */
-	{ 8,	0,	printargs,		"SYS_949"	}, /* 949 */
-	{ 8,	0,	printargs,		"SYS_950"	}, /* 950 */
-	{ 8,	0,	printargs,		"SYS_951"	}, /* 951 */
-	{ 8,	0,	printargs,		"SYS_952"	}, /* 952 */
-	{ 8,	0,	printargs,		"SYS_953"	}, /* 953 */
-	{ 8,	0,	printargs,		"SYS_954"	}, /* 954 */
-	{ 8,	0,	printargs,		"SYS_955"	}, /* 955 */
-	{ 8,	0,	printargs,		"SYS_956"	}, /* 956 */
-	{ 8,	0,	printargs,		"SYS_957"	}, /* 957 */
-	{ 8,	0,	printargs,		"SYS_958"	}, /* 958 */
-	{ 8,	0,	printargs,		"SYS_959"	}, /* 959 */
-	{ 8,	0,	printargs,		"SYS_960"	}, /* 960 */
-	{ 8,	0,	printargs,		"SYS_961"	}, /* 961 */
-	{ 8,	0,	printargs,		"SYS_962"	}, /* 962 */
-	{ 8,	0,	printargs,		"SYS_963"	}, /* 963 */
-	{ 8,	0,	printargs,		"SYS_964"	}, /* 964 */
-	{ 8,	0,	printargs,		"SYS_965"	}, /* 965 */
-	{ 8,	0,	printargs,		"SYS_966"	}, /* 966 */
-	{ 8,	0,	printargs,		"SYS_967"	}, /* 967 */
-	{ 8,	0,	printargs,		"SYS_968"	}, /* 968 */
-	{ 8,	0,	printargs,		"SYS_969"	}, /* 969 */
-	{ 8,	0,	printargs,		"SYS_970"	}, /* 970 */
-	{ 8,	0,	printargs,		"SYS_971"	}, /* 971 */
-	{ 8,	0,	printargs,		"SYS_972"	}, /* 972 */
-	{ 8,	0,	printargs,		"SYS_973"	}, /* 973 */
-	{ 8,	0,	printargs,		"SYS_974"	}, /* 974 */
-	{ 8,	0,	printargs,		"SYS_975"	}, /* 975 */
-	{ 8,	0,	printargs,		"SYS_976"	}, /* 976 */
-	{ 8,	0,	printargs,		"SYS_977"	}, /* 977 */
-	{ 8,	0,	printargs,		"SYS_978"	}, /* 978 */
-	{ 8,	0,	printargs,		"SYS_979"	}, /* 979 */
-	{ 8,	0,	printargs,		"SYS_980"	}, /* 980 */
-	{ 8,	0,	printargs,		"SYS_981"	}, /* 981 */
-	{ 8,	0,	printargs,		"SYS_982"	}, /* 982 */
-	{ 8,	0,	printargs,		"SYS_983"	}, /* 983 */
-	{ 8,	0,	printargs,		"SYS_984"	}, /* 984 */
-	{ 8,	0,	printargs,		"SYS_985"	}, /* 985 */
-	{ 8,	0,	printargs,		"SYS_986"	}, /* 986 */
-	{ 8,	0,	printargs,		"SYS_987"	}, /* 987 */
-	{ 8,	0,	printargs,		"SYS_988"	}, /* 988 */
-	{ 8,	0,	printargs,		"SYS_989"	}, /* 989 */
-	{ 8,	0,	printargs,		"SYS_990"	}, /* 990 */
-	{ 8,	0,	printargs,		"SYS_991"	}, /* 991 */
-	{ 8,	0,	printargs,		"SYS_992"	}, /* 992 */
-	{ 8,	0,	printargs,		"SYS_993"	}, /* 993 */
-	{ 8,	0,	printargs,		"SYS_994"	}, /* 994 */
-	{ 8,	0,	printargs,		"SYS_995"	}, /* 995 */
-	{ 8,	0,	printargs,		"SYS_996"	}, /* 996 */
-	{ 8,	0,	printargs,		"SYS_997"	}, /* 997 */
-	{ 8,	0,	printargs,		"SYS_998"	}, /* 998 */
-	{ 8,	0,	printargs,		"SYS_999"	}, /* 999 */
-	{ 8,	0,	printargs,		"SYS_1000"	}, /* 1000 */
-	{ 8,	0,	printargs,		"SYS_1001"	}, /* 1001 */
-	{ 8,	0,	printargs,		"SYS_1002"	}, /* 1002 */
-	{ 8,	0,	printargs,		"SYS_1003"	}, /* 1003 */
-	{ 8,	0,	printargs,		"SYS_1004"	}, /* 1004 */
-	{ 8,	0,	printargs,		"SYS_1005"	}, /* 1005 */
-	{ 8,	0,	printargs,		"SYS_1006"	}, /* 1006 */
-	{ 8,	0,	printargs,		"SYS_1007"	}, /* 1007 */
-	{ 8,	0,	printargs,		"SYS_1008"	}, /* 1008 */
-	{ 8,	0,	printargs,		"SYS_1009"	}, /* 1009 */
-	{ 8,	0,	printargs,		"SYS_1010"	}, /* 1010 */
-	{ 8,	0,	printargs,		"SYS_1011"	}, /* 1011 */
-	{ 8,	0,	printargs,		"SYS_1012"	}, /* 1012 */
-	{ 8,	0,	printargs,		"SYS_1013"	}, /* 1013 */
-	{ 8,	0,	printargs,		"SYS_1014"	}, /* 1014 */
-	{ 8,	0,	printargs,		"SYS_1015"	}, /* 1015 */
-	{ 8,	0,	printargs,		"SYS_1016"	}, /* 1016 */
-	{ 8,	0,	printargs,		"SYS_1017"	}, /* 1017 */
-	{ 8,	0,	printargs,		"SYS_1018"	}, /* 1018 */
-	{ 8,	0,	printargs,		"SYS_1019"	}, /* 1019 */
-	{ 8,	0,	printargs,		"SYS_1020"	}, /* 1020 */
-	{ 8,	0,	printargs,		"SYS_1021"	}, /* 1021 */
-	{ 8,	0,	printargs,		"SYS_1022"	}, /* 1022 */
-	{ 8,	0,	printargs,		"SYS_1023"	}, /* 1023 */
-	{ 0,	0,	printargs,		"ni_syscall"	}, /* 1024 */
-	{ 1,	TP,	sys_exit,		"exit"		}, /* 1025 */
-	{ 3,	TF,	sys_read,		"read"		}, /* 1026 */
-	{ 3,	TF,	sys_write,		"write"		}, /* 1027 */
-	{ 3,	TF,	sys_open,		"open"		}, /* 1028 */
-	{ 1,	0,	sys_close,		"close"		}, /* 1029 */
-	{ 2,	0,	sys_creat,		"creat"		}, /* 1030 */
-	{ 2,	TF,	sys_link,		"link"		}, /* 1031 */
-	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 1032 */
-	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 1033 */
-	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 1034 */
-	{ 1,	TF,	sys_fchdir,		"fchdir"	}, /* 1035 */
-	{ 2,	0,	sys_utimes,		"utimes"	}, /* 1036 */
-	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 1037 */
-	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 1038 */
-	{ 3,	TF,	sys_chown,		"chown"		}, /* 1039 */
-	{ 3,	TF,	sys_lseek,		"lseek"		}, /* 1040 */
-	{ 0,	0,	sys_getpid,		"getpid"	}, /* 1041 */
-	{ 0,	0,	sys_getppid,		"getppid"	}, /* 1042 */
-	{ 5,	TF,	sys_mount,		"mount"		}, /* 1043 */
-	{ 1,	0,	sys_umount2,		"umount"	}, /* 1044 */
-	{ 1,	0,	sys_setuid,		"setuid"	}, /* 1045 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 1046 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 1047 */
-	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 1048 */
-	{ 2,	TF,	sys_access,		"access"	}, /* 1049 */
-	{ 0,	0,	sys_sync,		"sync"		}, /* 1050 */
-	{ 1,	0,	sys_fsync,		"fsync"		}, /* 1051 */
-	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 1052 */
-	{ 2,	TS,	sys_kill,		"kill"		}, /* 1053 */
-	{ 2,	TF,	sys_rename,		"rename"	}, /* 1054 */
-	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 1055 */
-	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 1056 */
-	{ 1,	0,	sys_dup,		"dup"		}, /* 1057 */
-	{ 1,	0,	sys_pipe,		"pipe"		}, /* 1058 */
-	{ 1,	0,	sys_times,		"times"		}, /* 1059 */
-	{ 1,	0,	sys_brk,		"brk"		}, /* 1060 */
-	{ 1,	0,	sys_setgid,		"setgid"	}, /* 1061 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 1062 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 1063 */
-	{ 1,	TF,	sys_acct,		"acct"		}, /* 1064 */
-	{ 3,	0,	sys_ioctl,		"ioctl"		}, /* 1065 */
-	{ 3,	0,	sys_fcntl,		"fcntl"		}, /* 1066 */
-	{ 1,	0,	sys_umask,		"umask"		}, /* 1067 */
-	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 1068 */
-	{ 2,	0,	sys_ustat,		"ustat"		}, /* 1069 */
-	{ 2,	0,	sys_dup2,		"dup2"		}, /* 1070 */
-	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 1071 */
-	{ 2,	0,	sys_setregid,		"setregid"	}, /* 1072 */
-	{ 3,	0,	printargs,		"getresuid"	}, /* 1073 */
-	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 1074 */
-	{ 3,	0,	sys_getresuid,		"getresgid"	}, /* 1075 */
-	{ 3,	0,	printargs,		"setresgid"	}, /* 1076 */
-	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 1077 */
-	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 1078 */
-	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 1079 */
-	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 1080 */
-	{ 0,	0,	sys_setsid,		"setsid"	}, /* 1081 */
-	{ 1,	0,	sys_getsid,		"getsid"	}, /* 1082 */
-	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 1083 */
-	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 1084 */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 1085 */
-	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 1086 */
-	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 1087 */
-	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 1088 */
-	{ 5,	0,	sys_select,		"select"	}, /* 1089 */
-	{ 3,	0,	sys_poll,		"poll"		}, /* 1090 */
-	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 1091 */
-	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 1092 */
-	{ 1,	0,	sys_uselib,		"uselib"	}, /* 1093 */
-	{ 1,	0,	sys_swapon,		"swapon"	}, /* 1094 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 1095 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 1096 */
-	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 1097 */
-	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 1098 */
-	{ 2,	0,	sys_fchmod,		"fchmod"	}, /* 1099 */
-	{ 3,	0,	sys_fchown,		"fchown"	}, /* 1100 */
-	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 1101 */
-	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 1102 */
-	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 1103 */
-	{ 2,	0,	sys_fstatfs,		"fstatfs"	}, /* 1104 */
-	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 1105 */
-	{ 3,	TI,	sys_semget,		"semget"	}, /* 1106 */
-	{ 3,	TI,	printargs,		"semop"		}, /* 1107 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 1108 */
-	{ 2,	TI,	sys_msgget,		"msgget"	}, /* 1109 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 1110 */
-	{ 5,	TI,	sys_msgrcv,		"msgrcv"	}, /* 1111 */
-	{ 3,	TI,	sys_msgctl,		"msgctl"	}, /* 1112 */
-	{ 3,	TI,	sys_shmget,		"shmget"	}, /* 1113 */
-	{ 3,	TI,	sys_shmat,		"shmat"		}, /* 1114 */
-	{ 1,	TI,	sys_shmdt,		"shmdt"		}, /* 1115 */
-	{ 3,	TI,	sys_shmctl,		"shmctl"	}, /* 1116 */
-	{ 3,	0,	sys_syslog,		"syslog"	}, /* 1117 */
-	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 1118 */
-	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 1119 */
-	{ 2,	TF,	sys_stat,		"stat"		}, /* 1120 */
-	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 1121 */
-	{ 2,	0,	sys_fstat,		"fstat"		}, /* 1122 */
-	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 1123 */
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 1124 */
-	{ 5,	0,	printargs,		"vm86"		}, /* 1125 */
-	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 1126 */
-	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 1127 */
-	{ 5,	TP,	sys_clone,		"clone"		}, /* 1128 */
-	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 1129 */
-	{ 1,	0,	sys_uname,		"uname"		}, /* 1130 */
-	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 1131 */
-	{ 2,	0,	sys_create_module,	"create_module"	}, /* 1132 */
-	{ 4,	0,	sys_init_module,	"init_module"	}, /* 1133 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 1134 */
-	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 1135 */
-	{ 5,	0,	sys_query_module,	"query_module"	}, /* 1136 */
-	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 1137 */
-	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 1138 */
-	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 1139 */
-	{ 1,	0,	sys_personality,	"personality"	}, /* 1140 */
-	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 1141 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 1142 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 1143 */
-	{ 3,	0,	sys_getdents,		"getdents"	}, /* 1144 */
-	{ 2,	0,	sys_flock,		"flock"		}, /* 1145 */
-	{ 5,	0,	sys_readv,		"readv"		}, /* 1146 */
-	{ 5,	0,	sys_writev,		"writev"	}, /* 1147 */
-	{ 4,	0,	sys_pread,		"pread"		}, /* 1148 */
-	{ 4,	0,	sys_pwrite,		"pwrite"	}, /* 1149 */
-	{ 1,	0,	printargs,		"_sysctl"	}, /* 1150 */
-	{ 6,	0,	sys_mmap,		"mmap"		}, /* 1151 */
-	{ 2,	0,	sys_munmap,		"munmap"	}, /* 1152 */
-	{ 2,	0,	sys_mlock,		"mlock"		}, /* 1153 */
-	{ 1,	0,	sys_mlockall,		"mlockall"	}, /* 1154 */
-	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 1155 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 1156 */
-	{ 3,	0,	sys_msync,		"msync"		}, /* 1157 */
-	{ 2,	0,	sys_munlock,		"munlock"	}, /* 1158 */
-	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 1159 */
-	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 1160 */
-	{ 2,	0,	sys_sched_setparam,	"sched_setparam"}, /* 1161 */
-	{ 2,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 1162 */
-	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 1163 */
-	{ 0,	0,	sys_sched_yield,	"sched_yield"	}, /* 1164 */
-	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 1165 */
-	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 1166 */
-	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 1167 */
-	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 1168 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 1169 */
-	{ 5,	0,	sys_prctl,		"prctl"		}, /* 1170 */
-	{ 1,	0,	sys_getpagesize,	"getpagesize"	}, /* 1171 */
-	{ 6,	0,	sys_mmap,		"mmap2"		}, /* 1172 */
-	{ 5,	0,	printargs,		"pciconfig_read"}, /* 1173 */
-	{ 5,	0,	printargs,		"pciconfig_write"}, /* 1174 */
-	{ 8,	0,	printargs,		"perfmonctl"	}, /* 1175 */
-	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	}, /* 1176 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 1177 */
-	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 1178 */
-	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 1179 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,	"rt_sigqueueinfo"}, /* 1180 */
-	{ 0,	TS,	sys_sigreturn,		"rt_sigreturn"	}, /* 1181 */
-	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 1182 */
-	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 1183 */
-	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 1184 */
-	{ 2,	0,	sys_capget,		"capget"	}, /* 1185 */
-	{ 2,	0,	sys_capset,		"capset"	}, /* 1186 */
-	{ 4,	TF,	sys_sendfile,		"sendfile"	}, /* 1187 */
-	{ 5,	TN,	printargs,		"getpmsg"	}, /* 1188 */
-	{ 5,	TN,	printargs,		"putpmsg"	}, /* 1189 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 1190 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 1191 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 1192 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 1193 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 1194 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 1195 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 1196 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 1197 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 1198 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 1199 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 1200 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 1201 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 1202 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 1203 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 1204 */
-	{ 3,	TN,	sys_sendmsg,		"sendmsg"	}, /* 1205 */
-	{ 3,	TN,	sys_recvmsg,		"recvmsg"	}, /* 1206 */
-	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 1207 */
-	{ 3,	0,	printargs,		"mincore"	}, /* 1208 */
-	{ 3,	0,	sys_madvise,		"madvise"	}, /* 1209 */
-	{ 2,	TF,	sys_stat,		"stat"		}, /* 1210 */
-	{ 2,	0,	sys_lstat,		"lstat"		}, /* 1211 */
-	{ 2,	TF,	sys_fstat,		"fstat"		}, /* 1212 */
-	{ 6,	TP,	sys_clone,		"clone2"	}, /* 1213 */
-	{ 3,	0,	printargs,		"getdents64"	}, /* 1214 */
-	{ 2,	0,	printargs,		"getunwind"	}, /* 1215 */
-	{ 4,	0,	sys_readahead,		"readahead"	}, /* 1216 */
-	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 1217 */
-	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 1218 */
-	{ 5,	0,	sys_setxattr,		"fsetxattr"	}, /* 1219 */
-	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 1220 */
-	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 1221 */
-	{ 4,	0,	sys_getxattr,		"fgetxattr"	}, /* 1222 */
-	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 1223 */
-	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 1224 */
-	{ 3,	0,	sys_listxattr,		"flistxattr"	}, /* 1225 */
-	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 1226 */
-	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 1227 */
-	{ 2,	0,	sys_removexattr,	"fremovexattr"	}, /* 1228 */
-	{ 2,	TS,	sys_kill,		"tkill"		}, /* 1229 */
-	{ 5,	0,	sys_futex,		"futex"		}, /* 1230 */
-	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity"},/* 1231 */
-	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity"},/* 1232 */
-	{ 1,	0,	printargs,		"set_tid_address"}, /* 1233 */
-	{ 5,	TF,	sys_fadvise64,		"fadvise64"	}, /* 1234 */
-	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 1235 */
-	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 1236 */
-	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 1237 */
-	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 1238 */
-	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 1239 */
-	{ 5,	0,	sys_io_getevents,		"io_getevents"	}, /* 1240 */
-	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 1241 */
-	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 1242 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 1243 */
-	{ 4,	0,	sys_epoll_ctl,		"epoll_ctl"	}, /* 1244 */
-	{ 4,	0,	sys_epoll_wait,		"epoll_wait"	}, /* 1245 */
-	{ 0,	0,	printargs,		"restart_syscall"}, /* 1246 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 1247 */
-	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 1248 */
-	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 1249 */
-	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 1250 */
-	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"}, /* 1251 */
-	{ 1,	0,	sys_timer_delete,	"timer_delete"	}, /* 1252 */
-	{ 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 1253 */
-	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 1254 */
-	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 1255 */
-	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"}, /* 1256 */
-	{ 8,	0,	printargs,		"fstatfs64"	}, /* 1257 */
-	{ 8,	0,	printargs,		"statfs64"	}, /* 1258 */
-	{ 6,	0,	sys_mbind,		"mbind"		}, /* 1259 */
-	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"	}, /* 1260 */
-	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"	}, /* 1261 */
-	{ 4,	0,	sys_mq_open,		"mq_open"	}, /* 1262 */
-	{ 1,	0,	sys_mq_unlink,		"mq_unlink"	}, /* 1263 */
-	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"	}, /* 1264 */
-	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 1265 */
-	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 1266 */
-	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 1267 */
-	{ 5,	0,	printargs,		"sys_kexec_load" }, /* 1268 */
-	{ 5,	0,	printargs,		"vserver"	}, /* 1269 */
-	{ 5,	TP,	sys_waitid,		"waitid"	}, /* 1270 */
-	{ 8,	0,	printargs,		"SYS_1271"	}, /* 1271 */
-	{ 8,	0,	printargs,		"SYS_1272"	}, /* 1272 */
-	{ 8,	0,	printargs,		"SYS_1273"	}, /* 1273 */
-	{ 8,	0,	printargs,		"SYS_1274"	}, /* 1274 */
-	{ 8,	0,	printargs,		"SYS_1275"	}, /* 1275 */
-	{ 8,	0,	printargs,		"SYS_1276"	}, /* 1276 */
-	{ 8,	0,	printargs,		"SYS_1277"	}, /* 1277 */
-	{ 8,	0,	printargs,		"SYS_1278"	}, /* 1278 */
-	{ 8,	0,	printargs,		"SYS_1279"	}, /* 1279 */
-	{ 8,	0,	printargs,		"SYS_1280"	}, /* 1280 */
-	{ 8,	0,	printargs,		"SYS_1281"	}, /* 1281 */
-	{ 8,	0,	printargs,		"SYS_1282"	}, /* 1282 */
-	{ 8,	0,	printargs,		"SYS_1283"	}, /* 1283 */
-	{ 8,	0,	printargs,		"SYS_1284"	}, /* 1284 */
-	{ 8,	0,	printargs,		"SYS_1285"	}, /* 1285 */
-	{ 8,	0,	printargs,		"SYS_1286"	}, /* 1286 */
-	{ 8,	0,	printargs,		"SYS_1287"	}, /* 1287 */
-	{ 8,	0,	printargs,		"SYS_1288"	}, /* 1288 */
-	{ 8,	0,	printargs,		"SYS_1289"	}, /* 1289 */
-	{ 8,	0,	printargs,		"SYS_1290"	}, /* 1290 */
-	{ 8,	0,	printargs,		"SYS_1291"	}, /* 1291 */
-	{ 8,	0,	printargs,		"SYS_1292"	}, /* 1292 */
-	{ 8,	0,	printargs,		"SYS_1293"	}, /* 1293 */
-	{ 8,	0,	printargs,		"SYS_1294"	}, /* 1294 */
-	{ 8,	0,	printargs,		"SYS_1295"	}, /* 1295 */
-	{ 8,	0,	printargs,		"SYS_1296"	}, /* 1296 */
-	{ 8,	0,	printargs,		"SYS_1297"	}, /* 1297 */
-	{ 8,	0,	printargs,		"SYS_1298"	}, /* 1298 */
-	{ 8,	0,	printargs,		"SYS_1299"	}, /* 1299 */
-	{ 8,	0,	printargs,		"SYS_1300"	}, /* 1300 */
-	{ 8,	0,	printargs,		"SYS_1301"	}, /* 1301 */
-	{ 8,	0,	printargs,		"SYS_1302"	}, /* 1302 */
-	{ 8,	0,	printargs,		"SYS_1303"	}, /* 1303 */
-	{ 8,	0,	printargs,		"SYS_1304"	}, /* 1304 */
-	{ 8,	0,	printargs,		"SYS_1305"	}, /* 1305 */
diff --git a/strace/linux/ioctlent.h b/strace/linux/ioctlent.h
deleted file mode 100644
index 57a2070..0000000
--- a/strace/linux/ioctlent.h
+++ /dev/null
@@ -1,1312 +0,0 @@
-	/* Generated by ioctlsort */
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_DOS",	0x4d2},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_DOS",	0x4d3},
-	{"linux/umsdos_fs.h",	"UMSDOS_RMDIR_DOS",	0x4d4},
-	{"linux/umsdos_fs.h",	"UMSDOS_STAT_DOS",	0x4d5},
-	{"linux/umsdos_fs.h",	"UMSDOS_CREAT_EMD",	0x4d6},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_EMD",	0x4d7},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_EMD",	0x4d8},
-	{"linux/umsdos_fs.h",	"UMSDOS_GETVERSION",	0x4d9},
-	{"linux/umsdos_fs.h",	"UMSDOS_INIT_EMD",	0x4da},
-	{"linux/umsdos_fs.h",	"UMSDOS_DOS_SETUP",	0x4db},
-	{"linux/umsdos_fs.h",	"UMSDOS_RENAME_DOS",	0x4dc},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/elevator.h",	"BLKELVGET",	0x126a},
-	{"linux/elevator.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKGETLASTSECT",	0x126c},
-	{"linux/fs.h",	"BLKSETLASTSECT",	0x126d},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/fs.h",	"BLKGETSIZE64",	0x1272},
-	{"scsi/sg.h",	"SG_SET_TIMEOUT",	0x2201},
-	{"scsi/sg.h",	"SG_GET_TIMEOUT",	0x2202},
-	{"scsi/sg.h",	"SG_EMULATED_HOST",	0x2203},
-	{"scsi/sg.h",	"SG_SET_TRANSFORM",	0x2204},
-	{"scsi/sg.h",	"SG_GET_TRANSFORM",	0x2205},
-	{"scsi/sg.h",	"SG_GET_COMMAND_Q",	0x2270},
-	{"scsi/sg.h",	"SG_SET_COMMAND_Q",	0x2271},
-	{"scsi/sg.h",	"SG_GET_RESERVED_SIZE",	0x2272},
-	{"scsi/sg.h",	"SG_SET_RESERVED_SIZE",	0x2275},
-	{"scsi/sg.h",	"SG_GET_SCSI_ID",	0x2276},
-	{"scsi/sg.h",	"SG_SET_FORCE_LOW_DMA",	0x2279},
-	{"scsi/sg.h",	"SG_GET_LOW_DMA",	0x227a},
-	{"scsi/sg.h",	"SG_SET_FORCE_PACK_ID",	0x227b},
-	{"scsi/sg.h",	"SG_GET_PACK_ID",	0x227c},
-	{"scsi/sg.h",	"SG_GET_NUM_WAITING",	0x227d},
-	{"scsi/sg.h",	"SG_SET_DEBUG",	0x227e},
-	{"scsi/sg.h",	"SG_GET_SG_TABLESIZE",	0x227f},
-	{"scsi/sg.h",	"SG_GET_VERSION_NUM",	0x2282},
-	{"scsi/sg.h",	"SG_NEXT_CMD_LEN",	0x2283},
-	{"scsi/sg.h",	"SG_SCSI_RESET",	0x2284},
-	{"scsi/sg.h",	"SG_IO",	0x2285},
-	{"scsi/sg.h",	"SG_GET_REQUEST_TABLE",	0x2286},
-	{"scsi/sg.h",	"SG_SET_KEEP_ORPHAN",	0x2287},
-	{"scsi/sg.h",	"SG_GET_KEEP_ORPHAN",	0x2288},
-	{"scsi/sg.h",	"SG_GET_ACCESS_COUNT",	0x2289},
-	{"linux/i2o.h",	"BLKI2OGRSTRAT",	0x3201},
-	{"linux/i2o.h",	"BLKI2OGWSTRAT",	0x3202},
-	{"linux/i2o.h",	"BLKI2OSRSTRAT",	0x3203},
-	{"linux/i2o.h",	"BLKI2OSWSTRAT",	0x3204},
-	{"asm/processor.h",	"MICROCODE_IOCFREE",	0x3600},
-	{"linux/radeonfb.h",	"FBIO_RADEON_GET_MIRROR",	0x4003},
-	{"linux/radeonfb.h",	"FBIO_RADEON_SET_MIRROR",	0x4004},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/pmu.h",	"PMU_IOC_GRAB_BACKLIGHT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/cciss_ioctl.h",	"CCISS_DEREGDISK",	0x420c},
-	{"linux/cciss_ioctl.h",	"CCISS_REGNEWDISK",	0x420d},
-	{"linux/cciss_ioctl.h",	"CCISS_REGNEWD",	0x420e},
-	{"linux/cciss_ioctl.h",	"CCISS_RESCANDISK",	0x4210},
-	{"linux/cciss_ioctl.h",	"CCISS_GETLUNINFO",	0x4211},
-	{"linux/cciss_ioctl.h",	"CCISS_BIG_PASSTHRU",	0x4212},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGREP",	0x4503},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCGKEY",	0x4505},
-	{"linux/input.h",	"EVIOCGBUS",	0x4507},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCSGAIN",	0x4582},
-	{"linux/input.h",	"EVIOCSAUTOCENTER",	0x4583},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/input.h",	"EVIOCGRAB",	0x4590},
-	{"linux/fb.h",	"FBIOGET_VSCREENINFO",	0x4600},
-	{"linux/fb.h",	"FBIOPUT_VSCREENINFO",	0x4601},
-	{"linux/fb.h",	"FBIOGET_FSCREENINFO",	0x4602},
-	{"linux/fb.h",	"FBIOGETCMAP",	0x4604},
-	{"linux/fb.h",	"FBIOPUTCMAP",	0x4605},
-	{"linux/fb.h",	"FBIOPAN_DISPLAY",	0x4606},
-	{"linux/fb.h",	"FBIOGET_FCURSORINFO",	0x4607},
-	{"linux/fb.h",	"FBIOGET_VCURSORINFO",	0x4608},
-	{"linux/fb.h",	"FBIO_CURSOR",	0x4608},
-	{"linux/fb.h",	"FBIOPUT_VCURSORINFO",	0x4609},
-	{"linux/fb.h",	"FBIOGET_CURSORSTATE",	0x460a},
-	{"linux/fb.h",	"FBIOPUT_CURSORSTATE",	0x460b},
-	{"linux/fb.h",	"FBIOGET_CON2FBMAP",	0x460f},
-	{"linux/fb.h",	"FBIOPUT_CON2FBMAP",	0x4610},
-	{"linux/fb.h",	"FBIOBLANK",	0x4611},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/fb.h",	"FBIO_ALLOC",	0x4613},
-	{"linux/fb.h",	"FBIO_FREE",	0x4614},
-	{"linux/fb.h",	"FBIOGET_GLYPH",	0x4615},
-	{"linux/fb.h",	"FBIOGET_HWCINFO",	0x4616},
-	{"linux/fb.h",	"FBIOPUT_MODEINFO",	0x4617},
-	{"linux/fb.h",	"FBIOGET_DISPINFO",	0x4618},
-	{"linux/matroxfb.h",	"FBIO_WAITFORVSYNC",	0x4620},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/hiddev.h",	"HIDIOCGFLAG",	0x480e},
-	{"linux/hiddev.h",	"HIDIOCSFLAG",	0x480f},
-	{"linux/hiddev.h",	"HIDIOCGCOLLECTIONINDEX",	0x4810},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_INFO",	0x4810},
-	{"sound/sb16_csp.h",	"SNDRV_SB_CSP_IOCTL_INFO",	0x4810},
-	{"linux/hiddev.h",	"HIDIOCGCOLLECTIONINFO",	0x4811},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_CODE_POKE",	0x4811},
-	{"sound/sb16_csp.h",	"SNDRV_SB_CSP_IOCTL_LOAD_CODE",	0x4811},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_CODE_PEEK",	0x4812},
-	{"sound/sb16_csp.h",	"SNDRV_SB_CSP_IOCTL_UNLOAD_CODE",	0x4812},
-	{"linux/hiddev.h",	"HIDIOCGUSAGES",	0x4813},
-	{"sound/sb16_csp.h",	"SNDRV_SB_CSP_IOCTL_START",	0x4813},
-	{"linux/hiddev.h",	"HIDIOCSUSAGES",	0x4814},
-	{"sound/sb16_csp.h",	"SNDRV_SB_CSP_IOCTL_STOP",	0x4814},
-	{"sound/sb16_csp.h",	"SNDRV_SB_CSP_IOCTL_PAUSE",	0x4815},
-	{"sound/sb16_csp.h",	"SNDRV_SB_CSP_IOCTL_RESTART",	0x4816},
-	{"sound/asound_fm.h",	"SNDRV_DM_FM_IOCTL_INFO",	0x4820},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_TRAM_SETUP",	0x4820},
-	{"sound/asound_fm.h",	"SNDRV_DM_FM_IOCTL_RESET",	0x4821},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_TRAM_POKE",	0x4821},
-	{"sound/asound_fm.h",	"SNDRV_DM_FM_IOCTL_PLAY_NOTE",	0x4822},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_TRAM_PEEK",	0x4822},
-	{"sound/asound_fm.h",	"SNDRV_DM_FM_IOCTL_SET_VOICE",	0x4823},
-	{"sound/asound_fm.h",	"SNDRV_DM_FM_IOCTL_SET_PARAMS",	0x4824},
-	{"sound/asound_fm.h",	"SNDRV_DM_FM_IOCTL_SET_MODE",	0x4825},
-	{"sound/asound_fm.h",	"SNDRV_DM_FM_IOCTL_SET_CONNECTION",	0x4826},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_PCM_POKE",	0x4830},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_PCM_PEEK",	0x4831},
-	{"sound/hdsp.h",	"SNDRV_HDSP_IOCTL_GET_PEAK_RMS",	0x4840},
-	{"sound/hdsp.h",	"SNDRV_HDSP_IOCTL_GET_CONFIG_INFO",	0x4841},
-	{"sound/hdsp.h",	"SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE",	0x4842},
-	{"sound/hdsp.h",	"SNDRV_HDSP_IOCTL_GET_VERSION",	0x4843},
-	{"sound/hdsp.h",	"SNDRV_HDSP_IOCTL_GET_MIXER",	0x4844},
-	{"sound/hdsp.h",	"SNDRV_HDSP_IOCTL_GET_9632_AEB",	0x4845},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_STOP",	0x4880},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_CONTINUE",	0x4881},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_ZERO_TRAM_COUNTER",	0x4882},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_SINGLE_STEP",	0x4883},
-	{"sound/emu10k1.h",	"SNDRV_EMU10K1_IOCTL_DBG_READ",	0x4884},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/kd.h",	"KIOCSOUND",	0x4b2f},
-	{"linux/kd.h",	"KDMKTONE",	0x4b30},
-	{"linux/kd.h",	"KDGETLED",	0x4b31},
-	{"linux/kd.h",	"KDSETLED",	0x4b32},
-	{"linux/kd.h",	"KDGKBTYPE",	0x4b33},
-	{"linux/kd.h",	"KDADDIO",	0x4b34},
-	{"linux/kd.h",	"KDDELIO",	0x4b35},
-	{"linux/kd.h",	"KDENABIO",	0x4b36},
-	{"linux/kd.h",	"KDDISABIO",	0x4b37},
-	{"linux/kd.h",	"KDSETMODE",	0x4b3a},
-	{"linux/kd.h",	"KDGETMODE",	0x4b3b},
-	{"linux/kd.h",	"KDMAPDISP",	0x4b3c},
-	{"linux/kd.h",	"KDUNMAPDISP",	0x4b3d},
-	{"linux/kd.h",	"GIO_SCRNMAP",	0x4b40},
-	{"linux/kd.h",	"PIO_SCRNMAP",	0x4b41},
-	{"linux/kd.h",	"KDGKBMODE",	0x4b44},
-	{"linux/kd.h",	"KDSKBMODE",	0x4b45},
-	{"linux/kd.h",	"KDGKBENT",	0x4b46},
-	{"linux/kd.h",	"KDSKBENT",	0x4b47},
-	{"linux/kd.h",	"KDGKBSENT",	0x4b48},
-	{"linux/kd.h",	"KDSKBSENT",	0x4b49},
-	{"linux/kd.h",	"KDGKBDIACR",	0x4b4a},
-	{"linux/kd.h",	"KDSKBDIACR",	0x4b4b},
-	{"linux/kd.h",	"KDGETKEYCODE",	0x4b4c},
-	{"linux/kd.h",	"KDSETKEYCODE",	0x4b4d},
-	{"linux/kd.h",	"KDSIGACCEPT",	0x4b4e},
-	{"linux/kd.h",	"KDKBDREP",	0x4b52},
-	{"linux/kd.h",	"GIO_FONT",	0x4b60},
-	{"linux/kd.h",	"PIO_FONT",	0x4b61},
-	{"linux/kd.h",	"KDGKBMETA",	0x4b62},
-	{"linux/kd.h",	"KDSKBMETA",	0x4b63},
-	{"linux/kd.h",	"KDGKBLED",	0x4b64},
-	{"linux/kd.h",	"KDSKBLED",	0x4b65},
-	{"linux/kd.h",	"GIO_UNIMAP",	0x4b66},
-	{"linux/kd.h",	"PIO_UNIMAP",	0x4b67},
-	{"linux/kd.h",	"PIO_UNIMAPCLR",	0x4b68},
-	{"linux/kd.h",	"GIO_UNISCRNMAP",	0x4b69},
-	{"linux/kd.h",	"PIO_UNISCRNMAP",	0x4b6a},
-	{"linux/kd.h",	"GIO_FONTX",	0x4b6b},
-	{"linux/kd.h",	"PIO_FONTX",	0x4b6c},
-	{"linux/kd.h",	"PIO_FONTRESET",	0x4b6d},
-	{"linux/kd.h",	"GIO_CMAP",	0x4b70},
-	{"linux/kd.h",	"PIO_CMAP",	0x4b71},
-	{"linux/kd.h",	"KDFONTOP",	0x4b72},
-	{"asm/mtrr.h",	"MTRRIOC_ADD_ENTRY",	0x4d00},
-	{"asm/mtrr.h",	"MTRRIOC_SET_ENTRY",	0x4d01},
-	{"asm/mtrr.h",	"MTRRIOC_DEL_ENTRY",	0x4d02},
-	{"asm/mtrr.h",	"MTRRIOC_GET_ENTRY",	0x4d03},
-	{"asm/mtrr.h",	"MTRRIOC_KILL_ENTRY",	0x4d04},
-	{"asm/mtrr.h",	"MTRRIOC_ADD_PAGE_ENTRY",	0x4d05},
-	{"asm/mtrr.h",	"MTRRIOC_SET_PAGE_ENTRY",	0x4d06},
-	{"asm/mtrr.h",	"MTRRIOC_DEL_PAGE_ENTRY",	0x4d07},
-	{"asm/mtrr.h",	"MTRRIOC_GET_PAGE_ENTRY",	0x4d08},
-	{"asm/mtrr.h",	"MTRRIOC_KILL_PAGE_ENTRY",	0x4d09},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/ticable.h",	"IOCTL_TIUSB_TIMEOUT",	0x4e20},
-	{"linux/ticable.h",	"IOCTL_TIUSB_RESET_DEVICE",	0x4e21},
-	{"linux/ticable.h",	"IOCTL_TIUSB_RESET_PIPES",	0x4e22},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"sound/sscape_ioctl.h",	"SND_SSCAPE_LOAD_BOOTB",	0x5064},
-	{"sound/sscape_ioctl.h",	"SND_SSCAPE_LOAD_MCODE",	0x5065},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_PVERSION",	0x5300},
-	{"linux/cdrom.h",	"CDROMPAUSE",	0x5301},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_CLIENT_ID",	0x5301},
-	{"linux/cdrom.h",	"CDROMRESUME",	0x5302},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_SYSTEM_INFO",	0x5302},
-	{"linux/cdrom.h",	"CDROMPLAYMSF",	0x5303},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_RUNNING_MODE",	0x5303},
-	{"linux/cdrom.h",	"CDROMPLAYTRKIND",	0x5304},
-	{"linux/cdrom.h",	"CDROMREADTOCHDR",	0x5305},
-	{"linux/cdrom.h",	"CDROMREADTOCENTRY",	0x5306},
-	{"linux/cdrom.h",	"CDROMSTOP",	0x5307},
-	{"linux/cdrom.h",	"CDROMSTART",	0x5308},
-	{"linux/cdrom.h",	"CDROMEJECT",	0x5309},
-	{"linux/cdrom.h",	"CDROMVOLCTRL",	0x530a},
-	{"linux/cdrom.h",	"CDROMSUBCHNL",	0x530b},
-	{"linux/cdrom.h",	"CDROMREADMODE2",	0x530c},
-	{"linux/cdrom.h",	"CDROMREADMODE1",	0x530d},
-	{"linux/cdrom.h",	"CDROMREADAUDIO",	0x530e},
-	{"linux/cdrom.h",	"CDROMEJECT_SW",	0x530f},
-	{"linux/cdrom.h",	"CDROMMULTISESSION",	0x5310},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_GET_CLIENT_INFO",	0x5310},
-	{"linux/cdrom.h",	"CDROM_GET_MCN",	0x5311},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_SET_CLIENT_INFO",	0x5311},
-	{"linux/cdrom.h",	"CDROMRESET",	0x5312},
-	{"linux/cdrom.h",	"CDROMVOLREAD",	0x5313},
-	{"linux/cdrom.h",	"CDROMREADRAW",	0x5314},
-	{"linux/cdrom.h",	"CDROMREADCOOKED",	0x5315},
-	{"linux/cdrom.h",	"CDROMSEEK",	0x5316},
-	{"linux/cdrom.h",	"CDROMPLAYBLK",	0x5317},
-	{"linux/cdrom.h",	"CDROMREADALL",	0x5318},
-	{"linux/cdrom.h",	"CDROMCLOSETRAY",	0x5319},
-	{"linux/cdrom.h",	"CDROMGETSPINDOWN",	0x531d},
-	{"linux/cdrom.h",	"CDROMSETSPINDOWN",	0x531e},
-	{"linux/cdrom.h",	"CDROM_SET_OPTIONS",	0x5320},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_CREATE_PORT",	0x5320},
-	{"linux/cdrom.h",	"CDROM_CLEAR_OPTIONS",	0x5321},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_DELETE_PORT",	0x5321},
-	{"linux/cdrom.h",	"CDROM_SELECT_SPEED",	0x5322},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_GET_PORT_INFO",	0x5322},
-	{"linux/cdrom.h",	"CDROM_SELECT_DISC",	0x5323},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_SET_PORT_INFO",	0x5323},
-	{"linux/cdrom.h",	"CDROM_MEDIA_CHANGED",	0x5325},
-	{"linux/cdrom.h",	"CDROM_DRIVE_STATUS",	0x5326},
-	{"linux/cdrom.h",	"CDROM_DISC_STATUS",	0x5327},
-	{"linux/cdrom.h",	"CDROM_CHANGER_NSLOTS",	0x5328},
-	{"linux/cdrom.h",	"CDROM_LOCKDOOR",	0x5329},
-	{"linux/cdrom.h",	"CDROM_DEBUG",	0x5330},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT",	0x5330},
-	{"linux/cdrom.h",	"CDROM_GET_CAPABILITY",	0x5331},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT",	0x5331},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_CREATE_QUEUE",	0x5332},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_DELETE_QUEUE",	0x5333},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_GET_QUEUE_INFO",	0x5334},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_SET_QUEUE_INFO",	0x5335},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_GET_NAMED_QUEUE",	0x5336},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_GET_QUEUE_STATUS",	0x5340},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_GET_QUEUE_TEMPO",	0x5341},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_SET_QUEUE_TEMPO",	0x5342},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_GET_QUEUE_OWNER",	0x5343},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_SET_QUEUE_OWNER",	0x5344},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_GET_QUEUE_TIMER",	0x5345},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_SET_QUEUE_TIMER",	0x5346},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_GET_QUEUE_CLIENT",	0x5349},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT",	0x534a},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_GET_CLIENT_POOL",	0x534b},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_SET_CLIENT_POOL",	0x534c},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_REMOVE_EVENTS",	0x534e},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_QUERY_SUBS",	0x534f},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_GET_SUBSCRIPTION",	0x5350},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT",	0x5351},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT",	0x5352},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_GET_QUEUE_SYNC",	0x5353},
-	{"sound/asequencer.h",	"SNDRV_SEQ_IOCTL_SET_QUEUE_SYNC",	0x5354},
-	{"scsi/scsi_ioctl.h",	"SCSI_IOCTL_DOORLOCK",	0x5380},
-	{"scsi/scsi_ioctl.h",	"SCSI_IOCTL_DOORUNLOCK",	0x5381},
-	{"linux/cdrom.h",	"CDROMAUDIOBUFSIZ",	0x5382},
-	{"scsi/scsi.h",	"SCSI_IOCTL_GET_IDLUN",	0x5382},
-	{"scsi/scsi.h",	"SCSI_IOCTL_TAGGED_ENABLE",	0x5383},
-	{"scsi/scsi.h",	"SCSI_IOCTL_TAGGED_DISABLE",	0x5384},
-	{"scsi/scsi.h",	"SCSI_IOCTL_PROBE_HOST",	0x5385},
-	{"scsi/scsi.h",	"SCSI_IOCTL_GET_BUS_NUMBER",	0x5386},
-	{"scsi/scsi.h",	"SCSI_IOCTL_GET_PCI",	0x5387},
-	{"linux/cdrom.h",	"DVD_READ_STRUCT",	0x5390},
-	{"linux/cdrom.h",	"DVD_WRITE_STRUCT",	0x5391},
-	{"linux/cdrom.h",	"DVD_AUTH",	0x5392},
-	{"linux/cdrom.h",	"CDROM_SEND_PACKET",	0x5393},
-	{"linux/cdrom.h",	"CDROM_NEXT_WRITABLE",	0x5394},
-	{"linux/cdrom.h",	"CDROM_LAST_WRITTEN",	0x5395},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"asm/ioctls.h",	"TCGETS",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"asm/ioctls.h",	"TCSETS",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"asm/ioctls.h",	"TCSETSW",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"asm/ioctls.h",	"TCSETSF",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"asm/ioctls.h",	"TCGETA",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"asm/ioctls.h",	"TCSETA",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"asm/ioctls.h",	"TCSETAW",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"asm/ioctls.h",	"TCSETAF",	0x5408},
-	{"asm/ioctls.h",	"TCSBRK",	0x5409},
-	{"asm/ioctls.h",	"TCXONC",	0x540a},
-	{"asm/ioctls.h",	"TCFLSH",	0x540b},
-	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
-	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
-	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
-	{"asm/ioctls.h",	"TIOCGPGRP",	0x540f},
-	{"asm/ioctls.h",	"TIOCSPGRP",	0x5410},
-	{"asm/ioctls.h",	"TIOCOUTQ",	0x5411},
-	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
-	{"asm/ioctls.h",	"TIOCGWINSZ",	0x5413},
-	{"asm/ioctls.h",	"TIOCSWINSZ",	0x5414},
-	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
-	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
-	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
-	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
-	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
-	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
-	{"asm/ioctls.h",	"FIONREAD",	0x541b},
-	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
-	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
-	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
-	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
-	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
-	{"asm/ioctls.h",	"FIONBIO",	0x5421},
-	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
-	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
-	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
-	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
-	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
-	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
-	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
-	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
-	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
-	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
-	{"asm/ioctls.h",	"TIOCGDEV",	0x5432},
-	{"asm/ioctls.h",	"FIONCLEX",	0x5450},
-	{"asm/ioctls.h",	"FIOCLEX",	0x5451},
-	{"asm/ioctls.h",	"FIOASYNC",	0x5452},
-	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
-	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
-	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
-	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
-	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
-	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
-	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
-	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
-	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
-	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
-	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
-	{"asm/ioctls.h",	"TIOCGHAYESESP",	0x545e},
-	{"asm/ioctls.h",	"TIOCSHAYESESP",	0x545f},
-	{"asm/ioctls.h",	"FIOQSIZE",	0x5460},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/uinput.h",	"UI_DEV_CREATE",	0x5501},
-	{"linux/uinput.h",	"UI_DEV_DESTROY",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCONNECT",	0x5516},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECT",	0x5517},
-	{"linux/uinput.h",	"UI_SET_EVBIT",	0x5564},
-	{"linux/uinput.h",	"UI_SET_KEYBIT",	0x5565},
-	{"linux/uinput.h",	"UI_SET_RELBIT",	0x5566},
-	{"linux/uinput.h",	"UI_SET_ABSBIT",	0x5567},
-	{"linux/uinput.h",	"UI_SET_MSCBIT",	0x5568},
-	{"linux/uinput.h",	"UI_SET_LEDBIT",	0x5569},
-	{"linux/uinput.h",	"UI_SET_SNDBIT",	0x556a},
-	{"linux/uinput.h",	"UI_SET_FFBIT",	0x556b},
-	{"linux/videodev2.h",	"VIDIOC_QUERYCAP",	0x5600},
-	{"linux/vt.h",	"VT_OPENQRY",	0x5600},
-	{"linux/videodev2.h",	"VIDIOC_RESERVED",	0x5601},
-	{"linux/vt.h",	"VT_GETMODE",	0x5601},
-	{"linux/videodev2.h",	"VIDIOC_ENUM_FMT",	0x5602},
-	{"linux/vt.h",	"VT_SETMODE",	0x5602},
-	{"linux/vt.h",	"VT_GETSTATE",	0x5603},
-	{"linux/videodev2.h",	"VIDIOC_G_FMT",	0x5604},
-	{"linux/vt.h",	"VT_SENDSIG",	0x5604},
-	{"linux/videodev2.h",	"VIDIOC_S_FMT",	0x5605},
-	{"linux/vt.h",	"VT_RELDISP",	0x5605},
-	{"linux/videodev2.h",	"VIDIOC_G_COMP",	0x5606},
-	{"linux/vt.h",	"VT_ACTIVATE",	0x5606},
-	{"linux/videodev2.h",	"VIDIOC_S_COMP",	0x5607},
-	{"linux/vt.h",	"VT_WAITACTIVE",	0x5607},
-	{"linux/videodev2.h",	"VIDIOC_REQBUFS",	0x5608},
-	{"linux/vt.h",	"VT_DISALLOCATE",	0x5608},
-	{"linux/videodev2.h",	"VIDIOC_QUERYBUF",	0x5609},
-	{"linux/vt.h",	"VT_RESIZE",	0x5609},
-	{"linux/videodev2.h",	"VIDIOC_G_FBUF",	0x560a},
-	{"linux/vt.h",	"VT_RESIZEX",	0x560a},
-	{"linux/videodev2.h",	"VIDIOC_S_FBUF",	0x560b},
-	{"linux/vt.h",	"VT_LOCKSWITCH",	0x560b},
-	{"linux/vt.h",	"VT_UNLOCKSWITCH",	0x560c},
-	{"linux/videodev2.h",	"VIDIOC_OVERLAY",	0x560e},
-	{"linux/videodev2.h",	"VIDIOC_QBUF",	0x560f},
-	{"linux/videodev2.h",	"VIDIOC_DQBUF",	0x5611},
-	{"linux/videodev2.h",	"VIDIOC_STREAMON",	0x5612},
-	{"linux/videodev2.h",	"VIDIOC_STREAMOFF",	0x5613},
-	{"linux/videodev2.h",	"VIDIOC_G_PARM",	0x5615},
-	{"linux/videodev2.h",	"VIDIOC_S_PARM",	0x5616},
-	{"linux/videodev2.h",	"VIDIOC_G_STD",	0x5617},
-	{"linux/videodev2.h",	"VIDIOC_S_STD",	0x5618},
-	{"linux/videodev2.h",	"VIDIOC_ENUMSTD",	0x5619},
-	{"linux/videodev2.h",	"VIDIOC_ENUMINPUT",	0x561a},
-	{"linux/matroxfb.h",	"MATROXFB_G_TVOCTRL",	0x561b},
-	{"linux/videodev2.h",	"VIDIOC_G_CTRL",	0x561b},
-	{"linux/matroxfb.h",	"MATROXFB_S_TVOCTRL",	0x561c},
-	{"linux/videodev2.h",	"VIDIOC_S_CTRL",	0x561c},
-	{"linux/videodev2.h",	"VIDIOC_G_TUNER",	0x561d},
-	{"linux/videodev2.h",	"VIDIOC_S_TUNER",	0x561e},
-	{"linux/videodev2.h",	"VIDIOC_G_AUDIO",	0x5621},
-	{"linux/videodev2.h",	"VIDIOC_S_AUDIO",	0x5622},
-	{"linux/matroxfb.h",	"MATROXFB_TVOQUERYCTRL",	0x5624},
-	{"linux/videodev2.h",	"VIDIOC_QUERYCTRL",	0x5624},
-	{"linux/videodev2.h",	"VIDIOC_QUERYMENU",	0x5625},
-	{"linux/videodev2.h",	"VIDIOC_G_INPUT",	0x5626},
-	{"linux/videodev2.h",	"VIDIOC_S_INPUT",	0x5627},
-	{"linux/videodev2.h",	"VIDIOC_G_OUTPUT",	0x562e},
-	{"linux/videodev2.h",	"VIDIOC_S_OUTPUT",	0x562f},
-	{"linux/videodev2.h",	"VIDIOC_ENUMOUTPUT",	0x5630},
-	{"linux/videodev2.h",	"VIDIOC_G_AUDOUT",	0x5631},
-	{"linux/videodev2.h",	"VIDIOC_S_AUDOUT",	0x5632},
-	{"linux/videodev2.h",	"VIDIOC_G_MODULATOR",	0x5636},
-	{"linux/videodev2.h",	"VIDIOC_S_MODULATOR",	0x5637},
-	{"linux/videodev2.h",	"VIDIOC_G_FREQUENCY",	0x5638},
-	{"linux/videodev2.h",	"VIDIOC_S_FREQUENCY",	0x5639},
-	{"linux/videodev2.h",	"VIDIOC_CROPCAP",	0x563a},
-	{"linux/videodev2.h",	"VIDIOC_G_CROP",	0x563b},
-	{"linux/videodev2.h",	"VIDIOC_S_CROP",	0x563c},
-	{"linux/videodev2.h",	"VIDIOC_G_JPEGCOMP",	0x563d},
-	{"linux/videodev2.h",	"VIDIOC_S_JPEGCOMP",	0x563e},
-	{"linux/videodev2.h",	"VIDIOC_QUERYSTD",	0x563f},
-	{"linux/videodev2.h",	"VIDIOC_TRY_FMT",	0x5640},
-	{"linux/videodev2.h",	"VIDIOC_ENUMAUDIO",	0x5641},
-	{"linux/videodev2.h",	"VIDIOC_ENUMAUDOUT",	0x5642},
-	{"linux/videodev2.h",	"VIDIOC_G_PRIORITY",	0x5643},
-	{"linux/videodev2.h",	"VIDIOC_S_PRIORITY",	0x5644},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/watchdog.h",	"WDIOC_SETTIMEOUT",	0x5706},
-	{"linux/watchdog.h",	"WDIOC_GETTIMEOUT",	0x5707},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_he.h",	"HE_GET_REG",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_GETTHIST",	0x6164},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmbr2684.h",	"BR2684_SETFILT",	0x6190},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/atmdev.h",	"ATM_NEWBACKENDIF",	0x61f3},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"linux/usb_gadgetfs.h",	"GADGETFS_FIFO_STATUS",	0x6701},
-	{"linux/usb_gadgetfs.h",	"GADGETFS_FIFO_FLUSH",	0x6702},
-	{"linux/usb_gadgetfs.h",	"GADGETFS_CLEAR_HALT",	0x6703},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/ipmi.h",	"IPMICTL_RECEIVE_MSG_TRUNC",	0x690b},
-	{"linux/ipmi.h",	"IPMICTL_RECEIVE_MSG",	0x690c},
-	{"linux/ipmi.h",	"IPMICTL_SEND_COMMAND",	0x690d},
-	{"linux/ipmi.h",	"IPMICTL_REGISTER_FOR_CMD",	0x690e},
-	{"linux/ipmi.h",	"IPMICTL_UNREGISTER_FOR_CMD",	0x690f},
-	{"linux/ipmi.h",	"IPMICTL_SET_GETS_EVENTS_CMD",	0x6910},
-	{"linux/ipmi.h",	"IPMICTL_SET_MY_ADDRESS_CMD",	0x6911},
-	{"linux/ipmi.h",	"IPMICTL_GET_MY_ADDRESS_CMD",	0x6912},
-	{"linux/ipmi.h",	"IPMICTL_SET_MY_LUN_CMD",	0x6913},
-	{"linux/ipmi.h",	"IPMICTL_GET_MY_LUN_CMD",	0x6914},
-	{"linux/i8k.h",	"I8K_BIOS_VERSION",	0x6980},
-	{"linux/i8k.h",	"I8K_MACHINE_ID",	0x6981},
-	{"linux/i8k.h",	"I8K_POWER_STATUS",	0x6982},
-	{"linux/i8k.h",	"I8K_FN_STATUS",	0x6983},
-	{"linux/i8k.h",	"I8K_GET_TEMP",	0x6984},
-	{"linux/i8k.h",	"I8K_GET_SPEED",	0x6985},
-	{"linux/i8k.h",	"I8K_GET_FAN",	0x6986},
-	{"linux/i8k.h",	"I8K_SET_FAN",	0x6987},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/synclink.h",	"MGSL_IOCSIF",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/synclink.h",	"MGSL_IOCGIF",	0x6d0b},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/sisfb.h",	"SISFB_GET_INFO",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/rtc.h",	"RTC_PLL_GET",	0x7011},
-	{"linux/rtc.h",	"RTC_PLL_SET",	0x7012},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_DEVICE",	0x7050},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_REINTKML",	0x7051},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_GET_RCVD",	0x7052},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_SET_IOCTL_UID",	0x7053},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_GET_KML_SIZE",	0x7054},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_PURGE_FILE_DATA",	0x7055},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_CONNECT",	0x7056},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_GO_FETCH_KML",	0x7057},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_MARK",	0x7058},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_CLEAR_FSET",	0x7059},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_CLEAR_ALL_FSETS",	0x7060},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_SET_FSET",	0x7061},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_REVOKE_PERMIT",	0x7062},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_SET_KMLSIZE",	0x7063},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_CLIENT_MAKE_BRANCH",	0x7064},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_SERVER_MAKE_BRANCH",	0x7065},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_BRANCH_UNDO",	0x7066},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_BRANCH_REDO",	0x7067},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_SET_PID",	0x7068},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_SET_CHANNEL",	0x7069},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_GET_CHANNEL",	0x7070},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_GET_FILEID",	0x7071},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_ADJUST_LML",	0x7072},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_SET_FILEID",	0x7073},
-	{"linux/intermezzo_idl.h",	"IZO_IOC_REPSTATUS",	0x7074},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/ticable.h",	"IOCTL_TISER_DELAY",	0x70a0},
-	{"linux/ticable.h",	"IOCTL_TISER_TIMEOUT",	0x70a1},
-	{"linux/ticable.h",	"IOCTL_TIPAR_DELAY",	0x70a8},
-	{"linux/ticable.h",	"IOCTL_TIPAR_TIMEOUT",	0x70a9},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/videotext.h",	"VTXIOCGETINFO",	0x7101},
-	{"linux/videotext.h",	"VTXIOCCLRPAGE",	0x7102},
-	{"linux/videotext.h",	"VTXIOCCLRFOUND",	0x7103},
-	{"linux/videotext.h",	"VTXIOCPAGEREQ",	0x7104},
-	{"linux/videotext.h",	"VTXIOCGETSTAT",	0x7105},
-	{"linux/videotext.h",	"VTXIOCGETPAGE",	0x7106},
-	{"linux/videotext.h",	"VTXIOCSTOPDAU",	0x7107},
-	{"linux/videotext.h",	"VTXIOCPUTPAGE",	0x7108},
-	{"linux/videotext.h",	"VTXIOCSETDISP",	0x7109},
-	{"linux/videotext.h",	"VTXIOCPUTSTAT",	0x710a},
-	{"linux/videotext.h",	"VTXIOCCLRCACHE",	0x710b},
-	{"linux/videotext.h",	"VTXIOCSETVIRT",	0x710c},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/videotext.h",	"TUNIOCGETINFO",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/videotext.h",	"TUNIOCRESET",	0x7202},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"linux/videotext.h",	"TUNIOCSETFREQ",	0x7203},
-	{"linux/videotext.h",	"TUNIOCGETFREQ",	0x7204},
-	{"linux/videotext.h",	"TUNIOCSETCHAN",	0x7205},
-	{"linux/videotext.h",	"TUNIOCGETCHAN",	0x7206},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1CAP",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1REM",	0x7603},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2CAP",	0x7604},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2REM",	0x7605},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/sonypi.h",	"SONYPI_IOCGBATFLAGS",	0x7607},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/sonypi.h",	"SONYPI_IOCGBLUE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/sonypi.h",	"SONYPI_IOCSBLUE",	0x7609},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"asm/sockios.h",	"FIOSETOWN",	0x8901},
-	{"asm/sockios.h",	"SIOCSPGRP",	0x8902},
-	{"asm/sockios.h",	"FIOGETOWN",	0x8903},
-	{"asm/sockios.h",	"SIOCGPGRP",	0x8904},
-	{"asm/sockios.h",	"SIOCATMARK",	0x8905},
-	{"asm/sockios.h",	"SIOCGSTAMP",	0x8906},
-	{"linux/sockios.h",	"SIOCADDRT",	0x890b},
-	{"linux/sockios.h",	"SIOCDELRT",	0x890c},
-	{"linux/sockios.h",	"SIOCRTMSG",	0x890d},
-	{"linux/sockios.h",	"SIOCGIFNAME",	0x8910},
-	{"linux/sockios.h",	"SIOCSIFLINK",	0x8911},
-	{"linux/sockios.h",	"SIOCGIFCONF",	0x8912},
-	{"linux/sockios.h",	"SIOCGIFFLAGS",	0x8913},
-	{"linux/sockios.h",	"SIOCSIFFLAGS",	0x8914},
-	{"linux/sockios.h",	"SIOCGIFADDR",	0x8915},
-	{"linux/sockios.h",	"SIOCSIFADDR",	0x8916},
-	{"linux/sockios.h",	"SIOCGIFDSTADDR",	0x8917},
-	{"linux/sockios.h",	"SIOCSIFDSTADDR",	0x8918},
-	{"linux/sockios.h",	"SIOCGIFBRDADDR",	0x8919},
-	{"linux/sockios.h",	"SIOCSIFBRDADDR",	0x891a},
-	{"linux/sockios.h",	"SIOCGIFNETMASK",	0x891b},
-	{"linux/sockios.h",	"SIOCSIFNETMASK",	0x891c},
-	{"linux/sockios.h",	"SIOCGIFMETRIC",	0x891d},
-	{"linux/sockios.h",	"SIOCSIFMETRIC",	0x891e},
-	{"linux/sockios.h",	"SIOCGIFMEM",	0x891f},
-	{"linux/sockios.h",	"SIOCSIFMEM",	0x8920},
-	{"linux/sockios.h",	"SIOCGIFMTU",	0x8921},
-	{"linux/sockios.h",	"SIOCSIFMTU",	0x8922},
-	{"linux/sockios.h",	"SIOCSIFNAME",	0x8923},
-	{"linux/sockios.h",	"SIOCSIFHWADDR",	0x8924},
-	{"linux/sockios.h",	"SIOCGIFENCAP",	0x8925},
-	{"linux/sockios.h",	"SIOCSIFENCAP",	0x8926},
-	{"linux/sockios.h",	"SIOCGIFHWADDR",	0x8927},
-	{"linux/sockios.h",	"SIOCGIFSLAVE",	0x8929},
-	{"linux/sockios.h",	"SIOCSIFSLAVE",	0x8930},
-	{"linux/sockios.h",	"SIOCADDMULTI",	0x8931},
-	{"linux/sockios.h",	"SIOCDELMULTI",	0x8932},
-	{"linux/sockios.h",	"SIOCGIFINDEX",	0x8933},
-	{"linux/sockios.h",	"SIOCSIFPFLAGS",	0x8934},
-	{"linux/sockios.h",	"SIOCGIFPFLAGS",	0x8935},
-	{"linux/sockios.h",	"SIOCDIFADDR",	0x8936},
-	{"linux/sockios.h",	"SIOCSIFHWBROADCAST",	0x8937},
-	{"linux/sockios.h",	"SIOCGIFCOUNT",	0x8938},
-	{"linux/sockios.h",	"SIOCGIFBR",	0x8940},
-	{"linux/sockios.h",	"SIOCSIFBR",	0x8941},
-	{"linux/sockios.h",	"SIOCGIFTXQLEN",	0x8942},
-	{"linux/sockios.h",	"SIOCSIFTXQLEN",	0x8943},
-	{"linux/sockios.h",	"SIOCGIFDIVERT",	0x8944},
-	{"linux/sockios.h",	"SIOCSIFDIVERT",	0x8945},
-	{"linux/sockios.h",	"SIOCETHTOOL",	0x8946},
-	{"linux/sockios.h",	"SIOCGMIIPHY",	0x8947},
-	{"linux/sockios.h",	"SIOCGMIIREG",	0x8948},
-	{"linux/sockios.h",	"SIOCSMIIREG",	0x8949},
-	{"linux/sockios.h",	"SIOCWANDEV",	0x894a},
-	{"linux/sockios.h",	"SIOCDARP",	0x8953},
-	{"linux/sockios.h",	"SIOCGARP",	0x8954},
-	{"linux/sockios.h",	"SIOCSARP",	0x8955},
-	{"linux/sockios.h",	"SIOCDRARP",	0x8960},
-	{"linux/sockios.h",	"SIOCGRARP",	0x8961},
-	{"linux/sockios.h",	"SIOCSRARP",	0x8962},
-	{"linux/sockios.h",	"SIOCGIFMAP",	0x8970},
-	{"linux/sockios.h",	"SIOCSIFMAP",	0x8971},
-	{"linux/sockios.h",	"SIOCADDDLCI",	0x8980},
-	{"linux/sockios.h",	"SIOCDELDLCI",	0x8981},
-	{"linux/sockios.h",	"SIOCGIFVLAN",	0x8982},
-	{"linux/sockios.h",	"SIOCSIFVLAN",	0x8983},
-	{"linux/sockios.h",	"SIOCBONDENSLAVE",	0x8990},
-	{"linux/sockios.h",	"SIOCBONDRELEASE",	0x8991},
-	{"linux/sockios.h",	"SIOCBONDSETHWADDR",	0x8992},
-	{"linux/sockios.h",	"SIOCBONDSLAVEINFOQUERY",	0x8993},
-	{"linux/sockios.h",	"SIOCBONDINFOQUERY",	0x8994},
-	{"linux/sockios.h",	"SIOCBONDCHANGEACTIVE",	0x8995},
-	{"linux/sockios.h",	"SIOCPROTOPRIVATE",	0x89e0},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/sockios.h",	"SIOCDEVPRIVATE",	0x89f0},
-	{"linux/wireless.h",	"SIOCSIWCOMMIT",	0x8b00},
-	{"linux/wireless.h",	"SIOCGIWNAME",	0x8b01},
-	{"linux/wireless.h",	"SIOCSIWNWID",	0x8b02},
-	{"linux/wireless.h",	"SIOCGIWNWID",	0x8b03},
-	{"linux/wireless.h",	"SIOCSIWFREQ",	0x8b04},
-	{"linux/wireless.h",	"SIOCGIWFREQ",	0x8b05},
-	{"linux/wireless.h",	"SIOCSIWMODE",	0x8b06},
-	{"linux/wireless.h",	"SIOCGIWMODE",	0x8b07},
-	{"linux/wireless.h",	"SIOCSIWSENS",	0x8b08},
-	{"linux/wireless.h",	"SIOCGIWSENS",	0x8b09},
-	{"linux/wireless.h",	"SIOCSIWRANGE",	0x8b0a},
-	{"linux/wireless.h",	"SIOCGIWRANGE",	0x8b0b},
-	{"linux/wireless.h",	"SIOCSIWPRIV",	0x8b0c},
-	{"linux/wireless.h",	"SIOCGIWPRIV",	0x8b0d},
-	{"linux/wireless.h",	"SIOCSIWSTATS",	0x8b0e},
-	{"linux/wireless.h",	"SIOCGIWSTATS",	0x8b0f},
-	{"linux/wireless.h",	"SIOCSIWSPY",	0x8b10},
-	{"linux/wireless.h",	"SIOCGIWSPY",	0x8b11},
-	{"linux/wireless.h",	"SIOCSIWTHRSPY",	0x8b12},
-	{"linux/wireless.h",	"SIOCGIWTHRSPY",	0x8b13},
-	{"linux/wireless.h",	"SIOCSIWAP",	0x8b14},
-	{"linux/wireless.h",	"SIOCGIWAP",	0x8b15},
-	{"linux/wireless.h",	"SIOCGIWAPLIST",	0x8b17},
-	{"linux/wireless.h",	"SIOCSIWSCAN",	0x8b18},
-	{"linux/wireless.h",	"SIOCGIWSCAN",	0x8b19},
-	{"linux/wireless.h",	"SIOCSIWESSID",	0x8b1a},
-	{"linux/wireless.h",	"SIOCGIWESSID",	0x8b1b},
-	{"linux/wireless.h",	"SIOCSIWNICKN",	0x8b1c},
-	{"linux/wireless.h",	"SIOCGIWNICKN",	0x8b1d},
-	{"linux/wireless.h",	"SIOCSIWRATE",	0x8b20},
-	{"linux/wireless.h",	"SIOCGIWRATE",	0x8b21},
-	{"linux/wireless.h",	"SIOCSIWRTS",	0x8b22},
-	{"linux/wireless.h",	"SIOCGIWRTS",	0x8b23},
-	{"linux/wireless.h",	"SIOCSIWFRAG",	0x8b24},
-	{"linux/wireless.h",	"SIOCGIWFRAG",	0x8b25},
-	{"linux/wireless.h",	"SIOCSIWTXPOW",	0x8b26},
-	{"linux/wireless.h",	"SIOCGIWTXPOW",	0x8b27},
-	{"linux/wireless.h",	"SIOCSIWRETRY",	0x8b28},
-	{"linux/wireless.h",	"SIOCGIWRETRY",	0x8b29},
-	{"linux/wireless.h",	"SIOCSIWENCODE",	0x8b2a},
-	{"linux/wireless.h",	"SIOCGIWENCODE",	0x8b2b},
-	{"linux/wireless.h",	"SIOCSIWPOWER",	0x8b2c},
-	{"linux/wireless.h",	"SIOCGIWPOWER",	0x8b2d},
-	{"linux/wireless.h",	"SIOCIWFIRSTPRIV",	0x8be0},
-	{"linux/wireless.h",	"SIOCIWLASTPRIV",	0x8bff},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/dm-ioctl.h",	"DM_VERSION",	0xfd00},
-	{"linux/dm-ioctl.h",	"DM_REMOVE_ALL",	0xfd01},
-	{"linux/dm-ioctl.h",	"DM_LIST_DEVICES",	0xfd02},
-	{"linux/dm-ioctl.h",	"DM_DEV_CREATE",	0xfd03},
-	{"linux/dm-ioctl.h",	"DM_DEV_REMOVE",	0xfd04},
-	{"linux/dm-ioctl.h",	"DM_DEV_RENAME",	0xfd05},
-	{"linux/dm-ioctl.h",	"DM_DEV_SUSPEND",	0xfd06},
-	{"linux/dm-ioctl.h",	"DM_DEV_STATUS",	0xfd07},
-	{"linux/dm-ioctl.h",	"DM_DEV_WAIT",	0xfd08},
-	{"linux/dm-ioctl.h",	"DM_TABLE_LOAD",	0xfd09},
-	{"linux/dm-ioctl.h",	"DM_TABLE_CLEAR",	0xfd0a},
-	{"linux/dm-ioctl.h",	"DM_TABLE_DEPS",	0xfd0b},
-	{"linux/dm-ioctl.h",	"DM_TABLE_STATUS",	0xfd0c},
-	{"linux/dm-ioctl.h",	"DM_LIST_VERSIONS",	0xfd0d},
-	{"linux/lvm.h",	"VG_CREATE_OLD",	0xfe00},
-	{"linux/lvm.h",	"VG_REMOVE",	0xfe01},
-	{"linux/lvm.h",	"VG_EXTEND",	0xfe03},
-	{"linux/lvm.h",	"VG_REDUCE",	0xfe04},
-	{"linux/lvm.h",	"VG_STATUS",	0xfe05},
-	{"linux/lvm.h",	"VG_STATUS_GET_COUNT",	0xfe06},
-	{"linux/lvm.h",	"VG_STATUS_GET_NAMELIST",	0xfe07},
-	{"linux/lvm.h",	"VG_SET_EXTENDABLE",	0xfe08},
-	{"linux/lvm.h",	"VG_RENAME",	0xfe09},
-	{"linux/lvm.h",	"VG_CREATE",	0xfe0a},
-	{"linux/lvm.h",	"LV_CREATE",	0xfe20},
-	{"linux/lvm.h",	"LV_REMOVE",	0xfe21},
-	{"linux/lvm.h",	"LV_ACTIVATE",	0xfe22},
-	{"linux/lvm.h",	"LV_DEACTIVATE",	0xfe23},
-	{"linux/lvm.h",	"LV_EXTEND",	0xfe24},
-	{"linux/lvm.h",	"LV_REDUCE",	0xfe25},
-	{"linux/lvm.h",	"LV_STATUS_BYNAME",	0xfe26},
-	{"linux/lvm.h",	"LV_STATUS_BYINDEX",	0xfe27},
-	{"linux/lvm.h",	"LV_SET_ACCESS",	0xfe28},
-	{"linux/lvm.h",	"LV_SET_ALLOCATION",	0xfe29},
-	{"linux/lvm.h",	"LV_SET_STATUS",	0xfe2a},
-	{"linux/lvm.h",	"LE_REMAP",	0xfe2b},
-	{"linux/lvm.h",	"LV_SNAPSHOT_USE_RATE",	0xfe2c},
-	{"linux/lvm.h",	"LV_STATUS_BYDEV",	0xfe2e},
-	{"linux/lvm.h",	"LV_RENAME",	0xfe2f},
-	{"linux/lvm.h",	"LV_BMAP",	0xfe30},
-	{"linux/lvm.h",	"PV_STATUS",	0xfe40},
-	{"linux/lvm.h",	"PV_CHANGE",	0xfe41},
-	{"linux/lvm.h",	"PV_FLUSH",	0xfe42},
-	{"linux/lvm.h",	"PE_LOCK_UNLOCK",	0xfe50},
-	{"linux/lvm.h",	"LVM_GET_IOP_VERSION",	0xfe98},
-	{"linux/lvm.h",	"LVM_RESET",	0xfe99},
-	{"linux/lvm.h",	"LVM_LOCK_LVM",	0xfe9a},
diff --git a/strace/linux/ioctlent.sh b/strace/linux/ioctlent.sh
deleted file mode 100644
index 8f3d74b..0000000
--- a/strace/linux/ioctlent.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2001 Wichert Akkerman <wichert@cistron.nl>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#	$Id: ioctlent.sh,v 1.12 2004/10/06 22:31:38 roland Exp $
-#
-
-# Validate arg count.
-case $# in
-1)
-	dir="$1"
-	asm=asm
-	;;
-2)
-	dir="$1"
-	asm="$2"
-	;;
-*)
-        echo "usage: $0 include-directory [asm-subdirectory]" >&2
-        exit 1
-	;;
-esac
-
-lookup_ioctls()
-{
-	type="$1"
-	shift
-
-	# Build the list of all ioctls
-	regexp='^[[:space:]]*#[[:space:]]*define[[:space:]]\+[A-Z][A-Z0-9_]*[[:space:]]\+0x'"$type"'..\>'
-	(cd "$dir" ; grep "$regexp" "$@" /dev/null 2>/dev/null ) |
-		sed -ne "s,$asm/,asm/,g"'
-s/^\(.*\):[[:space:]]*#[[:space:]]*define[[:space:]]*\([A-Z0-9_]*\)[[:space:]]*\(0x'"$type"'..\).*/	{ "\1",	"\2",	\3	},/p' \
-		>> ioctls.h
-}
-
-: > ioctls.h
-lookup_ioctls 22 scsi/sg.h
-lookup_ioctls 46 linux/fb.h
-lookup_ioctls 4B linux/kd.h
-lookup_ioctls 53 linux/cdrom.h scsi/scsi.h scsi/scsi_ioctl.h
-lookup_ioctls 54 $asm/ioctls.h
-lookup_ioctls 56 linux/vt.h
-lookup_ioctls '7[12]' linux/videotext.h
-lookup_ioctls 89 $asm/sockios.h linux/sockios.h
-lookup_ioctls 8B linux/wireless.h
-
-files="linux/* $asm/* scsi/* sound/*"
-
-# Build the list of all ioctls
-regexp='^[[:space:]]*#[[:space:]]*define[[:space:]]\+[A-Z][A-Z0-9_]*[[:space:]]\+_S\?\(IO\|IOW\|IOR\|IOWR\)\>'
-(cd $dir ; grep $regexp $files 2>/dev/null ) | \
-	sed -ne "s,$asm/,asm/,g"'
-s/^\(.*\):[[:space:]]*#[[:space:]]*define[[:space:]]*\([A-Z0-9_]*\)[[:space:]]*_S\?I.*(\([^[,]*\)[[:space:]]*,[[:space:]]*\([^,)]*\).*/	{ "\1",	"\2",	_IOC(_IOC_NONE,\3,\4,0)	},/p' \
-	>> ioctls.h
-
-# Some use a special base to offset their ioctls on. Extract that as well.
-: > ioctldefs.h
-
-bases=$(sed -ne 's/.*_IOC_NONE.*,[[:space:]]*\([A-Z][A-Z0-9_]\+\)[[:space:]+,].*/\1/p' ioctls.h | uniq | sort)
-for base in $bases ; do
-	echo "Looking for $base"
-	regexp="^[[:space:]]*#[[:space:]]*define[[:space:]]\+$base"
-	(cd $dir ; grep -h $regexp 2>/dev/null $files ) | \
-		grep -v '\<_IO' >> ioctldefs.h
-done
diff --git a/strace/linux/ioctlsort.c b/strace/linux/ioctlsort.c
deleted file mode 100644
index f544d84..0000000
--- a/strace/linux/ioctlsort.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <stdint.h>
-
-#include <asm/ioctl.h>
-#include <linux/types.h>
-
-#include "ioctldefs.h"
-#include <linux/atmioc.h>
-
-struct ioctlent {
-	const char*	header;
-	const char*	name;
-	unsigned long	code;
-};
-
-struct ioctlent ioctls[] = {
-#include "ioctls.h"
-};
-
-int nioctls = sizeof(ioctls) / sizeof(ioctls[0]);
-
-
-int compare(const void* a, const void* b) {
-	unsigned long code1 = ((struct ioctlent *) a)->code;
-	unsigned long code2 = ((struct ioctlent *) b)->code;
-	const char *name1 = ((struct ioctlent *) a)->name;
-	const char *name2 = ((struct ioctlent *) b)->name;
-	return (code1 > code2) ? 1 : (code1 < code2) ? -1 : strcmp (name1, name2);
-}
-
-
-int main(int argc, char** argv) {
-	int i;
-
-#ifdef POWERPC			/* unspeakable kludge */
-	for (i = 0; i < nioctls; i++)
-		ioctls[i].code &= ~_IOC_DIRMASK;
-#endif
-
-	qsort(ioctls, nioctls, sizeof(ioctls[0]), compare);
-	puts ("\t/* Generated by ioctlsort */");
-	for (i = 0; i < nioctls; i++)
-		if (i == 0 || ioctls[i].code != ioctls[i-1].code ||
-		    strcmp (ioctls[i].name, ioctls[i-1].name))
-			printf("\t{\"%s\",\t\"%s\",\t%#lx},\n",
-				ioctls[i].header, ioctls[i].name, ioctls[i].code);
-
-	return 0;
-}
diff --git a/strace/linux/mips/ioctlent.h b/strace/linux/mips/ioctlent.h
deleted file mode 100644
index c1d6b8a..0000000
--- a/strace/linux/mips/ioctlent.h
+++ /dev/null
@@ -1,838 +0,0 @@
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_DOS",	0x4d2},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_DOS",	0x4d3},
-	{"linux/umsdos_fs.h",	"UMSDOS_RMDIR_DOS",	0x4d4},
-	{"linux/umsdos_fs.h",	"UMSDOS_STAT_DOS",	0x4d5},
-	{"linux/umsdos_fs.h",	"UMSDOS_CREAT_EMD",	0x4d6},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_EMD",	0x4d7},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_EMD",	0x4d8},
-	{"linux/umsdos_fs.h",	"UMSDOS_GETVERSION",	0x4d9},
-	{"linux/umsdos_fs.h",	"UMSDOS_INIT_EMD",	0x4da},
-	{"linux/umsdos_fs.h",	"UMSDOS_DOS_SETUP",	0x4db},
-	{"linux/umsdos_fs.h",	"UMSDOS_RENAME_DOS",	0x4dc},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKPG",	0x1269},
-	{"linux/elevator.h",	"BLKELVGET",	0x126a},
-	{"linux/fs.h",	"BLKELVGET",	0x126a},
-	{"linux/elevator.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/fs.h",	"BLKGETSIZE64",	0x1272},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGREP",	0x4503},
-	{"linux/input.h",	"EVIOCSREP",	0x4503},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCSKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCGKEY",	0x4505},
-	{"linux/input.h",	"EVIOCGBUS",	0x4507},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCSGAIN",	0x4582},
-	{"linux/input.h",	"EVIOCSAUTOCENTER",	0x4583},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"asm/ioctls.h",	"TCGETS",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"asm/ioctls.h",	"TCSETS",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"asm/ioctls.h",	"TCSETSW",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"asm/ioctls.h",	"TCSETSF",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"asm/ioctls.h",	"TCGETA",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"asm/ioctls.h",	"TCSETA",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"asm/ioctls.h",	"TCSETAW",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"asm/ioctls.h",	"TCSETAF",	0x5408},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"asm/ioctls.h",	"TCSBRK",	0x5409},
-	{"asm/ioctls.h",	"TCXONC",	0x540a},
-	{"asm/ioctls.h",	"TCFLSH",	0x540b},
-	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
-	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
-	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
-	{"asm/ioctls.h",	"TIOCGPGRP",	0x540f},
-	{"asm/ioctls.h",	"TIOCSPGRP",	0x5410},
-	{"asm/ioctls.h",	"TIOCOUTQ",	0x5411},
-	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
-	{"asm/ioctls.h",	"TIOCGWINSZ",	0x5413},
-	{"asm/ioctls.h",	"TIOCSWINSZ",	0x5414},
-	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
-	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
-	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
-	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
-	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
-	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
-	{"asm/ioctls.h",	"FIONREAD",	0x541b},
-	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
-	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
-	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
-	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
-	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
-	{"asm/ioctls.h",	"FIONBIO",	0x5421},
-	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
-	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
-	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
-	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
-	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
-	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
-	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
-	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
-	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
-	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
-	{"asm/ioctls.h",	"FIONCLEX",	0x5450},
-	{"asm/ioctls.h",	"FIOCLEX",	0x5451},
-	{"asm/ioctls.h",	"FIOASYNC",	0x5452},
-	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
-	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
-	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
-	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
-	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
-	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
-	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
-	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
-	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
-	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
-	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
-	{"asm/ioctls.h",	"TIOCGHAYESESP",	0x545e},
-	{"asm/ioctls.h",	"TIOCSHAYESESP",	0x545f},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/watchdog.h",	"WDIOC_SETTIMEOUT",	0x5706},
-	{"linux/watchdog.h",	"WDIOC_GETTIMEOUT",	0x5707},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_GETTHIST",	0x6164},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETFLAGS",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/i8k.h",	"I8K_BIOS_VERSION",	0x6980},
-	{"linux/i8k.h",	"I8K_MACHINE_ID",	0x6981},
-	{"linux/i8k.h",	"I8K_POWER_STATUS",	0x6982},
-	{"linux/i8k.h",	"I8K_FN_STATUS",	0x6983},
-	{"linux/i8k.h",	"I8K_GET_TEMP",	0x6984},
-	{"linux/i8k.h",	"I8K_GET_SPEED",	0x6985},
-	{"linux/i8k.h",	"I8K_GET_FAN",	0x6986},
-	{"linux/i8k.h",	"I8K_SET_FAN",	0x6987},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID2",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO_V2",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETMOUNT",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETPID",	0x7004},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLOSE_JOURNALF",	0x7006},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/intermezzo_fs.h",	"PRESTO_SET_FSETROOT",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_FSETROOT",	0x7008},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETOPT",	0x7009},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETOPT",	0x700a},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_KMLSIZE",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_RECNO",	0x700c},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETATTR",	0x7010},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CREATE",	0x7011},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_LINK",	0x7012},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_UNLINK",	0x7013},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SYMLINK",	0x7014},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKDIR",	0x7015},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RMDIR",	0x7016},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKNOD",	0x7017},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RENAME",	0x7018},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CLOSE",	0x701a},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_IOPEN",	0x701b},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETEXTATTR",	0x701c},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_DELEXTATTR",	0x701d},
-	{"linux/intermezzo_fs.h",	"PRESTO_MARK",	0x7020},
-	{"linux/intermezzo_fs.h",	"PRESTO_RELEASE_PERMIT",	0x7021},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_ALL_FSETROOTS",	0x7022},
-	{"linux/intermezzo_fs.h",	"PRESTO_BACKFETCH_LML",	0x7023},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT",	0x7024},
-	{"linux/intermezzo_fs.h",	"PRESTO_CANCEL_LML",	0x7025},
-	{"linux/intermezzo_fs.h",	"PRESTO_RESET_FSET",	0x7026},
-	{"linux/intermezzo_fs.h",	"PRESTO_COMPLETE_CLOSES",	0x7027},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_BEGIN",	0x7030},
-	{"linux/intermezzo_fs.h",	"PRESTO_DO_REINT",	0x7031},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_END",	0x7032},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"OLD_PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/sonypi.h",	"SONYPI_IOCSBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION_OLD",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION_OLD",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1CAP",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1REM",	0x7603},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2CAP",	0x7604},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2REM",	0x7605},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/sonypi.h",	"SONYPI_IOCGBATFLAGS",	0x7607},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/sonypi.h",	"SONYPI_IOCGBLUE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/sonypi.h",	"SONYPI_IOCSBLUE",	0x7609},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"OSIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/dn.h",	"OSIOCGNETADDR",	0x89e1},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/lvm.h",	"VG_CREATE_OLD",	0xfe00},
-	{"linux/lvm.h",	"VG_REMOVE",	0xfe01},
-	{"linux/lvm.h",	"VG_EXTEND",	0xfe03},
-	{"linux/lvm.h",	"VG_REDUCE",	0xfe04},
-	{"linux/lvm.h",	"VG_STATUS",	0xfe05},
-	{"linux/lvm.h",	"VG_STATUS_GET_COUNT",	0xfe06},
-	{"linux/lvm.h",	"VG_STATUS_GET_NAMELIST",	0xfe07},
-	{"linux/lvm.h",	"VG_SET_EXTENDABLE",	0xfe08},
-	{"linux/lvm.h",	"VG_RENAME",	0xfe09},
-	{"linux/lvm.h",	"VG_CREATE",	0xfe0a},
-	{"linux/lvm.h",	"LV_CREATE",	0xfe20},
-	{"linux/lvm.h",	"LV_REMOVE",	0xfe21},
-	{"linux/lvm.h",	"LV_ACTIVATE",	0xfe22},
-	{"linux/lvm.h",	"LV_DEACTIVATE",	0xfe23},
-	{"linux/lvm.h",	"LV_EXTEND",	0xfe24},
-	{"linux/lvm.h",	"LV_REDUCE",	0xfe25},
-	{"linux/lvm.h",	"LV_STATUS_BYNAME",	0xfe26},
-	{"linux/lvm.h",	"LV_STATUS_BYINDEX",	0xfe27},
-	{"linux/lvm.h",	"LV_SET_ACCESS",	0xfe28},
-	{"linux/lvm.h",	"LV_SET_ALLOCATION",	0xfe29},
-	{"linux/lvm.h",	"LV_SET_STATUS",	0xfe2a},
-	{"linux/lvm.h",	"LE_REMAP",	0xfe2b},
-	{"linux/lvm.h",	"LV_SNAPSHOT_USE_RATE",	0xfe2c},
-	{"linux/lvm.h",	"LV_STATUS_BYDEV",	0xfe2e},
-	{"linux/lvm.h",	"LV_RENAME",	0xfe2f},
-	{"linux/lvm.h",	"LV_BMAP",	0xfe30},
-	{"linux/lvm.h",	"PV_STATUS",	0xfe40},
-	{"linux/lvm.h",	"PV_CHANGE",	0xfe41},
-	{"linux/lvm.h",	"PV_FLUSH",	0xfe42},
-	{"linux/lvm.h",	"PE_LOCK_UNLOCK",	0xfe50},
-	{"linux/lvm.h",	"LVM_GET_IOP_VERSION",	0xfe98},
-	{"linux/lvm.h",	"LVM_RESET",	0xfe99},
-	{"linux/lvm.h",	"LVM_LOCK_LVM",	0xff00},
diff --git a/strace/linux/powerpc/errnoent.h b/strace/linux/powerpc/errnoent.h
deleted file mode 100644
index 22659a4..0000000
--- a/strace/linux/powerpc/errnoent.h
+++ /dev/null
@@ -1,529 +0,0 @@
-	"ERRNO_0", /* 0 */
-	"EPERM", /* 1 */
-	"ENOENT", /* 2 */
-	"ESRCH", /* 3 */
-	"EINTR", /* 4 */
-	"EIO", /* 5 */
-	"ENXIO", /* 6 */
-	"E2BIG", /* 7 */
-	"ENOEXEC", /* 8 */
-	"EBADF", /* 9 */
-	"ECHILD", /* 10 */
-	"EAGAIN", /* 11 */
-	"ENOMEM", /* 12 */
-	"EACCES", /* 13 */
-	"EFAULT", /* 14 */
-	"ENOTBLK", /* 15 */
-	"EBUSY", /* 16 */
-	"EEXIST", /* 17 */
-	"EXDEV", /* 18 */
-	"ENODEV", /* 19 */
-	"ENOTDIR", /* 20 */
-	"EISDIR", /* 21 */
-	"EINVAL", /* 22 */
-	"ENFILE", /* 23 */
-	"EMFILE", /* 24 */
-	"ENOTTY", /* 25 */
-	"ETXTBSY", /* 26 */
-	"EFBIG", /* 27 */
-	"ENOSPC", /* 28 */
-	"ESPIPE", /* 29 */
-	"EROFS", /* 30 */
-	"EMLINK", /* 31 */
-	"EPIPE", /* 32 */
-	"EDOM", /* 33 */
-	"ERANGE", /* 34 */
-	"EDEADLK", /* 35 */
-	"ENAMETOOLONG", /* 36 */
-	"ENOLCK", /* 37 */
-	"ENOSYS", /* 38 */
-	"ENOTEMPTY", /* 39 */
-	"ELOOP", /* 40 */
-	"ERRNO_41", /* 41 */
-	"ENOMSG", /* 42 */
-	"EIDRM", /* 43 */
-	"ECHRNG", /* 44 */
-	"EL2NSYNC", /* 45 */
-	"EL3HLT", /* 46 */
-	"EL3RST", /* 47 */
-	"ELNRNG", /* 48 */
-	"EUNATCH", /* 49 */
-	"ENOCSI", /* 50 */
-	"EL2HLT", /* 51 */
-	"EBADE", /* 52 */
-	"EBADR", /* 53 */
-	"EXFULL", /* 54 */
-	"ENOANO", /* 55 */
-	"EBADRQC", /* 56 */
-	"EBADSLT", /* 57 */
-	"EDEADLOCK", /* 58 */
-	"EBFONT", /* 59 */
-	"ENOSTR", /* 60 */
-	"ENODATA", /* 61 */
-	"ETIME", /* 62 */
-	"ENOSR", /* 63 */
-	"ENONET", /* 64 */
-	"ENOPKG", /* 65 */
-	"EREMOTE", /* 66 */
-	"ENOLINK", /* 67 */
-	"EADV", /* 68 */
-	"ESRMNT", /* 69 */
-	"ECOMM", /* 70 */
-	"EPROTO", /* 71 */
-	"EMULTIHOP", /* 72 */
-	"EDOTDOT", /* 73 */
-	"EBADMSG", /* 74 */
-	"EOVERFLOW", /* 75 */
-	"ENOTUNIQ", /* 76 */
-	"EBADFD", /* 77 */
-	"EREMCHG", /* 78 */
-	"ELIBACC", /* 79 */
-	"ELIBBAD", /* 80 */
-	"ELIBSCN", /* 81 */
-	"ELIBMAX", /* 82 */
-	"ELIBEXEC", /* 83 */
-	"EILSEQ", /* 84 */
-	"ERESTART", /* 85 */
-	"ESTRPIPE", /* 86 */
-	"EUSERS", /* 87 */
-	"ENOTSOCK", /* 88 */
-	"EDESTADDRREQ", /* 89 */
-	"EMSGSIZE", /* 90 */
-	"EPROTOTYPE", /* 91 */
-	"ENOPROTOOPT", /* 92 */
-	"EPROTONOSUPPORT", /* 93 */
-	"ESOCKTNOSUPPORT", /* 94 */
-	"EOPNOTSUPP", /* 95 */
-	"EPFNOSUPPORT", /* 96 */
-	"EAFNOSUPPORT", /* 97 */
-	"EADDRINUSE", /* 98 */
-	"EADDRNOTAVAIL", /* 99 */
-	"ENETDOWN", /* 100 */
-	"ENETUNREACH", /* 101 */
-	"ENETRESET", /* 102 */
-	"ECONNABORTED", /* 103 */
-	"ECONNRESET", /* 104 */
-	"ENOBUFS", /* 105 */
-	"EISCONN", /* 106 */
-	"ENOTCONN", /* 107 */
-	"ESHUTDOWN", /* 108 */
-	"ETOOMANYREFS", /* 109 */
-	"ETIMEDOUT", /* 110 */
-	"ECONNREFUSED", /* 111 */
-	"EHOSTDOWN", /* 112 */
-	"EHOSTUNREACH", /* 113 */
-	"EALREADY", /* 114 */
-	"EINPROGRESS", /* 115 */
-	"ESTALE", /* 116 */
-	"EUCLEAN", /* 117 */
-	"ENOTNAM", /* 118 */
-	"ENAVAIL", /* 119 */
-	"EISNAM", /* 120 */
-	"EREMOTEIO", /* 121 */
-	"EDQUOT", /* 122 */
-	"ENOMEDIUM", /* 123 */
-	"EMEDIUMTYPE", /* 124 */
-	"ERRNO_125", /* 125 */
-	"ERRNO_126", /* 126 */
-	"ERRNO_127", /* 127 */
-	"ERRNO_128", /* 128 */
-	"ERRNO_129", /* 129 */
-	"ERRNO_130", /* 130 */
-	"ERRNO_131", /* 131 */
-	"ERRNO_132", /* 132 */
-	"ERRNO_133", /* 133 */
-	"ERRNO_134", /* 134 */
-	"ERRNO_135", /* 135 */
-	"ERRNO_136", /* 136 */
-	"ERRNO_137", /* 137 */
-	"ERRNO_138", /* 138 */
-	"ERRNO_139", /* 139 */
-	"ERRNO_140", /* 140 */
-	"ERRNO_141", /* 141 */
-	"ERRNO_142", /* 142 */
-	"ERRNO_143", /* 143 */
-	"ERRNO_144", /* 144 */
-	"ERRNO_145", /* 145 */
-	"ERRNO_146", /* 146 */
-	"ERRNO_147", /* 147 */
-	"ERRNO_148", /* 148 */
-	"ERRNO_149", /* 149 */
-	"ERRNO_150", /* 150 */
-	"ERRNO_151", /* 151 */
-	"ERRNO_152", /* 152 */
-	"ERRNO_153", /* 153 */
-	"ERRNO_154", /* 154 */
-	"ERRNO_155", /* 155 */
-	"ERRNO_156", /* 156 */
-	"ERRNO_157", /* 157 */
-	"ERRNO_158", /* 158 */
-	"ERRNO_159", /* 159 */
-	"ERRNO_160", /* 160 */
-	"ERRNO_161", /* 161 */
-	"ERRNO_162", /* 162 */
-	"ERRNO_163", /* 163 */
-	"ERRNO_164", /* 164 */
-	"ERRNO_165", /* 165 */
-	"ERRNO_166", /* 166 */
-	"ERRNO_167", /* 167 */
-	"ERRNO_168", /* 168 */
-	"ERRNO_169", /* 169 */
-	"ERRNO_170", /* 170 */
-	"ERRNO_171", /* 171 */
-	"ERRNO_172", /* 172 */
-	"ERRNO_173", /* 173 */
-	"ERRNO_174", /* 174 */
-	"ERRNO_175", /* 175 */
-	"ERRNO_176", /* 176 */
-	"ERRNO_177", /* 177 */
-	"ERRNO_178", /* 178 */
-	"ERRNO_179", /* 179 */
-	"ERRNO_180", /* 180 */
-	"ERRNO_181", /* 181 */
-	"ERRNO_182", /* 182 */
-	"ERRNO_183", /* 183 */
-	"ERRNO_184", /* 184 */
-	"ERRNO_185", /* 185 */
-	"ERRNO_186", /* 186 */
-	"ERRNO_187", /* 187 */
-	"ERRNO_188", /* 188 */
-	"ERRNO_189", /* 189 */
-	"ERRNO_190", /* 190 */
-	"ERRNO_191", /* 191 */
-	"ERRNO_192", /* 192 */
-	"ERRNO_193", /* 193 */
-	"ERRNO_194", /* 194 */
-	"ERRNO_195", /* 195 */
-	"ERRNO_196", /* 196 */
-	"ERRNO_197", /* 197 */
-	"ERRNO_198", /* 198 */
-	"ERRNO_199", /* 199 */
-	"ERRNO_200", /* 200 */
-	"ERRNO_201", /* 201 */
-	"ERRNO_202", /* 202 */
-	"ERRNO_203", /* 203 */
-	"ERRNO_204", /* 204 */
-	"ERRNO_205", /* 205 */
-	"ERRNO_206", /* 206 */
-	"ERRNO_207", /* 207 */
-	"ERRNO_208", /* 208 */
-	"ERRNO_209", /* 209 */
-	"ERRNO_210", /* 210 */
-	"ERRNO_211", /* 211 */
-	"ERRNO_212", /* 212 */
-	"ERRNO_213", /* 213 */
-	"ERRNO_214", /* 214 */
-	"ERRNO_215", /* 215 */
-	"ERRNO_216", /* 216 */
-	"ERRNO_217", /* 217 */
-	"ERRNO_218", /* 218 */
-	"ERRNO_219", /* 219 */
-	"ERRNO_220", /* 220 */
-	"ERRNO_221", /* 221 */
-	"ERRNO_222", /* 222 */
-	"ERRNO_223", /* 223 */
-	"ERRNO_224", /* 224 */
-	"ERRNO_225", /* 225 */
-	"ERRNO_226", /* 226 */
-	"ERRNO_227", /* 227 */
-	"ERRNO_228", /* 228 */
-	"ERRNO_229", /* 229 */
-	"ERRNO_230", /* 230 */
-	"ERRNO_231", /* 231 */
-	"ERRNO_232", /* 232 */
-	"ERRNO_233", /* 233 */
-	"ERRNO_234", /* 234 */
-	"ERRNO_235", /* 235 */
-	"ERRNO_236", /* 236 */
-	"ERRNO_237", /* 237 */
-	"ERRNO_238", /* 238 */
-	"ERRNO_239", /* 239 */
-	"ERRNO_240", /* 240 */
-	"ERRNO_241", /* 241 */
-	"ERRNO_242", /* 242 */
-	"ERRNO_243", /* 243 */
-	"ERRNO_244", /* 244 */
-	"ERRNO_245", /* 245 */
-	"ERRNO_246", /* 246 */
-	"ERRNO_247", /* 247 */
-	"ERRNO_248", /* 248 */
-	"ERRNO_249", /* 249 */
-	"ERRNO_250", /* 250 */
-	"ERRNO_251", /* 251 */
-	"ERRNO_252", /* 252 */
-	"ERRNO_253", /* 253 */
-	"ERRNO_254", /* 254 */
-	"ERRNO_255", /* 255 */
-	"ERRNO_256", /* 256 */
-	"ERRNO_257", /* 257 */
-	"ERRNO_258", /* 258 */
-	"ERRNO_259", /* 259 */
-	"ERRNO_260", /* 260 */
-	"ERRNO_261", /* 261 */
-	"ERRNO_262", /* 262 */
-	"ERRNO_263", /* 263 */
-	"ERRNO_264", /* 264 */
-	"ERRNO_265", /* 265 */
-	"ERRNO_266", /* 266 */
-	"ERRNO_267", /* 267 */
-	"ERRNO_268", /* 268 */
-	"ERRNO_269", /* 269 */
-	"ERRNO_270", /* 270 */
-	"ERRNO_271", /* 271 */
-	"ERRNO_272", /* 272 */
-	"ERRNO_273", /* 273 */
-	"ERRNO_274", /* 274 */
-	"ERRNO_275", /* 275 */
-	"ERRNO_276", /* 276 */
-	"ERRNO_277", /* 277 */
-	"ERRNO_278", /* 278 */
-	"ERRNO_279", /* 279 */
-	"ERRNO_280", /* 280 */
-	"ERRNO_281", /* 281 */
-	"ERRNO_282", /* 282 */
-	"ERRNO_283", /* 283 */
-	"ERRNO_284", /* 284 */
-	"ERRNO_285", /* 285 */
-	"ERRNO_286", /* 286 */
-	"ERRNO_287", /* 287 */
-	"ERRNO_288", /* 288 */
-	"ERRNO_289", /* 289 */
-	"ERRNO_290", /* 290 */
-	"ERRNO_291", /* 291 */
-	"ERRNO_292", /* 292 */
-	"ERRNO_293", /* 293 */
-	"ERRNO_294", /* 294 */
-	"ERRNO_295", /* 295 */
-	"ERRNO_296", /* 296 */
-	"ERRNO_297", /* 297 */
-	"ERRNO_298", /* 298 */
-	"ERRNO_299", /* 299 */
-	"ERRNO_300", /* 300 */
-	"ERRNO_301", /* 301 */
-	"ERRNO_302", /* 302 */
-	"ERRNO_303", /* 303 */
-	"ERRNO_304", /* 304 */
-	"ERRNO_305", /* 305 */
-	"ERRNO_306", /* 306 */
-	"ERRNO_307", /* 307 */
-	"ERRNO_308", /* 308 */
-	"ERRNO_309", /* 309 */
-	"ERRNO_310", /* 310 */
-	"ERRNO_311", /* 311 */
-	"ERRNO_312", /* 312 */
-	"ERRNO_313", /* 313 */
-	"ERRNO_314", /* 314 */
-	"ERRNO_315", /* 315 */
-	"ERRNO_316", /* 316 */
-	"ERRNO_317", /* 317 */
-	"ERRNO_318", /* 318 */
-	"ERRNO_319", /* 319 */
-	"ERRNO_320", /* 320 */
-	"ERRNO_321", /* 321 */
-	"ERRNO_322", /* 322 */
-	"ERRNO_323", /* 323 */
-	"ERRNO_324", /* 324 */
-	"ERRNO_325", /* 325 */
-	"ERRNO_326", /* 326 */
-	"ERRNO_327", /* 327 */
-	"ERRNO_328", /* 328 */
-	"ERRNO_329", /* 329 */
-	"ERRNO_330", /* 330 */
-	"ERRNO_331", /* 331 */
-	"ERRNO_332", /* 332 */
-	"ERRNO_333", /* 333 */
-	"ERRNO_334", /* 334 */
-	"ERRNO_335", /* 335 */
-	"ERRNO_336", /* 336 */
-	"ERRNO_337", /* 337 */
-	"ERRNO_338", /* 338 */
-	"ERRNO_339", /* 339 */
-	"ERRNO_340", /* 340 */
-	"ERRNO_341", /* 341 */
-	"ERRNO_342", /* 342 */
-	"ERRNO_343", /* 343 */
-	"ERRNO_344", /* 344 */
-	"ERRNO_345", /* 345 */
-	"ERRNO_346", /* 346 */
-	"ERRNO_347", /* 347 */
-	"ERRNO_348", /* 348 */
-	"ERRNO_349", /* 349 */
-	"ERRNO_350", /* 350 */
-	"ERRNO_351", /* 351 */
-	"ERRNO_352", /* 352 */
-	"ERRNO_353", /* 353 */
-	"ERRNO_354", /* 354 */
-	"ERRNO_355", /* 355 */
-	"ERRNO_356", /* 356 */
-	"ERRNO_357", /* 357 */
-	"ERRNO_358", /* 358 */
-	"ERRNO_359", /* 359 */
-	"ERRNO_360", /* 360 */
-	"ERRNO_361", /* 361 */
-	"ERRNO_362", /* 362 */
-	"ERRNO_363", /* 363 */
-	"ERRNO_364", /* 364 */
-	"ERRNO_365", /* 365 */
-	"ERRNO_366", /* 366 */
-	"ERRNO_367", /* 367 */
-	"ERRNO_368", /* 368 */
-	"ERRNO_369", /* 369 */
-	"ERRNO_370", /* 370 */
-	"ERRNO_371", /* 371 */
-	"ERRNO_372", /* 372 */
-	"ERRNO_373", /* 373 */
-	"ERRNO_374", /* 374 */
-	"ERRNO_375", /* 375 */
-	"ERRNO_376", /* 376 */
-	"ERRNO_377", /* 377 */
-	"ERRNO_378", /* 378 */
-	"ERRNO_379", /* 379 */
-	"ERRNO_380", /* 380 */
-	"ERRNO_381", /* 381 */
-	"ERRNO_382", /* 382 */
-	"ERRNO_383", /* 383 */
-	"ERRNO_384", /* 384 */
-	"ERRNO_385", /* 385 */
-	"ERRNO_386", /* 386 */
-	"ERRNO_387", /* 387 */
-	"ERRNO_388", /* 388 */
-	"ERRNO_389", /* 389 */
-	"ERRNO_390", /* 390 */
-	"ERRNO_391", /* 391 */
-	"ERRNO_392", /* 392 */
-	"ERRNO_393", /* 393 */
-	"ERRNO_394", /* 394 */
-	"ERRNO_395", /* 395 */
-	"ERRNO_396", /* 396 */
-	"ERRNO_397", /* 397 */
-	"ERRNO_398", /* 398 */
-	"ERRNO_399", /* 399 */
-	"ERRNO_400", /* 400 */
-	"ERRNO_401", /* 401 */
-	"ERRNO_402", /* 402 */
-	"ERRNO_403", /* 403 */
-	"ERRNO_404", /* 404 */
-	"ERRNO_405", /* 405 */
-	"ERRNO_406", /* 406 */
-	"ERRNO_407", /* 407 */
-	"ERRNO_408", /* 408 */
-	"ERRNO_409", /* 409 */
-	"ERRNO_410", /* 410 */
-	"ERRNO_411", /* 411 */
-	"ERRNO_412", /* 412 */
-	"ERRNO_413", /* 413 */
-	"ERRNO_414", /* 414 */
-	"ERRNO_415", /* 415 */
-	"ERRNO_416", /* 416 */
-	"ERRNO_417", /* 417 */
-	"ERRNO_418", /* 418 */
-	"ERRNO_419", /* 419 */
-	"ERRNO_420", /* 420 */
-	"ERRNO_421", /* 421 */
-	"ERRNO_422", /* 422 */
-	"ERRNO_423", /* 423 */
-	"ERRNO_424", /* 424 */
-	"ERRNO_425", /* 425 */
-	"ERRNO_426", /* 426 */
-	"ERRNO_427", /* 427 */
-	"ERRNO_428", /* 428 */
-	"ERRNO_429", /* 429 */
-	"ERRNO_430", /* 430 */
-	"ERRNO_431", /* 431 */
-	"ERRNO_432", /* 432 */
-	"ERRNO_433", /* 433 */
-	"ERRNO_434", /* 434 */
-	"ERRNO_435", /* 435 */
-	"ERRNO_436", /* 436 */
-	"ERRNO_437", /* 437 */
-	"ERRNO_438", /* 438 */
-	"ERRNO_439", /* 439 */
-	"ERRNO_440", /* 440 */
-	"ERRNO_441", /* 441 */
-	"ERRNO_442", /* 442 */
-	"ERRNO_443", /* 443 */
-	"ERRNO_444", /* 444 */
-	"ERRNO_445", /* 445 */
-	"ERRNO_446", /* 446 */
-	"ERRNO_447", /* 447 */
-	"ERRNO_448", /* 448 */
-	"ERRNO_449", /* 449 */
-	"ERRNO_450", /* 450 */
-	"ERRNO_451", /* 451 */
-	"ERRNO_452", /* 452 */
-	"ERRNO_453", /* 453 */
-	"ERRNO_454", /* 454 */
-	"ERRNO_455", /* 455 */
-	"ERRNO_456", /* 456 */
-	"ERRNO_457", /* 457 */
-	"ERRNO_458", /* 458 */
-	"ERRNO_459", /* 459 */
-	"ERRNO_460", /* 460 */
-	"ERRNO_461", /* 461 */
-	"ERRNO_462", /* 462 */
-	"ERRNO_463", /* 463 */
-	"ERRNO_464", /* 464 */
-	"ERRNO_465", /* 465 */
-	"ERRNO_466", /* 466 */
-	"ERRNO_467", /* 467 */
-	"ERRNO_468", /* 468 */
-	"ERRNO_469", /* 469 */
-	"ERRNO_470", /* 470 */
-	"ERRNO_471", /* 471 */
-	"ERRNO_472", /* 472 */
-	"ERRNO_473", /* 473 */
-	"ERRNO_474", /* 474 */
-	"ERRNO_475", /* 475 */
-	"ERRNO_476", /* 476 */
-	"ERRNO_477", /* 477 */
-	"ERRNO_478", /* 478 */
-	"ERRNO_479", /* 479 */
-	"ERRNO_480", /* 480 */
-	"ERRNO_481", /* 481 */
-	"ERRNO_482", /* 482 */
-	"ERRNO_483", /* 483 */
-	"ERRNO_484", /* 484 */
-	"ERRNO_485", /* 485 */
-	"ERRNO_486", /* 486 */
-	"ERRNO_487", /* 487 */
-	"ERRNO_488", /* 488 */
-	"ERRNO_489", /* 489 */
-	"ERRNO_490", /* 490 */
-	"ERRNO_491", /* 491 */
-	"ERRNO_492", /* 492 */
-	"ERRNO_493", /* 493 */
-	"ERRNO_494", /* 494 */
-	"ERRNO_495", /* 495 */
-	"ERRNO_496", /* 496 */
-	"ERRNO_497", /* 497 */
-	"ERRNO_498", /* 498 */
-	"ERRNO_499", /* 499 */
-	"ERRNO_500", /* 500 */
-	"ERRNO_501", /* 501 */
-	"ERRNO_502", /* 502 */
-	"ERRNO_503", /* 503 */
-	"ERRNO_504", /* 504 */
-	"ERRNO_505", /* 505 */
-	"ERRNO_506", /* 506 */
-	"ERRNO_507", /* 507 */
-	"ERRNO_508", /* 508 */
-	"ERRNO_509", /* 509 */
-	"ERRNO_510", /* 510 */
-	"ERRNO_511", /* 511 */
-	"ERESTARTSYS", /* 512 */
-	"ERESTARTNOINTR", /* 513 */
-	"ERESTARTNOHAND", /* 514 */
-	"ENOIOCTLCMD", /* 515 */
-	"ERRNO_516", /* 516 */
-	"ERRNO_517", /* 517 */
-	"ERRNO_518", /* 518 */
-	"ERRNO_519", /* 519 */
-	"ERRNO_520", /* 520 */
-	"EBADHANDLE", /* 521 */
-	"ENOTSYNC", /* 522 */
-	"EBADCOOKIE", /* 523 */
-	"ENOTSUPP", /* 524 */
-	"ETOOSMALL", /* 525 */
-	"ESERVERFAULT", /* 526 */
-	"EBADTYPE", /* 527 */
-	"EJUKEBOX", /* 528 */
diff --git a/strace/linux/powerpc/ioctlent.h b/strace/linux/powerpc/ioctlent.h
deleted file mode 100644
index 16010da..0000000
--- a/strace/linux/powerpc/ioctlent.h
+++ /dev/null
@@ -1,1181 +0,0 @@
-	/* Generated by ioctlsort */
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_DOS",	0x4d2},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_DOS",	0x4d3},
-	{"linux/umsdos_fs.h",	"UMSDOS_RMDIR_DOS",	0x4d4},
-	{"linux/umsdos_fs.h",	"UMSDOS_STAT_DOS",	0x4d5},
-	{"linux/umsdos_fs.h",	"UMSDOS_CREAT_EMD",	0x4d6},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_EMD",	0x4d7},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_EMD",	0x4d8},
-	{"linux/umsdos_fs.h",	"UMSDOS_GETVERSION",	0x4d9},
-	{"linux/umsdos_fs.h",	"UMSDOS_INIT_EMD",	0x4da},
-	{"linux/umsdos_fs.h",	"UMSDOS_DOS_SETUP",	0x4db},
-	{"linux/umsdos_fs.h",	"UMSDOS_RENAME_DOS",	0x4dc},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKELVGET",	0x126a},
-	{"linux/fs.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/fs.h",	"BLKGETSIZE64",	0x1272},
-	{"scsi/sg.h",	"SG_SET_TIMEOUT",	0x2201},
-	{"scsi/sg.h",	"SG_GET_TIMEOUT",	0x2202},
-	{"scsi/sg.h",	"SG_EMULATED_HOST",	0x2203},
-	{"scsi/sg.h",	"SG_SET_TRANSFORM",	0x2204},
-	{"scsi/sg.h",	"SG_GET_TRANSFORM",	0x2205},
-	{"scsi/sg.h",	"SG_GET_COMMAND_Q",	0x2270},
-	{"scsi/sg.h",	"SG_SET_COMMAND_Q",	0x2271},
-	{"scsi/sg.h",	"SG_GET_RESERVED_SIZE",	0x2272},
-	{"scsi/sg.h",	"SG_SET_RESERVED_SIZE",	0x2275},
-	{"scsi/sg.h",	"SG_GET_SCSI_ID",	0x2276},
-	{"scsi/sg.h",	"SG_SET_FORCE_LOW_DMA",	0x2279},
-	{"scsi/sg.h",	"SG_GET_LOW_DMA",	0x227a},
-	{"scsi/sg.h",	"SG_SET_FORCE_PACK_ID",	0x227b},
-	{"scsi/sg.h",	"SG_GET_PACK_ID",	0x227c},
-	{"scsi/sg.h",	"SG_GET_NUM_WAITING",	0x227d},
-	{"scsi/sg.h",	"SG_SET_DEBUG",	0x227e},
-	{"scsi/sg.h",	"SG_GET_SG_TABLESIZE",	0x227f},
-	{"scsi/sg.h",	"SG_GET_VERSION_NUM",	0x2282},
-	{"scsi/sg.h",	"SG_NEXT_CMD_LEN",	0x2283},
-	{"scsi/sg.h",	"SG_SCSI_RESET",	0x2284},
-	{"scsi/sg.h",	"SG_IO",	0x2285},
-	{"scsi/sg.h",	"SG_GET_REQUEST_TABLE",	0x2286},
-	{"scsi/sg.h",	"SG_SET_KEEP_ORPHAN",	0x2287},
-	{"scsi/sg.h",	"SG_GET_KEEP_ORPHAN",	0x2288},
-	{"linux/i2o.h",	"BLKI2OGRSTRAT",	0x3201},
-	{"linux/i2o.h",	"BLKI2OGWSTRAT",	0x3202},
-	{"linux/i2o.h",	"BLKI2OSRSTRAT",	0x3203},
-	{"linux/i2o.h",	"BLKI2OSWSTRAT",	0x3204},
-	{"linux/radeonfb.h",	"FBIO_RADEON_GET_MIRROR",	0x4003},
-	{"linux/radeonfb.h",	"FBIO_RADEON_SET_MIRROR",	0x4004},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/pmu.h",	"PMU_IOC_GRAB_BACKLIGHT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/cciss_ioctl.h",	"CCISS_DEREGDISK",	0x420c},
-	{"linux/cciss_ioctl.h",	"CCISS_REGNEWDISK",	0x420d},
-	{"linux/cciss_ioctl.h",	"CCISS_REGNEWD",	0x420e},
-	{"linux/cciss_ioctl.h",	"CCISS_GETLUNINFO",	0x4211},
-	{"linux/cciss_ioctl.h",	"CCISS_BIG_PASSTHRU",	0x4212},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCSKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/input.h",	"EVIOCGRAB",	0x4590},
-	{"linux/fb.h",	"FBIOGET_VSCREENINFO",	0x4600},
-	{"linux/fb.h",	"FBIOPUT_VSCREENINFO",	0x4601},
-	{"linux/fb.h",	"FBIOGET_FSCREENINFO",	0x4602},
-	{"linux/fb.h",	"FBIOGETCMAP",	0x4604},
-	{"linux/fb.h",	"FBIOPUTCMAP",	0x4605},
-	{"linux/fb.h",	"FBIOPAN_DISPLAY",	0x4606},
-	{"linux/fb.h",	"FBIO_CURSOR",	0x4608},
-	{"linux/fb.h",	"FBIOGET_CON2FBMAP",	0x460f},
-	{"linux/fb.h",	"FBIOPUT_CON2FBMAP",	0x4610},
-	{"linux/fb.h",	"FBIOBLANK",	0x4611},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/fb.h",	"FBIO_ALLOC",	0x4613},
-	{"linux/fb.h",	"FBIO_FREE",	0x4614},
-	{"linux/fb.h",	"FBIOGET_GLYPH",	0x4615},
-	{"linux/fb.h",	"FBIOGET_HWCINFO",	0x4616},
-	{"linux/fb.h",	"FBIOPUT_MODEINFO",	0x4617},
-	{"linux/fb.h",	"FBIOGET_DISPINFO",	0x4618},
-	{"linux/matroxfb.h",	"FBIO_WAITFORVSYNC",	0x4620},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/hiddev.h",	"HIDIOCGFLAG",	0x480e},
-	{"linux/hiddev.h",	"HIDIOCSFLAG",	0x480f},
-	{"linux/hiddev.h",	"HIDIOCGCOLLECTIONINDEX",	0x4810},
-	{"linux/hiddev.h",	"HIDIOCGCOLLECTIONINFO",	0x4811},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/kd.h",	"KIOCSOUND",	0x4b2f},
-	{"linux/kd.h",	"KDMKTONE",	0x4b30},
-	{"linux/kd.h",	"KDGETLED",	0x4b31},
-	{"linux/kd.h",	"KDSETLED",	0x4b32},
-	{"linux/kd.h",	"KDGKBTYPE",	0x4b33},
-	{"linux/kd.h",	"KDADDIO",	0x4b34},
-	{"linux/kd.h",	"KDDELIO",	0x4b35},
-	{"linux/kd.h",	"KDENABIO",	0x4b36},
-	{"linux/kd.h",	"KDDISABIO",	0x4b37},
-	{"linux/kd.h",	"KDSETMODE",	0x4b3a},
-	{"linux/kd.h",	"KDGETMODE",	0x4b3b},
-	{"linux/kd.h",	"KDMAPDISP",	0x4b3c},
-	{"linux/kd.h",	"KDUNMAPDISP",	0x4b3d},
-	{"linux/kd.h",	"GIO_SCRNMAP",	0x4b40},
-	{"linux/kd.h",	"PIO_SCRNMAP",	0x4b41},
-	{"linux/kd.h",	"KDGKBMODE",	0x4b44},
-	{"linux/kd.h",	"KDSKBMODE",	0x4b45},
-	{"linux/kd.h",	"KDGKBENT",	0x4b46},
-	{"linux/kd.h",	"KDSKBENT",	0x4b47},
-	{"linux/kd.h",	"KDGKBSENT",	0x4b48},
-	{"linux/kd.h",	"KDSKBSENT",	0x4b49},
-	{"linux/kd.h",	"KDGKBDIACR",	0x4b4a},
-	{"linux/kd.h",	"KDSKBDIACR",	0x4b4b},
-	{"linux/kd.h",	"KDGETKEYCODE",	0x4b4c},
-	{"linux/kd.h",	"KDSETKEYCODE",	0x4b4d},
-	{"linux/kd.h",	"KDSIGACCEPT",	0x4b4e},
-	{"linux/kd.h",	"KDKBDREP",	0x4b52},
-	{"linux/kd.h",	"GIO_FONT",	0x4b60},
-	{"linux/kd.h",	"PIO_FONT",	0x4b61},
-	{"linux/kd.h",	"KDGKBMETA",	0x4b62},
-	{"linux/kd.h",	"KDSKBMETA",	0x4b63},
-	{"linux/kd.h",	"KDGKBLED",	0x4b64},
-	{"linux/kd.h",	"KDSKBLED",	0x4b65},
-	{"linux/kd.h",	"GIO_UNIMAP",	0x4b66},
-	{"linux/kd.h",	"PIO_UNIMAP",	0x4b67},
-	{"linux/kd.h",	"PIO_UNIMAPCLR",	0x4b68},
-	{"linux/kd.h",	"GIO_UNISCRNMAP",	0x4b69},
-	{"linux/kd.h",	"PIO_UNISCRNMAP",	0x4b6a},
-	{"linux/kd.h",	"GIO_FONTX",	0x4b6b},
-	{"linux/kd.h",	"PIO_FONTX",	0x4b6c},
-	{"linux/kd.h",	"PIO_FONTRESET",	0x4b6d},
-	{"linux/kd.h",	"GIO_CMAP",	0x4b70},
-	{"linux/kd.h",	"PIO_CMAP",	0x4b71},
-	{"linux/kd.h",	"KDFONTOP",	0x4b72},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/ticable.h",	"IOCTL_TIUSB_TIMEOUT",	0x4e20},
-	{"linux/ticable.h",	"IOCTL_TIUSB_RESET_DEVICE",	0x4e21},
-	{"linux/ticable.h",	"IOCTL_TIUSB_RESET_PIPES",	0x4e22},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"linux/cdrom.h",	"CDROMPAUSE",	0x5301},
-	{"linux/cdrom.h",	"CDROMRESUME",	0x5302},
-	{"linux/cdrom.h",	"CDROMPLAYMSF",	0x5303},
-	{"linux/cdrom.h",	"CDROMPLAYTRKIND",	0x5304},
-	{"linux/cdrom.h",	"CDROMREADTOCHDR",	0x5305},
-	{"linux/cdrom.h",	"CDROMREADTOCENTRY",	0x5306},
-	{"linux/cdrom.h",	"CDROMSTOP",	0x5307},
-	{"linux/cdrom.h",	"CDROMSTART",	0x5308},
-	{"linux/cdrom.h",	"CDROMEJECT",	0x5309},
-	{"linux/cdrom.h",	"CDROMVOLCTRL",	0x530a},
-	{"linux/cdrom.h",	"CDROMSUBCHNL",	0x530b},
-	{"linux/cdrom.h",	"CDROMREADMODE2",	0x530c},
-	{"linux/cdrom.h",	"CDROMREADMODE1",	0x530d},
-	{"linux/cdrom.h",	"CDROMREADAUDIO",	0x530e},
-	{"linux/cdrom.h",	"CDROMEJECT_SW",	0x530f},
-	{"linux/cdrom.h",	"CDROMMULTISESSION",	0x5310},
-	{"linux/cdrom.h",	"CDROM_GET_MCN",	0x5311},
-	{"linux/cdrom.h",	"CDROMRESET",	0x5312},
-	{"linux/cdrom.h",	"CDROMVOLREAD",	0x5313},
-	{"linux/cdrom.h",	"CDROMREADRAW",	0x5314},
-	{"linux/cdrom.h",	"CDROMREADCOOKED",	0x5315},
-	{"linux/cdrom.h",	"CDROMSEEK",	0x5316},
-	{"linux/cdrom.h",	"CDROMPLAYBLK",	0x5317},
-	{"linux/cdrom.h",	"CDROMREADALL",	0x5318},
-	{"linux/cdrom.h",	"CDROMCLOSETRAY",	0x5319},
-	{"linux/cdrom.h",	"CDROMGETSPINDOWN",	0x531d},
-	{"linux/cdrom.h",	"CDROMSETSPINDOWN",	0x531e},
-	{"linux/cdrom.h",	"CDROM_SET_OPTIONS",	0x5320},
-	{"linux/cdrom.h",	"CDROM_CLEAR_OPTIONS",	0x5321},
-	{"linux/cdrom.h",	"CDROM_SELECT_SPEED",	0x5322},
-	{"linux/cdrom.h",	"CDROM_SELECT_DISC",	0x5323},
-	{"linux/cdrom.h",	"CDROM_MEDIA_CHANGED",	0x5325},
-	{"linux/cdrom.h",	"CDROM_DRIVE_STATUS",	0x5326},
-	{"linux/cdrom.h",	"CDROM_DISC_STATUS",	0x5327},
-	{"linux/cdrom.h",	"CDROM_CHANGER_NSLOTS",	0x5328},
-	{"linux/cdrom.h",	"CDROM_LOCKDOOR",	0x5329},
-	{"linux/cdrom.h",	"CDROM_DEBUG",	0x5330},
-	{"linux/cdrom.h",	"CDROM_GET_CAPABILITY",	0x5331},
-	{"scsi/scsi_ioctl.h",	"SCSI_IOCTL_DOORLOCK",	0x5380},
-	{"scsi/scsi_ioctl.h",	"SCSI_IOCTL_DOORUNLOCK",	0x5381},
-	{"linux/cdrom.h",	"CDROMAUDIOBUFSIZ",	0x5382},
-	{"scsi/scsi.h",	"SCSI_IOCTL_GET_IDLUN",	0x5382},
-	{"scsi/scsi.h",	"SCSI_IOCTL_TAGGED_ENABLE",	0x5383},
-	{"scsi/scsi.h",	"SCSI_IOCTL_TAGGED_DISABLE",	0x5384},
-	{"scsi/scsi.h",	"SCSI_IOCTL_PROBE_HOST",	0x5385},
-	{"scsi/scsi.h",	"SCSI_IOCTL_GET_BUS_NUMBER",	0x5386},
-	{"linux/cdrom.h",	"DVD_READ_STRUCT",	0x5390},
-	{"linux/cdrom.h",	"DVD_WRITE_STRUCT",	0x5391},
-	{"linux/cdrom.h",	"DVD_AUTH",	0x5392},
-	{"linux/cdrom.h",	"CDROM_SEND_PACKET",	0x5393},
-	{"linux/cdrom.h",	"CDROM_NEXT_WRITABLE",	0x5394},
-	{"linux/cdrom.h",	"CDROM_LAST_WRITTEN",	0x5395},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
-	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
-	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
-	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
-	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
-	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
-	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
-	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
-	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
-	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
-	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
-	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
-	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
-	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
-	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
-	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
-	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
-	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
-	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
-	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
-	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
-	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
-	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
-	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
-	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
-	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
-	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
-	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
-	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
-	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
-	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
-	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
-	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
-	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
-	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/uinput.h",	"UI_DEV_CREATE",	0x5501},
-	{"linux/uinput.h",	"UI_DEV_DESTROY",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCONNECT",	0x5516},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECT",	0x5517},
-	{"linux/uinput.h",	"UI_SET_EVBIT",	0x5564},
-	{"linux/uinput.h",	"UI_SET_KEYBIT",	0x5565},
-	{"linux/uinput.h",	"UI_SET_RELBIT",	0x5566},
-	{"linux/uinput.h",	"UI_SET_ABSBIT",	0x5567},
-	{"linux/uinput.h",	"UI_SET_MSCBIT",	0x5568},
-	{"linux/uinput.h",	"UI_SET_LEDBIT",	0x5569},
-	{"linux/uinput.h",	"UI_SET_SNDBIT",	0x556a},
-	{"linux/uinput.h",	"UI_SET_FFBIT",	0x556b},
-	{"linux/videodev2.h",	"VIDIOC_QUERYCAP",	0x5600},
-	{"linux/vt.h",	"VT_OPENQRY",	0x5600},
-	{"linux/videodev2.h",	"VIDIOC_RESERVED",	0x5601},
-	{"linux/vt.h",	"VT_GETMODE",	0x5601},
-	{"linux/videodev2.h",	"VIDIOC_ENUM_FMT",	0x5602},
-	{"linux/vt.h",	"VT_SETMODE",	0x5602},
-	{"linux/vt.h",	"VT_GETSTATE",	0x5603},
-	{"linux/videodev2.h",	"VIDIOC_G_FMT",	0x5604},
-	{"linux/vt.h",	"VT_SENDSIG",	0x5604},
-	{"linux/videodev2.h",	"VIDIOC_S_FMT",	0x5605},
-	{"linux/vt.h",	"VT_RELDISP",	0x5605},
-	{"linux/videodev2.h",	"VIDIOC_G_COMP",	0x5606},
-	{"linux/vt.h",	"VT_ACTIVATE",	0x5606},
-	{"linux/videodev2.h",	"VIDIOC_S_COMP",	0x5607},
-	{"linux/vt.h",	"VT_WAITACTIVE",	0x5607},
-	{"linux/videodev2.h",	"VIDIOC_REQBUFS",	0x5608},
-	{"linux/vt.h",	"VT_DISALLOCATE",	0x5608},
-	{"linux/videodev2.h",	"VIDIOC_QUERYBUF",	0x5609},
-	{"linux/vt.h",	"VT_RESIZE",	0x5609},
-	{"linux/videodev2.h",	"VIDIOC_G_FBUF",	0x560a},
-	{"linux/vt.h",	"VT_RESIZEX",	0x560a},
-	{"linux/videodev2.h",	"VIDIOC_S_FBUF",	0x560b},
-	{"linux/vt.h",	"VT_LOCKSWITCH",	0x560b},
-	{"linux/vt.h",	"VT_UNLOCKSWITCH",	0x560c},
-	{"linux/videodev2.h",	"VIDIOC_OVERLAY",	0x560e},
-	{"linux/videodev2.h",	"VIDIOC_QBUF",	0x560f},
-	{"linux/videodev2.h",	"VIDIOC_DQBUF",	0x5611},
-	{"linux/videodev2.h",	"VIDIOC_STREAMON",	0x5612},
-	{"linux/videodev2.h",	"VIDIOC_STREAMOFF",	0x5613},
-	{"linux/videodev2.h",	"VIDIOC_G_PARM",	0x5615},
-	{"linux/videodev2.h",	"VIDIOC_S_PARM",	0x5616},
-	{"linux/videodev2.h",	"VIDIOC_G_STD",	0x5617},
-	{"linux/videodev2.h",	"VIDIOC_S_STD",	0x5618},
-	{"linux/videodev2.h",	"VIDIOC_ENUMSTD",	0x5619},
-	{"linux/videodev2.h",	"VIDIOC_ENUMINPUT",	0x561a},
-	{"linux/videodev2.h",	"VIDIOC_G_CTRL",	0x561b},
-	{"linux/videodev2.h",	"VIDIOC_S_CTRL",	0x561c},
-	{"linux/videodev2.h",	"VIDIOC_G_TUNER",	0x561d},
-	{"linux/videodev2.h",	"VIDIOC_S_TUNER",	0x561e},
-	{"linux/videodev2.h",	"VIDIOC_G_AUDIO",	0x5621},
-	{"linux/videodev2.h",	"VIDIOC_S_AUDIO",	0x5622},
-	{"linux/videodev2.h",	"VIDIOC_QUERYCTRL",	0x5624},
-	{"linux/videodev2.h",	"VIDIOC_QUERYMENU",	0x5625},
-	{"linux/videodev2.h",	"VIDIOC_G_INPUT",	0x5626},
-	{"linux/videodev2.h",	"VIDIOC_S_INPUT",	0x5627},
-	{"linux/videodev2.h",	"VIDIOC_G_OUTPUT",	0x562e},
-	{"linux/videodev2.h",	"VIDIOC_S_OUTPUT",	0x562f},
-	{"linux/videodev2.h",	"VIDIOC_ENUMOUTPUT",	0x5630},
-	{"linux/videodev2.h",	"VIDIOC_G_AUDOUT",	0x5631},
-	{"linux/videodev2.h",	"VIDIOC_S_AUDOUT",	0x5632},
-	{"linux/videodev2.h",	"VIDIOC_G_MODULATOR",	0x5636},
-	{"linux/videodev2.h",	"VIDIOC_S_MODULATOR",	0x5637},
-	{"linux/videodev2.h",	"VIDIOC_G_FREQUENCY",	0x5638},
-	{"linux/videodev2.h",	"VIDIOC_S_FREQUENCY",	0x5639},
-	{"linux/videodev2.h",	"VIDIOC_CROPCAP",	0x563a},
-	{"linux/videodev2.h",	"VIDIOC_G_CROP",	0x563b},
-	{"linux/videodev2.h",	"VIDIOC_S_CROP",	0x563c},
-	{"linux/videodev2.h",	"VIDIOC_G_JPEGCOMP",	0x563d},
-	{"linux/videodev2.h",	"VIDIOC_S_JPEGCOMP",	0x563e},
-	{"linux/videodev2.h",	"VIDIOC_QUERYSTD",	0x563f},
-	{"linux/videodev2.h",	"VIDIOC_TRY_FMT",	0x5640},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/watchdog.h",	"WDIOC_SETTIMEOUT",	0x5706},
-	{"linux/watchdog.h",	"WDIOC_GETTIMEOUT",	0x5707},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_he.h",	"HE_GET_REG",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmbr2684.h",	"BR2684_SETFILT",	0x6190},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/atmdev.h",	"ATM_NEWBACKENDIF",	0x61f3},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETFLAGS",	0x6601},
-	{"asm/ioctls.h",	"FIOCLEX",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETFLAGS",	0x6602},
-	{"asm/ioctls.h",	"FIONCLEX",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"asm/sockios.h",	"FIOGETOWN",	0x667b},
-	{"asm/sockios.h",	"FIOSETOWN",	0x667c},
-	{"asm/ioctls.h",	"FIOASYNC",	0x667d},
-	{"asm/ioctls.h",	"FIONBIO",	0x667e},
-	{"asm/ioctls.h",	"FIONREAD",	0x667f},
-	{"asm/ioctls.h",	"FIOQSIZE",	0x6680},
-	{"linux/usb_gadgetfs.h",	"GADGETFS_FIFO_STATUS",	0x6701},
-	{"linux/usb_gadgetfs.h",	"GADGETFS_FIFO_FLUSH",	0x6702},
-	{"linux/usb_gadgetfs.h",	"GADGETFS_CLEAR_HALT",	0x6703},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/ipmi.h",	"IPMICTL_RECEIVE_MSG_TRUNC",	0x690b},
-	{"linux/ipmi.h",	"IPMICTL_RECEIVE_MSG",	0x690c},
-	{"linux/ipmi.h",	"IPMICTL_SEND_COMMAND",	0x690d},
-	{"linux/ipmi.h",	"IPMICTL_REGISTER_FOR_CMD",	0x690e},
-	{"linux/ipmi.h",	"IPMICTL_UNREGISTER_FOR_CMD",	0x690f},
-	{"linux/ipmi.h",	"IPMICTL_SET_GETS_EVENTS_CMD",	0x6910},
-	{"linux/ipmi.h",	"IPMICTL_SET_MY_ADDRESS_CMD",	0x6911},
-	{"linux/ipmi.h",	"IPMICTL_GET_MY_ADDRESS_CMD",	0x6912},
-	{"linux/ipmi.h",	"IPMICTL_SET_MY_LUN_CMD",	0x6913},
-	{"linux/ipmi.h",	"IPMICTL_GET_MY_LUN_CMD",	0x6914},
-	{"linux/i8k.h",	"I8K_BIOS_VERSION",	0x6980},
-	{"linux/i8k.h",	"I8K_MACHINE_ID",	0x6981},
-	{"linux/i8k.h",	"I8K_POWER_STATUS",	0x6982},
-	{"linux/i8k.h",	"I8K_FN_STATUS",	0x6983},
-	{"linux/i8k.h",	"I8K_GET_TEMP",	0x6984},
-	{"linux/i8k.h",	"I8K_GET_SPEED",	0x6985},
-	{"linux/i8k.h",	"I8K_GET_FAN",	0x6986},
-	{"linux/i8k.h",	"I8K_SET_FAN",	0x6987},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/synclink.h",	"MGSL_IOCSIF",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/synclink.h",	"MGSL_IOCGIF",	0x6d0b},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID2",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO_V2",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/rtc.h",	"RTC_PLL_GET",	0x7011},
-	{"linux/rtc.h",	"RTC_PLL_SET",	0x7012},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"asm/nvram.h",	"PMAC_NVRAM_GET_OFFSET",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/ticable.h",	"IOCTL_TISER_DELAY",	0x70a0},
-	{"linux/ticable.h",	"IOCTL_TISER_TIMEOUT",	0x70a1},
-	{"linux/ticable.h",	"IOCTL_TIPAR_DELAY",	0x70a8},
-	{"linux/ticable.h",	"IOCTL_TIPAR_TIMEOUT",	0x70a9},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/videotext.h",	"VTXIOCGETINFO",	0x7101},
-	{"linux/videotext.h",	"VTXIOCCLRPAGE",	0x7102},
-	{"linux/videotext.h",	"VTXIOCCLRFOUND",	0x7103},
-	{"linux/videotext.h",	"VTXIOCPAGEREQ",	0x7104},
-	{"linux/videotext.h",	"VTXIOCGETSTAT",	0x7105},
-	{"linux/videotext.h",	"VTXIOCGETPAGE",	0x7106},
-	{"linux/videotext.h",	"VTXIOCSTOPDAU",	0x7107},
-	{"linux/videotext.h",	"VTXIOCPUTPAGE",	0x7108},
-	{"linux/videotext.h",	"VTXIOCSETDISP",	0x7109},
-	{"linux/videotext.h",	"VTXIOCPUTSTAT",	0x710a},
-	{"linux/videotext.h",	"VTXIOCCLRCACHE",	0x710b},
-	{"linux/videotext.h",	"VTXIOCSETVIRT",	0x710c},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"OLD_PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/videotext.h",	"TUNIOCGETINFO",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/videotext.h",	"TUNIOCRESET",	0x7202},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"linux/videotext.h",	"TUNIOCSETFREQ",	0x7203},
-	{"linux/videotext.h",	"TUNIOCGETFREQ",	0x7204},
-	{"linux/videotext.h",	"TUNIOCSETCHAN",	0x7205},
-	{"linux/videotext.h",	"TUNIOCGETCHAN",	0x7206},
-	{"asm/sockios.h",	"SIOCATMARK",	0x7307},
-	{"asm/sockios.h",	"SIOCSPGRP",	0x7308},
-	{"asm/sockios.h",	"SIOCGPGRP",	0x7309},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"asm/ioctls.h",	"TIOCGETP",	0x7408},
-	{"asm/ioctls.h",	"TIOCSETP",	0x7409},
-	{"asm/ioctls.h",	"TIOCSETN",	0x740a},
-	{"asm/ioctls.h",	"TIOCSETC",	0x7411},
-	{"asm/ioctls.h",	"TIOCGETC",	0x7412},
-	{"asm/ioctls.h",	"TCGETS",	0x7413},
-	{"asm/ioctls.h",	"TCSETS",	0x7414},
-	{"asm/ioctls.h",	"TCSETSW",	0x7415},
-	{"asm/ioctls.h",	"TCSETSF",	0x7416},
-	{"asm/ioctls.h",	"TCGETA",	0x7417},
-	{"asm/ioctls.h",	"TCSETA",	0x7418},
-	{"asm/ioctls.h",	"TCSETAW",	0x7419},
-	{"asm/ioctls.h",	"TCSETAF",	0x741c},
-	{"asm/ioctls.h",	"TCSBRK",	0x741d},
-	{"asm/ioctls.h",	"TCXONC",	0x741e},
-	{"asm/ioctls.h",	"TCFLSH",	0x741f},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"asm/ioctls.h",	"TIOCSWINSZ",	0x7467},
-	{"asm/ioctls.h",	"TIOCGWINSZ",	0x7468},
-	{"asm/ioctls.h",	"TIOCSTART",	0x746e},
-	{"asm/ioctls.h",	"TIOCSTOP",	0x746f},
-	{"asm/ioctls.h",	"TIOCOUTQ",	0x7473},
-	{"asm/ioctls.h",	"TIOCGLTC",	0x7474},
-	{"asm/ioctls.h",	"TIOCSLTC",	0x7475},
-	{"asm/ioctls.h",	"TIOCSPGRP",	0x7476},
-	{"asm/ioctls.h",	"TIOCGPGRP",	0x7477},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/sonypi.h",	"SONYPI_IOCSBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION_OLD",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION_OLD",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1CAP",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1REM",	0x7603},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2CAP",	0x7604},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2REM",	0x7605},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/sonypi.h",	"SONYPI_IOCGBATFLAGS",	0x7607},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/sonypi.h",	"SONYPI_IOCGBLUE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/sonypi.h",	"SONYPI_IOCSBLUE",	0x7609},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"asm/sockios.h",	"FIOSETOWN",	0x8901},
-	{"asm/sockios.h",	"SIOCSPGRP",	0x8902},
-	{"asm/sockios.h",	"FIOGETOWN",	0x8903},
-	{"asm/sockios.h",	"SIOCGPGRP",	0x8904},
-	{"asm/sockios.h",	"SIOCATMARK",	0x8905},
-	{"asm/sockios.h",	"SIOCGSTAMP",	0x8906},
-	{"linux/sockios.h",	"SIOCADDRT",	0x890b},
-	{"linux/sockios.h",	"SIOCDELRT",	0x890c},
-	{"linux/sockios.h",	"SIOCRTMSG",	0x890d},
-	{"linux/sockios.h",	"SIOCGIFNAME",	0x8910},
-	{"linux/sockios.h",	"SIOCSIFLINK",	0x8911},
-	{"linux/sockios.h",	"SIOCGIFCONF",	0x8912},
-	{"linux/sockios.h",	"SIOCGIFFLAGS",	0x8913},
-	{"linux/sockios.h",	"SIOCSIFFLAGS",	0x8914},
-	{"linux/sockios.h",	"SIOCGIFADDR",	0x8915},
-	{"linux/sockios.h",	"SIOCSIFADDR",	0x8916},
-	{"linux/sockios.h",	"SIOCGIFDSTADDR",	0x8917},
-	{"linux/sockios.h",	"SIOCSIFDSTADDR",	0x8918},
-	{"linux/sockios.h",	"SIOCGIFBRDADDR",	0x8919},
-	{"linux/sockios.h",	"SIOCSIFBRDADDR",	0x891a},
-	{"linux/sockios.h",	"SIOCGIFNETMASK",	0x891b},
-	{"linux/sockios.h",	"SIOCSIFNETMASK",	0x891c},
-	{"linux/sockios.h",	"SIOCGIFMETRIC",	0x891d},
-	{"linux/sockios.h",	"SIOCSIFMETRIC",	0x891e},
-	{"linux/sockios.h",	"SIOCGIFMEM",	0x891f},
-	{"linux/sockios.h",	"SIOCSIFMEM",	0x8920},
-	{"linux/sockios.h",	"SIOCGIFMTU",	0x8921},
-	{"linux/sockios.h",	"SIOCSIFMTU",	0x8922},
-	{"linux/sockios.h",	"SIOCSIFNAME",	0x8923},
-	{"linux/sockios.h",	"SIOCSIFHWADDR",	0x8924},
-	{"linux/sockios.h",	"SIOCGIFENCAP",	0x8925},
-	{"linux/sockios.h",	"SIOCSIFENCAP",	0x8926},
-	{"linux/sockios.h",	"SIOCGIFHWADDR",	0x8927},
-	{"linux/sockios.h",	"SIOCGIFSLAVE",	0x8929},
-	{"linux/sockios.h",	"SIOCSIFSLAVE",	0x8930},
-	{"linux/sockios.h",	"SIOCADDMULTI",	0x8931},
-	{"linux/sockios.h",	"SIOCDELMULTI",	0x8932},
-	{"linux/sockios.h",	"SIOCGIFINDEX",	0x8933},
-	{"linux/sockios.h",	"SIOCSIFPFLAGS",	0x8934},
-	{"linux/sockios.h",	"SIOCGIFPFLAGS",	0x8935},
-	{"linux/sockios.h",	"SIOCDIFADDR",	0x8936},
-	{"linux/sockios.h",	"SIOCSIFHWBROADCAST",	0x8937},
-	{"linux/sockios.h",	"SIOCGIFCOUNT",	0x8938},
-	{"linux/sockios.h",	"SIOCGIFBR",	0x8940},
-	{"linux/sockios.h",	"SIOCSIFBR",	0x8941},
-	{"linux/sockios.h",	"SIOCGIFTXQLEN",	0x8942},
-	{"linux/sockios.h",	"SIOCSIFTXQLEN",	0x8943},
-	{"linux/sockios.h",	"SIOCGIFDIVERT",	0x8944},
-	{"linux/sockios.h",	"SIOCSIFDIVERT",	0x8945},
-	{"linux/sockios.h",	"SIOCETHTOOL",	0x8946},
-	{"linux/sockios.h",	"SIOCGMIIPHY",	0x8947},
-	{"linux/sockios.h",	"SIOCGMIIREG",	0x8948},
-	{"linux/sockios.h",	"SIOCSMIIREG",	0x8949},
-	{"linux/sockios.h",	"SIOCWANDEV",	0x894a},
-	{"linux/sockios.h",	"SIOCDARP",	0x8953},
-	{"linux/sockios.h",	"SIOCGARP",	0x8954},
-	{"linux/sockios.h",	"SIOCSARP",	0x8955},
-	{"linux/sockios.h",	"SIOCDRARP",	0x8960},
-	{"linux/sockios.h",	"SIOCGRARP",	0x8961},
-	{"linux/sockios.h",	"SIOCSRARP",	0x8962},
-	{"linux/sockios.h",	"SIOCGIFMAP",	0x8970},
-	{"linux/sockios.h",	"SIOCSIFMAP",	0x8971},
-	{"linux/sockios.h",	"SIOCADDDLCI",	0x8980},
-	{"linux/sockios.h",	"SIOCDELDLCI",	0x8981},
-	{"linux/sockios.h",	"SIOCGIFVLAN",	0x8982},
-	{"linux/sockios.h",	"SIOCSIFVLAN",	0x8983},
-	{"linux/sockios.h",	"SIOCBONDENSLAVE",	0x8990},
-	{"linux/sockios.h",	"SIOCBONDRELEASE",	0x8991},
-	{"linux/sockios.h",	"SIOCBONDSETHWADDR",	0x8992},
-	{"linux/sockios.h",	"SIOCBONDSLAVEINFOQUERY",	0x8993},
-	{"linux/sockios.h",	"SIOCBONDINFOQUERY",	0x8994},
-	{"linux/sockios.h",	"SIOCBONDCHANGEACTIVE",	0x8995},
-	{"linux/dn.h",	"OSIOCSNETADDR",	0x89e0},
-	{"linux/sockios.h",	"SIOCPROTOPRIVATE",	0x89e0},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"OSIOCGNETADDR",	0x89e1},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/sockios.h",	"SIOCDEVPRIVATE",	0x89f0},
-	{"linux/wireless.h",	"SIOCIWFIRST",	0x8b00},
-	{"linux/wireless.h",	"SIOCSIWCOMMIT",	0x8b00},
-	{"linux/wireless.h",	"SIOCGIWNAME",	0x8b01},
-	{"linux/wireless.h",	"SIOCSIWNWID",	0x8b02},
-	{"linux/wireless.h",	"SIOCGIWNWID",	0x8b03},
-	{"linux/wireless.h",	"SIOCSIWFREQ",	0x8b04},
-	{"linux/wireless.h",	"SIOCGIWFREQ",	0x8b05},
-	{"linux/wireless.h",	"SIOCSIWMODE",	0x8b06},
-	{"linux/wireless.h",	"SIOCGIWMODE",	0x8b07},
-	{"linux/wireless.h",	"SIOCSIWSENS",	0x8b08},
-	{"linux/wireless.h",	"SIOCGIWSENS",	0x8b09},
-	{"linux/wireless.h",	"SIOCSIWRANGE",	0x8b0a},
-	{"linux/wireless.h",	"SIOCGIWRANGE",	0x8b0b},
-	{"linux/wireless.h",	"SIOCSIWPRIV",	0x8b0c},
-	{"linux/wireless.h",	"SIOCGIWPRIV",	0x8b0d},
-	{"linux/wireless.h",	"SIOCSIWSTATS",	0x8b0e},
-	{"linux/wireless.h",	"SIOCGIWSTATS",	0x8b0f},
-	{"linux/wireless.h",	"SIOCSIWSPY",	0x8b10},
-	{"linux/wireless.h",	"SIOCGIWSPY",	0x8b11},
-	{"linux/wireless.h",	"SIOCSIWTHRSPY",	0x8b12},
-	{"linux/wireless.h",	"SIOCGIWTHRSPY",	0x8b13},
-	{"linux/wireless.h",	"SIOCSIWAP",	0x8b14},
-	{"linux/wireless.h",	"SIOCGIWAP",	0x8b15},
-	{"linux/wireless.h",	"SIOCGIWAPLIST",	0x8b17},
-	{"linux/wireless.h",	"SIOCSIWSCAN",	0x8b18},
-	{"linux/wireless.h",	"SIOCGIWSCAN",	0x8b19},
-	{"linux/wireless.h",	"SIOCSIWESSID",	0x8b1a},
-	{"linux/wireless.h",	"SIOCGIWESSID",	0x8b1b},
-	{"linux/wireless.h",	"SIOCSIWNICKN",	0x8b1c},
-	{"linux/wireless.h",	"SIOCGIWNICKN",	0x8b1d},
-	{"linux/wireless.h",	"SIOCSIWRATE",	0x8b20},
-	{"linux/wireless.h",	"SIOCGIWRATE",	0x8b21},
-	{"linux/wireless.h",	"SIOCSIWRTS",	0x8b22},
-	{"linux/wireless.h",	"SIOCGIWRTS",	0x8b23},
-	{"linux/wireless.h",	"SIOCSIWFRAG",	0x8b24},
-	{"linux/wireless.h",	"SIOCGIWFRAG",	0x8b25},
-	{"linux/wireless.h",	"SIOCSIWTXPOW",	0x8b26},
-	{"linux/wireless.h",	"SIOCGIWTXPOW",	0x8b27},
-	{"linux/wireless.h",	"SIOCSIWRETRY",	0x8b28},
-	{"linux/wireless.h",	"SIOCGIWRETRY",	0x8b29},
-	{"linux/wireless.h",	"SIOCSIWENCODE",	0x8b2a},
-	{"linux/wireless.h",	"SIOCGIWENCODE",	0x8b2b},
-	{"linux/wireless.h",	"SIOCSIWPOWER",	0x8b2c},
-	{"linux/wireless.h",	"SIOCGIWPOWER",	0x8b2d},
-	{"linux/wireless.h",	"SIOCIWFIRSTPRIV",	0x8be0},
-	{"linux/wireless.h",	"SIOCIWLASTPRIV",	0x8bff},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/dm-ioctl-v4.h",	"DM_VERSION",	0xfd00},
-	{"linux/dm-ioctl-v4.h",	"DM_REMOVE_ALL",	0xfd01},
-	{"linux/dm-ioctl-v4.h",	"DM_LIST_DEVICES",	0xfd02},
-	{"linux/dm-ioctl-v4.h",	"DM_DEV_CREATE",	0xfd03},
-	{"linux/dm-ioctl-v4.h",	"DM_DEV_REMOVE",	0xfd04},
-	{"linux/dm-ioctl-v4.h",	"DM_DEV_RENAME",	0xfd05},
-	{"linux/dm-ioctl-v4.h",	"DM_DEV_SUSPEND",	0xfd06},
-	{"linux/dm-ioctl-v4.h",	"DM_DEV_STATUS",	0xfd07},
-	{"linux/dm-ioctl-v4.h",	"DM_DEV_WAIT",	0xfd08},
-	{"linux/dm-ioctl-v4.h",	"DM_TABLE_LOAD",	0xfd09},
-	{"linux/dm-ioctl-v4.h",	"DM_TABLE_CLEAR",	0xfd0a},
-	{"linux/dm-ioctl-v4.h",	"DM_TABLE_DEPS",	0xfd0b},
-	{"linux/dm-ioctl-v4.h",	"DM_TABLE_STATUS",	0xfd0c},
diff --git a/strace/linux/powerpc/signalent.h b/strace/linux/powerpc/signalent.h
deleted file mode 100644
index 04b00b1..0000000
--- a/strace/linux/powerpc/signalent.h
+++ /dev/null
@@ -1,33 +0,0 @@
-	"SIG_0",	/* 0 */
-	"SIGHUP",	/* 1 */
-	"SIGINT",	/* 2 */
-	"SIGQUIT",	/* 3 */
-	"SIGILL",	/* 4 */
-	"SIGTRAP",	/* 5 */
-	"SIGABRT",	/* 6 */
-	"SIGBUS",	/* 7 */
-	"SIGFPE",	/* 8 */
-	"SIGKILL",	/* 9 */
-	"SIGUSR1",	/* 10 */
-	"SIGSEGV",	/* 11 */
-	"SIGUSR2",	/* 12 */
-	"SIGPIPE",	/* 13 */
-	"SIGALRM",	/* 14 */
-	"SIGTERM",	/* 15 */
-	"SIGSTKFLT",	/* 16 */
-	"SIGCHLD",	/* 17 */
-	"SIGCONT",	/* 18 */
-	"SIGSTOP",	/* 19 */
-	"SIGTSTP",	/* 20 */
-	"SIGTTIN",	/* 21 */
-	"SIGTTOU",	/* 22 */
-	"SIGURG",	/* 23 */
-	"SIGXCPU",	/* 24 */
-	"SIGXFSZ",	/* 25 */
-	"SIGVTALRM",	/* 26 */
-	"SIGPROF",	/* 27 */
-	"SIGWINCH",	/* 28 */
-	"SIGIO",	/* 29 */
-	"SIGPWR",	/* 30 */
-	"SIGUNUSED",	/* 31 */
-	"SIGRTMIN",	/* 32 */
diff --git a/strace/linux/powerpc/syscallent.h b/strace/linux/powerpc/syscallent.h
deleted file mode 100644
index 5492227..0000000
--- a/strace/linux/powerpc/syscallent.h
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscallent.h,v 1.19 2005/05/09 08:02:05 roland Exp $
- */
-
-	{ 5,	0,	printargs,		"SYS_0"			}, /* 0 */
-	{ 1,	TP,	sys_exit,		"exit"			}, /* 1 */
-	{ 0,	TP,	sys_fork,		"fork"			}, /* 2 */
-	{ 3,	TF,	sys_read,		"read"			}, /* 3 */
-	{ 3,	TF,	sys_write,		"write"			}, /* 4 */
-	{ 3,	TF,	sys_open,		"open"			}, /* 5 */
-	{ 1,	0,	sys_close,		"close"			}, /* 6 */
-	{ 3,	TP,	sys_waitpid,		"waitpid"		}, /* 7 */
-	{ 2,	TF,	sys_creat,		"creat"			}, /* 8 */
-	{ 2,	TF,	sys_link,		"link"			}, /* 9 */
-	{ 1,	TF,	sys_unlink,		"unlink"		}, /* 10 */
-	{ 3,	TF|TP,	sys_execve,		"execve"		}, /* 11 */
-	{ 1,	TF,	sys_chdir,		"chdir"			}, /* 12 */
-	{ 1,	0,	sys_time,		"time"			}, /* 13 */
-	{ 3,	TF,	sys_mknod,		"mknod"			}, /* 14 */
-	{ 2,	TF,	sys_chmod,		"chmod"			}, /* 15 */
-	{ 3,	TF,	sys_chown,		"lchown"		}, /* 16 */
-	{ 0,	0,	sys_break,		"break"			}, /* 17 */
-	{ 2,	TF,	sys_oldstat,		"oldstat"		}, /* 18 */
-	{ 3,	TF,	sys_lseek,		"lseek"			}, /* 19 */
-	{ 0,	0,	sys_getpid,		"getpid"		}, /* 20 */
-	{ 5,	TF,	sys_mount,		"mount"			}, /* 21 */
-	{ 1,	TF,	sys_umount,		"oldumount"		}, /* 22 */
-	{ 1,	0,	sys_setuid,		"setuid"		}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"		}, /* 24 */
-	{ 1,	0,	sys_stime,		"stime"			}, /* 25 */
-	{ 4,	0,	sys_ptrace,		"ptrace"		}, /* 26 */
-	{ 1,	0,	sys_alarm,		"alarm"			}, /* 27 */
-	{ 2,	0,	sys_oldfstat,		"oldfstat"		}, /* 28 */
-	{ 0,	TS,	sys_pause,		"pause"			}, /* 29 */
-	{ 2,	TF,	sys_utime,		"utime"			}, /* 30 */
-	{ 2,	0,	sys_stty,		"stty"			}, /* 31 */
-	{ 2,	0,	sys_gtty,		"gtty"			}, /* 32 */
-	{ 2,	TF,	sys_access,		"access"		}, /* 33 */
-	{ 1,	0,	sys_nice,		"nice"			}, /* 34 */
-	{ 0,	0,	sys_ftime,		"ftime"			}, /* 35 */
-	{ 0,	0,	sys_sync,		"sync"			}, /* 36 */
-	{ 2,	TS,	sys_kill,		"kill"			}, /* 37 */
-	{ 2,	TF,	sys_rename,		"rename"		}, /* 38 */
-	{ 2,	TF,	sys_mkdir,		"mkdir"			}, /* 39 */
-	{ 1,	TF,	sys_rmdir,		"rmdir"			}, /* 40 */
-	{ 1,	0,	sys_dup,		"dup"			}, /* 41 */
-	{ 1,	0,	sys_pipe,		"pipe"			}, /* 42 */
-	{ 1,	0,	sys_times,		"times"			}, /* 43 */
-	{ 0,	0,	sys_prof,		"prof"			}, /* 44 */
-	{ 1,	0,	sys_brk,		"brk"			}, /* 45 */
-	{ 1,	0,	sys_setgid,		"setgid"		}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"		}, /* 47 */
-	{ 3,	TS,	sys_signal,		"signal"		}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"		}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"		}, /* 50 */
-	{ 1,	TF,	sys_acct,		"acct"			}, /* 51 */
-	{ 2,	TF,	sys_umount2,		"umount"		}, /* 52 */
-	{ 0,	0,	sys_lock,		"lock"			}, /* 53 */
-	{ 3,	0,	sys_ioctl,		"ioctl"			}, /* 54 */
-	{ 3,	0,	sys_fcntl,		"fcntl"			}, /* 55 */
-	{ 0,	0,	sys_mpx,		"sys_mpx"		}, /* 56 */
-	{ 2,	0,	sys_setpgid,		"setpgid"		}, /* 57 */
-	{ 2,	0,	sys_ulimit,		"ulimit"		}, /* 58 */
-	{ 1,	0,	sys_oldolduname,	"oldolduname"		}, /* 59 */
-	{ 1,	0,	sys_umask,		"umask"			}, /* 60 */
-	{ 1,	TF,	sys_chroot,		"chroot"		}, /* 61 */
-	{ 2,	0,	sys_ustat,		"ustat"			}, /* 62 */
-	{ 2,	0,	sys_dup2,		"dup2"			}, /* 63 */
-	{ 0,	0,	sys_getppid,		"getppid"		}, /* 64 */
-	{ 0,	0,	sys_getpgrp,		"getpgrp"		}, /* 65 */
-	{ 0,	0,	sys_setsid,		"setsid"		}, /* 66 */
-	{ 3,	TS,	sys_sigaction,		"sigaction"		}, /* 67 */
-	{ 1,	TS,	printargs,		"sgetmask"		}, /* 68 */
-	{ 1,	TS,	printargs,		"ssetmask"		}, /* 69 */
-	{ 2,	0,	sys_setreuid,		"setreuid"		}, /* 70 */
-	{ 2,	0,	sys_setregid,		"setregid"		}, /* 71 */
-	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"		}, /* 72 */
-	{ 1,	TS,	sys_sigpending,		"sigpending"		}, /* 73 */
-	{ 2,	0,	sys_sethostname,	"sethostname"		}, /* 74 */
-	{ 2,	0,	sys_setrlimit,		"setrlimit"		}, /* 75 */
-	{ 2,	0,	sys_getrlimit,		"oldgetrlimit"		}, /* 76 */
-	{ 2,	0,	sys_getrusage,		"getrusage"		}, /* 77 */
-	{ 2,	0,	sys_gettimeofday,	"gettimeofday"		}, /* 78 */
-	{ 2,	0,	sys_settimeofday,	"settimeofday"		}, /* 79 */
-	{ 2,	0,	sys_getgroups,		"getgroups"		}, /* 80 */
-	{ 2,	0,	sys_setgroups,		"setgroups"		}, /* 81 */
-	{ 1,	0,	sys_oldselect,		"oldselect"		}, /* 82 */
-	{ 2,	TF,	sys_symlink,		"symlink"		}, /* 83 */
-	{ 2,	TF,	sys_oldlstat,		"oldlstat"		}, /* 84 */
-	{ 3,	TF,	sys_readlink,		"readlink"		}, /* 85 */
-	{ 1,	TF,	sys_uselib,		"uselib"		}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"		}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"		}, /* 88 */
-	{ 3,	0,	sys_readdir,		"readdir"		}, /* 89 */
-	{ 6,	0,	sys_mmap,		"mmap"			}, /* 90 */
-	{ 2,	0,	sys_munmap,		"munmap"		}, /* 91 */
-	{ 2,	TF,	sys_truncate,		"truncate"		}, /* 92 */
-	{ 2,	0,	sys_ftruncate,		"ftruncate"		}, /* 93 */
-	{ 2,	0,	sys_fchmod,		"fchmod"		}, /* 94 */
-	{ 3,	0,	sys_fchown,		"fchown"		}, /* 95 */
-	{ 2,	0,	sys_getpriority,	"getpriority"		}, /* 96 */
-	{ 3,	0,	sys_setpriority,	"setpriority"		}, /* 97 */
-	{ 4,	0,	sys_profil,		"profil"		}, /* 98 */
-	{ 2,	TF,	sys_statfs,		"statfs"		}, /* 99 */
-	{ 2,	0,	sys_fstatfs,		"fstatfs"		}, /* 100 */
-	{ 3,	0,	sys_ioperm,		"ioperm"		}, /* 101 */
-	{ 2,	0,	sys_socketcall,		"socketcall"		}, /* 102 */
-	{ 3,	0,	sys_syslog,		"syslog"		}, /* 103 */
-	{ 3,	0,	sys_setitimer,		"setitimer"		}, /* 104 */
-	{ 2,	0,	sys_getitimer,		"getitimer"		}, /* 105 */
-	{ 2,	TF,	sys_stat,		"stat"			}, /* 106 */
-	{ 2,	TF,	sys_lstat,		"lstat"			}, /* 107 */
-	{ 2,	TF,	sys_fstat,		"fstat"			}, /* 108 */
-	{ 1,	0,	sys_olduname,		"olduname"		}, /* 109 */
-	{ 5,	0,	printargs,		"SYS_110"		}, /* 110 */
-	{ 0,	0,	sys_vhangup,		"vhangup"		}, /* 111 */
-	{ 0,	0,	sys_idle,		"idle"			}, /* 112 */
-	{ 5,	0,	printargs,		"SYS_113"		}, /* 113 */
-	{ 4,	TP,	sys_wait4,		"wait4"			}, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"		}, /* 115 */
-	{ 1,	0,	sys_sysinfo,		"sysinfo"		}, /* 116 */
-	{ 6,	0,	sys_ipc,		"ipc"			}, /* 117 */
-	{ 1,	0,	sys_fsync,		"fsync"			}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"		}, /* 119 */
-	{ 5,	TP,	sys_clone,		"clone"			}, /* 120 */
-	{ 2,	0,	sys_setdomainname,	"setdomainname"		}, /* 121 */
-	{ 1,	0,	sys_uname,		"uname"			}, /* 122 */
-	{ 5,	0,	printargs,		"SYS_123"		}, /* 123 */
-	{ 1,	0,	sys_adjtimex,		"adjtimex"		}, /* 124 */
-	{ 3,	0,	sys_mprotect,		"mprotect"		}, /* 125 */
-	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"		}, /* 126 */
-	{ 2,	0,	sys_create_module,	"create_module"		}, /* 127 */
-	{ 2,	0,	sys_init_module,	"init_module"		}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"		}, /* 129 */
-	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"	}, /* 130 */
-	{ 4,	0,	sys_quotactl,		"quotactl"		}, /* 131 */
-	{ 1,	0,	sys_getpgid,		"getpgid"		}, /* 132 */
-	{ 1,	TF,	sys_fchdir,		"fchdir"		}, /* 133 */
-	{ 0,	0,	sys_bdflush,		"bdflush"		}, /* 134 */
-	{ 3,	0,	sys_sysfs,		"sysfs"			}, /* 135 */
-	{ 1,	0,	sys_personality,	"personality"		}, /* 136 */
-	{ 5,	0,	sys_afs_syscall,	"afs_syscall"		}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"		}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"		}, /* 139 */
-	{ 5,	TF,	sys_llseek,		"_llseek"		}, /* 140 */
-	{ 3,	0,	sys_getdents,		"getdents"		}, /* 141 */
-	{ 5,	0,	sys_select,		"select"		}, /* 142 */
-	{ 2,	0,	sys_flock,		"flock"			}, /* 143 */
-	{ 3,	0,	sys_msync,		"msync"			}, /* 144 */
-	{ 3,	0,	sys_readv,		"readv"			}, /* 145 */
-	{ 3,	0,	sys_writev,		"writev"		}, /* 146 */
-	{ 1,	0,	sys_getsid,		"getsid"		}, /* 147 */
-	{ 1,	0,	sys_fdatasync,		"fdatasync"		}, /* 148 */
-	{ 1,	0,	sys_sysctl,		"_sysctl"		}, /* 149 */
-	{ 2,	0,	sys_mlock,		"mlock"			}, /* 150 */
-	{ 2,	0,	sys_munlock,		"munlock"		}, /* 151 */
-	{ 1,	0,	sys_mlockall,		"mlockall"		}, /* 152 */
-	{ 0,	0,	sys_munlockall,		"munlockall"		}, /* 153 */
-	{ 2,	0,	sys_sched_setparam,	"sched_setparam"	}, /* 154 */
-	{ 2,	0,	sys_sched_getparam,	"sched_getparam"	}, /* 155 */
-	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"	}, /* 156 */
-	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"	}, /* 157 */
-	{ 0,	0,	sys_sched_yield,	"sched_yield"		}, /* 158 */
-	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
-	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
-	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
-	{ 2,	0,	sys_nanosleep,		"nanosleep"		}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"		}, /* 163 */
-	{ 3,	0,	sys_setresuid,		"setresuid"		}, /* 164 */
-	{ 3,	0,	sys_getresuid,		"getresuid"		}, /* 165 */
-	{ 5,	0,	sys_query_module,	"query_module"		}, /* 166 */
-	{ 3,	0,	sys_poll,		"poll"			}, /* 167 */
-	{ 3,	0,	printargs,		"nfsservctl"		}, /* 168 */
-	{ 3,	0,	sys_setresgid,		"setresgid"		}, /* 169 */
-	{ 3,	0,	sys_getresgid,		"getresgid"		}, /* 170 */
-	{ 5,	0,	printargs,		"prctl"			}, /* 171 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"		}, /* 172 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"		}, /* 173 */
-	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"	}, /* 174 */
-	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"		}, /* 175 */
-	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"	}, /* 176 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,	"rt_sigqueueinfo"	}, /* 177 */
-	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"		}, /* 178 */
-	{ 6,	TF,	sys_pread,		"pread64"		}, /* 179 */
-	{ 6,	TF,	sys_pwrite,		"pwrite64"		}, /* 180 */
-	{ 3,	TF,	sys_chown,		"chown"			}, /* 181 */
-	{ 2,	TF,	sys_getcwd,		"getcwd"		}, /* 182 */
-	{ 2,	0,	sys_capget,		"capget"		}, /* 183 */
-	{ 2,	0,	sys_capset,		"capset"		}, /* 184 */
-	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"		}, /* 185 */
-	{ 4,	TF,	sys_sendfile,		"sendfile"		}, /* 186 */
-	{ 5,	0,	sys_getpmsg,		"getpmsg"		}, /* 187 */
-	{ 5,	0,	sys_putpmsg,		"putpmsg"		}, /* 188 */
-	{ 0,	TP,	sys_vfork,		"vfork"			}, /* 189 */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"		}, /* 190 */
-	{ 4,	0,	sys_readahead,		"readahead"		}, /* 190 */
-	{ 6,	0,	sys_mmap,		"mmap2"			}, /* 192 */
-	{ 4,	TF,	sys_truncate64,		"truncate64"		}, /* 193 */
-	{ 4,	TF,	sys_ftruncate64,	"ftruncate64"		}, /* 194 */
-
-	{ 2,	TF,	sys_stat64,		"stat64"		}, /* 195 */
-	{ 2,	TF,	sys_lstat64,		"lstat64"		}, /* 196 */
-	{ 2,	TF,	sys_fstat64,		"fstat64"		}, /* 197 */
-	{ 5,	0,	printargs,		"pciconfig_read"	}, /* 198 */
-	{ 5,	0,	printargs,		"pciconfig_write"	}, /* 199 */
-	{ 3,	0,	printargs,		"pciconfig_iobase"	}, /* 200 */
-	{ 8,	0,	printargs,		"MOL"			}, /* 201 */
-	{ 3,	0,	sys_getdents64,		"getdents64"		}, /* 202 */
-	{ 2,	TF,	sys_pivotroot,		"pivot_root"		}, /* 203 */
-	{ 3,	0,	sys_fcntl,		"fcntl64"		}, /* 204 */
-	{ 3,	0,	sys_madvise,		"madvise"		}, /* 205 */
-	{ 3,	0,	sys_mincore,		"mincore"		}, /* 206 */
-	{ 0,	0,	printargs,		"gettid"		}, /* 207 */
-	{ 2,	TS,	sys_kill,		"tkill"			}, /* 208 */
-	{ 5,	TF,	sys_setxattr,		"setxattr"		}, /* 209 */
-	{ 5,	TF,	sys_setxattr,		"lsetxattr"		}, /* 210 */
-	{ 5,	0,	sys_fsetxattr,		"fsetxattr"		}, /* 211 */
-	{ 4,	TF,	sys_getxattr,		"getxattr"		}, /* 212 */
-	{ 4,	TF,	sys_getxattr,		"lgetxattr"		}, /* 213 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"		}, /* 214 */
-	{ 3,	TF,	sys_listxattr,		"listxattr"		}, /* 215 */
-	{ 3,	TF,	sys_listxattr,		"llistxattr"		}, /* 216 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"		}, /* 217 */
-	{ 2,	TF,	sys_removexattr,	"removexattr"		}, /* 218 */
-	{ 2,	TF,	sys_removexattr,	"lremovexattr"		}, /* 219 */
-	{ 2,	0,	sys_fremovexattr,	"fremovexattr"		}, /* 220 */
-	{ 5,	0,	sys_futex,		"futex"			}, /* 221 */
-	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity"	}, /* 222 */
-	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity"	}, /* 223 */
-	{ 5,	0,	printargs,		"SYS_224"		}, /* 224 */
-	{ 5,	0,	printargs,		"tux"			}, /* 225 */
-	{ 4,	TF,	sys_sendfile64,		"sendfile64"		}, /* 226 */
-	{ 2,	0,	sys_io_setup,		"io_setup"		}, /* 227 */
-	{ 1,	0,	sys_io_destroy,		"io_destroy"		}, /* 228 */
-	{ 5,	0,	sys_io_getevents,		"io_getevents"		}, /* 229 */
-	{ 3,	0,	sys_io_submit,		"io_submit"		}, /* 230 */
-	{ 3,	0,	sys_io_cancel,		"io_cancel"		}, /* 231 */
-	{ 1,	0,	printargs,		"set_tid_address"	}, /* 232 */
-	{ 6,	TF,	sys_fadvise64,		"fadvise64"		}, /* 233 */
-	{ 1,	TP,	sys_exit,		"exit_group"		}, /* 234 */
-	{ 4,	0,	printargs,		"lookup_dcookie"	}, /* 235 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"		}, /* 236 */
-	{ 4,	0,	sys_epoll_ctl,		"epoll_ctl"		}, /* 237 */
-	{ 4,	0,	sys_epoll_wait,		"epoll_wait"		}, /* 238 */
-	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"	}, /* 239 */
-	{ 3,	0,	sys_timer_create,	"timer_create"		}, /* 240 */
-	{ 4,	0,	sys_timer_settime,	"timer_settime"		}, /* 241 */
-	{ 2,	0,	sys_timer_gettime,	"timer_gettime"		}, /* 242 */
-	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"	}, /* 243 */
-	{ 1,	0,	sys_timer_delete,	"timer_delete"		}, /* 244 */
-	{ 2,	0,	sys_clock_settime,	"clock_settime"		}, /* 245 */
-	{ 2,	0,	sys_clock_gettime,	"clock_gettime"		}, /* 246 */
-	{ 2,	0,	sys_clock_getres,	"clock_getres"		}, /* 247 */
-	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"	}, /* 248 */
-	{ 2,	0,	printargs,		"swapcontext"		}, /* 249 */
-	{ 3,	TS,	sys_tgkill,		"tgkill"		}, /* 250 */
-	{ 2,	TF,	sys_utimes,		"utimes"		}, /* 251 */
-	{ 3,	TF,	sys_statfs64,		"statfs64"		}, /* 252 */
-	{ 3,	TF,	sys_fstatfs64,		"fstatfs64"		}, /* 253 */
-	{ 6,	TF,	sys_fadvise64_64,	"fadvise64_64"		}, /* 254 */
-	{ 1,	0,	printargs,		"rtas"			}, /* 255 */
-	{ 5,	0,	printargs,		"debug_setcontext"	}, /* 256 */
-	{ 5,	0,	printargs,		"vserver"		}, /* 257 */
-	{ 5,	0,	printargs,		"SYS_258"		}, /* 258 */
-	{ 6,	0,	sys_mbind,		"mbind"			}, /* 259 */
-	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"		}, /* 260 */
-	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"		}, /* 261 */
-	{ 4,	0,	sys_mq_open,		"mq_open"		}, /* 262 */
-	{ 1,	0,	sys_mq_unlink,		"mq_unlink"		}, /* 263 */
-	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"		}, /* 264 */
-	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive"	}, /* 265 */
-	{ 2,	0,	sys_mq_notify,		"mq_notify"		}, /* 266 */
-	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"		}, /* 267 */
-	{ 5,	0,	printargs,		"sys_kexec_load"	}, /* 268 */
-	{ 5,	0,	printargs,		"add_key"		}, /* 269 */
-	{ 5,	0,	printargs,		"request_key"		}, /* 270 */
-	{ 5,	0,	printargs,		"keyctl"		}, /* 271 */
-	{ 5,	TP,	sys_waitid,		"waitid"		}, /* 272 */
-	{ 5,	0,	printargs,		"SYS_273"		}, /* 273 */
-	{ 5,	0,	printargs,		"SYS_274"		}, /* 274 */
-	{ 5,	0,	printargs,		"SYS_275"		}, /* 275 */
-	{ 5,	0,	printargs,		"SYS_276"		}, /* 276 */
-	{ 5,	0,	printargs,		"SYS_277"		}, /* 277 */
-	{ 5,	0,	printargs,		"SYS_278"		}, /* 278 */
-	{ 5,	0,	printargs,		"SYS_279"		}, /* 279 */
-	{ 5,	0,	printargs,		"SYS_280"		}, /* 280 */
-	{ 5,	0,	printargs,		"SYS_281"		}, /* 281 */
-	{ 5,	0,	printargs,		"SYS_282"		}, /* 282 */
-	{ 5,	0,	printargs,		"SYS_283"		}, /* 283 */
-	{ 5,	0,	printargs,		"SYS_284"		}, /* 284 */
-	{ 5,	0,	printargs,		"SYS_285"		}, /* 285 */
-	{ 5,	0,	printargs,		"SYS_286"		}, /* 286 */
-	{ 5,	0,	printargs,		"SYS_287"		}, /* 287 */
-	{ 5,	0,	printargs,		"SYS_288"		}, /* 288 */
-	{ 5,	0,	printargs,		"SYS_289"		}, /* 289 */
-	{ 5,	0,	printargs,		"SYS_290"		}, /* 290 */
-	{ 5,	0,	printargs,		"SYS_291"		}, /* 291 */
-	{ 5,	0,	printargs,		"SYS_292"		}, /* 292 */
-	{ 5,	0,	printargs,		"SYS_293"		}, /* 293 */
-	{ 5,	0,	printargs,		"SYS_294"		}, /* 294 */
-	{ 5,	0,	printargs,		"SYS_295"		}, /* 295 */
-	{ 5,	0,	printargs,		"SYS_296"		}, /* 296 */
-	{ 5,	0,	printargs,		"SYS_297"		}, /* 297 */
-	{ 5,	0,	printargs,		"SYS_298"		}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"		}, /* 299 */
-
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
-
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	printargs,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
-	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
-	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
-	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
-	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
-	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
diff --git a/strace/linux/s390/errnoent.h b/strace/linux/s390/errnoent.h
deleted file mode 100644
index 180b506..0000000
--- a/strace/linux/s390/errnoent.h
+++ /dev/null
@@ -1,125 +0,0 @@
-	"ERRNO_0", /* 0 */
-	"EPERM", /* 1 */
-	"ENOENT", /* 2 */
-	"ESRCH", /* 3 */
-	"EINTR", /* 4 */
-	"EIO", /* 5 */
-	"ENXIO", /* 6 */
-	"E2BIG", /* 7 */
-	"ENOEXEC", /* 8 */
-	"EBADF", /* 9 */
-	"ECHILD", /* 10 */
-	"EAGAIN", /* 11 */
-	"ENOMEM", /* 12 */
-	"EACCES", /* 13 */
-	"EFAULT", /* 14 */
-	"ENOTBLK", /* 15 */
-	"EBUSY", /* 16 */
-	"EEXIST", /* 17 */
-	"EXDEV", /* 18 */
-	"ENODEV", /* 19 */
-	"ENOTDIR", /* 20 */
-	"EISDIR", /* 21 */
-	"EINVAL", /* 22 */
-	"ENFILE", /* 23 */
-	"EMFILE", /* 24 */
-	"ENOTTY", /* 25 */
-	"ETXTBSY", /* 26 */
-	"EFBIG", /* 27 */
-	"ENOSPC", /* 28 */
-	"ESPIPE", /* 29 */
-	"EROFS", /* 30 */
-	"EMLINK", /* 31 */
-	"EPIPE", /* 32 */
-	"EDOM", /* 33 */
-	"ERANGE", /* 34 */
-	"EDEADLK", /* 35 */
-	"ENAMETOOLONG", /* 36 */
-	"ENOLCK", /* 37 */
-	"ENOSYS", /* 38 */
-	"ENOTEMPTY", /* 39 */
-	"ELOOP", /* 40 */
-	"ERRNO_41", /* 41 */
-	"ENOMSG", /* 42 */
-	"EIDRM", /* 43 */
-	"ECHRNG", /* 44 */
-	"EL2NSYNC", /* 45 */
-	"EL3HLT", /* 46 */
-	"EL3RST", /* 47 */
-	"ELNRNG", /* 48 */
-	"EUNATCH", /* 49 */
-	"ENOCSI", /* 50 */
-	"EL2HLT", /* 51 */
-	"EBADE", /* 52 */
-	"EBADR", /* 53 */
-	"EXFULL", /* 54 */
-	"ENOANO", /* 55 */
-	"EBADRQC", /* 56 */
-	"EBADSLT", /* 57 */
-	"ERRNO_58", /* 58 */
-	"EBFONT", /* 59 */
-	"ENOSTR", /* 60 */
-	"ENODATA", /* 61 */
-	"ETIME", /* 62 */
-	"ENOSR", /* 63 */
-	"ENONET", /* 64 */
-	"ENOPKG", /* 65 */
-	"EREMOTE", /* 66 */
-	"ENOLINK", /* 67 */
-	"EADV", /* 68 */
-	"ESRMNT", /* 69 */
-	"ECOMM", /* 70 */
-	"EPROTO", /* 71 */
-	"EMULTIHOP", /* 72 */
-	"EDOTDOT", /* 73 */
-	"EBADMSG", /* 74 */
-	"EOVERFLOW", /* 75 */
-	"ENOTUNIQ", /* 76 */
-	"EBADFD", /* 77 */
-	"EREMCHG", /* 78 */
-	"ELIBACC", /* 79 */
-	"ELIBBAD", /* 80 */
-	"ELIBSCN", /* 81 */
-	"ELIBMAX", /* 82 */
-	"ELIBEXEC", /* 83 */
-	"EILSEQ", /* 84 */
-	"ERESTART", /* 85 */
-	"ESTRPIPE", /* 86 */
-	"EUSERS", /* 87 */
-	"ENOTSOCK", /* 88 */
-	"EDESTADDRREQ", /* 89 */
-	"EMSGSIZE", /* 90 */
-	"EPROTOTYPE", /* 91 */
-	"ENOPROTOOPT", /* 92 */
-	"EPROTONOSUPPORT", /* 93 */
-	"ESOCKTNOSUPPORT", /* 94 */
-	"EOPNOTSUPP", /* 95 */
-	"EPFNOSUPPORT", /* 96 */
-	"EAFNOSUPPORT", /* 97 */
-	"EADDRINUSE", /* 98 */
-	"EADDRNOTAVAIL", /* 99 */
-	"ENETDOWN", /* 100 */
-	"ENETUNREACH", /* 101 */
-	"ENETRESET", /* 102 */
-	"ECONNABORTED", /* 103 */
-	"ECONNRESET", /* 104 */
-	"ENOBUFS", /* 105 */
-	"EISCONN", /* 106 */
-	"ENOTCONN", /* 107 */
-	"ESHUTDOWN", /* 108 */
-	"ETOOMANYREFS", /* 109 */
-	"ETIMEDOUT", /* 110 */
-	"ECONNREFUSED", /* 111 */
-	"EHOSTDOWN", /* 112 */
-	"EHOSTUNREACH", /* 113 */
-	"EALREADY", /* 114 */
-	"EINPROGRESS", /* 115 */
-	"ESTALE", /* 116 */
-	"EUCLEAN", /* 117 */
-	"ENOTNAM", /* 118 */
-	"ENAVAIL", /* 119 */
-	"EISNAM", /* 120 */
-	"EREMOTEIO", /* 121 */
-	"EDQUOT", /* 122 */
-	"ENOMEDIUM", /* 123 */
-	"EMEDIUMTYPE", /* 124 */
diff --git a/strace/linux/s390/ioctlent.h b/strace/linux/s390/ioctlent.h
deleted file mode 100644
index 414fbeb..0000000
--- a/strace/linux/s390/ioctlent.h
+++ /dev/null
@@ -1,941 +0,0 @@
-{"linux/fs.h", "FIBMAP", 0x1},
-{"linux/fs.h", "FIGETBSZ", 0x2},
-{"linux/fd.h", "FDCLRPRM", 0x241},
-{"linux/fd.h", "FDMSGON", 0x245},
-{"linux/fd.h", "FDMSGOFF", 0x246},
-{"linux/fd.h", "FDFMTBEG", 0x247},
-{"linux/fd.h", "FDFMTEND", 0x249},
-{"linux/fd.h", "FDSETEMSGTRESH", 0x24a},
-{"linux/fd.h", "FDFLUSH", 0x24b},
-{"linux/fd.h", "FDRESET", 0x254},
-{"linux/fd.h", "FDWERRORCLR", 0x256},
-{"linux/fd.h", "FDRAWCMD", 0x258},
-{"linux/fd.h", "FDTWADDLE", 0x259},
-{"linux/fd.h", "FDEJECT", 0x25a},
-{"linux/hdreg.h", "HDIO_GETGEO", 0x301},
-{"linux/hdreg.h", "HDIO_GET_UNMASKINTR", 0x302},
-{"linux/hdreg.h", "HDIO_GET_MULTCOUNT", 0x304},
-{"linux/hdreg.h", "HDIO_OBSOLETE_IDENTITY", 0x307},
-{"linux/hdreg.h", "HDIO_GET_KEEPSETTINGS", 0x308},
-{"linux/hdreg.h", "HDIO_GET_32BIT", 0x309},
-{"linux/hdreg.h", "HDIO_GET_NOWERR", 0x30a},
-{"linux/hdreg.h", "HDIO_GET_DMA", 0x30b},
-{"linux/hdreg.h", "HDIO_GET_NICE", 0x30c},
-{"linux/hdreg.h", "HDIO_GET_IDENTITY", 0x30d},
-{"linux/hdreg.h", "HDIO_DRIVE_RESET", 0x31c},
-{"linux/hdreg.h", "HDIO_TRISTATE_HWIF", 0x31d},
-{"linux/hdreg.h", "HDIO_DRIVE_TASK", 0x31e},
-{"linux/hdreg.h", "HDIO_DRIVE_CMD", 0x31f},
-{"linux/hdreg.h", "HDIO_SET_MULTCOUNT", 0x321},
-{"linux/hdreg.h", "HDIO_SET_UNMASKINTR", 0x322},
-{"linux/hdreg.h", "HDIO_SET_KEEPSETTINGS", 0x323},
-{"linux/hdreg.h", "HDIO_SET_32BIT", 0x324},
-{"linux/hdreg.h", "HDIO_SET_NOWERR", 0x325},
-{"linux/hdreg.h", "HDIO_SET_DMA", 0x326},
-{"linux/hdreg.h", "HDIO_SET_PIO_MODE", 0x327},
-{"linux/hdreg.h", "HDIO_SCAN_HWIF", 0x328},
-{"linux/hdreg.h", "HDIO_SET_NICE", 0x329},
-{"linux/hdreg.h", "HDIO_UNREGISTER_HWIF", 0x32a},
-{"linux/hdreg.h", "HDIO_GETGEO_BIG", 0x330},
-{"linux/hdreg.h", "HDIO_GETGEO_BIG_RAW", 0x331},
-{"linux/umsdos_fs.h", "UMSDOS_READDIR_DOS", 0x4d2},
-{"linux/umsdos_fs.h", "UMSDOS_UNLINK_DOS", 0x4d3},
-{"linux/umsdos_fs.h", "UMSDOS_RMDIR_DOS", 0x4d4},
-{"linux/umsdos_fs.h", "UMSDOS_STAT_DOS", 0x4d5},
-{"linux/umsdos_fs.h", "UMSDOS_CREAT_EMD", 0x4d6},
-{"linux/umsdos_fs.h", "UMSDOS_UNLINK_EMD", 0x4d7},
-{"linux/umsdos_fs.h", "UMSDOS_READDIR_EMD", 0x4d8},
-{"linux/umsdos_fs.h", "UMSDOS_GETVERSION", 0x4d9},
-{"linux/umsdos_fs.h", "UMSDOS_INIT_EMD", 0x4da},
-{"linux/umsdos_fs.h", "UMSDOS_DOS_SETUP", 0x4db},
-{"linux/umsdos_fs.h", "UMSDOS_RENAME_DOS", 0x4dc},
-{"linux/lp.h", "LPCHAR", 0x601},
-{"linux/lp.h", "LPTIME", 0x602},
-{"linux/lp.h", "LPABORT", 0x604},
-{"linux/lp.h", "LPSETIRQ", 0x605},
-{"linux/ac97_codec.h", "AC97_RECMUX_MONO_MIX", 0x606},
-{"linux/lp.h", "LPGETIRQ", 0x606},
-{"linux/lp.h", "LPWAIT", 0x608},
-{"linux/lp.h", "LPCAREFUL", 0x609},
-{"linux/lp.h", "LPABORTOPEN", 0x60a},
-{"linux/lp.h", "LPGETSTATUS", 0x60b},
-{"linux/lp.h", "LPRESET", 0x60c},
-{"linux/lp.h", "LPGETSTATS", 0x60d},
-{"linux/lp.h", "LPGETFLAGS", 0x60e},
-{"linux/lp.h", "LPSETTIMEOUT", 0x60f},
-{"linux/fs.h", "BLKROSET", 0x125d},
-{"linux/fs.h", "BLKROGET", 0x125e},
-{"linux/fs.h", "BLKRRPART", 0x125f},
-{"linux/fs.h", "BLKGETSIZE", 0x1260},
-{"linux/fs.h", "BLKFLSBUF", 0x1261},
-{"linux/fs.h", "BLKRASET", 0x1262},
-{"linux/fs.h", "BLKRAGET", 0x1263},
-{"linux/fs.h", "BLKFRASET", 0x1264},
-{"linux/fs.h", "BLKFRAGET", 0x1265},
-{"linux/fs.h", "BLKSECTSET", 0x1266},
-{"linux/fs.h", "BLKSECTGET", 0x1267},
-{"linux/fs.h", "BLKSSZGET", 0x1268},
-{"linux/fs.h", "BLKPG", 0x1269},
-{"scsi/sg.h", "SG_SET_TIMEOUT", 0x2201},
-{"scsi/sg.h", "SG_GET_TIMEOUT", 0x2202},
-{"scsi/sg.h", "SG_EMULATED_HOST", 0x2203},
-{"scsi/sg.h", "SG_SET_TRANSFORM", 0x2204},
-{"scsi/sg.h", "SG_GET_TRANSFORM", 0x2205},
-{"scsi/sg.h", "SG_GET_COMMAND_Q", 0x2270},
-{"scsi/sg.h", "SG_SET_COMMAND_Q", 0x2271},
-{"scsi/sg.h", "SG_GET_RESERVED_SIZE", 0x2272},
-{"scsi/sg.h", "SG_SET_RESERVED_SIZE", 0x2275},
-{"scsi/sg.h", "SG_GET_SCSI_ID", 0x2276},
-{"scsi/sg.h", "SG_SET_FORCE_LOW_DMA", 0x2279},
-{"scsi/sg.h", "SG_GET_LOW_DMA", 0x227a},
-{"scsi/sg.h", "SG_SET_FORCE_PACK_ID", 0x227b},
-{"scsi/sg.h", "SG_GET_PACK_ID", 0x227c},
-{"scsi/sg.h", "SG_GET_NUM_WAITING", 0x227d},
-{"scsi/sg.h", "SG_SET_DEBUG", 0x227e},
-{"scsi/sg.h", "SG_GET_SG_TABLESIZE", 0x227f},
-{"scsi/sg.h", "SG_GET_VERSION_NUM", 0x2282},
-{"scsi/sg.h", "SG_NEXT_CMD_LEN", 0x2283},
-{"scsi/sg.h", "SG_SCSI_RESET", 0x2284},
-{"scsi/sg.h", "SG_IO", 0x2285},
-{"scsi/sg.h", "SG_GET_REQUEST_TABLE", 0x2286},
-{"scsi/sg.h", "SG_SET_KEEP_ORPHAN", 0x2287},
-{"scsi/sg.h", "SG_GET_KEEP_ORPHAN", 0x2288},
-{"linux/agpgart.h", "AGPIOC_ACQUIRE", 0x4101},
-{"linux/agpgart.h", "AGPIOC_RELEASE", 0x4102},
-{"linux/pmu.h", "PMU_IOC_SLEEP", 0x4200},
-{"asm/dasd.h", "BIODASDDISABLE", 0x4400},
-{"asm/dasd.h", "BIODASDENABLE", 0x4401},
-{"asm/dasd.h", "BIODASDRSRV", 0x4402},
-{"asm/dasd.h", "BIODASDRLSE", 0x4403},
-{"asm/dasd.h", "BIODASDSLCK", 0x4404},
-{"asm/dasd.h", "BIODASDPRRST", 0x4405},
-{"asm/dasd.h", "BIODASDQUIESCE", 0x4406},
-{"asm/dasd.h", "BIODASDRESUME", 0x4407},
-{"asm/cmb.h", "BIODASDCMFENABLE", 0x4420},
-{"asm/cmb.h", "BIODASDCMFDISABLE", 0x4421},
-{"asm/cmb.h", "BIODASDRESETCMB", 0x4422},
-{"linux/fb.h", "FBIOGET_VSCREENINFO", 0x4600},
-{"linux/fb.h", "FBIOPUT_VSCREENINFO", 0x4601},
-{"linux/ps2esdi.h", "CMD_READ", 0x4601},
-{"linux/fb.h", "FBIOGET_FSCREENINFO", 0x4602},
-{"linux/ps2esdi.h", "CMD_WRITE", 0x4602},
-{"linux/fb.h", "FBIOGETCMAP", 0x4604},
-{"linux/fb.h", "FBIOPUTCMAP", 0x4605},
-{"linux/fb.h", "FBIOPAN_DISPLAY", 0x4606},
-{"linux/fb.h", "FBIOGET_FCURSORINFO", 0x4607},
-{"linux/fb.h", "FBIOGET_VCURSORINFO", 0x4608},
-{"linux/fb.h", "FBIOPUT_VCURSORINFO", 0x4609},
-{"linux/fb.h", "FBIOGET_CURSORSTATE", 0x460a},
-{"linux/fb.h", "FBIOPUT_CURSORSTATE", 0x460b},
-{"linux/fb.h", "FBIOGET_CON2FBMAP", 0x460f},
-{"linux/fb.h", "FBIOPUT_CON2FBMAP", 0x4610},
-{"linux/fb.h", "FBIOBLANK", 0x4611},
-{"linux/fb.h", "FBIO_ALLOC", 0x4613},
-{"linux/fb.h", "FBIO_FREE", 0x4614},
-{"linux/fb.h", "FBIOGET_GLYPH", 0x4615},
-{"linux/fb.h", "FBIOGET_HWCINFO", 0x4616},
-{"linux/isdn.h", "IIOCNETAIF", 0x4901},
-{"linux/isdn.h", "IIOCNETDIF", 0x4902},
-{"linux/isdn.h", "IIOCNETSCF", 0x4903},
-{"linux/isdn.h", "IIOCNETGCF", 0x4904},
-{"linux/isdn.h", "IIOCNETANM", 0x4905},
-{"linux/isdn.h", "IIOCNETDNM", 0x4906},
-{"linux/isdn.h", "IIOCNETGNM", 0x4907},
-{"linux/isdn.h", "IIOCGETSET", 0x4908},
-{"linux/isdn.h", "IIOCSETSET", 0x4909},
-{"linux/isdn.h", "IIOCSETVER", 0x490a},
-{"linux/isdn.h", "IIOCNETHUP", 0x490b},
-{"linux/isdn.h", "IIOCSETGST", 0x490c},
-{"linux/isdn.h", "IIOCSETBRJ", 0x490d},
-{"linux/isdn.h", "IIOCSIGPRF", 0x490e},
-{"linux/isdn.h", "IIOCGETPRF", 0x490f},
-{"linux/isdn.h", "IIOCSETPRF", 0x4910},
-{"linux/isdn.h", "IIOCGETMAP", 0x4911},
-{"linux/isdn.h", "IIOCSETMAP", 0x4912},
-{"linux/isdn.h", "IIOCNETASL", 0x4913},
-{"linux/isdn.h", "IIOCNETDIL", 0x4914},
-{"linux/isdn.h", "IIOCGETCPS", 0x4915},
-{"linux/isdn.h", "IIOCGETDVR", 0x4916},
-{"linux/isdn.h", "IIOCNETLCR", 0x4917},
-{"linux/isdn.h", "IIOCNETDWRSET", 0x4918},
-{"linux/isdn.h", "IIOCNETALN", 0x4920},
-{"linux/isdn.h", "IIOCNETDLN", 0x4921},
-{"linux/isdn.h", "IIOCNETGPN", 0x4922},
-{"linux/isdn.h", "IIOCDBGVAR", 0x497f},
-{"linux/isdn.h", "IIOCDRVCTL", 0x4980},
-{"linux/kd.h", "KIOCSOUND", 0x4b2f},
-{"linux/kd.h", "KDMKTONE", 0x4b30},
-{"linux/kd.h", "KDGETLED", 0x4b31},
-{"linux/kd.h", "KDSETLED", 0x4b32},
-{"linux/kd.h", "KDGKBTYPE", 0x4b33},
-{"linux/kd.h", "KDADDIO", 0x4b34},
-{"linux/kd.h", "KDDELIO", 0x4b35},
-{"linux/kd.h", "KDENABIO", 0x4b36},
-{"linux/kd.h", "KDDISABIO", 0x4b37},
-{"linux/kd.h", "KDSETMODE", 0x4b3a},
-{"linux/kd.h", "KDGETMODE", 0x4b3b},
-{"linux/kd.h", "KDMAPDISP", 0x4b3c},
-{"linux/kd.h", "KDUNMAPDISP", 0x4b3d},
-{"linux/kd.h", "GIO_SCRNMAP", 0x4b40},
-{"linux/kd.h", "PIO_SCRNMAP", 0x4b41},
-{"linux/kd.h", "KDGKBMODE", 0x4b44},
-{"linux/kd.h", "KDSKBMODE", 0x4b45},
-{"linux/kd.h", "KDGKBENT", 0x4b46},
-{"linux/kd.h", "KDSKBENT", 0x4b47},
-{"linux/kd.h", "KDGKBSENT", 0x4b48},
-{"linux/kd.h", "KDSKBSENT", 0x4b49},
-{"linux/kd.h", "KDGKBDIACR", 0x4b4a},
-{"linux/kd.h", "KDSKBDIACR", 0x4b4b},
-{"linux/kd.h", "KDGETKEYCODE", 0x4b4c},
-{"linux/kd.h", "KDSETKEYCODE", 0x4b4d},
-{"linux/kd.h", "KDSIGACCEPT", 0x4b4e},
-{"linux/kd.h", "KDGHWCLK", 0x4b50},
-{"linux/kd.h", "KDSHWCLK", 0x4b51},
-{"linux/kd.h", "KDKBDREP", 0x4b52},
-{"linux/kd.h", "GIO_FONT", 0x4b60},
-{"linux/kd.h", "PIO_FONT", 0x4b61},
-{"linux/kd.h", "KDGKBMETA", 0x4b62},
-{"linux/kd.h", "KDSKBMETA", 0x4b63},
-{"linux/kd.h", "KDGKBLED", 0x4b64},
-{"linux/kd.h", "KDSKBLED", 0x4b65},
-{"linux/kd.h", "GIO_UNIMAP", 0x4b66},
-{"linux/kd.h", "PIO_UNIMAP", 0x4b67},
-{"linux/kd.h", "PIO_UNIMAPCLR", 0x4b68},
-{"linux/kd.h", "GIO_UNISCRNMAP", 0x4b69},
-{"linux/kd.h", "PIO_UNISCRNMAP", 0x4b6a},
-{"linux/kd.h", "GIO_FONTX", 0x4b6b},
-{"linux/kd.h", "PIO_FONTX", 0x4b6c},
-{"linux/kd.h", "PIO_FONTRESET", 0x4b6d},
-{"linux/kd.h", "GIO_CMAP", 0x4b70},
-{"linux/kd.h", "PIO_CMAP", 0x4b71},
-{"linux/kd.h", "KDFONTOP", 0x4b72},
-{"linux/loop.h", "LOOP_SET_FD", 0x4c00},
-{"linux/loop.h", "LOOP_CLR_FD", 0x4c01},
-{"linux/loop.h", "LOOP_SET_STATUS", 0x4c02},
-{"linux/loop.h", "LOOP_GET_STATUS", 0x4c03},
-{"linux/random.h", "RNDZAPENTCNT", 0x5204},
-{"linux/random.h", "RNDCLEARPOOL", 0x5206},
-{"linux/cdrom.h", "CDROMPAUSE", 0x5301},
-{"linux/cdrom.h", "CDROMRESUME", 0x5302},
-{"linux/cdrom.h", "CDROMPLAYMSF", 0x5303},
-{"linux/cdrom.h", "CDROMPLAYTRKIND", 0x5304},
-{"linux/cdrom.h", "CDROMREADTOCHDR", 0x5305},
-{"linux/cdrom.h", "CDROMREADTOCENTRY", 0x5306},
-{"linux/cdrom.h", "CDROMSTOP", 0x5307},
-{"linux/cdrom.h", "CDROMSTART", 0x5308},
-{"linux/cdrom.h", "CDROMEJECT", 0x5309},
-{"linux/cdrom.h", "CDROMVOLCTRL", 0x530a},
-{"linux/cdrom.h", "CDROMSUBCHNL", 0x530b},
-{"linux/cdrom.h", "CDROMREADMODE2", 0x530c},
-{"linux/cdrom.h", "CDROMREADMODE1", 0x530d},
-{"linux/cdrom.h", "CDROMREADAUDIO", 0x530e},
-{"linux/cdrom.h", "CDROMEJECT_SW", 0x530f},
-{"linux/cdrom.h", "CDROMMULTISESSION", 0x5310},
-{"linux/cdrom.h", "CDROM_GET_MCN", 0x5311},
-{"linux/cdrom.h", "CDROMRESET", 0x5312},
-{"linux/cdrom.h", "CDROMVOLREAD", 0x5313},
-{"linux/cdrom.h", "CDROMREADRAW", 0x5314},
-{"linux/cdrom.h", "CDROMREADCOOKED", 0x5315},
-{"linux/cdrom.h", "CDROMSEEK", 0x5316},
-{"linux/cdrom.h", "CDROMPLAYBLK", 0x5317},
-{"linux/cdrom.h", "CDROMREADALL", 0x5318},
-{"linux/cdrom.h", "CDROMCLOSETRAY", 0x5319},
-{"linux/cdrom.h", "CDROMGETSPINDOWN", 0x531d},
-{"linux/cdrom.h", "CDROMSETSPINDOWN", 0x531e},
-{"linux/cdrom.h", "CDROM_SET_OPTIONS", 0x5320},
-{"linux/cdrom.h", "CDROM_CLEAR_OPTIONS", 0x5321},
-{"linux/cdrom.h", "CDROM_SELECT_SPEED", 0x5322},
-{"linux/cdrom.h", "CDROM_SELECT_DISC", 0x5323},
-{"linux/cdrom.h", "CDROM_MEDIA_CHANGED", 0x5325},
-{"linux/cdrom.h", "CDROM_DRIVE_STATUS", 0x5326},
-{"linux/cdrom.h", "CDROM_DISC_STATUS", 0x5327},
-{"linux/cdrom.h", "CDROM_CHANGER_NSLOTS", 0x5328},
-{"linux/cdrom.h", "CDROM_LOCKDOOR", 0x5329},
-{"linux/cdrom.h", "CDROM_DEBUG", 0x5330},
-{"linux/cdrom.h", "CDROM_GET_CAPABILITY", 0x5331},
-{"scsi/scsi_ioctl.h", "SCSI_IOCTL_DOORLOCK", 0x5380},
-{"scsi/scsi_ioctl.h", "SCSI_IOCTL_DOORUNLOCK", 0x5381},
-{"scsi/scsi.h", "SCSI_IOCTL_GET_IDLUN", 0x5382},
-{"scsi/scsi.h", "SCSI_IOCTL_TAGGED_ENABLE", 0x5383},
-{"scsi/scsi.h", "SCSI_IOCTL_TAGGED_DISABLE", 0x5384},
-{"scsi/scsi.h", "SCSI_IOCTL_PROBE_HOST", 0x5385},
-{"scsi/scsi.h", "SCSI_IOCTL_GET_BUS_NUMBER", 0x5386},
-{"linux/cdrom.h", "DVD_READ_STRUCT", 0x5390},
-{"linux/cdrom.h", "DVD_WRITE_STRUCT", 0x5391},
-{"linux/cdrom.h", "DVD_AUTH", 0x5392},
-{"linux/cdrom.h", "CDROM_SEND_PACKET", 0x5393},
-{"linux/cdrom.h", "CDROM_NEXT_WRITABLE", 0x5394},
-{"linux/cdrom.h", "CDROM_LAST_WRITTEN", 0x5395},
-{"asm/ioctls.h", "TCGETS", 0x5401},
-{"asm/ioctls.h", "TCSETS", 0x5402},
-{"asm/ioctls.h", "TCSETSW", 0x5403},
-{"asm/ioctls.h", "TCSETSF", 0x5404},
-{"asm/ioctls.h", "TCGETA", 0x5405},
-{"asm/ioctls.h", "TCSETA", 0x5406},
-{"asm/ioctls.h", "TCSETAW", 0x5407},
-{"asm/ioctls.h", "TCSETAF", 0x5408},
-{"asm/ioctls.h", "TCSBRK", 0x5409},
-{"asm/ioctls.h", "TCXONC", 0x540a},
-{"asm/ioctls.h", "TCFLSH", 0x540b},
-{"asm/ioctls.h", "TIOCEXCL", 0x540c},
-{"asm/ioctls.h", "TIOCNXCL", 0x540d},
-{"asm/ioctls.h", "TIOCSCTTY", 0x540e},
-{"asm/ioctls.h", "TIOCGPGRP", 0x540f},
-{"asm/ioctls.h", "TIOCSPGRP", 0x5410},
-{"asm/ioctls.h", "TIOCOUTQ", 0x5411},
-{"asm/ioctls.h", "TIOCSTI", 0x5412},
-{"asm/ioctls.h", "TIOCGWINSZ", 0x5413},
-{"asm/ioctls.h", "TIOCSWINSZ", 0x5414},
-{"asm/ioctls.h", "TIOCMGET", 0x5415},
-{"asm/ioctls.h", "TIOCMBIS", 0x5416},
-{"asm/ioctls.h", "TIOCMBIC", 0x5417},
-{"asm/ioctls.h", "TIOCMSET", 0x5418},
-{"asm/ioctls.h", "TIOCGSOFTCAR", 0x5419},
-{"asm/ioctls.h", "TIOCSSOFTCAR", 0x541a},
-{"asm/ioctls.h", "FIONREAD", 0x541b},
-{"asm/ioctls.h", "TIOCLINUX", 0x541c},
-{"asm/ioctls.h", "TIOCCONS", 0x541d},
-{"asm/ioctls.h", "TIOCGSERIAL", 0x541e},
-{"asm/ioctls.h", "TIOCSSERIAL", 0x541f},
-{"asm/ioctls.h", "TIOCPKT", 0x5420},
-{"asm/ioctls.h", "FIONBIO", 0x5421},
-{"asm/ioctls.h", "TIOCNOTTY", 0x5422},
-{"asm/ioctls.h", "TIOCSETD", 0x5423},
-{"asm/ioctls.h", "TIOCGETD", 0x5424},
-{"asm/ioctls.h", "TCSBRKP", 0x5425},
-{"asm/ioctls.h", "TIOCTTYGSTRUCT", 0x5426},
-{"asm/ioctls.h", "TIOCSBRK", 0x5427},
-{"asm/ioctls.h", "TIOCCBRK", 0x5428},
-{"asm/ioctls.h", "TIOCGSID", 0x5429},
-{"asm/ioctls.h", "FIONCLEX", 0x5450},
-{"asm/ioctls.h", "FIOCLEX", 0x5451},
-{"asm/ioctls.h", "FIOASYNC", 0x5452},
-{"asm/ioctls.h", "TIOCSERCONFIG", 0x5453},
-{"asm/ioctls.h", "TIOCSERGWILD", 0x5454},
-{"asm/ioctls.h", "TIOCSERSWILD", 0x5455},
-{"asm/ioctls.h", "TIOCGLCKTRMIOS", 0x5456},
-{"asm/ioctls.h", "TIOCSLCKTRMIOS", 0x5457},
-{"asm/ioctls.h", "TIOCSERGSTRUCT", 0x5458},
-{"asm/ioctls.h", "TIOCSERGETLSR", 0x5459},
-{"asm/ioctls.h", "TIOCSERGETMULTI", 0x545a},
-{"asm/ioctls.h", "TIOCSERSETMULTI", 0x545b},
-{"asm/ioctls.h", "TIOCMIWAIT", 0x545c},
-{"asm/ioctls.h", "TIOCGICOUNT", 0x545d},
-{"asm/ioctls.h", "FIOQSIZE", 0x545e},
-{"linux/usbdevice_fs.h", "USBDEVFS_DISCARDURB", 0x550b},
-{"linux/usbdevice_fs.h", "USBDEVFS_RESET", 0x5514},
-{"linux/vt.h", "VT_OPENQRY", 0x5600},
-{"linux/vt.h", "VT_GETMODE", 0x5601},
-{"linux/vt.h", "VT_SETMODE", 0x5602},
-{"linux/vt.h", "VT_GETSTATE", 0x5603},
-{"linux/vt.h", "VT_SENDSIG", 0x5604},
-{"linux/vt.h", "VT_RELDISP", 0x5605},
-{"linux/vt.h", "VT_ACTIVATE", 0x5606},
-{"linux/vt.h", "VT_WAITACTIVE", 0x5607},
-{"linux/vt.h", "VT_DISALLOCATE", 0x5608},
-{"linux/vt.h", "VT_RESIZE", 0x5609},
-{"linux/vt.h", "VT_RESIZEX", 0x560a},
-{"linux/vt.h", "VT_LOCKSWITCH", 0x560b},
-{"linux/vt.h", "VT_UNLOCKSWITCH", 0x560c},
-{"linux/sonet.h", "SONET_SETFRAMING", 0x6115},
-{"linux/atm_nicstar.h", "NS_ADJBUFLEV", 0x6163},
-{"linux/atm_tcp.h", "SIOCSIFATMTCP", 0x6180},
-{"linux/atm_tcp.h", "ATMTCP_CREATE", 0x618e},
-{"linux/atm_tcp.h", "ATMTCP_REMOVE", 0x618f},
-{"linux/atmlec.h", "ATMLEC_CTRL", 0x61d0},
-{"linux/atmlec.h", "ATMLEC_DATA", 0x61d1},
-{"linux/atmlec.h", "ATMLEC_MCAST", 0x61d2},
-{"linux/atmmpc.h", "ATMMPC_CTRL", 0x61d8},
-{"linux/atmmpc.h", "ATMMPC_DATA", 0x61d9},
-{"linux/atmclip.h", "SIOCMKCLIP", 0x61e0},
-{"linux/atmarp.h", "ATMARPD_CTRL", 0x61e1},
-{"linux/atmarp.h", "ATMARP_MKIP", 0x61e2},
-{"linux/atmarp.h", "ATMARP_SETENTRY", 0x61e3},
-{"linux/atmarp.h", "ATMARP_ENCAP", 0x61e5},
-{"linux/atmsvc.h", "ATMSIGD_CTRL", 0x61f0},
-{"linux/comstats.h", "COM_GETPORTSTATS", 0x631e},
-{"linux/comstats.h", "COM_CLRPORTSTATS", 0x631f},
-{"linux/comstats.h", "COM_GETBRDSTATS", 0x6320},
-{"linux/comstats.h", "COM_READPORT", 0x6328},
-{"linux/comstats.h", "COM_READBOARD", 0x6329},
-{"linux/comstats.h", "COM_READPANEL", 0x632a},
-{"linux/video_decoder.h", "DECODER_DUMP", 0x64c0},
-{"linux/synclink.h", "MGSL_IOCSTXIDLE", 0x6d02},
-{"linux/synclink.h", "MGSL_IOCGTXIDLE", 0x6d03},
-{"linux/synclink.h", "MGSL_IOCTXENABLE", 0x6d04},
-{"linux/synclink.h", "MGSL_IOCRXENABLE", 0x6d05},
-{"linux/synclink.h", "MGSL_IOCTXABORT", 0x6d06},
-{"linux/synclink.h", "MGSL_IOCGSTATS", 0x6d07},
-{"linux/synclink.h", "MGSL_IOCLOOPTXDONE", 0x6d09},
-{"linux/synclink.h", "MGSL_IOCCLRMODCOUNT", 0x6d0f},
-{"linux/ncp_fs.h", "NCP_IOC_CONN_LOGGED_IN", 0x6e03},
-{"linux/rtc.h", "RTC_AIE_ON", 0x7001},
-{"linux/rtc.h", "RTC_AIE_OFF", 0x7002},
-{"linux/rtc.h", "RTC_UIE_ON", 0x7003},
-{"linux/rtc.h", "RTC_UIE_OFF", 0x7004},
-{"linux/rtc.h", "RTC_PIE_ON", 0x7005},
-{"linux/rtc.h", "RTC_PIE_OFF", 0x7006},
-{"linux/rtc.h", "RTC_WIE_ON", 0x700f},
-{"linux/rtc.h", "RTC_WIE_OFF", 0x7010},
-{"linux/nvram.h", "NVRAM_INIT", 0x7040},
-{"linux/nvram.h", "NVRAM_SETCKS", 0x7041},
-{"linux/ppdev.h", "PPCLAIM", 0x708b},
-{"linux/ppdev.h", "PPRELEASE", 0x708c},
-{"linux/ppdev.h", "PPYIELD", 0x708d},
-{"linux/ppdev.h", "PPEXCL", 0x708f},
-{"linux/telephony.h", "PHONE_CAPABILITIES", 0x7180},
-{"linux/telephony.h", "PHONE_RING", 0x7183},
-{"linux/telephony.h", "PHONE_HOOKSTATE", 0x7184},
-{"linux/telephony.h", "PHONE_RING_START", 0x7187},
-{"linux/telephony.h", "PHONE_RING_STOP", 0x7188},
-{"linux/telephony.h", "PHONE_REC_START", 0x718a},
-{"linux/telephony.h", "PHONE_REC_STOP", 0x718b},
-{"linux/telephony.h", "PHONE_REC_LEVEL", 0x718f},
-{"linux/telephony.h", "PHONE_PLAY_START", 0x7191},
-{"linux/telephony.h", "PHONE_PLAY_STOP", 0x7192},
-{"linux/telephony.h", "PHONE_PLAY_LEVEL", 0x7195},
-{"linux/telephony.h", "PHONE_GET_TONE_ON_TIME", 0x719e},
-{"linux/telephony.h", "PHONE_GET_TONE_OFF_TIME", 0x719f},
-{"linux/telephony.h", "PHONE_GET_TONE_STATE", 0x71a0},
-{"linux/telephony.h", "PHONE_BUSY", 0x71a1},
-{"linux/telephony.h", "PHONE_RINGBACK", 0x71a2},
-{"linux/telephony.h", "PHONE_DIALTONE", 0x71a3},
-{"linux/telephony.h", "PHONE_CPT_STOP", 0x71a4},
-{"linux/telephony.h", "PHONE_PSTN_GET_STATE", 0x71a5},
-{"linux/telephony.h", "PHONE_PSTN_LINETEST", 0x71a8},
-{"linux/ixjuser.h", "IXJCTL_DSP_RESET", 0x71c0},
-{"linux/ixjuser.h", "IXJCTL_DSP_IDLE", 0x71c5},
-{"linux/ixjuser.h", "IXJCTL_TESTRAM", 0x71c6},
-{"linux/ixjuser.h", "IXJCTL_AEC_STOP", 0x71cc},
-{"linux/ixjuser.h", "IXJCTL_AEC_GET_LEVEL", 0x71cd},
-{"linux/ixjuser.h", "IXJCTL_PSTN_LINETEST", 0x71d3},
-{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_CLEAR", 0x71e7},
-{"linux/cdk.h", "STL_BINTR", 0x7314},
-{"linux/cdk.h", "STL_BSTART", 0x7315},
-{"linux/cdk.h", "STL_BSTOP", 0x7316},
-{"linux/cdk.h", "STL_BRESET", 0x7317},
-{"linux/cdk.h", "STL_GETPFLAG", 0x7350},
-{"linux/cdk.h", "STL_SETPFLAG", 0x7351},
-{"linux/if_ppp.h", "PPPIOCDISCONN", 0x7439},
-{"linux/if_ppp.h", "PPPIOCXFERUNIT", 0x744e},
-{"linux/jffs.h", "JFFS_PRINT_HASH", 0x745a},
-{"linux/jffs.h", "JFFS_PRINT_TREE", 0x745b},
-{"linux/jffs.h", "JFFS_GET_STATUS", 0x745c},
-{"asm/sockios.h", "FIOSETOWN", 0x8901},
-{"asm/sockios.h", "SIOCSPGRP", 0x8902},
-{"asm/sockios.h", "FIOGETOWN", 0x8903},
-{"asm/sockios.h", "SIOCGPGRP", 0x8904},
-{"asm/sockios.h", "SIOCATMARK", 0x8905},
-{"asm/sockios.h", "SIOCGSTAMP", 0x8906},
-{"linux/sockios.h", "SIOCADDRT", 0x890b},
-{"linux/sockios.h", "SIOCDELRT", 0x890c},
-{"linux/sockios.h", "SIOCRTMSG", 0x890d},
-{"linux/sockios.h", "SIOCGIFNAME", 0x8910},
-{"linux/sockios.h", "SIOCSIFLINK", 0x8911},
-{"linux/sockios.h", "SIOCGIFCONF", 0x8912},
-{"linux/sockios.h", "SIOCGIFFLAGS", 0x8913},
-{"linux/sockios.h", "SIOCSIFFLAGS", 0x8914},
-{"linux/sockios.h", "SIOCGIFADDR", 0x8915},
-{"linux/sockios.h", "SIOCSIFADDR", 0x8916},
-{"linux/sockios.h", "SIOCGIFDSTADDR", 0x8917},
-{"linux/sockios.h", "SIOCSIFDSTADDR", 0x8918},
-{"linux/sockios.h", "SIOCGIFBRDADDR", 0x8919},
-{"linux/sockios.h", "SIOCSIFBRDADDR", 0x891a},
-{"linux/sockios.h", "SIOCGIFNETMASK", 0x891b},
-{"linux/sockios.h", "SIOCSIFNETMASK", 0x891c},
-{"linux/sockios.h", "SIOCGIFMETRIC", 0x891d},
-{"linux/sockios.h", "SIOCSIFMETRIC", 0x891e},
-{"linux/sockios.h", "SIOCGIFMEM", 0x891f},
-{"linux/sockios.h", "SIOCSIFMEM", 0x8920},
-{"linux/sockios.h", "SIOCGIFMTU", 0x8921},
-{"linux/sockios.h", "SIOCSIFMTU", 0x8922},
-{"linux/sockios.h", "SIOCSIFNAME", 0x8923},
-{"linux/sockios.h", "SIOCSIFHWADDR", 0x8924},
-{"linux/sockios.h", "SIOCGIFENCAP", 0x8925},
-{"linux/sockios.h", "SIOCSIFENCAP", 0x8926},
-{"linux/sockios.h", "SIOCGIFHWADDR", 0x8927},
-{"linux/sockios.h", "SIOCGIFSLAVE", 0x8929},
-{"linux/sockios.h", "SIOCSIFSLAVE", 0x8930},
-{"linux/sockios.h", "SIOCADDMULTI", 0x8931},
-{"linux/sockios.h", "SIOCDELMULTI", 0x8932},
-{"linux/sockios.h", "SIOCGIFINDEX", 0x8933},
-{"linux/sockios.h", "SIOCSIFPFLAGS", 0x8934},
-{"linux/sockios.h", "SIOCGIFPFLAGS", 0x8935},
-{"linux/sockios.h", "SIOCDIFADDR", 0x8936},
-{"linux/sockios.h", "SIOCSIFHWBROADCAST", 0x8937},
-{"linux/sockios.h", "SIOCGIFCOUNT", 0x8938},
-{"linux/sockios.h", "SIOCGIFBR", 0x8940},
-{"linux/sockios.h", "SIOCSIFBR", 0x8941},
-{"linux/sockios.h", "SIOCGIFTXQLEN", 0x8942},
-{"linux/sockios.h", "SIOCSIFTXQLEN", 0x8943},
-{"linux/sockios.h", "SIOCDARP", 0x8953},
-{"linux/sockios.h", "SIOCGARP", 0x8954},
-{"linux/sockios.h", "SIOCSARP", 0x8955},
-{"linux/sockios.h", "SIOCDRARP", 0x8960},
-{"linux/sockios.h", "SIOCGRARP", 0x8961},
-{"linux/sockios.h", "SIOCSRARP", 0x8962},
-{"linux/sockios.h", "SIOCGIFMAP", 0x8970},
-{"linux/sockios.h", "SIOCSIFMAP", 0x8971},
-{"linux/sockios.h", "SIOCADDDLCI", 0x8980},
-{"linux/sockios.h", "SIOCDELDLCI", 0x8981},
-{"linux/sockios.h", "SIOCPROTOPRIVATE", 0x89e0},
-{"linux/sockios.h", "SIOCDEVPRIVATE", 0x89f0},
-{"linux/auto_fs.h", "AUTOFS_IOC_READY", 0x9360},
-{"linux/auto_fs.h", "AUTOFS_IOC_FAIL", 0x9361},
-{"linux/auto_fs.h", "AUTOFS_IOC_CATATONIC", 0x9362},
-{"linux/nbd.h", "NBD_SET_SOCK", 0xab00},
-{"linux/nbd.h", "NBD_SET_BLKSIZE", 0xab01},
-{"linux/nbd.h", "NBD_SET_SIZE", 0xab02},
-{"linux/nbd.h", "NBD_DO_IT", 0xab03},
-{"linux/nbd.h", "NBD_CLEAR_SOCK", 0xab04},
-{"linux/nbd.h", "NBD_CLEAR_QUE", 0xab05},
-{"linux/nbd.h", "NBD_PRINT_DEBUG", 0xab06},
-{"linux/nbd.h", "NBD_SET_SIZE_BLOCKS", 0xab07},
-{"linux/nbd.h", "NBD_DISCONNECT", 0xab08},
-{"linux/raw.h", "RAW_SETBIND", 0xac00},
-{"linux/raw.h", "RAW_GETBIND", 0xac01},
-{"linux/if_pppox.h", "PPPOEIOCDFWD", 0xb101},
-{"linux/lvm.h", "LV_ACTIVATE", 0xfe22},
-{"linux/lvm.h", "LV_DEACTIVATE", 0xfe23},
-{"linux/lvm.h", "LVM_RESET", 0xfe99},
-{"linux/lvm.h", "LVM_LOCK_LVM", 0xff00},
-{"linux/cyclades.h", "CYGETMON", 0x435901},
-{"linux/cyclades.h", "CYGETTHRESH", 0x435902},
-{"linux/cyclades.h", "CYSETTHRESH", 0x435903},
-{"linux/cyclades.h", "CYGETDEFTHRESH", 0x435904},
-{"linux/cyclades.h", "CYSETDEFTHRESH", 0x435905},
-{"linux/cyclades.h", "CYGETTIMEOUT", 0x435906},
-{"linux/cyclades.h", "CYSETTIMEOUT", 0x435907},
-{"linux/cyclades.h", "CYGETDEFTIMEOUT", 0x435908},
-{"linux/cyclades.h", "CYSETDEFTIMEOUT", 0x435909},
-{"linux/cyclades.h", "CYSETRFLOW", 0x43590a},
-{"linux/cyclades.h", "CYGETRFLOW", 0x43590b},
-{"linux/cyclades.h", "CYSETRTSDTR_INV", 0x43590c},
-{"linux/cyclades.h", "CYGETRTSDTR_INV", 0x43590d},
-{"linux/cyclades.h", "CYZSETPOLLCYCLE", 0x43590e},
-{"linux/cyclades.h", "CYZGETPOLLCYCLE", 0x43590f},
-{"linux/cyclades.h", "CYGETCD1400VER", 0x435910},
-{"linux/cyclades.h", "CYGETCARDINFO", 0x435911},
-{"linux/cyclades.h", "CYSETWAIT", 0x435912},
-{"linux/cyclades.h", "CYGETWAIT", 0x435913},
-{"linux/soundcard.h", "SOUND_MIXER_READ_VOLUME", 0x20044d00},
-{"linux/soundcard.h", "SOUND_MIXER_READ_BASS", 0x20044d01},
-{"linux/soundcard.h", "SOUND_MIXER_READ_TREBLE", 0x20044d02},
-{"linux/soundcard.h", "SOUND_MIXER_READ_SYNTH", 0x20044d03},
-{"linux/soundcard.h", "SOUND_MIXER_READ_PCM", 0x20044d04},
-{"linux/soundcard.h", "SOUND_MIXER_READ_SPEAKER", 0x20044d05},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE", 0x20044d06},
-{"linux/soundcard.h", "SOUND_MIXER_READ_MIC", 0x20044d07},
-{"linux/soundcard.h", "SOUND_MIXER_READ_CD", 0x20044d08},
-{"linux/soundcard.h", "SOUND_MIXER_READ_IMIX", 0x20044d09},
-{"linux/soundcard.h", "SOUND_MIXER_READ_ALTPCM", 0x20044d0a},
-{"linux/soundcard.h", "SOUND_MIXER_READ_RECLEV", 0x20044d0b},
-{"linux/soundcard.h", "SOUND_MIXER_READ_IGAIN", 0x20044d0c},
-{"linux/soundcard.h", "SOUND_MIXER_READ_OGAIN", 0x20044d0d},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE1", 0x20044d0e},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE2", 0x20044d0f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE3", 0x20044d10},
-{"linux/soundcard.h", "SOUND_MIXER_READ_MUTE", 0x20044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_ENHANCE", 0x20044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LOUD", 0x20044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_STEREODEVS", 0x20044dfb},
-{"linux/soundcard.h", "SOUND_MIXER_READ_CAPS", 0x20044dfc},
-{"linux/soundcard.h", "SOUND_MIXER_READ_RECMASK", 0x20044dfd},
-{"linux/soundcard.h", "SOUND_MIXER_READ_DEVMASK", 0x20044dfe},
-{"linux/soundcard.h", "SOUND_MIXER_READ_RECSRC", 0x20044dff},
-{"linux/ppdev.h", "PPWCONTROL", 0x40017084},
-{"linux/ppdev.h", "PPWDATA", 0x40017086},
-{"linux/ppdev.h", "PPWCTLONIRQ", 0x40017092},
-{"linux/telephony.h", "PHONE_MAXRINGS", 0x40017185},
-{"linux/telephony.h", "PHONE_PLAY_TONE", 0x4001719b},
-{"linux/ppdev.h", "PPFCONTROL", 0x4002708e},
-{"linux/telephony.h", "PHONE_RING_CADENCE", 0x40027186},
-{"linux/agpgart.h", "AGPIOC_DEALLOCATE", 0x40044107},
-{"linux/random.h", "RNDADDTOENTCNT", 0x40045201},
-{"asm/ioctls.h", "TIOCSPTLCK", 0x40045431},
-{"linux/atmdev.h", "ATM_SETSC", 0x400461f1},
-{"linux/devfs_fs.h", "DEVFSDIOC_SET_EVENT_MASK", 0x40046402},
-{"linux/devfs_fs.h", "DEVFSDIOC_RELEASE_EVENT_QUEUE", 0x40046403},
-{"linux/video_decoder.h", "DECODER_SET_NORM", 0x40046403},
-{"linux/devfs_fs.h", "DEVFSDIOC_SET_DEBUG_MASK", 0x40046404},
-{"linux/video_decoder.h", "DECODER_SET_INPUT", 0x40046404},
-{"linux/video_decoder.h", "DECODER_SET_OUTPUT", 0x40046405},
-{"linux/video_decoder.h", "DECODER_ENABLE_OUTPUT", 0x40046406},
-{"linux/video_encoder.h", "ENCODER_SET_NORM", 0x40046502},
-{"linux/video_encoder.h", "ENCODER_SET_INPUT", 0x40046503},
-{"linux/video_encoder.h", "ENCODER_SET_OUTPUT", 0x40046504},
-{"linux/video_encoder.h", "ENCODER_ENABLE_OUTPUT", 0x40046505},
-{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID", 0x40046e02},
-{"linux/ncp_fs.h", "NCP_IOC_SET_SIGN_WANTED", 0x40046e06},
-{"linux/ncp_fs.h", "NCP_IOC_GETDENTRYTTL", 0x40046e0c},
-{"linux/ppdev.h", "PPSETMODE", 0x40047080},
-{"linux/ppdev.h", "PPDATADIR", 0x40047090},
-{"linux/ppdev.h", "PPNEGOT", 0x40047091},
-{"linux/ppdev.h", "PPSETPHASE", 0x40047094},
-{"linux/telephony.h", "PHONE_REC_CODEC", 0x40047189},
-{"linux/telephony.h", "PHONE_REC_DEPTH", 0x4004718c},
-{"linux/telephony.h", "PHONE_FRAME", 0x4004718d},
-{"linux/telephony.h", "PHONE_REC_VOLUME", 0x4004718e},
-{"linux/telephony.h", "PHONE_PLAY_CODEC", 0x40047190},
-{"linux/telephony.h", "PHONE_PLAY_DEPTH", 0x40047193},
-{"linux/telephony.h", "PHONE_PLAY_VOLUME", 0x40047194},
-{"linux/telephony.h", "PHONE_DTMF_OOB", 0x40047199},
-{"linux/telephony.h", "PHONE_SET_TONE_ON_TIME", 0x4004719c},
-{"linux/telephony.h", "PHONE_SET_TONE_OFF_TIME", 0x4004719d},
-{"linux/telephony.h", "PHONE_PSTN_SET_STATE", 0x400471a4},
-{"linux/telephony.h", "PHONE_WINK_DURATION", 0x400471a6},
-{"linux/ixjuser.h", "IXJCTL_GET_FILTER_HIST", 0x400471c8},
-{"linux/ixjuser.h", "IXJCTL_AEC_START", 0x400471cb},
-{"linux/ixjuser.h", "IXJCTL_SET_LED", 0x400471ce},
-{"linux/ixjuser.h", "IXJCTL_MIXER", 0x400471cf},
-{"linux/ixjuser.h", "IXJCTL_DAA_COEFF_SET", 0x400471d0},
-{"linux/ixjuser.h", "IXJCTL_PORT", 0x400471d1},
-{"linux/ixjuser.h", "IXJCTL_DAA_AGAIN", 0x400471d2},
-{"linux/ixjuser.h", "IXJCTL_POTS_PSTN", 0x400471d5},
-{"linux/ixjuser.h", "IXJCTL_HZ", 0x400471e0},
-{"linux/ixjuser.h", "IXJCTL_RATE", 0x400471e1},
-{"linux/ixjuser.h", "IXJCTL_INTERCOM_START", 0x400471fd},
-{"linux/ixjuser.h", "IXJCTL_INTERCOM_STOP", 0x400471fe},
-{"linux/if_ppp.h", "PPPIOCATTCHAN", 0x40047438},
-{"linux/if_ppp.h", "PPPIOCCONNECT", 0x4004743a},
-{"linux/if_ppp.h", "PPPIOCSMRRU", 0x4004743b},
-{"linux/if_ppp.h", "PPPIOCDETACH", 0x4004743c},
-{"linux/if_ppp.h", "PPPIOCATTACH", 0x4004743d},
-{"linux/if_ppp.h", "PPPIOCSDEBUG", 0x40047440},
-{"linux/if_ppp.h", "PPPIOCSMAXCID", 0x40047451},
-{"linux/if_ppp.h", "PPPIOCSMRU", 0x40047452},
-{"linux/if_ppp.h", "PPPIOCSRASYNCMAP", 0x40047454},
-{"linux/if_ppp.h", "PPPIOCSASYNCMAP", 0x40047457},
-{"linux/if_ppp.h", "PPPIOCSFLAGS", 0x40047459},
-{"linux/isdn_ppp.h", "PPPIOCBUNDLE", 0x40047481},
-{"linux/isdn_ppp.h", "PPPIOCSMPFLAGS", 0x40047483},
-{"linux/isdn_ppp.h", "PPPIOCSMPMTU", 0x40047484},
-{"linux/isdn_ppp.h", "PPPIOCSMPMRU", 0x40047485},
-{"linux/isdn_ppp.h", "PPPIOCSCOMPRESSOR", 0x40047487},
-{"linux/videodev.h", "VIDIOCCAPTURE", 0x40047608},
-{"linux/videodev.h", "VIDIOCSYNC", 0x40047612},
-{"linux/videodev.h", "VIDIOCSWRITEMODE", 0x40047619},
-{"linux/dn.h", "SIOCSNETADDR", 0x400489e0},
-{"linux/dn.h", "OSIOCSNETADDR", 0x400489e0},
-{"linux/auto_fs4.h", "AUTOFS_IOC_EXPIRE_MULTI", 0x40049366},
-{"linux/lvm.h", "VG_CREATE", 0x4004fe00},
-{"linux/lvm.h", "VG_REMOVE", 0x4004fe01},
-{"linux/lvm.h", "VG_EXTEND", 0x4004fe03},
-{"linux/lvm.h", "VG_REDUCE", 0x4004fe04},
-{"linux/lvm.h", "VG_SET_EXTENDABLE", 0x4004fe08},
-{"linux/lvm.h", "LV_CREATE", 0x4004fe20},
-{"linux/lvm.h", "LV_REMOVE", 0x4004fe21},
-{"linux/lvm.h", "LV_EXTEND", 0x4004fe24},
-{"linux/lvm.h", "LV_REDUCE", 0x4004fe25},
-{"linux/lvm.h", "LV_SET_ACCESS", 0x4004fe28},
-{"linux/lvm.h", "LV_SET_ALLOCATION", 0x4004fe29},
-{"linux/lvm.h", "LV_SET_STATUS", 0x4004fe2a},
-{"linux/lvm.h", "LE_REMAP", 0x4004fe2b},
-{"linux/lvm.h", "PV_FLUSH", 0x4004fe42},
-{"linux/lvm.h", "PE_LOCK_UNLOCK", 0x4004fe50},
-{"linux/elevator.h", "BLKELVSET", 0x4008126b},
-{"linux/fs.h", "BLKELVSET", 0x4008126b},
-{"linux/agpgart.h", "AGPIOC_SETUP", 0x40084103},
-{"linux/agpgart.h", "AGPIOC_RESERVE", 0x40084104},
-{"linux/agpgart.h", "AGPIOC_PROTECT", 0x40084105},
-{"linux/agpgart.h", "AGPIOC_BIND", 0x40084108},
-{"linux/agpgart.h", "AGPIOC_UNBIND", 0x40084109},
-{"linux/pmu.h", "PMU_IOC_SET_BACKLIGHT", 0x40084202},
-{"linux/input.h", "EVIOCSREP", 0x40084503},
-{"linux/input.h", "EVIOCSKEYCODE", 0x40084504},
-{"linux/random.h", "RNDADDENTROPY", 0x40085203},
-{"linux/usbdevice_fs.h", "USBDEVFS_REAPURB", 0x4008550c},
-{"linux/usbdevice_fs.h", "USBDEVFS_REAPURBNDELAY", 0x4008550d},
-{"linux/usbdevice_fs.h", "USBDEVFS_CONNECTINFO", 0x40085511},
-{"linux/ext2_fs.h", "EXT2_IOC_SETFLAGS", 0x40086602},
-{"linux/mtio.h", "MTIOCTOP", 0x40086d01},
-{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID2", 0x40086e02},
-{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_CONNECTION", 0x40086ef8},
-{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_MODE", 0x40086efa},
-{"linux/rtc.h", "RTC_IRQP_SET", 0x4008700c},
-{"linux/rtc.h", "RTC_EPOCH_SET", 0x4008700e},
-{"linux/serio.h", "SPIOCSTYPE", 0x40087101},
-{"linux/telephony.h", "PHONE_CAPABILITIES_CHECK", 0x40087182},
-{"linux/ixjuser.h", "IXJCTL_SET_FILTER", 0x400871c7},
-{"linux/ixjuser.h", "IXJCTL_INIT_TONE", 0x400871c9},
-{"linux/ixjuser.h", "IXJCTL_TONE_CADENCE", 0x400871ca},
-{"linux/if_ppp.h", "PPPIOCSNPMODE", 0x4008744b},
-{"linux/ext2_fs.h", "EXT2_IOC_SETVERSION", 0x40087602},
-{"linux/videodev.h", "VIDIOCSFREQ", 0x4008760f},
-{"linux/if_pppox.h", "PPPOEIOCSFWD", 0x4008b100},
-{"linux/fd.h", "FDFMTTRK", 0x400c0248},
-{"linux/capi.h", "CAPI_REGISTER", 0x400c4301},
-{"linux/i2o-dev.h", "I2OEVTREG", 0x400c690a},
-{"linux/ncp_fs.h", "NCP_IOC_GETROOT", 0x400c6e08},
-{"linux/videodev.h", "VIDIOCSPLAYMODE", 0x400c7618},
-{"linux/video_decoder.h", "DECODER_SET_PICTURE", 0x400e6407},
-{"linux/videodev.h", "VIDIOCSPICT", 0x400e7607},
-{"asm/dasd.h", "BIODASDFMT", 0x40104401},
-{"linux/atm_idt77105.h", "IDT77105_GETSTAT", 0x40106132},
-{"linux/atm_idt77105.h", "IDT77105_GETSTATZ", 0x40106133},
-{"linux/atmdev.h", "ATM_GETSTAT", 0x40106150},
-{"linux/atmdev.h", "ATM_GETSTATZ", 0x40106151},
-{"linux/atmdev.h", "ATM_GETLOOP", 0x40106152},
-{"linux/atmdev.h", "ATM_SETLOOP", 0x40106153},
-{"linux/atmdev.h", "ATM_QUERYLOOP", 0x40106154},
-{"linux/atm_eni.h", "ENI_MEMDUMP", 0x40106160},
-{"linux/atm_zatm.h", "ZATM_GETPOOL", 0x40106161},
-{"linux/atm_nicstar.h", "NS_SETBUFLEV", 0x40106162},
-{"linux/atm_zatm.h", "ZATM_GETPOOLZ", 0x40106162},
-{"linux/atm_zatm.h", "ZATM_SETPOOL", 0x40106163},
-{"linux/atm_zatm.h", "ZATM_GETTHIST", 0x40106164},
-{"linux/atm_eni.h", "ENI_SETMULT", 0x40106167},
-{"linux/atmdev.h", "ATM_GETLINKRATE", 0x40106181},
-{"linux/atmdev.h", "ATM_GETNAMES", 0x40106183},
-{"linux/atmdev.h", "ATM_GETTYPE", 0x40106184},
-{"linux/atmdev.h", "ATM_GETESI", 0x40106185},
-{"linux/atmdev.h", "ATM_GETADDR", 0x40106186},
-{"linux/atmdev.h", "ATM_RSTADDR", 0x40106187},
-{"linux/atmdev.h", "ATM_ADDADDR", 0x40106188},
-{"linux/atmdev.h", "ATM_DELADDR", 0x40106189},
-{"linux/atmdev.h", "ATM_GETCIRANGE", 0x4010618a},
-{"linux/atmdev.h", "ATM_SETCIRANGE", 0x4010618b},
-{"linux/atmdev.h", "ATM_SETESI", 0x4010618c},
-{"linux/atmdev.h", "ATM_SETESIF", 0x4010618d},
-{"linux/ppdev.h", "PPSETTIME", 0x40107096},
-{"linux/if_ppp.h", "PPPIOCSCOMPRESS", 0x4010744d},
-{"linux/videodev.h", "VIDIOCMCAPTURE", 0x40107613},
-{"asm/tape390.h", "TAPE390_DISPLAY", 0x40116401},
-{"linux/fd.h", "FDSETMAXERRS", 0x4014024c},
-{"linux/videodev.h", "VIDIOCSCAPTURE", 0x40147617},
-{"linux/videodev.h", "VIDIOCSFBUF", 0x4018760c},
-{"linux/fd.h", "FDSETPRM", 0x40200242},
-{"linux/fd.h", "FDDEFPRM", 0x40200243},
-{"asm/dasd.h", "BIODASDSATTR", 0x40204402},
-{"linux/if_ppp.h", "PPPIOCSXASYNCMAP", 0x4020744f},
-{"linux/videodev.h", "VIDIOCSMICROCODE", 0x4020761b},
-{"linux/videodev.h", "VIDIOCSVBIFMT", 0x4020761d},
-{"linux/joystick.h", "JSIOCSCORR", 0x40246a21},
-{"linux/rtc.h", "RTC_ALM_SET", 0x40247007},
-{"linux/rtc.h", "RTC_SET_TIME", 0x4024700a},
-{"linux/rtc.h", "RTC_WKALM_SET", 0x4028700f},
-{"linux/videodev.h", "VIDIOCSWIN", 0x4028760a},
-{"linux/videodev.h", "VIDIOCSAUDIO", 0x40287611},
-{"linux/smb_fs.h", "SMB_IOC_NEWCONN", 0x402c7502},
-{"linux/synclink.h", "MGSL_IOCSPARAMS", 0x40306d00},
-{"linux/videodev.h", "VIDIOCSCHAN", 0x40307603},
-{"linux/videodev.h", "VIDIOCSTUNER", 0x40407605},
-{"linux/fd.h", "FDSETDRVPRM", 0x40800290},
-{"linux/usbdevice_fs.h", "USBDEVFS_GETDRIVER", 0x41045508},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_VOLUME", 0x60044d00},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_BASS", 0x60044d01},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_TREBLE", 0x60044d02},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_SYNTH", 0x60044d03},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_PCM", 0x60044d04},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_SPEAKER", 0x60044d05},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE", 0x60044d06},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_MIC", 0x60044d07},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_CD", 0x60044d08},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_IMIX", 0x60044d09},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_ALTPCM", 0x60044d0a},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECLEV", 0x60044d0b},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_IGAIN", 0x60044d0c},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_OGAIN", 0x60044d0d},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE1", 0x60044d0e},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE2", 0x60044d0f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE3", 0x60044d10},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_MUTE", 0x60044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_ENHANCE", 0x60044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LOUD", 0x60044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECSRC", 0x60044dff},
-{"linux/joystick.h", "JSIOCGAXES", 0x80016a11},
-{"linux/joystick.h", "JSIOCGBUTTONS", 0x80016a12},
-{"linux/ppdev.h", "PPRSTATUS", 0x80017081},
-{"linux/ppdev.h", "PPRCONTROL", 0x80017083},
-{"linux/ppdev.h", "PPRDATA", 0x80017085},
-{"linux/capi.h", "CAPI_GET_ERRCODE", 0x80024321},
-{"linux/capi.h", "CAPI_INSTALLED", 0x80024322},
-{"linux/capi.h", "CAPI_GET_FLAGS", 0x80044323},
-{"linux/capi.h", "CAPI_SET_FLAGS", 0x80044324},
-{"linux/capi.h", "CAPI_CLR_FLAGS", 0x80044325},
-{"linux/capi.h", "CAPI_NCCI_OPENCOUNT", 0x80044326},
-{"linux/capi.h", "CAPI_NCCI_GETUNIT", 0x80044327},
-{"asm/dasd.h", "DASDAPIVER", 0x80044400},
-{"linux/input.h", "EVIOCGVERSION", 0x80044501},
-{"linux/random.h", "RNDGETENTCNT", 0x80045200},
-{"asm/ioctls.h", "TIOCGPTN", 0x80045430},
-{"linux/usbdevice_fs.h", "USBDEVFS_RESETEP", 0x80045503},
-{"linux/usbdevice_fs.h", "USBDEVFS_SETCONFIGURATION", 0x80045505},
-{"linux/usbdevice_fs.h", "USBDEVFS_CLAIMINTERFACE", 0x8004550f},
-{"linux/usbdevice_fs.h", "USBDEVFS_RELEASEINTERFACE", 0x80045510},
-{"linux/usbdevice_fs.h", "USBDEVFS_CLEAR_HALT", 0x80045515},
-{"linux/watchdog.h", "WDIOC_GETSTATUS", 0x80045701},
-{"linux/watchdog.h", "WDIOC_GETBOOTSTATUS", 0x80045702},
-{"linux/watchdog.h", "WDIOC_GETTEMP", 0x80045703},
-{"linux/watchdog.h", "WDIOC_SETOPTIONS", 0x80045704},
-{"linux/watchdog.h", "WDIOC_KEEPALIVE", 0x80045705},
-{"linux/sonet.h", "SONET_GETDIAG", 0x80046114},
-{"linux/sonet.h", "SONET_GETFRAMING", 0x80046116},
-{"linux/devfs_fs.h", "DEVFSDIOC_GET_PROTO_REV", 0x80046400},
-{"linux/video_decoder.h", "DECODER_GET_STATUS", 0x80046402},
-{"linux/i2o-dev.h", "I2OVALIDATE", 0x80046908},
-{"linux/joystick.h", "JSIOCGVERSION", 0x80046a01},
-{"linux/udf_fs_i.h", "UDF_GETEASIZE", 0x80046c40},
-{"linux/zftape.h", "MTIOC_ZFTAPE_GETBLKSZ", 0x80046d68},
-{"linux/ncp_fs.h", "NCP_IOC_SIGN_WANTED", 0x80046e06},
-{"linux/ncp_fs.h", "NCP_IOC_SETDENTRYTTL", 0x80046e0c},
-{"linux/ppdev.h", "PPCLRIRQ", 0x80047093},
-{"linux/telephony.h", "PHONE_DTMF_READY", 0x80047196},
-{"linux/telephony.h", "PHONE_GET_DTMF", 0x80047197},
-{"linux/telephony.h", "PHONE_GET_DTMF_ASCII", 0x80047198},
-{"linux/telephony.h", "PHONE_EXCEPTION", 0x8004719a},
-{"linux/ixjuser.h", "IXJCTL_CARDTYPE", 0x800471c1},
-{"linux/ixjuser.h", "IXJCTL_SERIAL", 0x800471c2},
-{"linux/ixjuser.h", "IXJCTL_DSP_TYPE", 0x800471c3},
-{"linux/ixjuser.h", "IXJCTL_DSP_VERSION", 0x800471c4},
-{"linux/if_ppp.h", "PPPIOCGCHAN", 0x80047437},
-{"linux/if_ppp.h", "PPPIOCGDEBUG", 0x80047441},
-{"linux/if_ppp.h", "PPPIOCGMRU", 0x80047453},
-{"linux/if_ppp.h", "PPPIOCGRASYNCMAP", 0x80047455},
-{"linux/if_ppp.h", "PPPIOCGUNIT", 0x80047456},
-{"linux/if_ppp.h", "PPPIOCGASYNCMAP", 0x80047458},
-{"linux/if_ppp.h", "PPPIOCGFLAGS", 0x8004745a},
-{"linux/isdn_ppp.h", "PPPIOCGMPFLAGS", 0x80047482},
-{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID", 0x80047501},
-{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID32", 0x80047503},
-{"linux/dn.h", "SIOCGNETADDR", 0x800489e1},
-{"linux/dn.h", "OSIOCGNETADDR", 0x800489e1},
-{"linux/auto_fs.h", "AUTOFS_IOC_PROTOVER", 0x80049363},
-{"linux/lvm.h", "LVM_GET_IOP_VERSION", 0x8004fe98},
-{"linux/sonet.h", "SONET_GETFRSENSE", 0x80066117},
-{"linux/elevator.h", "BLKELVGET", 0x8008126a},
-{"linux/fs.h", "BLKELVGET", 0x8008126a},
-{"linux/agpgart.h", "AGPIOC_INFO", 0x80084100},
-{"linux/pmu.h", "PMU_IOC_GET_BACKLIGHT", 0x80084201},
-{"linux/pmu.h", "PMU_IOC_GET_MODEL", 0x80084203},
-{"linux/pmu.h", "PMU_IOC_HAS_ADB", 0x80084204},
-{"linux/input.h", "EVIOCGID", 0x80084502},
-{"linux/input.h", "EVIOCGREP", 0x80084503},
-{"linux/input.h", "EVIOCGKEYCODE", 0x80084504},
-{"linux/input.h", "EVIOCGKEY", 0x80084505},
-{"linux/random.h", "RNDGETPOOL", 0x80085202},
-{"linux/usbdevice_fs.h", "USBDEVFS_SETINTERFACE", 0x80085504},
-{"linux/ext2_fs.h", "EXT2_IOC_GETFLAGS", 0x80086601},
-{"linux/udf_fs_i.h", "UDF_GETEABLOCK", 0x80086c41},
-{"linux/udf_fs_i.h", "UDF_GETVOLIDENT", 0x80086c42},
-{"linux/mtio.h", "MTIOCPOS", 0x80086d03},
-{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_CONNECTION", 0x80086ef8},
-{"linux/matroxfb.h", "MATROXFB_GET_AVAILABLE_OUTPUTS", 0x80086ef9},
-{"linux/matroxfb.h", "MATROXFB_GET_ALL_OUTPUTS", 0x80086efb},
-{"linux/rtc.h", "RTC_IRQP_READ", 0x8008700b},
-{"linux/rtc.h", "RTC_EPOCH_READ", 0x8008700d},
-{"linux/telephony.h", "PHONE_CAPABILITIES_LIST", 0x80087181},
-{"linux/ixjuser.h", "IXJCTL_CID", 0x800871d4},
-{"linux/ixjuser.h", "IXJCTL_FRAMES_READ", 0x800871e2},
-{"linux/ixjuser.h", "IXJCTL_FRAMES_WRITTEN", 0x800871e3},
-{"linux/ixjuser.h", "IXJCTL_READ_WAIT", 0x800871e4},
-{"linux/ixjuser.h", "IXJCTL_WRITE_WAIT", 0x800871e5},
-{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_READ", 0x800871e6},
-{"linux/ext2_fs.h", "EXT2_IOC_GETVERSION", 0x80087601},
-{"linux/videodev.h", "VIDIOCGFREQ", 0x8008760e},
-{"linux/video_decoder.h", "DECODER_GET_CAPABILITIES", 0x800c6401},
-{"linux/video_encoder.h", "ENCODER_GET_CAPABILITIES", 0x800c6501},
-{"linux/ncp_fs.h", "NCP_IOC_SETROOT", 0x800c6e08},
-{"linux/videodev.h", "VIDIOCKEY", 0x800c760d},
-{"linux/videodev.h", "VIDIOCGPICT", 0x800e7606},
-{"linux/fd.h", "FDGETDRVTYP", 0x8010020f},
-{"linux/usbdevice_fs.h", "USBDEVFS_DISCSIGNAL", 0x8010550e},
-{"linux/mtio.h", "MTIOCGETSIZE", 0x80106d09},
-{"linux/ncp_fs.h", "NCP_IOC_NCPREQUEST", 0x80106e01},
-{"linux/ncp_fs.h", "NCP_IOC_SETPRIVATEDATA", 0x80106e0a},
-{"linux/ppdev.h", "PPGETTIME", 0x80107095},
-{"linux/if_ppp.h", "PPPIOCGIDLE", 0x8010743f},
-{"linux/isdn_ppp.h", "PPPIOCGIFNAME", 0x80107488},
-{"linux/fd.h", "FDGETMAXERRS", 0x8014020e},
-{"linux/mtio.h", "MTIOCVOLINFO", 0x80146d08},
-{"linux/ncp_fs.h", "NCP_IOC_LOCKUNLOCK", 0x80146e07},
-{"linux/videodev.h", "VIDIOCGUNIT", 0x80147615},
-{"linux/videodev.h", "VIDIOCGCAPTURE", 0x80147616},
-{"linux/ncp_fs.h", "NCP_IOC_SIGN_INIT", 0x80186e05},
-{"linux/ncp_fs.h", "NCP_IOC_SETOBJECTNAME", 0x80186e09},
-{"linux/videodev.h", "VIDIOCGFBUF", 0x8018760b},
-{"linux/fd.h", "FDGETPRM", 0x80200204},
-{"asm/dasd.h", "BIODASDGATTR", 0x80204405},
-{"linux/fb.h", "FBIOGET_VBLANK", 0x80204612},
-{"linux/if_ppp.h", "PPPIOCGXASYNCMAP", 0x80207450},
-{"linux/videodev.h", "VIDIOCGVBIFMT", 0x8020761c},
-{"linux/sonet.h", "SONET_GETSTAT", 0x80246110},
-{"linux/sonet.h", "SONET_GETSTATZ", 0x80246111},
-{"linux/joystick.h", "JSIOCGCORR", 0x80246a22},
-{"linux/rtc.h", "RTC_ALM_READ", 0x80247008},
-{"linux/rtc.h", "RTC_RD_TIME", 0x80247009},
-{"linux/fd.h", "FDGETFDCSTAT", 0x80280215},
-{"linux/fd.h", "FDWERRORGET", 0x80280217},
-{"linux/rtc.h", "RTC_WKALM_RD", 0x80287010},
-{"linux/videodev.h", "VIDIOCGWIN", 0x80287609},
-{"linux/videodev.h", "VIDIOCGAUDIO", 0x80287610},
-{"linux/ncp_fs.h", "NCP_IOC_SETCHARSETS", 0x802a6e0b},
-{"linux/synclink.h", "MGSL_IOCGPARAMS", 0x80306d01},
-{"linux/mtio.h", "MTIOCGET", 0x80306d02},
-{"linux/usbdevice_fs.h", "USBDEVFS_SUBMITURB", 0x8038550a},
-{"linux/videodev.h", "VIDIOCGCAP", 0x803c7601},
-{"linux/i2o-dev.h", "I2OGETIOPS", 0x80406900},
-{"linux/isdn_ppp.h", "PPPIOCGCOMPRESSORS", 0x80407486},
-{"linux/watchdog.h", "WDIOC_GETSUPPORT", 0x80485700},
-{"linux/fd.h", "FDGETDRVSTAT", 0x80500212},
-{"linux/fd.h", "FDPOLLDRVSTAT", 0x80500213},
-{"linux/i2o-dev.h", "I2OEVTGET", 0x8068690b},
-{"linux/fd.h", "FDGETDRVPRM", 0x80800211},
-{"linux/usbdevice_fs.h", "USBDEVFS_HUB_PORTINFO", 0x80805513},
-{"linux/videodev.h", "VIDIOCGMBUF", 0x80887614},
-{"asm/dasd.h", "BIODASDPSRD", 0x80c04404},
-{"linux/auto_fs.h", "AUTOFS_IOC_EXPIRE", 0x810c9365},
-{"linux/videodev.h", "VIDIOCGPLAYINFO", 0x8118761a},
-{"asm/dasd.h", "BIODASDINFO", 0x81784401},
-{"asm/dasd.h", "BIODASDINFO2", 0x81a04403},
-{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_BOTH", 0x82307201},
-{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_SHORT", 0x82307202},
-{"asm/dasd.h", "BIODASDPRRD", 0x84084402},
-{"linux/capi.h", "CAPI_GET_MANUFACTURER", 0xc0044306},
-{"linux/capi.h", "CAPI_GET_SERIAL", 0xc0044308},
-{"linux/sonet.h", "SONET_SETDIAG", 0xc0046112},
-{"linux/sonet.h", "SONET_CLRDIAG", 0xc0046113},
-{"linux/synclink.h", "MGSL_IOCWAITEVENT", 0xc0046d08},
-{"linux/if_ppp.h", "PPPIOCNEWUNIT", 0xc004743e},
-{"linux/lvm.h", "VG_STATUS", 0xc004fe05},
-{"linux/lvm.h", "VG_STATUS_GET_COUNT", 0xc004fe06},
-{"linux/lvm.h", "VG_STATUS_GET_NAMELIST", 0xc004fe07},
-{"linux/lvm.h", "LV_STATUS_BYNAME", 0xc004fe26},
-{"linux/lvm.h", "LV_STATUS_BYINDEX", 0xc004fe27},
-{"linux/lvm.h", "PV_STATUS", 0xc004fe40},
-{"linux/lvm.h", "PV_CHANGE", 0xc004fe41},
-{"linux/agpgart.h", "AGPIOC_ALLOCATE", 0xc0084106},
-{"asm/cmb.h", "BIODASDREADCMB", 0xc0084420},
-{"linux/coda.h", "CIOC_KERNEL_VERSION", 0xc008630a},
-{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_MODE", 0xc0086efa},
-{"linux/telephony.h", "PHONE_QUERY_CODEC", 0xc00871a7},
-{"linux/if_ppp.h", "PPPIOCGNPMODE", 0xc008744c},
-{"linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", 0xc0089364},
-{"linux/capi.h", "CAPI_GET_VERSION", 0xc0104307},
-{"linux/capi.h", "CAPI_MANUFACTURER_CMD", 0xc0104320},
-{"linux/usbdevice_fs.h", "USBDEVFS_IOCTL", 0xc0105512},
-{"linux/atm_nicstar.h", "NS_GETPSTAT", 0xc0106161},
-{"linux/ncp_fs.h", "NCP_IOC_GETPRIVATEDATA", 0xc0106e0a},
-{"linux/usbdevice_fs.h", "USBDEVFS_CONTROL", 0xc0185500},
-{"linux/usbdevice_fs.h", "USBDEVFS_BULK", 0xc0185502},
-{"linux/i2o-dev.h", "I2OHRTGET", 0xc0186901},
-{"linux/i2o-dev.h", "I2OLCTGET", 0xc0186902},
-{"linux/mtio.h", "MTIOCRDFTSEG", 0xc0186d06},
-{"linux/mtio.h", "MTIOCWRFTSEG", 0xc0186d07},
-{"linux/mtio.h", "MTIOCFTFORMAT", 0xc0186d0a},
-{"linux/ncp_fs.h", "NCP_IOC_GETOBJECTNAME", 0xc0186e09},
-{"linux/mtio.h", "MTIOCFTCMD", 0xc0206d0b},
-{"linux/i2o-dev.h", "I2OPARMSET", 0xc0286903},
-{"linux/i2o-dev.h", "I2OPARMGET", 0xc0286904},
-{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO", 0xc0286e04},
-{"linux/ncp_fs.h", "NCP_IOC_GETCHARSETS", 0xc02a6e0b},
-{"linux/i2o-dev.h", "I2OSWDL", 0xc0306905},
-{"linux/i2o-dev.h", "I2OSWUL", 0xc0306906},
-{"linux/i2o-dev.h", "I2OSWDEL", 0xc0306907},
-{"linux/i2o-dev.h", "I2OHTML", 0xc0306909},
-{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO_V2", 0xc0306e04},
-{"linux/videodev.h", "VIDIOCGCHAN", 0xc0307602},
-{"linux/capi.h", "CAPI_GET_PROFILE", 0xc0404309},
-{"linux/videodev.h", "VIDIOCGTUNER", 0xc0407604},
-{"asm/cmb.h", "BIODASDREADALLCMB", 0xc0584421},
-{"linux/isdn_ppp.h", "PPPIOCGCALLINFO", 0xc0887480},
diff --git a/strace/linux/s390/signalent.h b/strace/linux/s390/signalent.h
deleted file mode 100644
index 04b00b1..0000000
--- a/strace/linux/s390/signalent.h
+++ /dev/null
@@ -1,33 +0,0 @@
-	"SIG_0",	/* 0 */
-	"SIGHUP",	/* 1 */
-	"SIGINT",	/* 2 */
-	"SIGQUIT",	/* 3 */
-	"SIGILL",	/* 4 */
-	"SIGTRAP",	/* 5 */
-	"SIGABRT",	/* 6 */
-	"SIGBUS",	/* 7 */
-	"SIGFPE",	/* 8 */
-	"SIGKILL",	/* 9 */
-	"SIGUSR1",	/* 10 */
-	"SIGSEGV",	/* 11 */
-	"SIGUSR2",	/* 12 */
-	"SIGPIPE",	/* 13 */
-	"SIGALRM",	/* 14 */
-	"SIGTERM",	/* 15 */
-	"SIGSTKFLT",	/* 16 */
-	"SIGCHLD",	/* 17 */
-	"SIGCONT",	/* 18 */
-	"SIGSTOP",	/* 19 */
-	"SIGTSTP",	/* 20 */
-	"SIGTTIN",	/* 21 */
-	"SIGTTOU",	/* 22 */
-	"SIGURG",	/* 23 */
-	"SIGXCPU",	/* 24 */
-	"SIGXFSZ",	/* 25 */
-	"SIGVTALRM",	/* 26 */
-	"SIGPROF",	/* 27 */
-	"SIGWINCH",	/* 28 */
-	"SIGIO",	/* 29 */
-	"SIGPWR",	/* 30 */
-	"SIGUNUSED",	/* 31 */
-	"SIGRTMIN",	/* 32 */
diff --git a/strace/linux/s390/syscallent.h b/strace/linux/s390/syscallent.h
deleted file mode 100644
index 23125f8..0000000
--- a/strace/linux/s390/syscallent.h
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Copyright (c) 2000 IBM Deutschland Entwicklung GmbH, IBM Coporation
- * Authors: Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
- *          D.J. Barrow  <barrow_dj@mail.yahoo.com,djbarrow@de.ibm.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-	{ 0,	0,	sys_setup,		"setup"		}, /* 0 */
-	{ 1,	TP,	sys_exit,		"_exit"		}, /* 1 */
-	{ 0,	TP,	sys_fork,		"fork"		}, /* 2 */
-	{ 3,	0,	sys_read,		"read"		}, /* 3 */
-	{ 3,	0,	sys_write,		"write"		}, /* 4 */
-	{ 3,	TF,	sys_open,		"open"		}, /* 5 */
-	{ 1,	0,	sys_close,		"close"		}, /* 6 */
-	{ -1,	0,	printargs,		"SYS_7"		}, /* 7 */
-	{ 2,	TF,	sys_creat,		"creat"		}, /* 8 */
-	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
-	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
-	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 11 */
-	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
-	{ 1,	0,	sys_time,		"time"		}, /* 13 */
-	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
-	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 16 */
-	{ -1,	0,	printargs,		"SYS_17"	}, /* 17 */
-	{ -1,	0,	printargs,		"SYS_18"	}, /* 18 */
-	{ 3,	0,	sys_lseek,		"lseek"		}, /* 19 */
-	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
-	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
-	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
-	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 24 */
-	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
-	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
-	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
-	{ -1,	0,	printargs,		"SYS_28"	}, /* 28 */
-	{ 0,	TS,	sys_pause,		"pause"		}, /* 29 */
-	{ 2,	TF,	sys_utime,		"utime"		}, /* 30 */
-	{ -1,	0,	printargs,		"SYS_31"	}, /* 31 */
-	{ -1,	0,	printargs,		"SYS_32"	}, /* 32 */
-	{ 2,	TF,	sys_access,		"access"	}, /* 33 */
-	{ 1,	0,	sys_nice,		"nice"		}, /* 34 */
-	{ -1,	0,	printargs,		"SYS_35"	}, /* 35 */
-	{ 0,	0,	sys_sync,		"sync"		}, /* 36 */
-	{ 2,	TS,	sys_kill,		"kill"		}, /* 37 */
-	{ 2,	TF,	sys_rename,		"rename"	}, /* 38 */
-	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 39 */
-	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 40 */
-	{ 1,	0,	sys_dup,		"dup"		}, /* 41 */
-	{ 1,	0,	sys_pipe,		"pipe"		}, /* 42 */
-	{ 1,	0,	sys_times,		"times"		}, /* 43 */
-	{ -1,	0,	printargs,		"SYS_44"	}, /* 44 */
-	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
-	{ -1,	0,	printargs,		"SYS_46"	}, /* 46 */
-	{ -1,	0,	printargs,		"SYS_47"	}, /* 47 */
-	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 50 */
-	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
-	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
-	{ -1,	0,	printargs,		"SYS_53"	}, /* 53 */
-	{ 3,	0,	sys_ioctl,		"ioctl"		}, /* 54 */
-	{ 3,	0,	sys_fcntl,		"fcntl"		}, /* 55 */
-	{ -1,	0,	printargs,		"SYS_56"	}, /* 56 */
-	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 57 */
-	{ -1,	0,	printargs,		"SYS_58"	}, /* 58 */
-	{ -1,	0,	printargs,		"SYS_59"	}, /* 59 */
-	{ 1,	0,	sys_umask,		"umask"		}, /* 60 */
-	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 61 */
-	{ 2,	0,	sys_ustat,		"ustat"		}, /* 62 */
-	{ 2,	0,	sys_dup2,		"dup2"		}, /* 63 */
-	{ 0,	0,	sys_getppid,		"getppid"	}, /* 64 */
-	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
-	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
-	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
-	{ -1,	0,	printargs,		"SYS_68"	}, /* 68 */
-	{ -1,	0,	printargs,		"SYS_69"	}, /* 69 */
-	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
-	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
-	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
-	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
-	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
-	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 75 */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 76 */
-	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 77 */
-	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 78 */
-	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 79 */
-	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 80 */
-	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 81 */
-	{ -1,	0,	printargs,		"SYS_82"	}, /* 82 */
-	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 83 */
-	{ -1,	0,	printargs,		"SYS_84"	}, /* 84 */
-	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
-	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
-	{ 3,	0,	sys_readdir,		"readdir"	}, /* 89 */
-	{ 6,	0,	sys_old_mmap,		"mmap"		}, /* 90 */
-	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
-	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
-	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 93 */
-	{ 2,	0,	sys_fchmod,		"fchmod"	}, /* 94 */
-	{ 3,	0,	sys_fchown,		"fchown"	}, /* 95 */
-	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
-	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
-	{ -1,	0,	printargs,		"SYS_98"	}, /* 98 */
-	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
-	{ 2,	0,	sys_fstatfs,		"fstatfs"	}, /* 100 */
-	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
-	{ 2,	0,	sys_socketcall,		"socketcall"	}, /* 102 */
-	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
-	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
-	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
-	{ 2,	TF,	sys_stat,		"stat"		}, /* 106 */
-	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 107 */
-	{ 2,	0,	sys_fstat,		"fstat"		}, /* 108 */
-	{ -1,	0,	printargs,		"SYS_109"	}, /* 109 */
-	{ -1,	0,	printargs,		"SYS_110"	}, /* 110 */
-	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
-	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
-	{ -1,	0,	printargs,		"SYS_113"	}, /* 113 */
-	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
-	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
-	{ 5,	0,	sys_ipc,		"ipc"		}, /* 117 */
-	{ 1,	0,	sys_fsync,		"fsync"		}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
-	{ 5,	TP,	sys_clone,		"clone"		}, /* 120 */
-	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
-	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
-	{ -1,	0,	printargs,		"SYS_123"	}, /* 123 */
-	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 124 */
-	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 125 */
-	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
-	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
-	{ 2,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
-	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
-	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
-	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
-	{ 1,	0,	sys_fchdir,		"fchdir"	}, /* 133 */
-	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
-	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
-	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
-	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 139 */
-	{ 5,	0,	sys_llseek,		"_llseek"	}, /* 140 */
-	{ 3,	0,	sys_getdents,		"getdents"	}, /* 141 */
-	{ 5,	0,	sys_select,		"select"	}, /* 142 */
-	{ 2,	0,	sys_flock,		"flock"		}, /* 143 */
-	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
-	{ 3,	0,	sys_readv,		"readv"		}, /* 145 */
-	{ 3,	0,	sys_writev,		"writev"	}, /* 146 */
-	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
-	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 148 */
-	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
-	{ 2,	0,	sys_mlock,		"mlock"		}, /* 150 */
-	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
-	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
-	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
-	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
-	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 156 */
-	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 157 */
-	{ 0,	0,	sys_sched_yield,	"sched_yield"}, /* 158 */
-	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
-	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
-	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
-	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 163 */
-	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
-	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
-	{ -1,	0,	printargs,		"SYS_166"	}, /* 166 */
-	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
-	{ 3,	0,	sys_poll,		"poll"		}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
-	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
-	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
-	{ 5,	0,	printargs,		"prctl"		}, /* 172 */
-	{ 1,	TS,	sys_sigreturn,		"rt_sigreturn"	}, /* 173 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 174 */
-	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
-	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
-	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,	"rt_sigqueueinfo"}, /* 178 */
-	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
-	{ 5,	TF,	sys_pread,		"pread"		}, /* 180 */
-	{ 5,	TF,	sys_pwrite,		"pwrite"	}, /* 181 */
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 182 */
-	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
-	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
-	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */
-	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	}, /* 186 */
-	{ 4,	TF,	sys_sendfile,		"sendfile"	}, /* 187 */
-	{ 5,	0,	sys_getpmsg,		"getpmsg"	}, /* 188 */
-	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 189 */
-	{ 0,	TP,	sys_vfork,		"vfork"		}, /* 190 */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 191 */
-	{ 6,	0,	sys_mmap,		"mmap2"		}, /* 192 */
-	{ 2,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
-	{ 2,	TF,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
-	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
-	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
-	{ 2,	TF,	sys_fstat64,		"fstat64"	}, /* 197 */
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 198 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 199 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 200 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 201 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 202 */
-	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 203 */
-	{ 2,	0,	sys_setregid,		"setregid"	}, /* 204 */
-	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 205 */
-	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 206 */
-	{ 3,	0,	sys_fchown,		"fchown"	}, /* 207 */
-	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 208 */
-	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 209 */
-	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 210 */
-	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 211 */
-	{ 3,	TF,	sys_chown,		"chown"		}, /* 212 */
-	{ 1,	0,	sys_setuid,		"setuid"	}, /* 213 */
-	{ 1,	0,	sys_setgid,		"setgid"	}, /* 214 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 215 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 216 */
-        { 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
-	{ 3,	0,	sys_mincore,	         "mincore"      }, /* 218 */
-	{ 3,	0,	sys_madvise,		"madvise"	}, /* 219 */
-	{ 3,	0,	sys_getdents64,		"getdents64"	}, /* 220 */
-	{ 3,	0,	sys_fcntl,		"fcntl64"	}, /* 221 */
-	{ 4,	0,	sys_readahead,		"readahead"	}, /* 222 */
-	{ 4,	TF,	sys_sendfile64,		"sendfile64"	}, /* 223 */
-	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 224 */
-	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 225 */
-	{ 5,	0,	sys_fsetxattr,		"fsetxattr"	}, /* 226 */
-	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 227 */
-	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 228 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"	}, /* 229 */
-	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 230 */
-	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 231 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"	}, /* 232 */
-	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 233 */
-	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 234 */
-	{ 2,	0,	sys_fremovexattr,	"fremovexattr"	}, /* 235 */
-	{ 0,	0,	printargs,		"gettid"	}, /* 236 */
-	{ 2,	TS,	sys_kill,		"tkill"		}, /* 237 */
-	{ 5,	0,	sys_futex,		"futex"		}, /* 238 */
-	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 239 */
-	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 240 */
-	{ -1,	0,	printargs,		"SYS_241"	}, /* 241 */
-	{ -1,	0,	printargs,		"SYS_242"	}, /* 242 */
-	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 243 */
-	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 244 */
-	{ 5,	0,	sys_io_getevents,		"io_getevents"	}, /* 245 */
-	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 246 */
-	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 247 */
-	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 248 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 249 */
-	{ 4,	0,	sys_epoll_ctl,		"epoll_ctl"	}, /* 250 */
-	{ 4,	0,	sys_epoll_wait,		"epoll_wait"	}, /* 251 */
-	{ 1,	0,	printargs,		"set_tid_address"}, /* 252 */
-	{ 5,	0,	printargs,		"fadvise64"	}, /* 253 */
-	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 254 */
-	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 255 */
-	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 256 */
-	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"}, /* 257 */
-	{ 1,	0,	sys_timer_delete,	"timer_delete"	}, /* 258 */
-	{ 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 259 */
-	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 260 */
-	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 261 */
-	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"}, /* 262 */
-
-	{ 5,	0,	printargs,		"SYS_263"	}, /* 263 */
-	{ 5,	0,	printargs,		"SYS_264"	}, /* 264 */
-	{ 5,	0,	printargs,		"SYS_265"	}, /* 265 */
-	{ 5,	0,	printargs,		"SYS_266"	}, /* 266 */
-	{ 5,	0,	printargs,		"SYS_267"	}, /* 267 */
-	{ 5,	0,	printargs,		"SYS_268"	}, /* 268 */
-	{ 5,	0,	printargs,		"SYS_269"	}, /* 269 */
-	{ 5,	0,	printargs,		"SYS_270"	}, /* 270 */
-	{ 5,	0,	printargs,		"SYS_271"	}, /* 271 */
-	{ 5,	0,	printargs,		"SYS_272"	}, /* 272 */
-	{ 5,	0,	printargs,		"SYS_273"	}, /* 273 */
-	{ 5,	0,	printargs,		"SYS_274"	}, /* 274 */
-	{ 5,	0,	printargs,		"SYS_275"	}, /* 275 */
-	{ 5,	0,	printargs,		"SYS_276"	}, /* 276 */
-	{ 5,	0,	printargs,		"SYS_277"	}, /* 277 */
-	{ 5,	0,	printargs,		"SYS_278"	}, /* 278 */
-	{ 5,	0,	printargs,		"SYS_279"	}, /* 279 */
-	{ 5,	0,	printargs,		"SYS_280"	}, /* 280 */
-	{ 5,	0,	printargs,		"SYS_281"	}, /* 281 */
-	{ 5,	0,	printargs,		"SYS_282"	}, /* 282 */
-	{ 5,	0,	printargs,		"SYS_283"	}, /* 283 */
-	{ 5,	0,	printargs,		"SYS_284"	}, /* 284 */
-	{ 5,	0,	printargs,		"SYS_285"	}, /* 285 */
-	{ 5,	0,	printargs,		"SYS_286"	}, /* 286 */
-	{ 5,	0,	printargs,		"SYS_287"	}, /* 287 */
-	{ 5,	0,	printargs,		"SYS_288"	}, /* 288 */
-	{ 5,	0,	printargs,		"SYS_289"	}, /* 289 */
-	{ 5,	0,	printargs,		"SYS_290"	}, /* 290 */
-	{ 5,	0,	printargs,		"SYS_291"	}, /* 291 */
-	{ 5,	0,	printargs,		"SYS_292"	}, /* 292 */
-	{ 5,	0,	printargs,		"SYS_293"	}, /* 293 */
-	{ 5,	0,	printargs,		"SYS_294"	}, /* 294 */
-	{ 5,	0,	printargs,		"SYS_295"	}, /* 295 */
-	{ 5,	0,	printargs,		"SYS_296"	}, /* 296 */
-	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
-	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
-
-#if SYS_socket_subcall != 300
- #error fix me
-#endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
-
-#if SYS_ipc_subcall != 318
- #error fix me
-#endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
diff --git a/strace/linux/s390x/errnoent.h b/strace/linux/s390x/errnoent.h
deleted file mode 100644
index 180b506..0000000
--- a/strace/linux/s390x/errnoent.h
+++ /dev/null
@@ -1,125 +0,0 @@
-	"ERRNO_0", /* 0 */
-	"EPERM", /* 1 */
-	"ENOENT", /* 2 */
-	"ESRCH", /* 3 */
-	"EINTR", /* 4 */
-	"EIO", /* 5 */
-	"ENXIO", /* 6 */
-	"E2BIG", /* 7 */
-	"ENOEXEC", /* 8 */
-	"EBADF", /* 9 */
-	"ECHILD", /* 10 */
-	"EAGAIN", /* 11 */
-	"ENOMEM", /* 12 */
-	"EACCES", /* 13 */
-	"EFAULT", /* 14 */
-	"ENOTBLK", /* 15 */
-	"EBUSY", /* 16 */
-	"EEXIST", /* 17 */
-	"EXDEV", /* 18 */
-	"ENODEV", /* 19 */
-	"ENOTDIR", /* 20 */
-	"EISDIR", /* 21 */
-	"EINVAL", /* 22 */
-	"ENFILE", /* 23 */
-	"EMFILE", /* 24 */
-	"ENOTTY", /* 25 */
-	"ETXTBSY", /* 26 */
-	"EFBIG", /* 27 */
-	"ENOSPC", /* 28 */
-	"ESPIPE", /* 29 */
-	"EROFS", /* 30 */
-	"EMLINK", /* 31 */
-	"EPIPE", /* 32 */
-	"EDOM", /* 33 */
-	"ERANGE", /* 34 */
-	"EDEADLK", /* 35 */
-	"ENAMETOOLONG", /* 36 */
-	"ENOLCK", /* 37 */
-	"ENOSYS", /* 38 */
-	"ENOTEMPTY", /* 39 */
-	"ELOOP", /* 40 */
-	"ERRNO_41", /* 41 */
-	"ENOMSG", /* 42 */
-	"EIDRM", /* 43 */
-	"ECHRNG", /* 44 */
-	"EL2NSYNC", /* 45 */
-	"EL3HLT", /* 46 */
-	"EL3RST", /* 47 */
-	"ELNRNG", /* 48 */
-	"EUNATCH", /* 49 */
-	"ENOCSI", /* 50 */
-	"EL2HLT", /* 51 */
-	"EBADE", /* 52 */
-	"EBADR", /* 53 */
-	"EXFULL", /* 54 */
-	"ENOANO", /* 55 */
-	"EBADRQC", /* 56 */
-	"EBADSLT", /* 57 */
-	"ERRNO_58", /* 58 */
-	"EBFONT", /* 59 */
-	"ENOSTR", /* 60 */
-	"ENODATA", /* 61 */
-	"ETIME", /* 62 */
-	"ENOSR", /* 63 */
-	"ENONET", /* 64 */
-	"ENOPKG", /* 65 */
-	"EREMOTE", /* 66 */
-	"ENOLINK", /* 67 */
-	"EADV", /* 68 */
-	"ESRMNT", /* 69 */
-	"ECOMM", /* 70 */
-	"EPROTO", /* 71 */
-	"EMULTIHOP", /* 72 */
-	"EDOTDOT", /* 73 */
-	"EBADMSG", /* 74 */
-	"EOVERFLOW", /* 75 */
-	"ENOTUNIQ", /* 76 */
-	"EBADFD", /* 77 */
-	"EREMCHG", /* 78 */
-	"ELIBACC", /* 79 */
-	"ELIBBAD", /* 80 */
-	"ELIBSCN", /* 81 */
-	"ELIBMAX", /* 82 */
-	"ELIBEXEC", /* 83 */
-	"EILSEQ", /* 84 */
-	"ERESTART", /* 85 */
-	"ESTRPIPE", /* 86 */
-	"EUSERS", /* 87 */
-	"ENOTSOCK", /* 88 */
-	"EDESTADDRREQ", /* 89 */
-	"EMSGSIZE", /* 90 */
-	"EPROTOTYPE", /* 91 */
-	"ENOPROTOOPT", /* 92 */
-	"EPROTONOSUPPORT", /* 93 */
-	"ESOCKTNOSUPPORT", /* 94 */
-	"EOPNOTSUPP", /* 95 */
-	"EPFNOSUPPORT", /* 96 */
-	"EAFNOSUPPORT", /* 97 */
-	"EADDRINUSE", /* 98 */
-	"EADDRNOTAVAIL", /* 99 */
-	"ENETDOWN", /* 100 */
-	"ENETUNREACH", /* 101 */
-	"ENETRESET", /* 102 */
-	"ECONNABORTED", /* 103 */
-	"ECONNRESET", /* 104 */
-	"ENOBUFS", /* 105 */
-	"EISCONN", /* 106 */
-	"ENOTCONN", /* 107 */
-	"ESHUTDOWN", /* 108 */
-	"ETOOMANYREFS", /* 109 */
-	"ETIMEDOUT", /* 110 */
-	"ECONNREFUSED", /* 111 */
-	"EHOSTDOWN", /* 112 */
-	"EHOSTUNREACH", /* 113 */
-	"EALREADY", /* 114 */
-	"EINPROGRESS", /* 115 */
-	"ESTALE", /* 116 */
-	"EUCLEAN", /* 117 */
-	"ENOTNAM", /* 118 */
-	"ENAVAIL", /* 119 */
-	"EISNAM", /* 120 */
-	"EREMOTEIO", /* 121 */
-	"EDQUOT", /* 122 */
-	"ENOMEDIUM", /* 123 */
-	"EMEDIUMTYPE", /* 124 */
diff --git a/strace/linux/s390x/ioctlent.h b/strace/linux/s390x/ioctlent.h
deleted file mode 100644
index 414fbeb..0000000
--- a/strace/linux/s390x/ioctlent.h
+++ /dev/null
@@ -1,941 +0,0 @@
-{"linux/fs.h", "FIBMAP", 0x1},
-{"linux/fs.h", "FIGETBSZ", 0x2},
-{"linux/fd.h", "FDCLRPRM", 0x241},
-{"linux/fd.h", "FDMSGON", 0x245},
-{"linux/fd.h", "FDMSGOFF", 0x246},
-{"linux/fd.h", "FDFMTBEG", 0x247},
-{"linux/fd.h", "FDFMTEND", 0x249},
-{"linux/fd.h", "FDSETEMSGTRESH", 0x24a},
-{"linux/fd.h", "FDFLUSH", 0x24b},
-{"linux/fd.h", "FDRESET", 0x254},
-{"linux/fd.h", "FDWERRORCLR", 0x256},
-{"linux/fd.h", "FDRAWCMD", 0x258},
-{"linux/fd.h", "FDTWADDLE", 0x259},
-{"linux/fd.h", "FDEJECT", 0x25a},
-{"linux/hdreg.h", "HDIO_GETGEO", 0x301},
-{"linux/hdreg.h", "HDIO_GET_UNMASKINTR", 0x302},
-{"linux/hdreg.h", "HDIO_GET_MULTCOUNT", 0x304},
-{"linux/hdreg.h", "HDIO_OBSOLETE_IDENTITY", 0x307},
-{"linux/hdreg.h", "HDIO_GET_KEEPSETTINGS", 0x308},
-{"linux/hdreg.h", "HDIO_GET_32BIT", 0x309},
-{"linux/hdreg.h", "HDIO_GET_NOWERR", 0x30a},
-{"linux/hdreg.h", "HDIO_GET_DMA", 0x30b},
-{"linux/hdreg.h", "HDIO_GET_NICE", 0x30c},
-{"linux/hdreg.h", "HDIO_GET_IDENTITY", 0x30d},
-{"linux/hdreg.h", "HDIO_DRIVE_RESET", 0x31c},
-{"linux/hdreg.h", "HDIO_TRISTATE_HWIF", 0x31d},
-{"linux/hdreg.h", "HDIO_DRIVE_TASK", 0x31e},
-{"linux/hdreg.h", "HDIO_DRIVE_CMD", 0x31f},
-{"linux/hdreg.h", "HDIO_SET_MULTCOUNT", 0x321},
-{"linux/hdreg.h", "HDIO_SET_UNMASKINTR", 0x322},
-{"linux/hdreg.h", "HDIO_SET_KEEPSETTINGS", 0x323},
-{"linux/hdreg.h", "HDIO_SET_32BIT", 0x324},
-{"linux/hdreg.h", "HDIO_SET_NOWERR", 0x325},
-{"linux/hdreg.h", "HDIO_SET_DMA", 0x326},
-{"linux/hdreg.h", "HDIO_SET_PIO_MODE", 0x327},
-{"linux/hdreg.h", "HDIO_SCAN_HWIF", 0x328},
-{"linux/hdreg.h", "HDIO_SET_NICE", 0x329},
-{"linux/hdreg.h", "HDIO_UNREGISTER_HWIF", 0x32a},
-{"linux/hdreg.h", "HDIO_GETGEO_BIG", 0x330},
-{"linux/hdreg.h", "HDIO_GETGEO_BIG_RAW", 0x331},
-{"linux/umsdos_fs.h", "UMSDOS_READDIR_DOS", 0x4d2},
-{"linux/umsdos_fs.h", "UMSDOS_UNLINK_DOS", 0x4d3},
-{"linux/umsdos_fs.h", "UMSDOS_RMDIR_DOS", 0x4d4},
-{"linux/umsdos_fs.h", "UMSDOS_STAT_DOS", 0x4d5},
-{"linux/umsdos_fs.h", "UMSDOS_CREAT_EMD", 0x4d6},
-{"linux/umsdos_fs.h", "UMSDOS_UNLINK_EMD", 0x4d7},
-{"linux/umsdos_fs.h", "UMSDOS_READDIR_EMD", 0x4d8},
-{"linux/umsdos_fs.h", "UMSDOS_GETVERSION", 0x4d9},
-{"linux/umsdos_fs.h", "UMSDOS_INIT_EMD", 0x4da},
-{"linux/umsdos_fs.h", "UMSDOS_DOS_SETUP", 0x4db},
-{"linux/umsdos_fs.h", "UMSDOS_RENAME_DOS", 0x4dc},
-{"linux/lp.h", "LPCHAR", 0x601},
-{"linux/lp.h", "LPTIME", 0x602},
-{"linux/lp.h", "LPABORT", 0x604},
-{"linux/lp.h", "LPSETIRQ", 0x605},
-{"linux/ac97_codec.h", "AC97_RECMUX_MONO_MIX", 0x606},
-{"linux/lp.h", "LPGETIRQ", 0x606},
-{"linux/lp.h", "LPWAIT", 0x608},
-{"linux/lp.h", "LPCAREFUL", 0x609},
-{"linux/lp.h", "LPABORTOPEN", 0x60a},
-{"linux/lp.h", "LPGETSTATUS", 0x60b},
-{"linux/lp.h", "LPRESET", 0x60c},
-{"linux/lp.h", "LPGETSTATS", 0x60d},
-{"linux/lp.h", "LPGETFLAGS", 0x60e},
-{"linux/lp.h", "LPSETTIMEOUT", 0x60f},
-{"linux/fs.h", "BLKROSET", 0x125d},
-{"linux/fs.h", "BLKROGET", 0x125e},
-{"linux/fs.h", "BLKRRPART", 0x125f},
-{"linux/fs.h", "BLKGETSIZE", 0x1260},
-{"linux/fs.h", "BLKFLSBUF", 0x1261},
-{"linux/fs.h", "BLKRASET", 0x1262},
-{"linux/fs.h", "BLKRAGET", 0x1263},
-{"linux/fs.h", "BLKFRASET", 0x1264},
-{"linux/fs.h", "BLKFRAGET", 0x1265},
-{"linux/fs.h", "BLKSECTSET", 0x1266},
-{"linux/fs.h", "BLKSECTGET", 0x1267},
-{"linux/fs.h", "BLKSSZGET", 0x1268},
-{"linux/fs.h", "BLKPG", 0x1269},
-{"scsi/sg.h", "SG_SET_TIMEOUT", 0x2201},
-{"scsi/sg.h", "SG_GET_TIMEOUT", 0x2202},
-{"scsi/sg.h", "SG_EMULATED_HOST", 0x2203},
-{"scsi/sg.h", "SG_SET_TRANSFORM", 0x2204},
-{"scsi/sg.h", "SG_GET_TRANSFORM", 0x2205},
-{"scsi/sg.h", "SG_GET_COMMAND_Q", 0x2270},
-{"scsi/sg.h", "SG_SET_COMMAND_Q", 0x2271},
-{"scsi/sg.h", "SG_GET_RESERVED_SIZE", 0x2272},
-{"scsi/sg.h", "SG_SET_RESERVED_SIZE", 0x2275},
-{"scsi/sg.h", "SG_GET_SCSI_ID", 0x2276},
-{"scsi/sg.h", "SG_SET_FORCE_LOW_DMA", 0x2279},
-{"scsi/sg.h", "SG_GET_LOW_DMA", 0x227a},
-{"scsi/sg.h", "SG_SET_FORCE_PACK_ID", 0x227b},
-{"scsi/sg.h", "SG_GET_PACK_ID", 0x227c},
-{"scsi/sg.h", "SG_GET_NUM_WAITING", 0x227d},
-{"scsi/sg.h", "SG_SET_DEBUG", 0x227e},
-{"scsi/sg.h", "SG_GET_SG_TABLESIZE", 0x227f},
-{"scsi/sg.h", "SG_GET_VERSION_NUM", 0x2282},
-{"scsi/sg.h", "SG_NEXT_CMD_LEN", 0x2283},
-{"scsi/sg.h", "SG_SCSI_RESET", 0x2284},
-{"scsi/sg.h", "SG_IO", 0x2285},
-{"scsi/sg.h", "SG_GET_REQUEST_TABLE", 0x2286},
-{"scsi/sg.h", "SG_SET_KEEP_ORPHAN", 0x2287},
-{"scsi/sg.h", "SG_GET_KEEP_ORPHAN", 0x2288},
-{"linux/agpgart.h", "AGPIOC_ACQUIRE", 0x4101},
-{"linux/agpgart.h", "AGPIOC_RELEASE", 0x4102},
-{"linux/pmu.h", "PMU_IOC_SLEEP", 0x4200},
-{"asm/dasd.h", "BIODASDDISABLE", 0x4400},
-{"asm/dasd.h", "BIODASDENABLE", 0x4401},
-{"asm/dasd.h", "BIODASDRSRV", 0x4402},
-{"asm/dasd.h", "BIODASDRLSE", 0x4403},
-{"asm/dasd.h", "BIODASDSLCK", 0x4404},
-{"asm/dasd.h", "BIODASDPRRST", 0x4405},
-{"asm/dasd.h", "BIODASDQUIESCE", 0x4406},
-{"asm/dasd.h", "BIODASDRESUME", 0x4407},
-{"asm/cmb.h", "BIODASDCMFENABLE", 0x4420},
-{"asm/cmb.h", "BIODASDCMFDISABLE", 0x4421},
-{"asm/cmb.h", "BIODASDRESETCMB", 0x4422},
-{"linux/fb.h", "FBIOGET_VSCREENINFO", 0x4600},
-{"linux/fb.h", "FBIOPUT_VSCREENINFO", 0x4601},
-{"linux/ps2esdi.h", "CMD_READ", 0x4601},
-{"linux/fb.h", "FBIOGET_FSCREENINFO", 0x4602},
-{"linux/ps2esdi.h", "CMD_WRITE", 0x4602},
-{"linux/fb.h", "FBIOGETCMAP", 0x4604},
-{"linux/fb.h", "FBIOPUTCMAP", 0x4605},
-{"linux/fb.h", "FBIOPAN_DISPLAY", 0x4606},
-{"linux/fb.h", "FBIOGET_FCURSORINFO", 0x4607},
-{"linux/fb.h", "FBIOGET_VCURSORINFO", 0x4608},
-{"linux/fb.h", "FBIOPUT_VCURSORINFO", 0x4609},
-{"linux/fb.h", "FBIOGET_CURSORSTATE", 0x460a},
-{"linux/fb.h", "FBIOPUT_CURSORSTATE", 0x460b},
-{"linux/fb.h", "FBIOGET_CON2FBMAP", 0x460f},
-{"linux/fb.h", "FBIOPUT_CON2FBMAP", 0x4610},
-{"linux/fb.h", "FBIOBLANK", 0x4611},
-{"linux/fb.h", "FBIO_ALLOC", 0x4613},
-{"linux/fb.h", "FBIO_FREE", 0x4614},
-{"linux/fb.h", "FBIOGET_GLYPH", 0x4615},
-{"linux/fb.h", "FBIOGET_HWCINFO", 0x4616},
-{"linux/isdn.h", "IIOCNETAIF", 0x4901},
-{"linux/isdn.h", "IIOCNETDIF", 0x4902},
-{"linux/isdn.h", "IIOCNETSCF", 0x4903},
-{"linux/isdn.h", "IIOCNETGCF", 0x4904},
-{"linux/isdn.h", "IIOCNETANM", 0x4905},
-{"linux/isdn.h", "IIOCNETDNM", 0x4906},
-{"linux/isdn.h", "IIOCNETGNM", 0x4907},
-{"linux/isdn.h", "IIOCGETSET", 0x4908},
-{"linux/isdn.h", "IIOCSETSET", 0x4909},
-{"linux/isdn.h", "IIOCSETVER", 0x490a},
-{"linux/isdn.h", "IIOCNETHUP", 0x490b},
-{"linux/isdn.h", "IIOCSETGST", 0x490c},
-{"linux/isdn.h", "IIOCSETBRJ", 0x490d},
-{"linux/isdn.h", "IIOCSIGPRF", 0x490e},
-{"linux/isdn.h", "IIOCGETPRF", 0x490f},
-{"linux/isdn.h", "IIOCSETPRF", 0x4910},
-{"linux/isdn.h", "IIOCGETMAP", 0x4911},
-{"linux/isdn.h", "IIOCSETMAP", 0x4912},
-{"linux/isdn.h", "IIOCNETASL", 0x4913},
-{"linux/isdn.h", "IIOCNETDIL", 0x4914},
-{"linux/isdn.h", "IIOCGETCPS", 0x4915},
-{"linux/isdn.h", "IIOCGETDVR", 0x4916},
-{"linux/isdn.h", "IIOCNETLCR", 0x4917},
-{"linux/isdn.h", "IIOCNETDWRSET", 0x4918},
-{"linux/isdn.h", "IIOCNETALN", 0x4920},
-{"linux/isdn.h", "IIOCNETDLN", 0x4921},
-{"linux/isdn.h", "IIOCNETGPN", 0x4922},
-{"linux/isdn.h", "IIOCDBGVAR", 0x497f},
-{"linux/isdn.h", "IIOCDRVCTL", 0x4980},
-{"linux/kd.h", "KIOCSOUND", 0x4b2f},
-{"linux/kd.h", "KDMKTONE", 0x4b30},
-{"linux/kd.h", "KDGETLED", 0x4b31},
-{"linux/kd.h", "KDSETLED", 0x4b32},
-{"linux/kd.h", "KDGKBTYPE", 0x4b33},
-{"linux/kd.h", "KDADDIO", 0x4b34},
-{"linux/kd.h", "KDDELIO", 0x4b35},
-{"linux/kd.h", "KDENABIO", 0x4b36},
-{"linux/kd.h", "KDDISABIO", 0x4b37},
-{"linux/kd.h", "KDSETMODE", 0x4b3a},
-{"linux/kd.h", "KDGETMODE", 0x4b3b},
-{"linux/kd.h", "KDMAPDISP", 0x4b3c},
-{"linux/kd.h", "KDUNMAPDISP", 0x4b3d},
-{"linux/kd.h", "GIO_SCRNMAP", 0x4b40},
-{"linux/kd.h", "PIO_SCRNMAP", 0x4b41},
-{"linux/kd.h", "KDGKBMODE", 0x4b44},
-{"linux/kd.h", "KDSKBMODE", 0x4b45},
-{"linux/kd.h", "KDGKBENT", 0x4b46},
-{"linux/kd.h", "KDSKBENT", 0x4b47},
-{"linux/kd.h", "KDGKBSENT", 0x4b48},
-{"linux/kd.h", "KDSKBSENT", 0x4b49},
-{"linux/kd.h", "KDGKBDIACR", 0x4b4a},
-{"linux/kd.h", "KDSKBDIACR", 0x4b4b},
-{"linux/kd.h", "KDGETKEYCODE", 0x4b4c},
-{"linux/kd.h", "KDSETKEYCODE", 0x4b4d},
-{"linux/kd.h", "KDSIGACCEPT", 0x4b4e},
-{"linux/kd.h", "KDGHWCLK", 0x4b50},
-{"linux/kd.h", "KDSHWCLK", 0x4b51},
-{"linux/kd.h", "KDKBDREP", 0x4b52},
-{"linux/kd.h", "GIO_FONT", 0x4b60},
-{"linux/kd.h", "PIO_FONT", 0x4b61},
-{"linux/kd.h", "KDGKBMETA", 0x4b62},
-{"linux/kd.h", "KDSKBMETA", 0x4b63},
-{"linux/kd.h", "KDGKBLED", 0x4b64},
-{"linux/kd.h", "KDSKBLED", 0x4b65},
-{"linux/kd.h", "GIO_UNIMAP", 0x4b66},
-{"linux/kd.h", "PIO_UNIMAP", 0x4b67},
-{"linux/kd.h", "PIO_UNIMAPCLR", 0x4b68},
-{"linux/kd.h", "GIO_UNISCRNMAP", 0x4b69},
-{"linux/kd.h", "PIO_UNISCRNMAP", 0x4b6a},
-{"linux/kd.h", "GIO_FONTX", 0x4b6b},
-{"linux/kd.h", "PIO_FONTX", 0x4b6c},
-{"linux/kd.h", "PIO_FONTRESET", 0x4b6d},
-{"linux/kd.h", "GIO_CMAP", 0x4b70},
-{"linux/kd.h", "PIO_CMAP", 0x4b71},
-{"linux/kd.h", "KDFONTOP", 0x4b72},
-{"linux/loop.h", "LOOP_SET_FD", 0x4c00},
-{"linux/loop.h", "LOOP_CLR_FD", 0x4c01},
-{"linux/loop.h", "LOOP_SET_STATUS", 0x4c02},
-{"linux/loop.h", "LOOP_GET_STATUS", 0x4c03},
-{"linux/random.h", "RNDZAPENTCNT", 0x5204},
-{"linux/random.h", "RNDCLEARPOOL", 0x5206},
-{"linux/cdrom.h", "CDROMPAUSE", 0x5301},
-{"linux/cdrom.h", "CDROMRESUME", 0x5302},
-{"linux/cdrom.h", "CDROMPLAYMSF", 0x5303},
-{"linux/cdrom.h", "CDROMPLAYTRKIND", 0x5304},
-{"linux/cdrom.h", "CDROMREADTOCHDR", 0x5305},
-{"linux/cdrom.h", "CDROMREADTOCENTRY", 0x5306},
-{"linux/cdrom.h", "CDROMSTOP", 0x5307},
-{"linux/cdrom.h", "CDROMSTART", 0x5308},
-{"linux/cdrom.h", "CDROMEJECT", 0x5309},
-{"linux/cdrom.h", "CDROMVOLCTRL", 0x530a},
-{"linux/cdrom.h", "CDROMSUBCHNL", 0x530b},
-{"linux/cdrom.h", "CDROMREADMODE2", 0x530c},
-{"linux/cdrom.h", "CDROMREADMODE1", 0x530d},
-{"linux/cdrom.h", "CDROMREADAUDIO", 0x530e},
-{"linux/cdrom.h", "CDROMEJECT_SW", 0x530f},
-{"linux/cdrom.h", "CDROMMULTISESSION", 0x5310},
-{"linux/cdrom.h", "CDROM_GET_MCN", 0x5311},
-{"linux/cdrom.h", "CDROMRESET", 0x5312},
-{"linux/cdrom.h", "CDROMVOLREAD", 0x5313},
-{"linux/cdrom.h", "CDROMREADRAW", 0x5314},
-{"linux/cdrom.h", "CDROMREADCOOKED", 0x5315},
-{"linux/cdrom.h", "CDROMSEEK", 0x5316},
-{"linux/cdrom.h", "CDROMPLAYBLK", 0x5317},
-{"linux/cdrom.h", "CDROMREADALL", 0x5318},
-{"linux/cdrom.h", "CDROMCLOSETRAY", 0x5319},
-{"linux/cdrom.h", "CDROMGETSPINDOWN", 0x531d},
-{"linux/cdrom.h", "CDROMSETSPINDOWN", 0x531e},
-{"linux/cdrom.h", "CDROM_SET_OPTIONS", 0x5320},
-{"linux/cdrom.h", "CDROM_CLEAR_OPTIONS", 0x5321},
-{"linux/cdrom.h", "CDROM_SELECT_SPEED", 0x5322},
-{"linux/cdrom.h", "CDROM_SELECT_DISC", 0x5323},
-{"linux/cdrom.h", "CDROM_MEDIA_CHANGED", 0x5325},
-{"linux/cdrom.h", "CDROM_DRIVE_STATUS", 0x5326},
-{"linux/cdrom.h", "CDROM_DISC_STATUS", 0x5327},
-{"linux/cdrom.h", "CDROM_CHANGER_NSLOTS", 0x5328},
-{"linux/cdrom.h", "CDROM_LOCKDOOR", 0x5329},
-{"linux/cdrom.h", "CDROM_DEBUG", 0x5330},
-{"linux/cdrom.h", "CDROM_GET_CAPABILITY", 0x5331},
-{"scsi/scsi_ioctl.h", "SCSI_IOCTL_DOORLOCK", 0x5380},
-{"scsi/scsi_ioctl.h", "SCSI_IOCTL_DOORUNLOCK", 0x5381},
-{"scsi/scsi.h", "SCSI_IOCTL_GET_IDLUN", 0x5382},
-{"scsi/scsi.h", "SCSI_IOCTL_TAGGED_ENABLE", 0x5383},
-{"scsi/scsi.h", "SCSI_IOCTL_TAGGED_DISABLE", 0x5384},
-{"scsi/scsi.h", "SCSI_IOCTL_PROBE_HOST", 0x5385},
-{"scsi/scsi.h", "SCSI_IOCTL_GET_BUS_NUMBER", 0x5386},
-{"linux/cdrom.h", "DVD_READ_STRUCT", 0x5390},
-{"linux/cdrom.h", "DVD_WRITE_STRUCT", 0x5391},
-{"linux/cdrom.h", "DVD_AUTH", 0x5392},
-{"linux/cdrom.h", "CDROM_SEND_PACKET", 0x5393},
-{"linux/cdrom.h", "CDROM_NEXT_WRITABLE", 0x5394},
-{"linux/cdrom.h", "CDROM_LAST_WRITTEN", 0x5395},
-{"asm/ioctls.h", "TCGETS", 0x5401},
-{"asm/ioctls.h", "TCSETS", 0x5402},
-{"asm/ioctls.h", "TCSETSW", 0x5403},
-{"asm/ioctls.h", "TCSETSF", 0x5404},
-{"asm/ioctls.h", "TCGETA", 0x5405},
-{"asm/ioctls.h", "TCSETA", 0x5406},
-{"asm/ioctls.h", "TCSETAW", 0x5407},
-{"asm/ioctls.h", "TCSETAF", 0x5408},
-{"asm/ioctls.h", "TCSBRK", 0x5409},
-{"asm/ioctls.h", "TCXONC", 0x540a},
-{"asm/ioctls.h", "TCFLSH", 0x540b},
-{"asm/ioctls.h", "TIOCEXCL", 0x540c},
-{"asm/ioctls.h", "TIOCNXCL", 0x540d},
-{"asm/ioctls.h", "TIOCSCTTY", 0x540e},
-{"asm/ioctls.h", "TIOCGPGRP", 0x540f},
-{"asm/ioctls.h", "TIOCSPGRP", 0x5410},
-{"asm/ioctls.h", "TIOCOUTQ", 0x5411},
-{"asm/ioctls.h", "TIOCSTI", 0x5412},
-{"asm/ioctls.h", "TIOCGWINSZ", 0x5413},
-{"asm/ioctls.h", "TIOCSWINSZ", 0x5414},
-{"asm/ioctls.h", "TIOCMGET", 0x5415},
-{"asm/ioctls.h", "TIOCMBIS", 0x5416},
-{"asm/ioctls.h", "TIOCMBIC", 0x5417},
-{"asm/ioctls.h", "TIOCMSET", 0x5418},
-{"asm/ioctls.h", "TIOCGSOFTCAR", 0x5419},
-{"asm/ioctls.h", "TIOCSSOFTCAR", 0x541a},
-{"asm/ioctls.h", "FIONREAD", 0x541b},
-{"asm/ioctls.h", "TIOCLINUX", 0x541c},
-{"asm/ioctls.h", "TIOCCONS", 0x541d},
-{"asm/ioctls.h", "TIOCGSERIAL", 0x541e},
-{"asm/ioctls.h", "TIOCSSERIAL", 0x541f},
-{"asm/ioctls.h", "TIOCPKT", 0x5420},
-{"asm/ioctls.h", "FIONBIO", 0x5421},
-{"asm/ioctls.h", "TIOCNOTTY", 0x5422},
-{"asm/ioctls.h", "TIOCSETD", 0x5423},
-{"asm/ioctls.h", "TIOCGETD", 0x5424},
-{"asm/ioctls.h", "TCSBRKP", 0x5425},
-{"asm/ioctls.h", "TIOCTTYGSTRUCT", 0x5426},
-{"asm/ioctls.h", "TIOCSBRK", 0x5427},
-{"asm/ioctls.h", "TIOCCBRK", 0x5428},
-{"asm/ioctls.h", "TIOCGSID", 0x5429},
-{"asm/ioctls.h", "FIONCLEX", 0x5450},
-{"asm/ioctls.h", "FIOCLEX", 0x5451},
-{"asm/ioctls.h", "FIOASYNC", 0x5452},
-{"asm/ioctls.h", "TIOCSERCONFIG", 0x5453},
-{"asm/ioctls.h", "TIOCSERGWILD", 0x5454},
-{"asm/ioctls.h", "TIOCSERSWILD", 0x5455},
-{"asm/ioctls.h", "TIOCGLCKTRMIOS", 0x5456},
-{"asm/ioctls.h", "TIOCSLCKTRMIOS", 0x5457},
-{"asm/ioctls.h", "TIOCSERGSTRUCT", 0x5458},
-{"asm/ioctls.h", "TIOCSERGETLSR", 0x5459},
-{"asm/ioctls.h", "TIOCSERGETMULTI", 0x545a},
-{"asm/ioctls.h", "TIOCSERSETMULTI", 0x545b},
-{"asm/ioctls.h", "TIOCMIWAIT", 0x545c},
-{"asm/ioctls.h", "TIOCGICOUNT", 0x545d},
-{"asm/ioctls.h", "FIOQSIZE", 0x545e},
-{"linux/usbdevice_fs.h", "USBDEVFS_DISCARDURB", 0x550b},
-{"linux/usbdevice_fs.h", "USBDEVFS_RESET", 0x5514},
-{"linux/vt.h", "VT_OPENQRY", 0x5600},
-{"linux/vt.h", "VT_GETMODE", 0x5601},
-{"linux/vt.h", "VT_SETMODE", 0x5602},
-{"linux/vt.h", "VT_GETSTATE", 0x5603},
-{"linux/vt.h", "VT_SENDSIG", 0x5604},
-{"linux/vt.h", "VT_RELDISP", 0x5605},
-{"linux/vt.h", "VT_ACTIVATE", 0x5606},
-{"linux/vt.h", "VT_WAITACTIVE", 0x5607},
-{"linux/vt.h", "VT_DISALLOCATE", 0x5608},
-{"linux/vt.h", "VT_RESIZE", 0x5609},
-{"linux/vt.h", "VT_RESIZEX", 0x560a},
-{"linux/vt.h", "VT_LOCKSWITCH", 0x560b},
-{"linux/vt.h", "VT_UNLOCKSWITCH", 0x560c},
-{"linux/sonet.h", "SONET_SETFRAMING", 0x6115},
-{"linux/atm_nicstar.h", "NS_ADJBUFLEV", 0x6163},
-{"linux/atm_tcp.h", "SIOCSIFATMTCP", 0x6180},
-{"linux/atm_tcp.h", "ATMTCP_CREATE", 0x618e},
-{"linux/atm_tcp.h", "ATMTCP_REMOVE", 0x618f},
-{"linux/atmlec.h", "ATMLEC_CTRL", 0x61d0},
-{"linux/atmlec.h", "ATMLEC_DATA", 0x61d1},
-{"linux/atmlec.h", "ATMLEC_MCAST", 0x61d2},
-{"linux/atmmpc.h", "ATMMPC_CTRL", 0x61d8},
-{"linux/atmmpc.h", "ATMMPC_DATA", 0x61d9},
-{"linux/atmclip.h", "SIOCMKCLIP", 0x61e0},
-{"linux/atmarp.h", "ATMARPD_CTRL", 0x61e1},
-{"linux/atmarp.h", "ATMARP_MKIP", 0x61e2},
-{"linux/atmarp.h", "ATMARP_SETENTRY", 0x61e3},
-{"linux/atmarp.h", "ATMARP_ENCAP", 0x61e5},
-{"linux/atmsvc.h", "ATMSIGD_CTRL", 0x61f0},
-{"linux/comstats.h", "COM_GETPORTSTATS", 0x631e},
-{"linux/comstats.h", "COM_CLRPORTSTATS", 0x631f},
-{"linux/comstats.h", "COM_GETBRDSTATS", 0x6320},
-{"linux/comstats.h", "COM_READPORT", 0x6328},
-{"linux/comstats.h", "COM_READBOARD", 0x6329},
-{"linux/comstats.h", "COM_READPANEL", 0x632a},
-{"linux/video_decoder.h", "DECODER_DUMP", 0x64c0},
-{"linux/synclink.h", "MGSL_IOCSTXIDLE", 0x6d02},
-{"linux/synclink.h", "MGSL_IOCGTXIDLE", 0x6d03},
-{"linux/synclink.h", "MGSL_IOCTXENABLE", 0x6d04},
-{"linux/synclink.h", "MGSL_IOCRXENABLE", 0x6d05},
-{"linux/synclink.h", "MGSL_IOCTXABORT", 0x6d06},
-{"linux/synclink.h", "MGSL_IOCGSTATS", 0x6d07},
-{"linux/synclink.h", "MGSL_IOCLOOPTXDONE", 0x6d09},
-{"linux/synclink.h", "MGSL_IOCCLRMODCOUNT", 0x6d0f},
-{"linux/ncp_fs.h", "NCP_IOC_CONN_LOGGED_IN", 0x6e03},
-{"linux/rtc.h", "RTC_AIE_ON", 0x7001},
-{"linux/rtc.h", "RTC_AIE_OFF", 0x7002},
-{"linux/rtc.h", "RTC_UIE_ON", 0x7003},
-{"linux/rtc.h", "RTC_UIE_OFF", 0x7004},
-{"linux/rtc.h", "RTC_PIE_ON", 0x7005},
-{"linux/rtc.h", "RTC_PIE_OFF", 0x7006},
-{"linux/rtc.h", "RTC_WIE_ON", 0x700f},
-{"linux/rtc.h", "RTC_WIE_OFF", 0x7010},
-{"linux/nvram.h", "NVRAM_INIT", 0x7040},
-{"linux/nvram.h", "NVRAM_SETCKS", 0x7041},
-{"linux/ppdev.h", "PPCLAIM", 0x708b},
-{"linux/ppdev.h", "PPRELEASE", 0x708c},
-{"linux/ppdev.h", "PPYIELD", 0x708d},
-{"linux/ppdev.h", "PPEXCL", 0x708f},
-{"linux/telephony.h", "PHONE_CAPABILITIES", 0x7180},
-{"linux/telephony.h", "PHONE_RING", 0x7183},
-{"linux/telephony.h", "PHONE_HOOKSTATE", 0x7184},
-{"linux/telephony.h", "PHONE_RING_START", 0x7187},
-{"linux/telephony.h", "PHONE_RING_STOP", 0x7188},
-{"linux/telephony.h", "PHONE_REC_START", 0x718a},
-{"linux/telephony.h", "PHONE_REC_STOP", 0x718b},
-{"linux/telephony.h", "PHONE_REC_LEVEL", 0x718f},
-{"linux/telephony.h", "PHONE_PLAY_START", 0x7191},
-{"linux/telephony.h", "PHONE_PLAY_STOP", 0x7192},
-{"linux/telephony.h", "PHONE_PLAY_LEVEL", 0x7195},
-{"linux/telephony.h", "PHONE_GET_TONE_ON_TIME", 0x719e},
-{"linux/telephony.h", "PHONE_GET_TONE_OFF_TIME", 0x719f},
-{"linux/telephony.h", "PHONE_GET_TONE_STATE", 0x71a0},
-{"linux/telephony.h", "PHONE_BUSY", 0x71a1},
-{"linux/telephony.h", "PHONE_RINGBACK", 0x71a2},
-{"linux/telephony.h", "PHONE_DIALTONE", 0x71a3},
-{"linux/telephony.h", "PHONE_CPT_STOP", 0x71a4},
-{"linux/telephony.h", "PHONE_PSTN_GET_STATE", 0x71a5},
-{"linux/telephony.h", "PHONE_PSTN_LINETEST", 0x71a8},
-{"linux/ixjuser.h", "IXJCTL_DSP_RESET", 0x71c0},
-{"linux/ixjuser.h", "IXJCTL_DSP_IDLE", 0x71c5},
-{"linux/ixjuser.h", "IXJCTL_TESTRAM", 0x71c6},
-{"linux/ixjuser.h", "IXJCTL_AEC_STOP", 0x71cc},
-{"linux/ixjuser.h", "IXJCTL_AEC_GET_LEVEL", 0x71cd},
-{"linux/ixjuser.h", "IXJCTL_PSTN_LINETEST", 0x71d3},
-{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_CLEAR", 0x71e7},
-{"linux/cdk.h", "STL_BINTR", 0x7314},
-{"linux/cdk.h", "STL_BSTART", 0x7315},
-{"linux/cdk.h", "STL_BSTOP", 0x7316},
-{"linux/cdk.h", "STL_BRESET", 0x7317},
-{"linux/cdk.h", "STL_GETPFLAG", 0x7350},
-{"linux/cdk.h", "STL_SETPFLAG", 0x7351},
-{"linux/if_ppp.h", "PPPIOCDISCONN", 0x7439},
-{"linux/if_ppp.h", "PPPIOCXFERUNIT", 0x744e},
-{"linux/jffs.h", "JFFS_PRINT_HASH", 0x745a},
-{"linux/jffs.h", "JFFS_PRINT_TREE", 0x745b},
-{"linux/jffs.h", "JFFS_GET_STATUS", 0x745c},
-{"asm/sockios.h", "FIOSETOWN", 0x8901},
-{"asm/sockios.h", "SIOCSPGRP", 0x8902},
-{"asm/sockios.h", "FIOGETOWN", 0x8903},
-{"asm/sockios.h", "SIOCGPGRP", 0x8904},
-{"asm/sockios.h", "SIOCATMARK", 0x8905},
-{"asm/sockios.h", "SIOCGSTAMP", 0x8906},
-{"linux/sockios.h", "SIOCADDRT", 0x890b},
-{"linux/sockios.h", "SIOCDELRT", 0x890c},
-{"linux/sockios.h", "SIOCRTMSG", 0x890d},
-{"linux/sockios.h", "SIOCGIFNAME", 0x8910},
-{"linux/sockios.h", "SIOCSIFLINK", 0x8911},
-{"linux/sockios.h", "SIOCGIFCONF", 0x8912},
-{"linux/sockios.h", "SIOCGIFFLAGS", 0x8913},
-{"linux/sockios.h", "SIOCSIFFLAGS", 0x8914},
-{"linux/sockios.h", "SIOCGIFADDR", 0x8915},
-{"linux/sockios.h", "SIOCSIFADDR", 0x8916},
-{"linux/sockios.h", "SIOCGIFDSTADDR", 0x8917},
-{"linux/sockios.h", "SIOCSIFDSTADDR", 0x8918},
-{"linux/sockios.h", "SIOCGIFBRDADDR", 0x8919},
-{"linux/sockios.h", "SIOCSIFBRDADDR", 0x891a},
-{"linux/sockios.h", "SIOCGIFNETMASK", 0x891b},
-{"linux/sockios.h", "SIOCSIFNETMASK", 0x891c},
-{"linux/sockios.h", "SIOCGIFMETRIC", 0x891d},
-{"linux/sockios.h", "SIOCSIFMETRIC", 0x891e},
-{"linux/sockios.h", "SIOCGIFMEM", 0x891f},
-{"linux/sockios.h", "SIOCSIFMEM", 0x8920},
-{"linux/sockios.h", "SIOCGIFMTU", 0x8921},
-{"linux/sockios.h", "SIOCSIFMTU", 0x8922},
-{"linux/sockios.h", "SIOCSIFNAME", 0x8923},
-{"linux/sockios.h", "SIOCSIFHWADDR", 0x8924},
-{"linux/sockios.h", "SIOCGIFENCAP", 0x8925},
-{"linux/sockios.h", "SIOCSIFENCAP", 0x8926},
-{"linux/sockios.h", "SIOCGIFHWADDR", 0x8927},
-{"linux/sockios.h", "SIOCGIFSLAVE", 0x8929},
-{"linux/sockios.h", "SIOCSIFSLAVE", 0x8930},
-{"linux/sockios.h", "SIOCADDMULTI", 0x8931},
-{"linux/sockios.h", "SIOCDELMULTI", 0x8932},
-{"linux/sockios.h", "SIOCGIFINDEX", 0x8933},
-{"linux/sockios.h", "SIOCSIFPFLAGS", 0x8934},
-{"linux/sockios.h", "SIOCGIFPFLAGS", 0x8935},
-{"linux/sockios.h", "SIOCDIFADDR", 0x8936},
-{"linux/sockios.h", "SIOCSIFHWBROADCAST", 0x8937},
-{"linux/sockios.h", "SIOCGIFCOUNT", 0x8938},
-{"linux/sockios.h", "SIOCGIFBR", 0x8940},
-{"linux/sockios.h", "SIOCSIFBR", 0x8941},
-{"linux/sockios.h", "SIOCGIFTXQLEN", 0x8942},
-{"linux/sockios.h", "SIOCSIFTXQLEN", 0x8943},
-{"linux/sockios.h", "SIOCDARP", 0x8953},
-{"linux/sockios.h", "SIOCGARP", 0x8954},
-{"linux/sockios.h", "SIOCSARP", 0x8955},
-{"linux/sockios.h", "SIOCDRARP", 0x8960},
-{"linux/sockios.h", "SIOCGRARP", 0x8961},
-{"linux/sockios.h", "SIOCSRARP", 0x8962},
-{"linux/sockios.h", "SIOCGIFMAP", 0x8970},
-{"linux/sockios.h", "SIOCSIFMAP", 0x8971},
-{"linux/sockios.h", "SIOCADDDLCI", 0x8980},
-{"linux/sockios.h", "SIOCDELDLCI", 0x8981},
-{"linux/sockios.h", "SIOCPROTOPRIVATE", 0x89e0},
-{"linux/sockios.h", "SIOCDEVPRIVATE", 0x89f0},
-{"linux/auto_fs.h", "AUTOFS_IOC_READY", 0x9360},
-{"linux/auto_fs.h", "AUTOFS_IOC_FAIL", 0x9361},
-{"linux/auto_fs.h", "AUTOFS_IOC_CATATONIC", 0x9362},
-{"linux/nbd.h", "NBD_SET_SOCK", 0xab00},
-{"linux/nbd.h", "NBD_SET_BLKSIZE", 0xab01},
-{"linux/nbd.h", "NBD_SET_SIZE", 0xab02},
-{"linux/nbd.h", "NBD_DO_IT", 0xab03},
-{"linux/nbd.h", "NBD_CLEAR_SOCK", 0xab04},
-{"linux/nbd.h", "NBD_CLEAR_QUE", 0xab05},
-{"linux/nbd.h", "NBD_PRINT_DEBUG", 0xab06},
-{"linux/nbd.h", "NBD_SET_SIZE_BLOCKS", 0xab07},
-{"linux/nbd.h", "NBD_DISCONNECT", 0xab08},
-{"linux/raw.h", "RAW_SETBIND", 0xac00},
-{"linux/raw.h", "RAW_GETBIND", 0xac01},
-{"linux/if_pppox.h", "PPPOEIOCDFWD", 0xb101},
-{"linux/lvm.h", "LV_ACTIVATE", 0xfe22},
-{"linux/lvm.h", "LV_DEACTIVATE", 0xfe23},
-{"linux/lvm.h", "LVM_RESET", 0xfe99},
-{"linux/lvm.h", "LVM_LOCK_LVM", 0xff00},
-{"linux/cyclades.h", "CYGETMON", 0x435901},
-{"linux/cyclades.h", "CYGETTHRESH", 0x435902},
-{"linux/cyclades.h", "CYSETTHRESH", 0x435903},
-{"linux/cyclades.h", "CYGETDEFTHRESH", 0x435904},
-{"linux/cyclades.h", "CYSETDEFTHRESH", 0x435905},
-{"linux/cyclades.h", "CYGETTIMEOUT", 0x435906},
-{"linux/cyclades.h", "CYSETTIMEOUT", 0x435907},
-{"linux/cyclades.h", "CYGETDEFTIMEOUT", 0x435908},
-{"linux/cyclades.h", "CYSETDEFTIMEOUT", 0x435909},
-{"linux/cyclades.h", "CYSETRFLOW", 0x43590a},
-{"linux/cyclades.h", "CYGETRFLOW", 0x43590b},
-{"linux/cyclades.h", "CYSETRTSDTR_INV", 0x43590c},
-{"linux/cyclades.h", "CYGETRTSDTR_INV", 0x43590d},
-{"linux/cyclades.h", "CYZSETPOLLCYCLE", 0x43590e},
-{"linux/cyclades.h", "CYZGETPOLLCYCLE", 0x43590f},
-{"linux/cyclades.h", "CYGETCD1400VER", 0x435910},
-{"linux/cyclades.h", "CYGETCARDINFO", 0x435911},
-{"linux/cyclades.h", "CYSETWAIT", 0x435912},
-{"linux/cyclades.h", "CYGETWAIT", 0x435913},
-{"linux/soundcard.h", "SOUND_MIXER_READ_VOLUME", 0x20044d00},
-{"linux/soundcard.h", "SOUND_MIXER_READ_BASS", 0x20044d01},
-{"linux/soundcard.h", "SOUND_MIXER_READ_TREBLE", 0x20044d02},
-{"linux/soundcard.h", "SOUND_MIXER_READ_SYNTH", 0x20044d03},
-{"linux/soundcard.h", "SOUND_MIXER_READ_PCM", 0x20044d04},
-{"linux/soundcard.h", "SOUND_MIXER_READ_SPEAKER", 0x20044d05},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE", 0x20044d06},
-{"linux/soundcard.h", "SOUND_MIXER_READ_MIC", 0x20044d07},
-{"linux/soundcard.h", "SOUND_MIXER_READ_CD", 0x20044d08},
-{"linux/soundcard.h", "SOUND_MIXER_READ_IMIX", 0x20044d09},
-{"linux/soundcard.h", "SOUND_MIXER_READ_ALTPCM", 0x20044d0a},
-{"linux/soundcard.h", "SOUND_MIXER_READ_RECLEV", 0x20044d0b},
-{"linux/soundcard.h", "SOUND_MIXER_READ_IGAIN", 0x20044d0c},
-{"linux/soundcard.h", "SOUND_MIXER_READ_OGAIN", 0x20044d0d},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE1", 0x20044d0e},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE2", 0x20044d0f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE3", 0x20044d10},
-{"linux/soundcard.h", "SOUND_MIXER_READ_MUTE", 0x20044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_ENHANCE", 0x20044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LOUD", 0x20044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_STEREODEVS", 0x20044dfb},
-{"linux/soundcard.h", "SOUND_MIXER_READ_CAPS", 0x20044dfc},
-{"linux/soundcard.h", "SOUND_MIXER_READ_RECMASK", 0x20044dfd},
-{"linux/soundcard.h", "SOUND_MIXER_READ_DEVMASK", 0x20044dfe},
-{"linux/soundcard.h", "SOUND_MIXER_READ_RECSRC", 0x20044dff},
-{"linux/ppdev.h", "PPWCONTROL", 0x40017084},
-{"linux/ppdev.h", "PPWDATA", 0x40017086},
-{"linux/ppdev.h", "PPWCTLONIRQ", 0x40017092},
-{"linux/telephony.h", "PHONE_MAXRINGS", 0x40017185},
-{"linux/telephony.h", "PHONE_PLAY_TONE", 0x4001719b},
-{"linux/ppdev.h", "PPFCONTROL", 0x4002708e},
-{"linux/telephony.h", "PHONE_RING_CADENCE", 0x40027186},
-{"linux/agpgart.h", "AGPIOC_DEALLOCATE", 0x40044107},
-{"linux/random.h", "RNDADDTOENTCNT", 0x40045201},
-{"asm/ioctls.h", "TIOCSPTLCK", 0x40045431},
-{"linux/atmdev.h", "ATM_SETSC", 0x400461f1},
-{"linux/devfs_fs.h", "DEVFSDIOC_SET_EVENT_MASK", 0x40046402},
-{"linux/devfs_fs.h", "DEVFSDIOC_RELEASE_EVENT_QUEUE", 0x40046403},
-{"linux/video_decoder.h", "DECODER_SET_NORM", 0x40046403},
-{"linux/devfs_fs.h", "DEVFSDIOC_SET_DEBUG_MASK", 0x40046404},
-{"linux/video_decoder.h", "DECODER_SET_INPUT", 0x40046404},
-{"linux/video_decoder.h", "DECODER_SET_OUTPUT", 0x40046405},
-{"linux/video_decoder.h", "DECODER_ENABLE_OUTPUT", 0x40046406},
-{"linux/video_encoder.h", "ENCODER_SET_NORM", 0x40046502},
-{"linux/video_encoder.h", "ENCODER_SET_INPUT", 0x40046503},
-{"linux/video_encoder.h", "ENCODER_SET_OUTPUT", 0x40046504},
-{"linux/video_encoder.h", "ENCODER_ENABLE_OUTPUT", 0x40046505},
-{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID", 0x40046e02},
-{"linux/ncp_fs.h", "NCP_IOC_SET_SIGN_WANTED", 0x40046e06},
-{"linux/ncp_fs.h", "NCP_IOC_GETDENTRYTTL", 0x40046e0c},
-{"linux/ppdev.h", "PPSETMODE", 0x40047080},
-{"linux/ppdev.h", "PPDATADIR", 0x40047090},
-{"linux/ppdev.h", "PPNEGOT", 0x40047091},
-{"linux/ppdev.h", "PPSETPHASE", 0x40047094},
-{"linux/telephony.h", "PHONE_REC_CODEC", 0x40047189},
-{"linux/telephony.h", "PHONE_REC_DEPTH", 0x4004718c},
-{"linux/telephony.h", "PHONE_FRAME", 0x4004718d},
-{"linux/telephony.h", "PHONE_REC_VOLUME", 0x4004718e},
-{"linux/telephony.h", "PHONE_PLAY_CODEC", 0x40047190},
-{"linux/telephony.h", "PHONE_PLAY_DEPTH", 0x40047193},
-{"linux/telephony.h", "PHONE_PLAY_VOLUME", 0x40047194},
-{"linux/telephony.h", "PHONE_DTMF_OOB", 0x40047199},
-{"linux/telephony.h", "PHONE_SET_TONE_ON_TIME", 0x4004719c},
-{"linux/telephony.h", "PHONE_SET_TONE_OFF_TIME", 0x4004719d},
-{"linux/telephony.h", "PHONE_PSTN_SET_STATE", 0x400471a4},
-{"linux/telephony.h", "PHONE_WINK_DURATION", 0x400471a6},
-{"linux/ixjuser.h", "IXJCTL_GET_FILTER_HIST", 0x400471c8},
-{"linux/ixjuser.h", "IXJCTL_AEC_START", 0x400471cb},
-{"linux/ixjuser.h", "IXJCTL_SET_LED", 0x400471ce},
-{"linux/ixjuser.h", "IXJCTL_MIXER", 0x400471cf},
-{"linux/ixjuser.h", "IXJCTL_DAA_COEFF_SET", 0x400471d0},
-{"linux/ixjuser.h", "IXJCTL_PORT", 0x400471d1},
-{"linux/ixjuser.h", "IXJCTL_DAA_AGAIN", 0x400471d2},
-{"linux/ixjuser.h", "IXJCTL_POTS_PSTN", 0x400471d5},
-{"linux/ixjuser.h", "IXJCTL_HZ", 0x400471e0},
-{"linux/ixjuser.h", "IXJCTL_RATE", 0x400471e1},
-{"linux/ixjuser.h", "IXJCTL_INTERCOM_START", 0x400471fd},
-{"linux/ixjuser.h", "IXJCTL_INTERCOM_STOP", 0x400471fe},
-{"linux/if_ppp.h", "PPPIOCATTCHAN", 0x40047438},
-{"linux/if_ppp.h", "PPPIOCCONNECT", 0x4004743a},
-{"linux/if_ppp.h", "PPPIOCSMRRU", 0x4004743b},
-{"linux/if_ppp.h", "PPPIOCDETACH", 0x4004743c},
-{"linux/if_ppp.h", "PPPIOCATTACH", 0x4004743d},
-{"linux/if_ppp.h", "PPPIOCSDEBUG", 0x40047440},
-{"linux/if_ppp.h", "PPPIOCSMAXCID", 0x40047451},
-{"linux/if_ppp.h", "PPPIOCSMRU", 0x40047452},
-{"linux/if_ppp.h", "PPPIOCSRASYNCMAP", 0x40047454},
-{"linux/if_ppp.h", "PPPIOCSASYNCMAP", 0x40047457},
-{"linux/if_ppp.h", "PPPIOCSFLAGS", 0x40047459},
-{"linux/isdn_ppp.h", "PPPIOCBUNDLE", 0x40047481},
-{"linux/isdn_ppp.h", "PPPIOCSMPFLAGS", 0x40047483},
-{"linux/isdn_ppp.h", "PPPIOCSMPMTU", 0x40047484},
-{"linux/isdn_ppp.h", "PPPIOCSMPMRU", 0x40047485},
-{"linux/isdn_ppp.h", "PPPIOCSCOMPRESSOR", 0x40047487},
-{"linux/videodev.h", "VIDIOCCAPTURE", 0x40047608},
-{"linux/videodev.h", "VIDIOCSYNC", 0x40047612},
-{"linux/videodev.h", "VIDIOCSWRITEMODE", 0x40047619},
-{"linux/dn.h", "SIOCSNETADDR", 0x400489e0},
-{"linux/dn.h", "OSIOCSNETADDR", 0x400489e0},
-{"linux/auto_fs4.h", "AUTOFS_IOC_EXPIRE_MULTI", 0x40049366},
-{"linux/lvm.h", "VG_CREATE", 0x4004fe00},
-{"linux/lvm.h", "VG_REMOVE", 0x4004fe01},
-{"linux/lvm.h", "VG_EXTEND", 0x4004fe03},
-{"linux/lvm.h", "VG_REDUCE", 0x4004fe04},
-{"linux/lvm.h", "VG_SET_EXTENDABLE", 0x4004fe08},
-{"linux/lvm.h", "LV_CREATE", 0x4004fe20},
-{"linux/lvm.h", "LV_REMOVE", 0x4004fe21},
-{"linux/lvm.h", "LV_EXTEND", 0x4004fe24},
-{"linux/lvm.h", "LV_REDUCE", 0x4004fe25},
-{"linux/lvm.h", "LV_SET_ACCESS", 0x4004fe28},
-{"linux/lvm.h", "LV_SET_ALLOCATION", 0x4004fe29},
-{"linux/lvm.h", "LV_SET_STATUS", 0x4004fe2a},
-{"linux/lvm.h", "LE_REMAP", 0x4004fe2b},
-{"linux/lvm.h", "PV_FLUSH", 0x4004fe42},
-{"linux/lvm.h", "PE_LOCK_UNLOCK", 0x4004fe50},
-{"linux/elevator.h", "BLKELVSET", 0x4008126b},
-{"linux/fs.h", "BLKELVSET", 0x4008126b},
-{"linux/agpgart.h", "AGPIOC_SETUP", 0x40084103},
-{"linux/agpgart.h", "AGPIOC_RESERVE", 0x40084104},
-{"linux/agpgart.h", "AGPIOC_PROTECT", 0x40084105},
-{"linux/agpgart.h", "AGPIOC_BIND", 0x40084108},
-{"linux/agpgart.h", "AGPIOC_UNBIND", 0x40084109},
-{"linux/pmu.h", "PMU_IOC_SET_BACKLIGHT", 0x40084202},
-{"linux/input.h", "EVIOCSREP", 0x40084503},
-{"linux/input.h", "EVIOCSKEYCODE", 0x40084504},
-{"linux/random.h", "RNDADDENTROPY", 0x40085203},
-{"linux/usbdevice_fs.h", "USBDEVFS_REAPURB", 0x4008550c},
-{"linux/usbdevice_fs.h", "USBDEVFS_REAPURBNDELAY", 0x4008550d},
-{"linux/usbdevice_fs.h", "USBDEVFS_CONNECTINFO", 0x40085511},
-{"linux/ext2_fs.h", "EXT2_IOC_SETFLAGS", 0x40086602},
-{"linux/mtio.h", "MTIOCTOP", 0x40086d01},
-{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID2", 0x40086e02},
-{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_CONNECTION", 0x40086ef8},
-{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_MODE", 0x40086efa},
-{"linux/rtc.h", "RTC_IRQP_SET", 0x4008700c},
-{"linux/rtc.h", "RTC_EPOCH_SET", 0x4008700e},
-{"linux/serio.h", "SPIOCSTYPE", 0x40087101},
-{"linux/telephony.h", "PHONE_CAPABILITIES_CHECK", 0x40087182},
-{"linux/ixjuser.h", "IXJCTL_SET_FILTER", 0x400871c7},
-{"linux/ixjuser.h", "IXJCTL_INIT_TONE", 0x400871c9},
-{"linux/ixjuser.h", "IXJCTL_TONE_CADENCE", 0x400871ca},
-{"linux/if_ppp.h", "PPPIOCSNPMODE", 0x4008744b},
-{"linux/ext2_fs.h", "EXT2_IOC_SETVERSION", 0x40087602},
-{"linux/videodev.h", "VIDIOCSFREQ", 0x4008760f},
-{"linux/if_pppox.h", "PPPOEIOCSFWD", 0x4008b100},
-{"linux/fd.h", "FDFMTTRK", 0x400c0248},
-{"linux/capi.h", "CAPI_REGISTER", 0x400c4301},
-{"linux/i2o-dev.h", "I2OEVTREG", 0x400c690a},
-{"linux/ncp_fs.h", "NCP_IOC_GETROOT", 0x400c6e08},
-{"linux/videodev.h", "VIDIOCSPLAYMODE", 0x400c7618},
-{"linux/video_decoder.h", "DECODER_SET_PICTURE", 0x400e6407},
-{"linux/videodev.h", "VIDIOCSPICT", 0x400e7607},
-{"asm/dasd.h", "BIODASDFMT", 0x40104401},
-{"linux/atm_idt77105.h", "IDT77105_GETSTAT", 0x40106132},
-{"linux/atm_idt77105.h", "IDT77105_GETSTATZ", 0x40106133},
-{"linux/atmdev.h", "ATM_GETSTAT", 0x40106150},
-{"linux/atmdev.h", "ATM_GETSTATZ", 0x40106151},
-{"linux/atmdev.h", "ATM_GETLOOP", 0x40106152},
-{"linux/atmdev.h", "ATM_SETLOOP", 0x40106153},
-{"linux/atmdev.h", "ATM_QUERYLOOP", 0x40106154},
-{"linux/atm_eni.h", "ENI_MEMDUMP", 0x40106160},
-{"linux/atm_zatm.h", "ZATM_GETPOOL", 0x40106161},
-{"linux/atm_nicstar.h", "NS_SETBUFLEV", 0x40106162},
-{"linux/atm_zatm.h", "ZATM_GETPOOLZ", 0x40106162},
-{"linux/atm_zatm.h", "ZATM_SETPOOL", 0x40106163},
-{"linux/atm_zatm.h", "ZATM_GETTHIST", 0x40106164},
-{"linux/atm_eni.h", "ENI_SETMULT", 0x40106167},
-{"linux/atmdev.h", "ATM_GETLINKRATE", 0x40106181},
-{"linux/atmdev.h", "ATM_GETNAMES", 0x40106183},
-{"linux/atmdev.h", "ATM_GETTYPE", 0x40106184},
-{"linux/atmdev.h", "ATM_GETESI", 0x40106185},
-{"linux/atmdev.h", "ATM_GETADDR", 0x40106186},
-{"linux/atmdev.h", "ATM_RSTADDR", 0x40106187},
-{"linux/atmdev.h", "ATM_ADDADDR", 0x40106188},
-{"linux/atmdev.h", "ATM_DELADDR", 0x40106189},
-{"linux/atmdev.h", "ATM_GETCIRANGE", 0x4010618a},
-{"linux/atmdev.h", "ATM_SETCIRANGE", 0x4010618b},
-{"linux/atmdev.h", "ATM_SETESI", 0x4010618c},
-{"linux/atmdev.h", "ATM_SETESIF", 0x4010618d},
-{"linux/ppdev.h", "PPSETTIME", 0x40107096},
-{"linux/if_ppp.h", "PPPIOCSCOMPRESS", 0x4010744d},
-{"linux/videodev.h", "VIDIOCMCAPTURE", 0x40107613},
-{"asm/tape390.h", "TAPE390_DISPLAY", 0x40116401},
-{"linux/fd.h", "FDSETMAXERRS", 0x4014024c},
-{"linux/videodev.h", "VIDIOCSCAPTURE", 0x40147617},
-{"linux/videodev.h", "VIDIOCSFBUF", 0x4018760c},
-{"linux/fd.h", "FDSETPRM", 0x40200242},
-{"linux/fd.h", "FDDEFPRM", 0x40200243},
-{"asm/dasd.h", "BIODASDSATTR", 0x40204402},
-{"linux/if_ppp.h", "PPPIOCSXASYNCMAP", 0x4020744f},
-{"linux/videodev.h", "VIDIOCSMICROCODE", 0x4020761b},
-{"linux/videodev.h", "VIDIOCSVBIFMT", 0x4020761d},
-{"linux/joystick.h", "JSIOCSCORR", 0x40246a21},
-{"linux/rtc.h", "RTC_ALM_SET", 0x40247007},
-{"linux/rtc.h", "RTC_SET_TIME", 0x4024700a},
-{"linux/rtc.h", "RTC_WKALM_SET", 0x4028700f},
-{"linux/videodev.h", "VIDIOCSWIN", 0x4028760a},
-{"linux/videodev.h", "VIDIOCSAUDIO", 0x40287611},
-{"linux/smb_fs.h", "SMB_IOC_NEWCONN", 0x402c7502},
-{"linux/synclink.h", "MGSL_IOCSPARAMS", 0x40306d00},
-{"linux/videodev.h", "VIDIOCSCHAN", 0x40307603},
-{"linux/videodev.h", "VIDIOCSTUNER", 0x40407605},
-{"linux/fd.h", "FDSETDRVPRM", 0x40800290},
-{"linux/usbdevice_fs.h", "USBDEVFS_GETDRIVER", 0x41045508},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_VOLUME", 0x60044d00},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_BASS", 0x60044d01},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_TREBLE", 0x60044d02},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_SYNTH", 0x60044d03},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_PCM", 0x60044d04},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_SPEAKER", 0x60044d05},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE", 0x60044d06},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_MIC", 0x60044d07},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_CD", 0x60044d08},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_IMIX", 0x60044d09},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_ALTPCM", 0x60044d0a},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECLEV", 0x60044d0b},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_IGAIN", 0x60044d0c},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_OGAIN", 0x60044d0d},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE1", 0x60044d0e},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE2", 0x60044d0f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE3", 0x60044d10},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_MUTE", 0x60044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_ENHANCE", 0x60044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LOUD", 0x60044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECSRC", 0x60044dff},
-{"linux/joystick.h", "JSIOCGAXES", 0x80016a11},
-{"linux/joystick.h", "JSIOCGBUTTONS", 0x80016a12},
-{"linux/ppdev.h", "PPRSTATUS", 0x80017081},
-{"linux/ppdev.h", "PPRCONTROL", 0x80017083},
-{"linux/ppdev.h", "PPRDATA", 0x80017085},
-{"linux/capi.h", "CAPI_GET_ERRCODE", 0x80024321},
-{"linux/capi.h", "CAPI_INSTALLED", 0x80024322},
-{"linux/capi.h", "CAPI_GET_FLAGS", 0x80044323},
-{"linux/capi.h", "CAPI_SET_FLAGS", 0x80044324},
-{"linux/capi.h", "CAPI_CLR_FLAGS", 0x80044325},
-{"linux/capi.h", "CAPI_NCCI_OPENCOUNT", 0x80044326},
-{"linux/capi.h", "CAPI_NCCI_GETUNIT", 0x80044327},
-{"asm/dasd.h", "DASDAPIVER", 0x80044400},
-{"linux/input.h", "EVIOCGVERSION", 0x80044501},
-{"linux/random.h", "RNDGETENTCNT", 0x80045200},
-{"asm/ioctls.h", "TIOCGPTN", 0x80045430},
-{"linux/usbdevice_fs.h", "USBDEVFS_RESETEP", 0x80045503},
-{"linux/usbdevice_fs.h", "USBDEVFS_SETCONFIGURATION", 0x80045505},
-{"linux/usbdevice_fs.h", "USBDEVFS_CLAIMINTERFACE", 0x8004550f},
-{"linux/usbdevice_fs.h", "USBDEVFS_RELEASEINTERFACE", 0x80045510},
-{"linux/usbdevice_fs.h", "USBDEVFS_CLEAR_HALT", 0x80045515},
-{"linux/watchdog.h", "WDIOC_GETSTATUS", 0x80045701},
-{"linux/watchdog.h", "WDIOC_GETBOOTSTATUS", 0x80045702},
-{"linux/watchdog.h", "WDIOC_GETTEMP", 0x80045703},
-{"linux/watchdog.h", "WDIOC_SETOPTIONS", 0x80045704},
-{"linux/watchdog.h", "WDIOC_KEEPALIVE", 0x80045705},
-{"linux/sonet.h", "SONET_GETDIAG", 0x80046114},
-{"linux/sonet.h", "SONET_GETFRAMING", 0x80046116},
-{"linux/devfs_fs.h", "DEVFSDIOC_GET_PROTO_REV", 0x80046400},
-{"linux/video_decoder.h", "DECODER_GET_STATUS", 0x80046402},
-{"linux/i2o-dev.h", "I2OVALIDATE", 0x80046908},
-{"linux/joystick.h", "JSIOCGVERSION", 0x80046a01},
-{"linux/udf_fs_i.h", "UDF_GETEASIZE", 0x80046c40},
-{"linux/zftape.h", "MTIOC_ZFTAPE_GETBLKSZ", 0x80046d68},
-{"linux/ncp_fs.h", "NCP_IOC_SIGN_WANTED", 0x80046e06},
-{"linux/ncp_fs.h", "NCP_IOC_SETDENTRYTTL", 0x80046e0c},
-{"linux/ppdev.h", "PPCLRIRQ", 0x80047093},
-{"linux/telephony.h", "PHONE_DTMF_READY", 0x80047196},
-{"linux/telephony.h", "PHONE_GET_DTMF", 0x80047197},
-{"linux/telephony.h", "PHONE_GET_DTMF_ASCII", 0x80047198},
-{"linux/telephony.h", "PHONE_EXCEPTION", 0x8004719a},
-{"linux/ixjuser.h", "IXJCTL_CARDTYPE", 0x800471c1},
-{"linux/ixjuser.h", "IXJCTL_SERIAL", 0x800471c2},
-{"linux/ixjuser.h", "IXJCTL_DSP_TYPE", 0x800471c3},
-{"linux/ixjuser.h", "IXJCTL_DSP_VERSION", 0x800471c4},
-{"linux/if_ppp.h", "PPPIOCGCHAN", 0x80047437},
-{"linux/if_ppp.h", "PPPIOCGDEBUG", 0x80047441},
-{"linux/if_ppp.h", "PPPIOCGMRU", 0x80047453},
-{"linux/if_ppp.h", "PPPIOCGRASYNCMAP", 0x80047455},
-{"linux/if_ppp.h", "PPPIOCGUNIT", 0x80047456},
-{"linux/if_ppp.h", "PPPIOCGASYNCMAP", 0x80047458},
-{"linux/if_ppp.h", "PPPIOCGFLAGS", 0x8004745a},
-{"linux/isdn_ppp.h", "PPPIOCGMPFLAGS", 0x80047482},
-{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID", 0x80047501},
-{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID32", 0x80047503},
-{"linux/dn.h", "SIOCGNETADDR", 0x800489e1},
-{"linux/dn.h", "OSIOCGNETADDR", 0x800489e1},
-{"linux/auto_fs.h", "AUTOFS_IOC_PROTOVER", 0x80049363},
-{"linux/lvm.h", "LVM_GET_IOP_VERSION", 0x8004fe98},
-{"linux/sonet.h", "SONET_GETFRSENSE", 0x80066117},
-{"linux/elevator.h", "BLKELVGET", 0x8008126a},
-{"linux/fs.h", "BLKELVGET", 0x8008126a},
-{"linux/agpgart.h", "AGPIOC_INFO", 0x80084100},
-{"linux/pmu.h", "PMU_IOC_GET_BACKLIGHT", 0x80084201},
-{"linux/pmu.h", "PMU_IOC_GET_MODEL", 0x80084203},
-{"linux/pmu.h", "PMU_IOC_HAS_ADB", 0x80084204},
-{"linux/input.h", "EVIOCGID", 0x80084502},
-{"linux/input.h", "EVIOCGREP", 0x80084503},
-{"linux/input.h", "EVIOCGKEYCODE", 0x80084504},
-{"linux/input.h", "EVIOCGKEY", 0x80084505},
-{"linux/random.h", "RNDGETPOOL", 0x80085202},
-{"linux/usbdevice_fs.h", "USBDEVFS_SETINTERFACE", 0x80085504},
-{"linux/ext2_fs.h", "EXT2_IOC_GETFLAGS", 0x80086601},
-{"linux/udf_fs_i.h", "UDF_GETEABLOCK", 0x80086c41},
-{"linux/udf_fs_i.h", "UDF_GETVOLIDENT", 0x80086c42},
-{"linux/mtio.h", "MTIOCPOS", 0x80086d03},
-{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_CONNECTION", 0x80086ef8},
-{"linux/matroxfb.h", "MATROXFB_GET_AVAILABLE_OUTPUTS", 0x80086ef9},
-{"linux/matroxfb.h", "MATROXFB_GET_ALL_OUTPUTS", 0x80086efb},
-{"linux/rtc.h", "RTC_IRQP_READ", 0x8008700b},
-{"linux/rtc.h", "RTC_EPOCH_READ", 0x8008700d},
-{"linux/telephony.h", "PHONE_CAPABILITIES_LIST", 0x80087181},
-{"linux/ixjuser.h", "IXJCTL_CID", 0x800871d4},
-{"linux/ixjuser.h", "IXJCTL_FRAMES_READ", 0x800871e2},
-{"linux/ixjuser.h", "IXJCTL_FRAMES_WRITTEN", 0x800871e3},
-{"linux/ixjuser.h", "IXJCTL_READ_WAIT", 0x800871e4},
-{"linux/ixjuser.h", "IXJCTL_WRITE_WAIT", 0x800871e5},
-{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_READ", 0x800871e6},
-{"linux/ext2_fs.h", "EXT2_IOC_GETVERSION", 0x80087601},
-{"linux/videodev.h", "VIDIOCGFREQ", 0x8008760e},
-{"linux/video_decoder.h", "DECODER_GET_CAPABILITIES", 0x800c6401},
-{"linux/video_encoder.h", "ENCODER_GET_CAPABILITIES", 0x800c6501},
-{"linux/ncp_fs.h", "NCP_IOC_SETROOT", 0x800c6e08},
-{"linux/videodev.h", "VIDIOCKEY", 0x800c760d},
-{"linux/videodev.h", "VIDIOCGPICT", 0x800e7606},
-{"linux/fd.h", "FDGETDRVTYP", 0x8010020f},
-{"linux/usbdevice_fs.h", "USBDEVFS_DISCSIGNAL", 0x8010550e},
-{"linux/mtio.h", "MTIOCGETSIZE", 0x80106d09},
-{"linux/ncp_fs.h", "NCP_IOC_NCPREQUEST", 0x80106e01},
-{"linux/ncp_fs.h", "NCP_IOC_SETPRIVATEDATA", 0x80106e0a},
-{"linux/ppdev.h", "PPGETTIME", 0x80107095},
-{"linux/if_ppp.h", "PPPIOCGIDLE", 0x8010743f},
-{"linux/isdn_ppp.h", "PPPIOCGIFNAME", 0x80107488},
-{"linux/fd.h", "FDGETMAXERRS", 0x8014020e},
-{"linux/mtio.h", "MTIOCVOLINFO", 0x80146d08},
-{"linux/ncp_fs.h", "NCP_IOC_LOCKUNLOCK", 0x80146e07},
-{"linux/videodev.h", "VIDIOCGUNIT", 0x80147615},
-{"linux/videodev.h", "VIDIOCGCAPTURE", 0x80147616},
-{"linux/ncp_fs.h", "NCP_IOC_SIGN_INIT", 0x80186e05},
-{"linux/ncp_fs.h", "NCP_IOC_SETOBJECTNAME", 0x80186e09},
-{"linux/videodev.h", "VIDIOCGFBUF", 0x8018760b},
-{"linux/fd.h", "FDGETPRM", 0x80200204},
-{"asm/dasd.h", "BIODASDGATTR", 0x80204405},
-{"linux/fb.h", "FBIOGET_VBLANK", 0x80204612},
-{"linux/if_ppp.h", "PPPIOCGXASYNCMAP", 0x80207450},
-{"linux/videodev.h", "VIDIOCGVBIFMT", 0x8020761c},
-{"linux/sonet.h", "SONET_GETSTAT", 0x80246110},
-{"linux/sonet.h", "SONET_GETSTATZ", 0x80246111},
-{"linux/joystick.h", "JSIOCGCORR", 0x80246a22},
-{"linux/rtc.h", "RTC_ALM_READ", 0x80247008},
-{"linux/rtc.h", "RTC_RD_TIME", 0x80247009},
-{"linux/fd.h", "FDGETFDCSTAT", 0x80280215},
-{"linux/fd.h", "FDWERRORGET", 0x80280217},
-{"linux/rtc.h", "RTC_WKALM_RD", 0x80287010},
-{"linux/videodev.h", "VIDIOCGWIN", 0x80287609},
-{"linux/videodev.h", "VIDIOCGAUDIO", 0x80287610},
-{"linux/ncp_fs.h", "NCP_IOC_SETCHARSETS", 0x802a6e0b},
-{"linux/synclink.h", "MGSL_IOCGPARAMS", 0x80306d01},
-{"linux/mtio.h", "MTIOCGET", 0x80306d02},
-{"linux/usbdevice_fs.h", "USBDEVFS_SUBMITURB", 0x8038550a},
-{"linux/videodev.h", "VIDIOCGCAP", 0x803c7601},
-{"linux/i2o-dev.h", "I2OGETIOPS", 0x80406900},
-{"linux/isdn_ppp.h", "PPPIOCGCOMPRESSORS", 0x80407486},
-{"linux/watchdog.h", "WDIOC_GETSUPPORT", 0x80485700},
-{"linux/fd.h", "FDGETDRVSTAT", 0x80500212},
-{"linux/fd.h", "FDPOLLDRVSTAT", 0x80500213},
-{"linux/i2o-dev.h", "I2OEVTGET", 0x8068690b},
-{"linux/fd.h", "FDGETDRVPRM", 0x80800211},
-{"linux/usbdevice_fs.h", "USBDEVFS_HUB_PORTINFO", 0x80805513},
-{"linux/videodev.h", "VIDIOCGMBUF", 0x80887614},
-{"asm/dasd.h", "BIODASDPSRD", 0x80c04404},
-{"linux/auto_fs.h", "AUTOFS_IOC_EXPIRE", 0x810c9365},
-{"linux/videodev.h", "VIDIOCGPLAYINFO", 0x8118761a},
-{"asm/dasd.h", "BIODASDINFO", 0x81784401},
-{"asm/dasd.h", "BIODASDINFO2", 0x81a04403},
-{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_BOTH", 0x82307201},
-{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_SHORT", 0x82307202},
-{"asm/dasd.h", "BIODASDPRRD", 0x84084402},
-{"linux/capi.h", "CAPI_GET_MANUFACTURER", 0xc0044306},
-{"linux/capi.h", "CAPI_GET_SERIAL", 0xc0044308},
-{"linux/sonet.h", "SONET_SETDIAG", 0xc0046112},
-{"linux/sonet.h", "SONET_CLRDIAG", 0xc0046113},
-{"linux/synclink.h", "MGSL_IOCWAITEVENT", 0xc0046d08},
-{"linux/if_ppp.h", "PPPIOCNEWUNIT", 0xc004743e},
-{"linux/lvm.h", "VG_STATUS", 0xc004fe05},
-{"linux/lvm.h", "VG_STATUS_GET_COUNT", 0xc004fe06},
-{"linux/lvm.h", "VG_STATUS_GET_NAMELIST", 0xc004fe07},
-{"linux/lvm.h", "LV_STATUS_BYNAME", 0xc004fe26},
-{"linux/lvm.h", "LV_STATUS_BYINDEX", 0xc004fe27},
-{"linux/lvm.h", "PV_STATUS", 0xc004fe40},
-{"linux/lvm.h", "PV_CHANGE", 0xc004fe41},
-{"linux/agpgart.h", "AGPIOC_ALLOCATE", 0xc0084106},
-{"asm/cmb.h", "BIODASDREADCMB", 0xc0084420},
-{"linux/coda.h", "CIOC_KERNEL_VERSION", 0xc008630a},
-{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_MODE", 0xc0086efa},
-{"linux/telephony.h", "PHONE_QUERY_CODEC", 0xc00871a7},
-{"linux/if_ppp.h", "PPPIOCGNPMODE", 0xc008744c},
-{"linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", 0xc0089364},
-{"linux/capi.h", "CAPI_GET_VERSION", 0xc0104307},
-{"linux/capi.h", "CAPI_MANUFACTURER_CMD", 0xc0104320},
-{"linux/usbdevice_fs.h", "USBDEVFS_IOCTL", 0xc0105512},
-{"linux/atm_nicstar.h", "NS_GETPSTAT", 0xc0106161},
-{"linux/ncp_fs.h", "NCP_IOC_GETPRIVATEDATA", 0xc0106e0a},
-{"linux/usbdevice_fs.h", "USBDEVFS_CONTROL", 0xc0185500},
-{"linux/usbdevice_fs.h", "USBDEVFS_BULK", 0xc0185502},
-{"linux/i2o-dev.h", "I2OHRTGET", 0xc0186901},
-{"linux/i2o-dev.h", "I2OLCTGET", 0xc0186902},
-{"linux/mtio.h", "MTIOCRDFTSEG", 0xc0186d06},
-{"linux/mtio.h", "MTIOCWRFTSEG", 0xc0186d07},
-{"linux/mtio.h", "MTIOCFTFORMAT", 0xc0186d0a},
-{"linux/ncp_fs.h", "NCP_IOC_GETOBJECTNAME", 0xc0186e09},
-{"linux/mtio.h", "MTIOCFTCMD", 0xc0206d0b},
-{"linux/i2o-dev.h", "I2OPARMSET", 0xc0286903},
-{"linux/i2o-dev.h", "I2OPARMGET", 0xc0286904},
-{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO", 0xc0286e04},
-{"linux/ncp_fs.h", "NCP_IOC_GETCHARSETS", 0xc02a6e0b},
-{"linux/i2o-dev.h", "I2OSWDL", 0xc0306905},
-{"linux/i2o-dev.h", "I2OSWUL", 0xc0306906},
-{"linux/i2o-dev.h", "I2OSWDEL", 0xc0306907},
-{"linux/i2o-dev.h", "I2OHTML", 0xc0306909},
-{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO_V2", 0xc0306e04},
-{"linux/videodev.h", "VIDIOCGCHAN", 0xc0307602},
-{"linux/capi.h", "CAPI_GET_PROFILE", 0xc0404309},
-{"linux/videodev.h", "VIDIOCGTUNER", 0xc0407604},
-{"asm/cmb.h", "BIODASDREADALLCMB", 0xc0584421},
-{"linux/isdn_ppp.h", "PPPIOCGCALLINFO", 0xc0887480},
diff --git a/strace/linux/s390x/signalent.h b/strace/linux/s390x/signalent.h
deleted file mode 100644
index 04b00b1..0000000
--- a/strace/linux/s390x/signalent.h
+++ /dev/null
@@ -1,33 +0,0 @@
-	"SIG_0",	/* 0 */
-	"SIGHUP",	/* 1 */
-	"SIGINT",	/* 2 */
-	"SIGQUIT",	/* 3 */
-	"SIGILL",	/* 4 */
-	"SIGTRAP",	/* 5 */
-	"SIGABRT",	/* 6 */
-	"SIGBUS",	/* 7 */
-	"SIGFPE",	/* 8 */
-	"SIGKILL",	/* 9 */
-	"SIGUSR1",	/* 10 */
-	"SIGSEGV",	/* 11 */
-	"SIGUSR2",	/* 12 */
-	"SIGPIPE",	/* 13 */
-	"SIGALRM",	/* 14 */
-	"SIGTERM",	/* 15 */
-	"SIGSTKFLT",	/* 16 */
-	"SIGCHLD",	/* 17 */
-	"SIGCONT",	/* 18 */
-	"SIGSTOP",	/* 19 */
-	"SIGTSTP",	/* 20 */
-	"SIGTTIN",	/* 21 */
-	"SIGTTOU",	/* 22 */
-	"SIGURG",	/* 23 */
-	"SIGXCPU",	/* 24 */
-	"SIGXFSZ",	/* 25 */
-	"SIGVTALRM",	/* 26 */
-	"SIGPROF",	/* 27 */
-	"SIGWINCH",	/* 28 */
-	"SIGIO",	/* 29 */
-	"SIGPWR",	/* 30 */
-	"SIGUNUSED",	/* 31 */
-	"SIGRTMIN",	/* 32 */
diff --git a/strace/linux/s390x/syscallent.h b/strace/linux/s390x/syscallent.h
deleted file mode 100644
index b7d02f3..0000000
--- a/strace/linux/s390x/syscallent.h
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright (c) 2000 IBM Deutschland Entwicklung GmbH, IBM Coporation
- * Author: Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-	{ 0,	0,	sys_setup,		"setup"		}, /* 0 */
-	{ 1,	TP,	sys_exit,		"_exit"		}, /* 1 */
-	{ 0,	TP,	sys_fork,		"fork"		}, /* 2 */
-	{ 3,	0,	sys_read,		"read"		}, /* 3 */
-	{ 3,	0,	sys_write,		"write"		}, /* 4 */
-	{ 3,	TF,	sys_open,		"open"		}, /* 5 */
-	{ 1,	0,	sys_close,		"close"		}, /* 6 */
-	{ -1,	0,	printargs,		"SYS_7"		}, /* 7 */
-	{ 2,	TF,	sys_creat,		"creat"		}, /* 8 */
-	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
-	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
-	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 11 */
-	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
-	{ -1,	0,	printargs,		"SYS_13"	}, /* 13 */
-	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
-	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
-	{ -1,	0,	printargs,		"SYS_16"	}, /* 16 */
-	{ -1,	0,	printargs,		"SYS_17"	}, /* 17 */
-	{ -1,	0,	printargs,		"SYS_18"	}, /* 18 */
-	{ 3,	0,	sys_lseek,		"lseek"		}, /* 19 */
-	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
-	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
-	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
-	{ -1,	0,	printargs,		"SYS_23"	}, /* 23 */
-	{ -1,	0,	printargs,		"SYS_24"	}, /* 24 */
-	{ -1,	0,	printargs,		"SYS_25"	}, /* 25 */
-	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
-	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
-	{ -1,	0,	printargs,		"SYS_28"	}, /* 28 */
-	{ 0,	TS,	sys_pause,		"pause"		}, /* 29 */
-	{ 2,	TF,	sys_utime,		"utime"		}, /* 30 */
-	{ -1,	0,	printargs,		"SYS_31"	}, /* 31 */
-	{ -1,	0,	printargs,		"SYS_32"	}, /* 32 */
-	{ 2,	TF,	sys_access,		"access"	}, /* 33 */
-	{ 1,	0,	sys_nice,		"nice"		}, /* 34 */
-	{ -1,	0,	printargs,		"SYS_35"	}, /* 35 */
-	{ 0,	0,	sys_sync,		"sync"		}, /* 36 */
-	{ 2,	TS,	sys_kill,		"kill"		}, /* 37 */
-	{ 2,	TF,	sys_rename,		"rename"	}, /* 38 */
-	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 39 */
-	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 40 */
-	{ 1,	0,	sys_dup,		"dup"		}, /* 41 */
-	{ 1,	0,	sys_pipe,		"pipe"		}, /* 42 */
-	{ 1,	0,	sys_times,		"times"		}, /* 43 */
-	{ -1,	0,	printargs,		"SYS_44"	}, /* 44 */
-	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
-	{ -1,	0,	printargs,		"SYS_46"	}, /* 46 */
-	{ -1,	0,	printargs,		"SYS_47"	}, /* 47 */
-	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ -1,	0,	printargs,		"SYS_49"	}, /* 49 */
-	{ -1,	0,	printargs,		"SYS_50"	}, /* 50 */
-	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
-	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
-	{ -1,	0,	printargs,		"SYS_53"	}, /* 53 */
-	{ 3,	0,	sys_ioctl,		"ioctl"		}, /* 54 */
-	{ 3,	0,	sys_fcntl,		"fcntl"		}, /* 55 */
-	{ -1,	0,	printargs,		"SYS_56"	}, /* 56 */
-	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 57 */
-	{ -1,	0,	printargs,		"SYS_58"	}, /* 58 */
-	{ -1,	0,	printargs,		"SYS_59"	}, /* 59 */
-	{ 1,	0,	sys_umask,		"umask"		}, /* 60 */
-	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 61 */
-	{ 2,	0,	sys_ustat,		"ustat"		}, /* 62 */
-	{ 2,	0,	sys_dup2,		"dup2"		}, /* 63 */
-	{ 0,	0,	sys_getppid,		"getppid"	}, /* 64 */
-	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
-	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
-	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
-	{ -1,	0,	printargs,		"SYS_68"	}, /* 68 */
-	{ -1,	0,	printargs,		"SYS_69"	}, /* 69 */
-	{ -1,	0,	printargs,		"SYS_70"	}, /* 70 */
-	{ -1,	0,	printargs,		"SYS_71"	}, /* 71 */
-	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
-	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
-	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
-	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 75 */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 76 */
-	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 77 */
-	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 78 */
-	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 79 */
-	{ -1,	0,	printargs,		"SYS_80"	}, /* 80 */
-	{ -1,	0,	printargs,		"SYS_81"	}, /* 81 */
-	{ -1,	0,	printargs,		"SYS_82"	}, /* 82 */
-	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 83 */
-	{ -1,	0,	printargs,		"SYS_84"	}, /* 84 */
-	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
-	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
-	{ -1,	0,	printargs,		"SYS_89"	}, /* 89 */
-	{ 6,	0,	sys_old_mmap,		"mmap"		}, /* 90 */
-	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
-	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
-	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 93 */
-	{ 2,	0,	sys_fchmod,		"fchmod"	}, /* 94 */
-	{ -1,	0,	printargs,		"SYS_95"	}, /* 95 */
-	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
-	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
-	{ -1,	0,	printargs,		"SYS_98"	}, /* 98 */
-	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
-	{ 2,	0,	sys_fstatfs,		"fstatfs"	}, /* 100 */
-	{ -1,	0,	printargs,		"SYS_101"	}, /* 101 */
-	{ 2,	0,	sys_socketcall,		"socketcall"	}, /* 102 */
-	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
-	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
-	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
-	{ 2,	TF,	sys_stat,		"stat"		}, /* 106 */
-	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 107 */
-	{ 2,	0,	sys_fstat,		"fstat"		}, /* 108 */
-	{ -1,	0,	printargs,		"SYS_109"	}, /* 109 */
-	{ -1,	0,	printargs,		"SYS_110"	}, /* 110 */
-	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
-	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
-	{ -1,	0,	printargs,		"SYS_113"	}, /* 113 */
-	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
-	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
-	{ 5,	0,	sys_ipc,		"ipc"		}, /* 117 */
-	{ 1,	0,	sys_fsync,		"fsync"		}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
-	{ 5,	TP,	sys_clone,		"clone"		}, /* 120 */
-	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
-	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
-	{ -1,	0,	printargs,		"SYS_123"	}, /* 123 */
-	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 124 */
-	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 125 */
-	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
-	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
-	{ 2,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
-	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
-	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
-	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
-	{ 1,	0,	sys_fchdir,		"fchdir"	}, /* 133 */
-	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
-	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
-	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
-	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ -1,	0,	printargs,		"SYS_138"	}, /* 138 */
-	{ -1,	0,	printargs,		"SYS_139"	}, /* 139 */
-	{ -1,	0,	printargs,		"SYS_140"	}, /* 140 */
-	{ 3,	0,	sys_getdents,		"getdents"	}, /* 141 */
-	{ 5,	0,	sys_select,		"select"	}, /* 142 */
-	{ 2,	0,	sys_flock,		"flock"		}, /* 143 */
-	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
-	{ 3,	0,	sys_readv,		"readv"		}, /* 145 */
-	{ 3,	0,	sys_writev,		"writev"	}, /* 146 */
-	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
-	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 148 */
-	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
-	{ 2,	0,	sys_mlock,		"mlock"		}, /* 150 */
-	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
-	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
-	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
-	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
-	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 156 */
-	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 157 */
-	{ 0,	0,	sys_sched_yield,	"sched_yield"}, /* 158 */
-	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
-	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
-	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
-	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 163 */
-	{ -1,	0,	printargs,		"SYS_164"	}, /* 164 */
-	{ -1,	0,	printargs,		"SYS_165"	}, /* 165 */
-	{ -1,	0,	printargs,		"SYS_166"	}, /* 166 */
-	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
-	{ 3,	0,	sys_poll,		"poll"		}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
-	{ -1,	0,	printargs,		"SYS_170"	}, /* 170 */
-	{ -1,	0,	printargs,		"SYS_171"	}, /* 171 */
-	{ 5,	0,	printargs,		"prctl"		}, /* 172 */
-	{ 1,	TS,	sys_sigreturn,		"rt_sigreturn"	}, /* 173 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 174 */
-	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
-	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
-	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,	"rt_sigqueueinfo"}, /* 178 */
-	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
-	{ 5,	TF,	sys_pread,		"pread"		}, /* 180 */
-	{ 5,	TF,	sys_pwrite,		"pwrite"	}, /* 181 */
-	{ -1,	0,	printargs,		"SYS_182"	}, /* 182 */
-	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
-	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
-	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */
-	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	}, /* 186 */
-	{ 4,	TF,	sys_sendfile,		"sendfile"	}, /* 187 */
-	{ 5,	0,	sys_getpmsg,		"getpmsg"	}, /* 188 */
-	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 189 */
-	{ 0,	TP,	sys_vfork,		"vfork"		}, /* 190 */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 191 */
- 	{ -1,	0,	printargs,		"SYS_192"	}, /* 192 */
- 	{ -1,	0,	printargs,		"SYS_193"	}, /* 193 */
- 	{ -1,	0,	printargs,		"SYS_194"	}, /* 194 */
- 	{ -1,	0,	printargs,		"SYS_195"	}, /* 195 */
- 	{ -1,	0,	printargs,		"SYS_196"	}, /* 196 */
- 	{ -1,	0,	printargs,		"SYS_197"	}, /* 197 */
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 198 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 199 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 200 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 201 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 202 */
-	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 203 */
-	{ 2,	0,	sys_setregid,		"setregid"	}, /* 204 */
-	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 205 */
-	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 206 */
-	{ 3,	0,	sys_fchown,		"fchown"	}, /* 207 */
-	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 208 */
-	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 209 */
-	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 210 */
-	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 211 */
-	{ 3,	TF,	sys_chown,		"chown"		}, /* 212 */
-	{ 1,	0,	sys_setuid,		"setuid"	}, /* 213 */
-	{ 1,	0,	sys_setgid,		"setgid"	}, /* 214 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 215 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 216 */
-        { 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
-	{ 3,	0,	sys_mincore,	         "mincore"      }, /* 218 */
-	{ 3,	0,	sys_madvise,		"madvise"	}, /* 219 */
-	{ 3,	0,	sys_getdents64,		"getdents64"	}, /* 220 */
-	{ -1,	0,	printargs,		"SYS_221"	}, /* 221 */
-	{ 4,	0,	sys_readahead,		"readahead"	}, /* 222 */
-	{ 4,	TF,	sys_sendfile64,		"sendfile64"	}, /* 223 */
-	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 224 */
-	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 225 */
-	{ 5,	0,	sys_fsetxattr,		"fsetxattr"	}, /* 226 */
-	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 227 */
-	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 228 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"	}, /* 229 */
-	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 230 */
-	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 231 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"	}, /* 232 */
-	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 233 */
-	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 234 */
-	{ 2,	0,	sys_fremovexattr,	"fremovexattr"	}, /* 235 */
-	{ 0,	0,	printargs,		"gettid"	}, /* 236 */
-	{ 2,	TS,	sys_kill,		"tkill"		}, /* 237 */
-	{ 5,	0,	sys_futex,		"futex"		}, /* 238 */
-	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 239 */
-	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 240 */
-	{ -1,	0,	printargs,		"SYS_241"	}, /* 241 */
-	{ -1,	0,	printargs,		"SYS_242"	}, /* 242 */
-	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 243 */
-	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 244 */
-	{ 5,	0,	sys_io_getevents,		"io_getevents"	}, /* 245 */
-	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 246 */
-	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 247 */
-	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 248 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 249 */
-	{ 4,	0,	sys_epoll_ctl,		"epoll_ctl"	}, /* 250 */
-	{ 4,	0,	sys_epoll_wait,		"epoll_wait"	}, /* 251 */
-	{ 1,	0,	printargs,		"set_tid_address"}, /* 252 */
-	{ 5,	0,	printargs,		"fadvise64"	}, /* 253 */
-	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 254 */
-	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 255 */
-	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 256 */
-	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"}, /* 257 */
-	{ 1,	0,	sys_timer_delete,	"timer_delete"	}, /* 258 */
-	{ 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 259 */
-	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 260 */
-	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 261 */
-	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"}, /* 262 */
-
-	{ 5,	0,	printargs,		"SYS_263"	}, /* 263 */
-	{ 5,	0,	printargs,		"SYS_264"	}, /* 264 */
-	{ 5,	0,	printargs,		"SYS_265"	}, /* 265 */
-	{ 5,	0,	printargs,		"SYS_266"	}, /* 266 */
-	{ 5,	0,	printargs,		"SYS_267"	}, /* 267 */
-	{ 5,	0,	printargs,		"SYS_268"	}, /* 268 */
-	{ 5,	0,	printargs,		"SYS_269"	}, /* 269 */
-	{ 5,	0,	printargs,		"SYS_270"	}, /* 270 */
-	{ 5,	0,	printargs,		"SYS_271"	}, /* 271 */
-	{ 5,	0,	printargs,		"SYS_272"	}, /* 272 */
-	{ 5,	0,	printargs,		"SYS_273"	}, /* 273 */
-	{ 5,	0,	printargs,		"SYS_274"	}, /* 274 */
-	{ 5,	0,	printargs,		"SYS_275"	}, /* 275 */
-	{ 5,	0,	printargs,		"SYS_276"	}, /* 276 */
-	{ 5,	0,	printargs,		"SYS_277"	}, /* 277 */
-	{ 5,	0,	printargs,		"SYS_278"	}, /* 278 */
-	{ 5,	0,	printargs,		"SYS_279"	}, /* 279 */
-	{ 5,	0,	printargs,		"SYS_280"	}, /* 280 */
-	{ 5,	0,	printargs,		"SYS_281"	}, /* 281 */
-	{ 5,	0,	printargs,		"SYS_282"	}, /* 282 */
-	{ 5,	0,	printargs,		"SYS_283"	}, /* 283 */
-	{ 5,	0,	printargs,		"SYS_284"	}, /* 284 */
-	{ 5,	0,	printargs,		"SYS_285"	}, /* 285 */
-	{ 5,	0,	printargs,		"SYS_286"	}, /* 286 */
-	{ 5,	0,	printargs,		"SYS_287"	}, /* 287 */
-	{ 5,	0,	printargs,		"SYS_288"	}, /* 288 */
-	{ 5,	0,	printargs,		"SYS_289"	}, /* 289 */
-	{ 5,	0,	printargs,		"SYS_290"	}, /* 290 */
-	{ 5,	0,	printargs,		"SYS_291"	}, /* 291 */
-	{ 5,	0,	printargs,		"SYS_292"	}, /* 292 */
-	{ 5,	0,	printargs,		"SYS_293"	}, /* 293 */
-	{ 5,	0,	printargs,		"SYS_294"	}, /* 294 */
-	{ 5,	0,	printargs,		"SYS_295"	}, /* 295 */
-	{ 5,	0,	printargs,		"SYS_296"	}, /* 296 */
-	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
-	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
-
-#if SYS_socket_subcall != 300
- #error fix me
-#endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
-
-#if SYS_ipc_subcall != 318
- #error fix me
-#endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
diff --git a/strace/linux/sh/errnoent.h b/strace/linux/sh/errnoent.h
deleted file mode 100644
index 68b2adc..0000000
--- a/strace/linux/sh/errnoent.h
+++ /dev/null
@@ -1,529 +0,0 @@
-	"ERRNO_0", /* 0 */
-	"EPERM", /* 1 */
-	"ENOENT", /* 2 */
-	"ESRCH", /* 3 */
-	"EINTR", /* 4 */
-	"EIO", /* 5 */
-	"ENXIO", /* 6 */
-	"E2BIG", /* 7 */
-	"ENOEXEC", /* 8 */
-	"EBADF", /* 9 */
-	"ECHILD", /* 10 */
-	"EAGAIN", /* 11 */
-	"ENOMEM", /* 12 */
-	"EACCES", /* 13 */
-	"EFAULT", /* 14 */
-	"ENOTBLK", /* 15 */
-	"EBUSY", /* 16 */
-	"EEXIST", /* 17 */
-	"EXDEV", /* 18 */
-	"ENODEV", /* 19 */
-	"ENOTDIR", /* 20 */
-	"EISDIR", /* 21 */
-	"EINVAL", /* 22 */
-	"ENFILE", /* 23 */
-	"EMFILE", /* 24 */
-	"ENOTTY", /* 25 */
-	"ETXTBSY", /* 26 */
-	"EFBIG", /* 27 */
-	"ENOSPC", /* 28 */
-	"ESPIPE", /* 29 */
-	"EROFS", /* 30 */
-	"EMLINK", /* 31 */
-	"EPIPE", /* 32 */
-	"EDOM", /* 33 */
-	"ERANGE", /* 34 */
-	"EDEADLK", /* 35 */
-	"ENAMETOOLONG", /* 36 */
-	"ENOLCK", /* 37 */
-	"ENOSYS", /* 38 */
-	"ENOTEMPTY", /* 39 */
-	"ELOOP", /* 40 */
-	"ERRNO_41", /* 41 */
-	"ENOMSG", /* 42 */
-	"EIDRM", /* 43 */
-	"ECHRNG", /* 44 */
-	"EL2NSYNC", /* 45 */
-	"EL3HLT", /* 46 */
-	"EL3RST", /* 47 */
-	"ELNRNG", /* 48 */
-	"EUNATCH", /* 49 */
-	"ENOCSI", /* 50 */
-	"EL2HLT", /* 51 */
-	"EBADE", /* 52 */
-	"EBADR", /* 53 */
-	"EXFULL", /* 54 */
-	"ENOANO", /* 55 */
-	"EBADRQC", /* 56 */
-	"EBADSLT", /* 57 */
-	"ERRNO_58", /* 58 */
-	"EBFONT", /* 59 */
-	"ENOSTR", /* 60 */
-	"ENODATA", /* 61 */
-	"ETIME", /* 62 */
-	"ENOSR", /* 63 */
-	"ENONET", /* 64 */
-	"ENOPKG", /* 65 */
-	"EREMOTE", /* 66 */
-	"ENOLINK", /* 67 */
-	"EADV", /* 68 */
-	"ESRMNT", /* 69 */
-	"ECOMM", /* 70 */
-	"EPROTO", /* 71 */
-	"EMULTIHOP", /* 72 */
-	"EDOTDOT", /* 73 */
-	"EBADMSG", /* 74 */
-	"EOVERFLOW", /* 75 */
-	"ENOTUNIQ", /* 76 */
-	"EBADFD", /* 77 */
-	"EREMCHG", /* 78 */
-	"ELIBACC", /* 79 */
-	"ELIBBAD", /* 80 */
-	"ELIBSCN", /* 81 */
-	"ELIBMAX", /* 82 */
-	"ELIBEXEC", /* 83 */
-	"EILSEQ", /* 84 */
-	"ERESTART", /* 85 */
-	"ESTRPIPE", /* 86 */
-	"EUSERS", /* 87 */
-	"ENOTSOCK", /* 88 */
-	"EDESTADDRREQ", /* 89 */
-	"EMSGSIZE", /* 90 */
-	"EPROTOTYPE", /* 91 */
-	"ENOPROTOOPT", /* 92 */
-	"EPROTONOSUPPORT", /* 93 */
-	"ESOCKTNOSUPPORT", /* 94 */
-	"EOPNOTSUPP", /* 95 */
-	"EPFNOSUPPORT", /* 96 */
-	"EAFNOSUPPORT", /* 97 */
-	"EADDRINUSE", /* 98 */
-	"EADDRNOTAVAIL", /* 99 */
-	"ENETDOWN", /* 100 */
-	"ENETUNREACH", /* 101 */
-	"ENETRESET", /* 102 */
-	"ECONNABORTED", /* 103 */
-	"ECONNRESET", /* 104 */
-	"ENOBUFS", /* 105 */
-	"EISCONN", /* 106 */
-	"ENOTCONN", /* 107 */
-	"ESHUTDOWN", /* 108 */
-	"ETOOMANYREFS", /* 109 */
-	"ETIMEDOUT", /* 110 */
-	"ECONNREFUSED", /* 111 */
-	"EHOSTDOWN", /* 112 */
-	"EHOSTUNREACH", /* 113 */
-	"EALREADY", /* 114 */
-	"EINPROGRESS", /* 115 */
-	"ESTALE", /* 116 */
-	"EUCLEAN", /* 117 */
-	"ENOTNAM", /* 118 */
-	"ENAVAIL", /* 119 */
-	"EISNAM", /* 120 */
-	"EREMOTEIO", /* 121 */
-	"EDQUOT", /* 122 */
-	"ENOMEDIUM", /* 123 */
-	"EMEDIUMTYPE", /* 124 */
-	"ERRNO_125", /* 125 */
-	"ERRNO_126", /* 126 */
-	"ERRNO_127", /* 127 */
-	"ERRNO_128", /* 128 */
-	"ERRNO_129", /* 129 */
-	"ERRNO_130", /* 130 */
-	"ERRNO_131", /* 131 */
-	"ERRNO_132", /* 132 */
-	"ERRNO_133", /* 133 */
-	"ERRNO_134", /* 134 */
-	"ERRNO_135", /* 135 */
-	"ERRNO_136", /* 136 */
-	"ERRNO_137", /* 137 */
-	"ERRNO_138", /* 138 */
-	"ERRNO_139", /* 139 */
-	"ERRNO_140", /* 140 */
-	"ERRNO_141", /* 141 */
-	"ERRNO_142", /* 142 */
-	"ERRNO_143", /* 143 */
-	"ERRNO_144", /* 144 */
-	"ERRNO_145", /* 145 */
-	"ERRNO_146", /* 146 */
-	"ERRNO_147", /* 147 */
-	"ERRNO_148", /* 148 */
-	"ERRNO_149", /* 149 */
-	"ERRNO_150", /* 150 */
-	"ERRNO_151", /* 151 */
-	"ERRNO_152", /* 152 */
-	"ERRNO_153", /* 153 */
-	"ERRNO_154", /* 154 */
-	"ERRNO_155", /* 155 */
-	"ERRNO_156", /* 156 */
-	"ERRNO_157", /* 157 */
-	"ERRNO_158", /* 158 */
-	"ERRNO_159", /* 159 */
-	"ERRNO_160", /* 160 */
-	"ERRNO_161", /* 161 */
-	"ERRNO_162", /* 162 */
-	"ERRNO_163", /* 163 */
-	"ERRNO_164", /* 164 */
-	"ERRNO_165", /* 165 */
-	"ERRNO_166", /* 166 */
-	"ERRNO_167", /* 167 */
-	"ERRNO_168", /* 168 */
-	"ERRNO_169", /* 169 */
-	"ERRNO_170", /* 170 */
-	"ERRNO_171", /* 171 */
-	"ERRNO_172", /* 172 */
-	"ERRNO_173", /* 173 */
-	"ERRNO_174", /* 174 */
-	"ERRNO_175", /* 175 */
-	"ERRNO_176", /* 176 */
-	"ERRNO_177", /* 177 */
-	"ERRNO_178", /* 178 */
-	"ERRNO_179", /* 179 */
-	"ERRNO_180", /* 180 */
-	"ERRNO_181", /* 181 */
-	"ERRNO_182", /* 182 */
-	"ERRNO_183", /* 183 */
-	"ERRNO_184", /* 184 */
-	"ERRNO_185", /* 185 */
-	"ERRNO_186", /* 186 */
-	"ERRNO_187", /* 187 */
-	"ERRNO_188", /* 188 */
-	"ERRNO_189", /* 189 */
-	"ERRNO_190", /* 190 */
-	"ERRNO_191", /* 191 */
-	"ERRNO_192", /* 192 */
-	"ERRNO_193", /* 193 */
-	"ERRNO_194", /* 194 */
-	"ERRNO_195", /* 195 */
-	"ERRNO_196", /* 196 */
-	"ERRNO_197", /* 197 */
-	"ERRNO_198", /* 198 */
-	"ERRNO_199", /* 199 */
-	"ERRNO_200", /* 200 */
-	"ERRNO_201", /* 201 */
-	"ERRNO_202", /* 202 */
-	"ERRNO_203", /* 203 */
-	"ERRNO_204", /* 204 */
-	"ERRNO_205", /* 205 */
-	"ERRNO_206", /* 206 */
-	"ERRNO_207", /* 207 */
-	"ERRNO_208", /* 208 */
-	"ERRNO_209", /* 209 */
-	"ERRNO_210", /* 210 */
-	"ERRNO_211", /* 211 */
-	"ERRNO_212", /* 212 */
-	"ERRNO_213", /* 213 */
-	"ERRNO_214", /* 214 */
-	"ERRNO_215", /* 215 */
-	"ERRNO_216", /* 216 */
-	"ERRNO_217", /* 217 */
-	"ERRNO_218", /* 218 */
-	"ERRNO_219", /* 219 */
-	"ERRNO_220", /* 220 */
-	"ERRNO_221", /* 221 */
-	"ERRNO_222", /* 222 */
-	"ERRNO_223", /* 223 */
-	"ERRNO_224", /* 224 */
-	"ERRNO_225", /* 225 */
-	"ERRNO_226", /* 226 */
-	"ERRNO_227", /* 227 */
-	"ERRNO_228", /* 228 */
-	"ERRNO_229", /* 229 */
-	"ERRNO_230", /* 230 */
-	"ERRNO_231", /* 231 */
-	"ERRNO_232", /* 232 */
-	"ERRNO_233", /* 233 */
-	"ERRNO_234", /* 234 */
-	"ERRNO_235", /* 235 */
-	"ERRNO_236", /* 236 */
-	"ERRNO_237", /* 237 */
-	"ERRNO_238", /* 238 */
-	"ERRNO_239", /* 239 */
-	"ERRNO_240", /* 240 */
-	"ERRNO_241", /* 241 */
-	"ERRNO_242", /* 242 */
-	"ERRNO_243", /* 243 */
-	"ERRNO_244", /* 244 */
-	"ERRNO_245", /* 245 */
-	"ERRNO_246", /* 246 */
-	"ERRNO_247", /* 247 */
-	"ERRNO_248", /* 248 */
-	"ERRNO_249", /* 249 */
-	"ERRNO_250", /* 250 */
-	"ERRNO_251", /* 251 */
-	"ERRNO_252", /* 252 */
-	"ERRNO_253", /* 253 */
-	"ERRNO_254", /* 254 */
-	"ERRNO_255", /* 255 */
-	"ERRNO_256", /* 256 */
-	"ERRNO_257", /* 257 */
-	"ERRNO_258", /* 258 */
-	"ERRNO_259", /* 259 */
-	"ERRNO_260", /* 260 */
-	"ERRNO_261", /* 261 */
-	"ERRNO_262", /* 262 */
-	"ERRNO_263", /* 263 */
-	"ERRNO_264", /* 264 */
-	"ERRNO_265", /* 265 */
-	"ERRNO_266", /* 266 */
-	"ERRNO_267", /* 267 */
-	"ERRNO_268", /* 268 */
-	"ERRNO_269", /* 269 */
-	"ERRNO_270", /* 270 */
-	"ERRNO_271", /* 271 */
-	"ERRNO_272", /* 272 */
-	"ERRNO_273", /* 273 */
-	"ERRNO_274", /* 274 */
-	"ERRNO_275", /* 275 */
-	"ERRNO_276", /* 276 */
-	"ERRNO_277", /* 277 */
-	"ERRNO_278", /* 278 */
-	"ERRNO_279", /* 279 */
-	"ERRNO_280", /* 280 */
-	"ERRNO_281", /* 281 */
-	"ERRNO_282", /* 282 */
-	"ERRNO_283", /* 283 */
-	"ERRNO_284", /* 284 */
-	"ERRNO_285", /* 285 */
-	"ERRNO_286", /* 286 */
-	"ERRNO_287", /* 287 */
-	"ERRNO_288", /* 288 */
-	"ERRNO_289", /* 289 */
-	"ERRNO_290", /* 290 */
-	"ERRNO_291", /* 291 */
-	"ERRNO_292", /* 292 */
-	"ERRNO_293", /* 293 */
-	"ERRNO_294", /* 294 */
-	"ERRNO_295", /* 295 */
-	"ERRNO_296", /* 296 */
-	"ERRNO_297", /* 297 */
-	"ERRNO_298", /* 298 */
-	"ERRNO_299", /* 299 */
-	"ERRNO_300", /* 300 */
-	"ERRNO_301", /* 301 */
-	"ERRNO_302", /* 302 */
-	"ERRNO_303", /* 303 */
-	"ERRNO_304", /* 304 */
-	"ERRNO_305", /* 305 */
-	"ERRNO_306", /* 306 */
-	"ERRNO_307", /* 307 */
-	"ERRNO_308", /* 308 */
-	"ERRNO_309", /* 309 */
-	"ERRNO_310", /* 310 */
-	"ERRNO_311", /* 311 */
-	"ERRNO_312", /* 312 */
-	"ERRNO_313", /* 313 */
-	"ERRNO_314", /* 314 */
-	"ERRNO_315", /* 315 */
-	"ERRNO_316", /* 316 */
-	"ERRNO_317", /* 317 */
-	"ERRNO_318", /* 318 */
-	"ERRNO_319", /* 319 */
-	"ERRNO_320", /* 320 */
-	"ERRNO_321", /* 321 */
-	"ERRNO_322", /* 322 */
-	"ERRNO_323", /* 323 */
-	"ERRNO_324", /* 324 */
-	"ERRNO_325", /* 325 */
-	"ERRNO_326", /* 326 */
-	"ERRNO_327", /* 327 */
-	"ERRNO_328", /* 328 */
-	"ERRNO_329", /* 329 */
-	"ERRNO_330", /* 330 */
-	"ERRNO_331", /* 331 */
-	"ERRNO_332", /* 332 */
-	"ERRNO_333", /* 333 */
-	"ERRNO_334", /* 334 */
-	"ERRNO_335", /* 335 */
-	"ERRNO_336", /* 336 */
-	"ERRNO_337", /* 337 */
-	"ERRNO_338", /* 338 */
-	"ERRNO_339", /* 339 */
-	"ERRNO_340", /* 340 */
-	"ERRNO_341", /* 341 */
-	"ERRNO_342", /* 342 */
-	"ERRNO_343", /* 343 */
-	"ERRNO_344", /* 344 */
-	"ERRNO_345", /* 345 */
-	"ERRNO_346", /* 346 */
-	"ERRNO_347", /* 347 */
-	"ERRNO_348", /* 348 */
-	"ERRNO_349", /* 349 */
-	"ERRNO_350", /* 350 */
-	"ERRNO_351", /* 351 */
-	"ERRNO_352", /* 352 */
-	"ERRNO_353", /* 353 */
-	"ERRNO_354", /* 354 */
-	"ERRNO_355", /* 355 */
-	"ERRNO_356", /* 356 */
-	"ERRNO_357", /* 357 */
-	"ERRNO_358", /* 358 */
-	"ERRNO_359", /* 359 */
-	"ERRNO_360", /* 360 */
-	"ERRNO_361", /* 361 */
-	"ERRNO_362", /* 362 */
-	"ERRNO_363", /* 363 */
-	"ERRNO_364", /* 364 */
-	"ERRNO_365", /* 365 */
-	"ERRNO_366", /* 366 */
-	"ERRNO_367", /* 367 */
-	"ERRNO_368", /* 368 */
-	"ERRNO_369", /* 369 */
-	"ERRNO_370", /* 370 */
-	"ERRNO_371", /* 371 */
-	"ERRNO_372", /* 372 */
-	"ERRNO_373", /* 373 */
-	"ERRNO_374", /* 374 */
-	"ERRNO_375", /* 375 */
-	"ERRNO_376", /* 376 */
-	"ERRNO_377", /* 377 */
-	"ERRNO_378", /* 378 */
-	"ERRNO_379", /* 379 */
-	"ERRNO_380", /* 380 */
-	"ERRNO_381", /* 381 */
-	"ERRNO_382", /* 382 */
-	"ERRNO_383", /* 383 */
-	"ERRNO_384", /* 384 */
-	"ERRNO_385", /* 385 */
-	"ERRNO_386", /* 386 */
-	"ERRNO_387", /* 387 */
-	"ERRNO_388", /* 388 */
-	"ERRNO_389", /* 389 */
-	"ERRNO_390", /* 390 */
-	"ERRNO_391", /* 391 */
-	"ERRNO_392", /* 392 */
-	"ERRNO_393", /* 393 */
-	"ERRNO_394", /* 394 */
-	"ERRNO_395", /* 395 */
-	"ERRNO_396", /* 396 */
-	"ERRNO_397", /* 397 */
-	"ERRNO_398", /* 398 */
-	"ERRNO_399", /* 399 */
-	"ERRNO_400", /* 400 */
-	"ERRNO_401", /* 401 */
-	"ERRNO_402", /* 402 */
-	"ERRNO_403", /* 403 */
-	"ERRNO_404", /* 404 */
-	"ERRNO_405", /* 405 */
-	"ERRNO_406", /* 406 */
-	"ERRNO_407", /* 407 */
-	"ERRNO_408", /* 408 */
-	"ERRNO_409", /* 409 */
-	"ERRNO_410", /* 410 */
-	"ERRNO_411", /* 411 */
-	"ERRNO_412", /* 412 */
-	"ERRNO_413", /* 413 */
-	"ERRNO_414", /* 414 */
-	"ERRNO_415", /* 415 */
-	"ERRNO_416", /* 416 */
-	"ERRNO_417", /* 417 */
-	"ERRNO_418", /* 418 */
-	"ERRNO_419", /* 419 */
-	"ERRNO_420", /* 420 */
-	"ERRNO_421", /* 421 */
-	"ERRNO_422", /* 422 */
-	"ERRNO_423", /* 423 */
-	"ERRNO_424", /* 424 */
-	"ERRNO_425", /* 425 */
-	"ERRNO_426", /* 426 */
-	"ERRNO_427", /* 427 */
-	"ERRNO_428", /* 428 */
-	"ERRNO_429", /* 429 */
-	"ERRNO_430", /* 430 */
-	"ERRNO_431", /* 431 */
-	"ERRNO_432", /* 432 */
-	"ERRNO_433", /* 433 */
-	"ERRNO_434", /* 434 */
-	"ERRNO_435", /* 435 */
-	"ERRNO_436", /* 436 */
-	"ERRNO_437", /* 437 */
-	"ERRNO_438", /* 438 */
-	"ERRNO_439", /* 439 */
-	"ERRNO_440", /* 440 */
-	"ERRNO_441", /* 441 */
-	"ERRNO_442", /* 442 */
-	"ERRNO_443", /* 443 */
-	"ERRNO_444", /* 444 */
-	"ERRNO_445", /* 445 */
-	"ERRNO_446", /* 446 */
-	"ERRNO_447", /* 447 */
-	"ERRNO_448", /* 448 */
-	"ERRNO_449", /* 449 */
-	"ERRNO_450", /* 450 */
-	"ERRNO_451", /* 451 */
-	"ERRNO_452", /* 452 */
-	"ERRNO_453", /* 453 */
-	"ERRNO_454", /* 454 */
-	"ERRNO_455", /* 455 */
-	"ERRNO_456", /* 456 */
-	"ERRNO_457", /* 457 */
-	"ERRNO_458", /* 458 */
-	"ERRNO_459", /* 459 */
-	"ERRNO_460", /* 460 */
-	"ERRNO_461", /* 461 */
-	"ERRNO_462", /* 462 */
-	"ERRNO_463", /* 463 */
-	"ERRNO_464", /* 464 */
-	"ERRNO_465", /* 465 */
-	"ERRNO_466", /* 466 */
-	"ERRNO_467", /* 467 */
-	"ERRNO_468", /* 468 */
-	"ERRNO_469", /* 469 */
-	"ERRNO_470", /* 470 */
-	"ERRNO_471", /* 471 */
-	"ERRNO_472", /* 472 */
-	"ERRNO_473", /* 473 */
-	"ERRNO_474", /* 474 */
-	"ERRNO_475", /* 475 */
-	"ERRNO_476", /* 476 */
-	"ERRNO_477", /* 477 */
-	"ERRNO_478", /* 478 */
-	"ERRNO_479", /* 479 */
-	"ERRNO_480", /* 480 */
-	"ERRNO_481", /* 481 */
-	"ERRNO_482", /* 482 */
-	"ERRNO_483", /* 483 */
-	"ERRNO_484", /* 484 */
-	"ERRNO_485", /* 485 */
-	"ERRNO_486", /* 486 */
-	"ERRNO_487", /* 487 */
-	"ERRNO_488", /* 488 */
-	"ERRNO_489", /* 489 */
-	"ERRNO_490", /* 490 */
-	"ERRNO_491", /* 491 */
-	"ERRNO_492", /* 492 */
-	"ERRNO_493", /* 493 */
-	"ERRNO_494", /* 494 */
-	"ERRNO_495", /* 495 */
-	"ERRNO_496", /* 496 */
-	"ERRNO_497", /* 497 */
-	"ERRNO_498", /* 498 */
-	"ERRNO_499", /* 499 */
-	"ERRNO_500", /* 500 */
-	"ERRNO_501", /* 501 */
-	"ERRNO_502", /* 502 */
-	"ERRNO_503", /* 503 */
-	"ERRNO_504", /* 504 */
-	"ERRNO_505", /* 505 */
-	"ERRNO_506", /* 506 */
-	"ERRNO_507", /* 507 */
-	"ERRNO_508", /* 508 */
-	"ERRNO_509", /* 509 */
-	"ERRNO_510", /* 510 */
-	"ERRNO_511", /* 511 */
-	"ERESTARTSYS", /* 512 */
-	"ERESTARTNOINTR", /* 513 */
-	"ERESTARTNOHAND", /* 514 */
-	"ENOIOCTLCMD", /* 515 */
-	"ERRNO_516", /* 516 */
-	"ERRNO_517", /* 517 */
-	"ERRNO_518", /* 518 */
-	"ERRNO_519", /* 519 */
-	"ERRNO_520", /* 520 */
-	"EBADHANDLE", /* 521 */
-	"ENOTSYNC", /* 522 */
-	"EBADCOOKIE", /* 523 */
-	"ENOTSUPP", /* 524 */
-	"ETOOSMALL", /* 525 */
-	"ESERVERFAULT", /* 526 */
-	"EBADTYPE", /* 527 */
-	"EJUKEBOX", /* 528 */
diff --git a/strace/linux/sh/ioctlent.h b/strace/linux/sh/ioctlent.h
deleted file mode 100644
index ef8bc7b..0000000
--- a/strace/linux/sh/ioctlent.h
+++ /dev/null
@@ -1,836 +0,0 @@
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_DOS",	0x4d2},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_DOS",	0x4d3},
-	{"linux/umsdos_fs.h",	"UMSDOS_RMDIR_DOS",	0x4d4},
-	{"linux/umsdos_fs.h",	"UMSDOS_STAT_DOS",	0x4d5},
-	{"linux/umsdos_fs.h",	"UMSDOS_CREAT_EMD",	0x4d6},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_EMD",	0x4d7},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_EMD",	0x4d8},
-	{"linux/umsdos_fs.h",	"UMSDOS_GETVERSION",	0x4d9},
-	{"linux/umsdos_fs.h",	"UMSDOS_INIT_EMD",	0x4da},
-	{"linux/umsdos_fs.h",	"UMSDOS_DOS_SETUP",	0x4db},
-	{"linux/umsdos_fs.h",	"UMSDOS_RENAME_DOS",	0x4dc},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKPG",	0x1269},
-	{"linux/elevator.h",	"BLKELVGET",	0x126a},
-	{"linux/fs.h",	"BLKELVGET",	0x126a},
-	{"linux/elevator.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/fs.h",	"BLKGETSIZE64",	0x1272},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGREP",	0x4503},
-	{"linux/input.h",	"EVIOCSREP",	0x4503},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCSKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCGKEY",	0x4505},
-	{"linux/input.h",	"EVIOCGBUS",	0x4507},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCSGAIN",	0x4582},
-	{"linux/input.h",	"EVIOCSAUTOCENTER",	0x4583},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"asm/ioctls.h",	"TCGETS",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"asm/ioctls.h",	"TCSETS",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"asm/ioctls.h",	"TCSETSW",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"asm/ioctls.h",	"TCSETSF",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
-	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
-	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
-	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
-	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
-	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
-	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
-	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
-	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
-	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
-	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
-	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
-	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
-	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
-	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
-	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
-	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
-	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
-	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
-	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
-	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
-	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
-	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
-	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
-	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
-	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
-	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
-	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
-	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
-	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
-	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
-	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
-	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
-	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
-	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
-	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/watchdog.h",	"WDIOC_SETTIMEOUT",	0x5706},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_GETTHIST",	0x6164},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETFLAGS",	0x6601},
-	{"asm/ioctls.h",	"FIOCLEX",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETFLAGS",	0x6602},
-	{"asm/ioctls.h",	"FIONCLEX",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"asm/sockios.h",	"FIOGETOWN",	0x667b},
-	{"asm/sockios.h",	"FIOSETOWN",	0x667c},
-	{"asm/ioctls.h",	"FIOASYNC",	0x667d},
-	{"asm/ioctls.h",	"FIONBIO",	0x667e},
-	{"asm/ioctls.h",	"FIONREAD",	0x667f},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/i8k.h",	"I8K_BIOS_VERSION",	0x6980},
-	{"linux/i8k.h",	"I8K_MACHINE_ID",	0x6981},
-	{"linux/i8k.h",	"I8K_POWER_STATUS",	0x6982},
-	{"linux/i8k.h",	"I8K_FN_STATUS",	0x6983},
-	{"linux/i8k.h",	"I8K_GET_TEMP",	0x6984},
-	{"linux/i8k.h",	"I8K_GET_SPEED",	0x6985},
-	{"linux/i8k.h",	"I8K_GET_FAN",	0x6986},
-	{"linux/i8k.h",	"I8K_SET_FAN",	0x6987},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID2",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO_V2",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETMOUNT",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETPID",	0x7004},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLOSE_JOURNALF",	0x7006},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/intermezzo_fs.h",	"PRESTO_SET_FSETROOT",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_FSETROOT",	0x7008},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETOPT",	0x7009},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETOPT",	0x700a},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_KMLSIZE",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_RECNO",	0x700c},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETATTR",	0x7010},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CREATE",	0x7011},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_LINK",	0x7012},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_UNLINK",	0x7013},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SYMLINK",	0x7014},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKDIR",	0x7015},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RMDIR",	0x7016},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKNOD",	0x7017},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RENAME",	0x7018},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CLOSE",	0x701a},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_IOPEN",	0x701b},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETEXTATTR",	0x701c},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_DELEXTATTR",	0x701d},
-	{"linux/intermezzo_fs.h",	"PRESTO_MARK",	0x7020},
-	{"linux/intermezzo_fs.h",	"PRESTO_RELEASE_PERMIT",	0x7021},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_ALL_FSETROOTS",	0x7022},
-	{"linux/intermezzo_fs.h",	"PRESTO_BACKFETCH_LML",	0x7023},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT",	0x7024},
-	{"linux/intermezzo_fs.h",	"PRESTO_CANCEL_LML",	0x7025},
-	{"linux/intermezzo_fs.h",	"PRESTO_RESET_FSET",	0x7026},
-	{"linux/intermezzo_fs.h",	"PRESTO_COMPLETE_CLOSES",	0x7027},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_BEGIN",	0x7030},
-	{"linux/intermezzo_fs.h",	"PRESTO_DO_REINT",	0x7031},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_END",	0x7032},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"OLD_PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"asm/sockios.h",	"SIOCATMARK",	0x7307},
-	{"asm/sockios.h",	"SIOCSPGRP",	0x7308},
-	{"asm/sockios.h",	"SIOCGPGRP",	0x7309},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"asm/sockios.h",	"SIOCGSTAMP",	0x7364},
-	{"asm/ioctls.h",	"TCGETA",	0x7417},
-	{"asm/ioctls.h",	"TCSETA",	0x7418},
-	{"asm/ioctls.h",	"TCSETAW",	0x7419},
-	{"asm/ioctls.h",	"TCSETAF",	0x741c},
-	{"asm/ioctls.h",	"TCSBRK",	0x741d},
-	{"asm/ioctls.h",	"TCXONC",	0x741e},
-	{"asm/ioctls.h",	"TCFLSH",	0x741f},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"asm/ioctls.h",	"TIOCSWINSZ",	0x7467},
-	{"asm/ioctls.h",	"TIOCGWINSZ",	0x7468},
-	{"asm/ioctls.h",	"TIOCSTART",	0x746e},
-	{"asm/ioctls.h",	"TIOCSTOP",	0x746f},
-	{"asm/ioctls.h",	"TIOCOUTQ",	0x7473},
-	{"asm/ioctls.h",	"TIOCSPGRP",	0x7476},
-	{"asm/ioctls.h",	"TIOCGPGRP",	0x7477},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/sonypi.h",	"SONYPI_IOCSBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION_OLD",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION_OLD",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"OSIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/dn.h",	"OSIOCGNETADDR",	0x89e1},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/lvm.h",	"VG_CREATE_OLD",	0xfe00},
-	{"linux/lvm.h",	"VG_REMOVE",	0xfe01},
-	{"linux/lvm.h",	"VG_EXTEND",	0xfe03},
-	{"linux/lvm.h",	"VG_REDUCE",	0xfe04},
-	{"linux/lvm.h",	"VG_STATUS",	0xfe05},
-	{"linux/lvm.h",	"VG_STATUS_GET_COUNT",	0xfe06},
-	{"linux/lvm.h",	"VG_STATUS_GET_NAMELIST",	0xfe07},
-	{"linux/lvm.h",	"VG_SET_EXTENDABLE",	0xfe08},
-	{"linux/lvm.h",	"VG_RENAME",	0xfe09},
-	{"linux/lvm.h",	"VG_CREATE",	0xfe0a},
-	{"linux/lvm.h",	"LV_CREATE",	0xfe20},
-	{"linux/lvm.h",	"LV_REMOVE",	0xfe21},
-	{"linux/lvm.h",	"LV_ACTIVATE",	0xfe22},
-	{"linux/lvm.h",	"LV_DEACTIVATE",	0xfe23},
-	{"linux/lvm.h",	"LV_EXTEND",	0xfe24},
-	{"linux/lvm.h",	"LV_REDUCE",	0xfe25},
-	{"linux/lvm.h",	"LV_STATUS_BYNAME",	0xfe26},
-	{"linux/lvm.h",	"LV_STATUS_BYINDEX",	0xfe27},
-	{"linux/lvm.h",	"LV_SET_ACCESS",	0xfe28},
-	{"linux/lvm.h",	"LV_SET_ALLOCATION",	0xfe29},
-	{"linux/lvm.h",	"LV_SET_STATUS",	0xfe2a},
-	{"linux/lvm.h",	"LE_REMAP",	0xfe2b},
-	{"linux/lvm.h",	"LV_SNAPSHOT_USE_RATE",	0xfe2c},
-	{"linux/lvm.h",	"LV_STATUS_BYDEV",	0xfe2e},
-	{"linux/lvm.h",	"LV_RENAME",	0xfe2f},
-	{"linux/lvm.h",	"LV_BMAP",	0xfe30},
-	{"linux/lvm.h",	"PV_STATUS",	0xfe40},
-	{"linux/lvm.h",	"PV_CHANGE",	0xfe41},
-	{"linux/lvm.h",	"PV_FLUSH",	0xfe42},
-	{"linux/lvm.h",	"PE_LOCK_UNLOCK",	0xfe50},
-	{"linux/lvm.h",	"LVM_GET_IOP_VERSION",	0xfe98},
-	{"linux/lvm.h",	"LVM_RESET",	0xfe99},
-	{"linux/lvm.h",	"LVM_LOCK_LVM",	0xff00},
diff --git a/strace/linux/sh/signalent.h b/strace/linux/sh/signalent.h
deleted file mode 100644
index 112f746..0000000
--- a/strace/linux/sh/signalent.h
+++ /dev/null
@@ -1,33 +0,0 @@
-	"SIG_0",	/* 0 */
-	"SIGHUP",	/* 1 */
-	"SIGINT",	/* 2 */
-	"SIGQUIT",	/* 3 */
-	"SIGILL",	/* 4 */
-	"SIGTRAP",	/* 5 */
-	"SIGABRT",	/* 6 */
-	"SIGBUS",	/* 7 */
-	"SIGFPE",	/* 8 */
-	"SIGKILL",	/* 9 */
-	"SIGUSR1",	/* 10 */
-	"SIGSEGV",	/* 11 */
-	"SIGUSR2",	/* 12 */
-	"SIGPIPE",	/* 13 */
-	"SIGALRM",	/* 14 */
-	"SIGTERM",	/* 15 */
-	"SIGSTKFLT",	/* 16 */
-	"SIGCHLD",	/* 17 */
-	"SIGCONT",	/* 18 */
-	"SIGSTOP",	/* 19 */
-	"SIGTSTP",	/* 20 */
-	"SIGTTIN",	/* 21 */
-	"SIGTTOU",	/* 22 */
-	"SIGURG",	/* 23 */
-	"SIGXCPU",	/* 24 */
-	"SIGXFSZ",	/* 25 */
-	"SIGVTALRM",	/* 26 */
-	"SIGPROF",	/* 27 */
-	"SIGWINCH",	/* 28 */
-	"SIGIO",	/* 29 */
-	"SIGPWR",	/* 30 */
-	"SIGSYS",	/* 31 */
-	"SIGRTMIN",	/* 32 */
diff --git a/strace/linux/sh/syscallent.h b/strace/linux/sh/syscallent.h
deleted file mode 100644
index bb63f75..0000000
--- a/strace/linux/sh/syscallent.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * Copyright (c) 2000 PocketPenguins Inc.  Linux for Hitachi SuperH
- *                    port by Greg Banks <gbanks@pocketpenguins.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscallent.h,v 1.4 2003/11/13 22:32:28 roland Exp $
- */
-
-	{ 0,	0,	sys_setup,		"setup"		}, /* 0 */
-	{ 1,	TP,	sys_exit,		"_exit"		}, /* 1 */
-	{ 0,	TP,	sys_fork,		"fork"		}, /* 2 */
-	{ 3,	0,	sys_read,		"read"		}, /* 3 */
-	{ 3,	0,	sys_write,		"write"		}, /* 4 */
-	{ 3,	TF,	sys_open,		"open"		}, /* 5 */
-	{ 1,	0,	sys_close,		"close"		}, /* 6 */
-	{ 3,	TP,	sys_waitpid,		"waitpid"	}, /* 7 */
-	{ 2,	TF,	sys_creat,		"creat"		}, /* 8 */
-	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
-	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
-	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 11 */
-	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
-	{ 1,	0,	sys_time,		"time"		}, /* 13 */
-	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
-	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
-	{ 3,	TF,	sys_chown,		"lchown"		}, /* 16 */
-	{ 0,	0,	sys_break,		"break"		}, /* 17 */
-	{ 2,	TF,	sys_oldstat,		"oldstat"	}, /* 18 */
-	{ 3,	0,	sys_lseek,		"lseek"		}, /* 19 */
-	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
-	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
-	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
-	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 24 */
-	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
-	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
-	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
-	{ 2,	0,	sys_oldfstat,		"oldfstat"	}, /* 28 */
-	{ 0,	TS,	sys_pause,		"pause"		}, /* 29 */
-	{ 2,	TF,	sys_utime,		"utime"		}, /* 30 */
-	{ 2,	0,	sys_stty,		"stty"		}, /* 31 */
-	{ 2,	0,	sys_gtty,		"gtty"		}, /* 32 */
-	{ 2,	TF,	sys_access,		"access"	}, /* 33 */
-	{ 1,	0,	sys_nice,		"nice"		}, /* 34 */
-	{ 0,	0,	sys_ftime,		"ftime"		}, /* 35 */
-	{ 0,	0,	sys_sync,		"sync"		}, /* 36 */
-	{ 2,	TS,	sys_kill,		"kill"		}, /* 37 */
-	{ 2,	TF,	sys_rename,		"rename"	}, /* 38 */
-	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 39 */
-	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 40 */
-	{ 1,	0,	sys_dup,		"dup"		}, /* 41 */
-	{ 1,	0,	sys_pipe,		"pipe"		}, /* 42 */
-	{ 1,	0,	sys_times,		"times"		}, /* 43 */
-	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
-	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
-	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 47 */
-	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 50 */
-	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
-	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
-	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
-	{ 3,	0,	sys_ioctl,		"ioctl"		}, /* 54 */
-	{ 3,	0,	sys_fcntl,		"fcntl"		}, /* 55 */
-	{ 0,	0,	sys_mpx,		"mpx"		}, /* 56 */
-	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 57 */
-	{ 2,	0,	sys_ulimit,		"ulimit"	}, /* 58 */
-	{ 1,	0,	sys_oldolduname,	"oldolduname"	}, /* 59 */
-	{ 1,	0,	sys_umask,		"umask"		}, /* 60 */
-	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 61 */
-	{ 2,	0,	sys_ustat,		"ustat"		}, /* 62 */
-	{ 2,	0,	sys_dup2,		"dup2"		}, /* 63 */
-	{ 0,	0,	sys_getppid,		"getppid"	}, /* 64 */
-	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
-	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
-	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
-	{ 0,	TS,	sys_siggetmask,		"siggetmask"	}, /* 68 */
-	{ 1,	TS,	sys_sigsetmask,		"sigsetmask"	}, /* 69 */
-	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
-	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
-	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
-	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
-	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
-	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 75 */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 76 */
-	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 77 */
-	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 78 */
-	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 79 */
-	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 80 */
-	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 81 */
-	{ 1,	0,	sys_oldselect,		"oldselect"	}, /* 82 */
-	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 83 */
-	{ 2,	TF,	sys_oldlstat,		"oldlstat"	}, /* 84 */
-	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
-	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
-	{ 3,	0,	sys_readdir,		"readdir"	}, /* 89 */
-	{ 6,	0,	sys_old_mmap,		"old_mmap"   	}, /* 90 */
-	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
-	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
-	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 93 */
-	{ 2,	0,	sys_fchmod,		"fchmod"	}, /* 94 */
-	{ 3,	0,	sys_fchown,		"fchown"	}, /* 95 */
-	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
-	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
-	{ 4,	0,	sys_profil,		"profil"	}, /* 98 */
-	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
-	{ 2,	0,	sys_fstatfs,		"fstatfs"	}, /* 100 */
-	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
-	{ 2,	0,	sys_socketcall,		"socketcall"	}, /* 102 */
-	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
-	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
-	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
-	{ 2,	TF,	sys_stat,		"stat"		}, /* 106 */
-	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 107 */
-	{ 2,	0,	sys_fstat,		"fstat"		}, /* 108 */
-	{ 1,	0,	sys_olduname,		"olduname"	}, /* 109 */
-	{ 1,	0,	sys_iopl,		"iopl"		}, /* 110 */
-	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
-	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
-	{ 1,	0,	sys_vm86old,		"vm86old"	}, /* 113 */
-	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
-	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
-	{ 5,	0,	sys_ipc,		"ipc"		}, /* 117 */
-	{ 1,	0,	sys_fsync,		"fsync"		}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
-	{ 5,	TP,	sys_clone,		"clone"		}, /* 120 */
-	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
-	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
-	{ 3,	0,	sys_modify_ldt,		"modify_ldt"	}, /* 123 */
-	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 124 */
-	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 125 */
-	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
-	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
-	{ 2,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
-	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
-	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
-	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
-	{ 1,	0,	sys_fchdir,		"fchdir"	}, /* 133 */
-	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
-	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
-	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
-	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 139 */
-	{ 5,	0,	sys_llseek,		"_llseek"	}, /* 140 */
-	{ 3,	0,	sys_getdents,		"getdents"	}, /* 141 */
-	{ 5,	0,	sys_select,		"select"	}, /* 142 */
-	{ 2,	0,	sys_flock,		"flock"		}, /* 143 */
-	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
-	{ 3,	0,	sys_readv,		"readv"		}, /* 145 */
-	{ 3,	0,	sys_writev,		"writev"	}, /* 146 */
-	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
-	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 148 */
-	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
-	{ 1,	0,	sys_mlock,		"mlock"		}, /* 150 */
-	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
-	{ 1,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
-	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
-	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
-	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 156 */
-	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 157 */
-	{ 0,	0,	sys_sched_yield,	"sched_yield"}, /* 158 */
-	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
-	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
-	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
-	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 163 */
-	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
-	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
-	{ 5,	0,	printargs,		"vm86"		}, /* 166 */
-	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
-	{ 3,	0,	sys_poll,		"poll"		}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
-	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
-	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
-	{ 5,	0,	printargs,		"prctl"		}, /* 172 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 173 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"  }, /* 174 */
-	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
-	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
-	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
-	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
-
-	{ 6,	TF,	sys_pread,		"pread"		}, /* 180 */
-	{ 6,	TF,	sys_pwrite,		"pwrite"	}, /* 181 */
-	{ 3,	TF,	sys_chown,		"chown"		}, /* 182 */
-	{ 2,	0,	sys_getcwd,		"getcwd"	}, /* 183 */
-	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
-	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */
-	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	}, /* 186 */
-	{ 4,	TF,	sys_sendfile,		"sendfile"	}, /* 187 */
-	{ 5,	0,	printargs,		"SYS_188"	}, /* 188 */
-	{ 5,	0,	printargs,		"SYS_189"	}, /* 189 */
-	{ 0,	TP,	sys_vfork,		"vfork"		}, /* 190 */
-	{ 5,	0,	printargs,		"getrlimit"	}, /* 191 */
-	{ 6,	0,	sys_mmap,		"mmap2"		}, /* 192 */
-	{ 5,	0,	sys_truncate64,		"truncate64"	}, /* 193 */
-	{ 5,	0,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
-	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
-	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
-	{ 2,	TF,	sys_fstat64,		"fstat64"	}, /* 197 */
-/*TODO*/{ 3,	TF,	printargs,		"lchown32"	}, /* 198 */
-/*TODO*/{ 0,	0,	printargs,		"getuid32"	}, /* 199 */
-
-	{ 0,	0,	printargs,		"getgid32"	}, /* 200 */
-	{ 0,	0,	printargs,		"geteuid32"	}, /* 201 */
-	{ 0,	0,	printargs,		"getegid32"	}, /* 202 */
-	{ 2,	0,	printargs,		"setreuid32"	}, /* 203 */
-	{ 2,	0,	printargs,		"setregid32"	}, /* 204 */
-	{ 2,	0,	sys_getgroups32,	"getgroups32"	}, /* 205 */
-	{ 2,	0,	sys_setgroups32,	"setgroups32"	}, /* 206 */
-	{ 3,	0,	printargs,		"fchown32"	}, /* 207 */
-	{ 3,	0,	printargs,		"setresuid32"	}, /* 208 */
-	{ 3,	0,	printargs,		"getresuid32"	}, /* 209 */
-	{ 3,	0,	printargs,		"setresgid32"	}, /* 210 */
-	{ 3,	0,	printargs,		"getsetgid32"	}, /* 211 */
-	{ 3,	TF,	printargs,		"chown32"	}, /* 212 */
-	{ 1,	0,	printargs,		"setuid32"	}, /* 213 */
-	{ 1,	0,	printargs,		"setgid32"	}, /* 214 */
-	{ 1,	0,	printargs,		"setfsuid32"	}, /* 215 */
-	{ 1,	0,	printargs,		"setfsgid32"	}, /* 216 */
-	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
-	{ 3,	0,	printargs,		"mincore"	}, /* 218 */
-	{ 3,	0,	sys_madvise,		"madvise"	}, /* 219 */
-	{ 4,	0,	printargs,		"getdents64"	}, /* 220 */
-	{ 3,	0,	sys_fcntl,		"fcntl64"	}, /* 221 */
-	{ 4,	0,	printargs,		"SYS_222"	}, /* 222 */
-	{ 4,	0,	printargs,		"SYS_223"	}, /* 223 */
-	{ 4,	0,	printargs,		"SYS_224"	}, /* 224 */
-	{ 5,	0,	printargs,		"SYS_225"	}, /* 225 */
-	{ 5,	0,	printargs,		"SYS_226"	}, /* 226 */
-	{ 5,	0,	printargs,		"SYS_227"	}, /* 227 */
-	{ 5,	0,	printargs,		"SYS_228"	}, /* 228 */
-	{ 5,	0,	printargs,		"SYS_229"	}, /* 229 */
-
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 230 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 231 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 232 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 233 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 234 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 235 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 236 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 237 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 238 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 239 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 240 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 241 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 242 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 243 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 244 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 245 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 246 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 247 */
-	{ 5,	0,	printargs,		"SYS_248"	}, /* 248 */
-	{ 5,	0,	printargs,		"SYS_249"	}, /* 249 */
-
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 250 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 251 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 252 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 253 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 254 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 255 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 256 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 257 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 258 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 259 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 260 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 261 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 262 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 263 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 264 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 265 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 266 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 267 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 268 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 269 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 270 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 271 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 272 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 273 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 274 */
-	{ 5,	0,	printargs,		"SYS_275"	}, /* 275 */
-	{ 5,	0,	printargs,		"SYS_276"	}, /* 276 */
-	{ 5,	0,	printargs,		"SYS_277"	}, /* 277 */
-	{ 5,	0,	printargs,		"SYS_278"	}, /* 278 */
-	{ 5,	0,	printargs,		"SYS_279"	}, /* 279 */
-
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 280 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 281 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 282 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 283 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 284 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 285 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 286 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 287 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 288 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 289 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 290 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 291 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 292 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 293 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 294 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 295 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 296 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 297 */
-	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
diff --git a/strace/linux/sh64/syscallent.h b/strace/linux/sh64/syscallent.h
deleted file mode 100644
index 8701da0..0000000
--- a/strace/linux/sh64/syscallent.h
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscallent.h,v 1.2 2003/11/13 22:32:28 roland Exp $
- */
-
-	{ 0,	0,	sys_setup,		"setup"		}, /* 0 */
-	{ 1,	TP,	sys_exit,		"_exit"		}, /* 1 */
-	{ 0,	TP,	sys_fork,		"fork"		}, /* 2 */
-	{ 3,	0,	sys_read,		"read"		}, /* 3 */
-	{ 3,	0,	sys_write,		"write"		}, /* 4 */
-	{ 3,	TF,	sys_open,		"open"		}, /* 5 */
-	{ 1,	0,	sys_close,		"close"		}, /* 6 */
-	{ 3,	TP,	sys_waitpid,		"waitpid"	}, /* 7 */
-	{ 2,	TF,	sys_creat,		"creat"		}, /* 8 */
-	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
-	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
-	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 11 */
-	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
-	{ 1,	0,	sys_time,		"time"		}, /* 13 */
-	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
-	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 16 */
-	{ 0,	0,	sys_break,		"break"		}, /* 17 */
-	{ 2,	TF,	sys_oldstat,		"oldstat"	}, /* 18 */
-	{ 3,	0,	sys_lseek,		"lseek"		}, /* 19 */
-	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
-	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
-	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
-	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 24 */
-	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
-	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
-	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
-	{ 2,	0,	sys_oldfstat,		"oldfstat"	}, /* 28 */
-	{ 0,	TS,	sys_pause,		"pause"		}, /* 29 */
-	{ 2,	TF,	sys_utime,		"utime"		}, /* 30 */
-	{ 2,	0,	sys_stty,		"stty"		}, /* 31 */
-	{ 2,	0,	sys_gtty,		"gtty"		}, /* 32 */
-	{ 2,	TF,	sys_access,		"access"	}, /* 33 */
-	{ 1,	0,	sys_nice,		"nice"		}, /* 34 */
-	{ 0,	0,	sys_ftime,		"ftime"		}, /* 35 */
-	{ 0,	0,	sys_sync,		"sync"		}, /* 36 */
-	{ 2,	TS,	sys_kill,		"kill"		}, /* 37 */
-	{ 2,	TF,	sys_rename,		"rename"	}, /* 38 */
-	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 39 */
-	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 40 */
-	{ 1,	0,	sys_dup,		"dup"		}, /* 41 */
-	{ 1,	0,	sys_pipe,		"pipe"		}, /* 42 */
-	{ 1,	0,	sys_times,		"times"		}, /* 43 */
-	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
-	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
-	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 47 */
-	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 50 */
-	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
-	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
-	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
-	{ 3,	0,	sys_ioctl,		"ioctl"		}, /* 54 */
-	{ 3,	0,	sys_fcntl,		"fcntl"		}, /* 55 */
-	{ 0,	0,	sys_mpx,		"mpx"		}, /* 56 */
-	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 57 */
-	{ 2,	0,	sys_ulimit,		"ulimit"	}, /* 58 */
-	{ 1,	0,	sys_oldolduname,	"oldolduname"	}, /* 59 */
-	{ 1,	0,	sys_umask,		"umask"		}, /* 60 */
-	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 61 */
-	{ 2,	0,	sys_ustat,		"ustat"		}, /* 62 */
-	{ 2,	0,	sys_dup2,		"dup2"		}, /* 63 */
-	{ 0,	0,	sys_getppid,		"getppid"	}, /* 64 */
-	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
-	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
-	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
-	{ 0,	TS,	sys_siggetmask,		"siggetmask"	}, /* 68 */
-	{ 1,	TS,	sys_sigsetmask,		"sigsetmask"	}, /* 69 */
-	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
-	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
-	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
-	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
-	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
-	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 75 */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 76 */
-	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 77 */
-	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 78 */
-	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 79 */
-	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 80 */
-	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 81 */
-	{ 1,	0,	sys_oldselect,		"oldselect"	}, /* 82 */
-	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 83 */
-	{ 2,	TF,	sys_oldlstat,		"oldlstat"	}, /* 84 */
-	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
-	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
-	{ 3,	0,	sys_readdir,		"readdir"	}, /* 89 */
-	{ 6,	0,	sys_old_mmap,		"old_mmap"	}, /* 90 */
-	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
-	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
-	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 93 */
-	{ 2,	0,	sys_fchmod,		"fchmod"	}, /* 94 */
-	{ 3,	0,	sys_fchown,		"fchown"	}, /* 95 */
-	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
-	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
-	{ 4,	0,	sys_profil,		"profil"	}, /* 98 */
-	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
-	{ 2,	0,	sys_fstatfs,		"fstatfs"	}, /* 100 */
-	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
-	{ 2,	0,	sys_socketcall,		"socketcall"	}, /* 102 */
-	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
-	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
-	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
-	{ 2,	TF,	sys_stat,		"stat"		}, /* 106 */
-	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 107 */
-	{ 2,	0,	sys_fstat,		"fstat"		}, /* 108 */
-	{ 1,	0,	sys_olduname,		"olduname"	}, /* 109 */
-	{ 1,	0,	sys_iopl,		"iopl"		}, /* 110 */
-	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
-	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
-	{ 1,	0,	printargs,		"SYS_113"	}, /* 113 */
-	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
-	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
-	{ 5,	0,	sys_ipc,		"ipc"		}, /* 117 */
-	{ 1,	0,	sys_fsync,		"fsync"		}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
-	{ 5,	TP,	sys_clone,		"clone"		}, /* 120 */
-	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
-	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
-	{ 3,	0,	printargs,		"SYS_123"	}, /* 123 */
-	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 124 */
-	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 125 */
-	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
-	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
-	{ 2,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
-	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
-	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
-	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
-	{ 1,	0,	sys_fchdir,		"fchdir"	}, /* 133 */
-	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
-	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
-	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
-	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 139 */
-	{ 5,	0,	sys_llseek,		"_llseek"	}, /* 140 */
-	{ 3,	0,	sys_getdents,		"getdents"	}, /* 141 */
-	{ 5,	0,	sys_select,		"select"	}, /* 142 */
-	{ 2,	0,	sys_flock,		"flock"		}, /* 143 */
-	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
-	{ 3,	0,	sys_readv,		"readv"		}, /* 145 */
-	{ 3,	0,	sys_writev,		"writev"	}, /* 146 */
-	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
-	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 148 */
-	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
-	{ 1,	0,	sys_mlock,		"mlock"		}, /* 150 */
-	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
-	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
-	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
-	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
-	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 156 */
-	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 157 */
-	{ 0,	0,	sys_sched_yield,	"sched_yield"}, /* 158 */
-	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
-	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
-	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
-	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 163 */
-	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
-	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
-	{ 5,	0,	printargs,		"SYS_166"	}, /* 166 */
-	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
-	{ 3,	0,	sys_poll,		"poll"		}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
-	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
-	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
-	{ 5,	0,	printargs,		"prctl"		}, /* 172 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 173 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"  }, /* 174 */
-	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
-	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
-	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
-	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
-	{ 5,	TF,	sys_pread,		"pread"		}, /* 180 */
-	{ 5,	TF,	sys_pwrite,		"pwrite"	}, /* 181 */
-	{ 3,	TF,	sys_chown,		"chown"		}, /* 182 */
-	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
-	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
-	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */
-	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	}, /* 186 */
-	{ 4,	TF,	sys_sendfile,		"sendfile"	}, /* 187 */
-	{ 5,	0,	printargs,		"SYS_188"	}, /* 188 */
-	{ 5,	0,	printargs,		"SYS_189"	}, /* 189 */
-	{ 0,	TP,	sys_vfork,		"vfork"		}, /* 190 */
-	{ 2,	0,	printargs,		"getrlimit"	}, /* 191 */
-	{ 6,	0,	sys_mmap,		"mmap2"		}, /* 192 */
-	{ 2,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
-	{ 2,	TF,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
-	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
-	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
-	{ 2,	TF,	sys_fstat64,		"fstat64"	}, /* 197 */
-	{ 3,	TF,	sys_chown,		"lchown32"	}, /* 198 */
-	{ 0,	0,	sys_getuid,		"getuid32"	}, /* 199 */
-	{ 0,	0,	printargs,		"getgid32"	}, /* 200 */
-	{ 0,	0,	printargs,		"geteuid32"	}, /* 201 */
-	{ 0,	0,	printargs,		"getegid32"	}, /* 202 */
-	{ 2,	0,	printargs,		"setreuid32"	}, /* 203 */
-	{ 2,	0,	printargs,		"setregid32"	}, /* 204 */
-	{ 2,	0,	sys_getgroups32,	"getgroups32"	}, /* 205 */
-	{ 2,	0,	sys_setgroups32,	"setgroups32"	}, /* 206 */
-	{ 3,	0,	printargs,		"fchown32"	}, /* 207 */
-	{ 3,	0,	printargs,		"setresuid32"	}, /* 208 */
-	{ 3,	0,	printargs,		"getresuid32"	}, /* 209 */
-	{ 3,	0,	printargs,		"setresgid32"	}, /* 210 */
-	{ 3,	0,	printargs,		"getresgid32"	}, /* 211 */
-	{ 3,	TF,	printargs,		"chown32"	}, /* 212 */
-	{ 1,	0,	printargs,		"setuid32"	}, /* 213 */
-	{ 1,	0,	printargs,		"setgid32"	}, /* 214 */
-	{ 1,	0,	printargs,		"setfsuid32"	}, /* 215 */
-	{ 1,	0,	printargs,		"setfsgid32"	}, /* 216 */
-	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
-	{ 3,	0,	printargs,		"mincore"	}, /* 218 */
-	{ 3,	0,	sys_madvise,		"madvise"	}, /* 219 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 220 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 221 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 222 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 223 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 224 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 225 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 226 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 227 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 228 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 229 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 230 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 231 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 232 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 233 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 234 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 235 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 236 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 237 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 238 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 239 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 240 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 241 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 242 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 243 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 244 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 245 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 246 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 247 */
-	{ 5,	0,	printargs,		"SYS_248"	}, /* 248 */
-	{ 5,	0,	printargs,		"SYS_249"	}, /* 249 */
-	{ 5,	0,	printargs,		"SYS_250"	}, /* 250 */
-	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */
-	{ 5,	0,	printargs,		"SYS_252"	}, /* 252 */
-	{ 5,	0,	printargs,		"SYS_253"	}, /* 253 */
-	{ 5,	0,	printargs,		"SYS_254"	}, /* 254 */
-	{ 5,	0,	printargs,		"SYS_255"	}, /* 255 */
-	{ 5,	0,	printargs,		"SYS_256"	}, /* 256 */
-	{ 5,	0,	printargs,		"SYS_257"	}, /* 257 */
-	{ 5,	0,	printargs,		"SYS_258"	}, /* 258 */
-	{ 5,	0,	printargs,		"SYS_259"	}, /* 259 */
-	{ 5,	0,	printargs,		"SYS_260"	}, /* 260 */
-	{ 5,	0,	printargs,		"SYS_261"	}, /* 261 */
-	{ 5,	0,	printargs,		"SYS_262"	}, /* 262 */
-	{ 5,	0,	printargs,		"SYS_263"	}, /* 263 */
-	{ 5,	0,	printargs,		"SYS_264"	}, /* 264 */
-	{ 5,	0,	printargs,		"SYS_265"	}, /* 265 */
-	{ 5,	0,	printargs,		"SYS_266"	}, /* 266 */
-	{ 5,	0,	printargs,		"SYS_267"	}, /* 267 */
-	{ 5,	0,	printargs,		"SYS_268"	}, /* 268 */
-	{ 5,	0,	printargs,		"SYS_269"	}, /* 269 */
-	{ 5,	0,	printargs,		"SYS_270"	}, /* 270 */
-	{ 5,	0,	printargs,		"SYS_271"	}, /* 271 */
-	{ 5,	0,	printargs,		"SYS_272"	}, /* 272 */
-	{ 5,	0,	printargs,		"SYS_273"	}, /* 273 */
-	{ 5,	0,	printargs,		"SYS_274"	}, /* 274 */
-	{ 5,	0,	printargs,		"SYS_275"	}, /* 275 */
-	{ 5,	0,	printargs,		"SYS_276"	}, /* 276 */
-	{ 5,	0,	printargs,		"SYS_277"	}, /* 277 */
-	{ 5,	0,	printargs,		"SYS_278"	}, /* 278 */
-	{ 5,	0,	printargs,		"SYS_279"	}, /* 279 */
-	{ 5,	0,	printargs,		"SYS_280"	}, /* 280 */
-	{ 5,	0,	printargs,		"SYS_281"	}, /* 281 */
-	{ 5,	0,	printargs,		"SYS_282"	}, /* 282 */
-	{ 5,	0,	printargs,		"SYS_283"	}, /* 283 */
-	{ 5,	0,	printargs,		"SYS_284"	}, /* 284 */
-	{ 5,	0,	printargs,		"SYS_285"	}, /* 285 */
-	{ 5,	0,	printargs,		"SYS_286"	}, /* 286 */
-	{ 5,	0,	printargs,		"SYS_287"	}, /* 287 */
-	{ 5,	0,	printargs,		"SYS_288"	}, /* 288 */
-	{ 5,	0,	printargs,		"SYS_289"	}, /* 289 */
-	{ 5,	0,	printargs,		"SYS_290"	}, /* 290 */
-	{ 5,	0,	printargs,		"SYS_291"	}, /* 291 */
-	{ 5,	0,	printargs,		"SYS_292"	}, /* 292 */
-	{ 5,	0,	printargs,		"SYS_293"	}, /* 293 */
-	{ 5,	0,	printargs,		"SYS_294"	}, /* 294 */
-	{ 5,	0,	printargs,		"SYS_295"	}, /* 295 */
-	{ 5,	0,	printargs,		"SYS_296"	}, /* 296 */
-	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
-	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
diff --git a/strace/linux/signalent.h b/strace/linux/signalent.h
deleted file mode 100644
index 112f746..0000000
--- a/strace/linux/signalent.h
+++ /dev/null
@@ -1,33 +0,0 @@
-	"SIG_0",	/* 0 */
-	"SIGHUP",	/* 1 */
-	"SIGINT",	/* 2 */
-	"SIGQUIT",	/* 3 */
-	"SIGILL",	/* 4 */
-	"SIGTRAP",	/* 5 */
-	"SIGABRT",	/* 6 */
-	"SIGBUS",	/* 7 */
-	"SIGFPE",	/* 8 */
-	"SIGKILL",	/* 9 */
-	"SIGUSR1",	/* 10 */
-	"SIGSEGV",	/* 11 */
-	"SIGUSR2",	/* 12 */
-	"SIGPIPE",	/* 13 */
-	"SIGALRM",	/* 14 */
-	"SIGTERM",	/* 15 */
-	"SIGSTKFLT",	/* 16 */
-	"SIGCHLD",	/* 17 */
-	"SIGCONT",	/* 18 */
-	"SIGSTOP",	/* 19 */
-	"SIGTSTP",	/* 20 */
-	"SIGTTIN",	/* 21 */
-	"SIGTTOU",	/* 22 */
-	"SIGURG",	/* 23 */
-	"SIGXCPU",	/* 24 */
-	"SIGXFSZ",	/* 25 */
-	"SIGVTALRM",	/* 26 */
-	"SIGPROF",	/* 27 */
-	"SIGWINCH",	/* 28 */
-	"SIGIO",	/* 29 */
-	"SIGPWR",	/* 30 */
-	"SIGSYS",	/* 31 */
-	"SIGRTMIN",	/* 32 */
diff --git a/strace/linux/sparc/dummy2.h b/strace/linux/sparc/dummy2.h
deleted file mode 100644
index 79c7753..0000000
--- a/strace/linux/sparc/dummy2.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: dummy2.h,v 1.1.1.1 1999/02/19 00:23:09 wichert Exp $
- */
-
-/* still unfinished */
-
-#define solaris_sysmp printargs
-#define solaris_sginap printargs
-#define solaris_sgikopt printargs
-#define solaris_sysmips printargs
-#define solaris_sigreturn printargs
-#define solaris_recvmsg printargs
-#define solaris_sendmsg printargs
-#define solaris_nfssvc printargs
-#define solaris_getfh printargs
-#define solaris_async_daemon printargs
-#define solaris_exportfs printargs
-#define solaris_BSD_getime printargs
-#define solaris_sproc printargs
-#define solaris_procblk printargs
-#define solaris_sprocsp printargs
-#define solaris_msync printargs
-#define solaris_madvise printargs
-#define solaris_pagelock printargs
-#define solaris_quotactl printargs
-#define solaris_cacheflush printargs
-#define solaris_cachectl printargs
-#define solaris_nuname printargs
-#define solaris_sigpoll printargs
-#define solaris_swapctl printargs
-#define solaris_sigstack printargs
-#define solaris_sigsendset printargs
-#define solaris_priocntl printargs
-#define solaris_ksigqueue printargs
-#define solaris_lwp_sema_wait printargs
-#define solaris_memcntl printargs
-#define solaris_syscall printargs
-#define solaris_clocal printargs
-#define solaris_syssun printargs
-#define solaris_sysi86 printargs
-#define solaris_sysmachine printargs
-#define solaris_plock printargs
-#define solaris_pathconf printargs
-#define solaris_sigtimedwait printargs
-#define solaris_ulimit printargs
-#define solaris_ptrace printargs
-#define solaris_stty printargs
-#define solaris_lwp_info printargs
-#define solaris_priocntlsys printargs
-#define solaris_hrtsys printargs
-#define solaris_xenix printargs
-#define solaris_statfs printargs
-#define solaris_fstatfs printargs
-#define solaris_statvfs printargs
-#define solaris_fstatvfs printargs
-#define solaris_fork1 printargs
-#define solaris_sigsendsys printargs
-#define solaris_gtty printargs
-#define solaris_vtrace printargs
-#define solaris_fpathconf printargs
-#define solaris_evsys printargs
-#define solaris_acct printargs
-#define solaris_exec printargs
-#define solaris_lwp_sema_post printargs
-#define solaris_nfssys printargs
-#define solaris_sigaltstack printargs
-#define solaris_uadmin printargs
-#define solaris_umount printargs
-#define solaris_modctl printargs
-#define solaris_acancel printargs
-#define solaris_async printargs
-#define solaris_evtrapret printargs
-#define solaris_lwp_create printargs
-#define solaris_lwp_exit printargs
-#define solaris_lwp_suspend printargs
-#define solaris_lwp_continue printargs
-#define solaris_lwp_kill printargs
-#define solaris_lwp_self printargs
-#define solaris_lwp_setprivate printargs
-#define solaris_lwp_getprivate printargs
-#define solaris_lwp_wait printargs
-#define solaris_lwp_mutex_unlock printargs
-#define solaris_lwp_mutex_lock printargs
-#define solaris_lwp_cond_wait printargs
-#define solaris_lwp_cond_signal printargs
-#define solaris_lwp_cond_broadcast printargs
-#define solaris_llseek printargs
-#define solaris_inst_sync printargs
-#define solaris_auditsys printargs
-#define solaris_processor_bind printargs
-#define solaris_processor_info printargs
-#define solaris_p_online printargs
-#define solaris_sigqueue printargs
-#define solaris_clock_gettime printargs
-#define solaris_clock_settime printargs
-#define solaris_clock_getres printargs
-#define solaris_nanosleep printargs
-#define solaris_timer_create printargs
-#define solaris_timer_delete printargs
-#define solaris_timer_settime printargs
-#define solaris_timer_gettime printargs
-#define solaris_timer_getoverrun printargs
-#define solaris_signal printargs
-#define solaris_sigset printargs
-#define solaris_sighold printargs
-#define solaris_sigrelse printargs
-#define solaris_sigignore printargs
-#define solaris_sigpause printargs
-#define solaris_msgctl printargs
-#define solaris_msgget printargs
-#define solaris_msgrcv printargs
-#define solaris_msgsnd printargs
-#define solaris_shmat printargs
-#define solaris_shmctl printargs
-#define solaris_shmdt printargs
-#define solaris_shmget printargs
-#define solaris_semctl printargs
-#define solaris_semget printargs
-#define solaris_semop printargs
-#define solaris_olduname printargs
-#define solaris_ustat printargs
-#define solaris_fusers printargs
-#define solaris_sysfs1 printargs
-#define solaris_sysfs2 printargs
-#define solaris_sysfs3 printargs
-
-/* like another call */
-#define solaris_lchown solaris_chown
-#define solaris_setuid solaris_close
-#define solaris_seteuid solaris_close
-#define solaris_setgid solaris_close
-#define solaris_setegid solaris_close
-#define solaris_vhangup solaris_close
-#define solaris_fdsync solaris_close
-#define solaris_sigfillset solaris_sigpending
-#define solaris_vfork solaris_fork
-#define solaris_ksigaction solaris_sigaction
-#define solaris_BSDgetpgrp solaris_getpgrp
-#define solaris_BSDsetpgrp solaris_setpgrp
-#define solaris_waitsys solaris_waitid
-
-/* printargs does the right thing */
-#define solaris_sync printargs
-#define solaris_profil printargs
-#define solaris_yield printargs
-#define solaris_pause printargs
-#define solaris_sethostid printargs
-
-/* subfunction entry points */
-#define solaris_pgrpsys printargs
-#define solaris_sigcall printargs
-#define solaris_msgsys printargs
-#define solaris_shmsys printargs
-#define solaris_semsys printargs
-#define solaris_utssys printargs
-#define solaris_sysfs printargs
-#define solaris_spcall printargs
-#define solaris_context printargs
-
-/* same as linux */
-#define solaris_exit sys_exit
-#define solaris_fork sys_fork
-#define solaris_read sys_read
-#define solaris_write sys_write
-#define solaris_close sys_close
-#define solaris_creat sys_creat
-#define solaris_link sys_link
-#define solaris_unlink sys_unlink
-#define solaris_chdir sys_chdir
-#define solaris_time sys_time
-#define solaris_chmod sys_chmod
-#define solaris_lseek sys_lseek
-#define solaris_stime sys_stime
-#define solaris_alarm sys_alarm
-#define solaris_utime sys_utime
-#define solaris_access sys_access
-#define solaris_nice sys_nice
-#define solaris_dup sys_dup
-#define solaris_pipe sys_pipe
-#define solaris_times sys_times
-#define solaris_execve sys_execve
-#define solaris_umask sys_umask
-#define solaris_chroot sys_chroot
-#define solaris_rmdir sys_rmdir
-#define solaris_mkdir sys_mkdir
-#define solaris_getdents sys_getdents
-#define solaris_poll sys_poll
-#define solaris_symlink sys_symlink
-#define solaris_readlink sys_readlink
-#define solaris_setgroups sys_setgroups
-#define solaris_getgroups sys_getgroups
-#define solaris_fchmod sys_fchmod
-#define solaris_fchown sys_fchown
-#define solaris_mprotect sys_mprotect
-#define solaris_munmap sys_munmap
-#define solaris_readv sys_readv
-#define solaris_writev sys_writev
-#define solaris_chown sys_chown
-#define solaris_rename sys_rename
-#define solaris_gettimeofday sys_gettimeofday
-#define solaris_getitimer sys_getitimer
-#define solaris_setitimer sys_setitimer
-#define solaris_brk sys_brk
-#define solaris_mmap sys_mmap
-#define solaris_getsid sys_getsid
-#define solaris_setsid sys_setsid
-#define solaris_getpgid sys_getpgid
-#define solaris_setpgid sys_setpgid
-#define solaris_getpgrp sys_getpgrp
-
-/* These are handled according to current_personality */
-#define solaris_xstat sys_xstat
-#define solaris_fxstat sys_fxstat
-#define solaris_lxstat sys_lxstat
-#define solaris_xmknod sys_xmknod
-#define solaris_stat sys_stat
-#define solaris_fstat sys_fstat
-#define solaris_lstat sys_lstat
-#define solaris_pread sys_pread
-#define solaris_pwrite sys_pwrite
-#define solaris_ioctl sys_ioctl
-#define solaris_mknod sys_mknod
-
-/* To be done */
-#define solaris_mount printargs
-#define solaris_sysinfo printargs
-#define solaris_sysconfig printargs
-#define solaris_getpmsg printargs
-#define solaris_putpmsg printargs
-#define solaris_wait printargs
-#define solaris_waitid printargs
-#define solaris_sigsuspend printargs
-#define solaris_setpgrp printargs
-#define solaris_getcontext printargs
-#define solaris_setcontext printargs
-#define solaris_getpid printargs
-#define solaris_getuid printargs
-#define solaris_kill printargs
-#define solaris_getgid printargs
-#define solaris_fcntl printargs
-#define solaris_getmsg printargs
-#define solaris_putmsg printargs
-#define solaris_sigprocmask printargs
-#define solaris_sigaction printargs
-#define solaris_sigpending printargs
-#define solaris_mincore printargs
-#define solaris_fchdir printargs
-#define solaris_setrlimit printargs
-#define solaris_getrlimit printargs
-#define solaris_uname printargs
-#define solaris_adjtime printargs
-#define solaris_fchroot printargs
-#define solaris_utimes printargs
-
-#if DONE
-#define solaris_open printargs
-#endif
diff --git a/strace/linux/sparc/errnoent.h b/strace/linux/sparc/errnoent.h
deleted file mode 100644
index d243699..0000000
--- a/strace/linux/sparc/errnoent.h
+++ /dev/null
@@ -1,127 +0,0 @@
-	"ERRNO_0", /* 0 */
-	"EPERM", /* 1 */
-	"ENOENT", /* 2 */
-	"ESRCH", /* 3 */
-	"EINTR", /* 4 */
-	"EIO", /* 5 */
-	"ENXIO", /* 6 */
-	"E2BIG", /* 7 */
-	"ENOEXEC", /* 8 */
-	"EBADF", /* 9 */
-	"ECHILD", /* 10 */
-	"EAGAIN", /* 11 */
-	"ENOMEM", /* 12 */
-	"EACCES", /* 13 */
-	"EFAULT", /* 14 */
-	"ENOTBLK", /* 15 */
-	"EBUSY", /* 16 */
-	"EEXIST", /* 17 */
-	"EXDEV", /* 18 */
-	"ENODEV", /* 19 */
-	"ENOTDIR", /* 20 */
-	"EISDIR", /* 21 */
-	"EINVAL", /* 22 */
-	"ENFILE", /* 23 */
-	"EMFILE", /* 24 */
-	"ENOTTY", /* 25 */
-	"ETXTBSY", /* 26 */
-	"EFBIG", /* 27 */
-	"ENOSPC", /* 28 */
-	"ESPIPE", /* 29 */
-	"EROFS", /* 30 */
-	"EMLINK", /* 31 */
-	"EPIPE", /* 32 */
-	"EDOM", /* 33 */
-	"ERANGE", /* 34 */
-	"EWOULDBLOCK", /* 35 */
-	"EINPROGRESS", /* 36 */
-	"EALREADY", /* 37 */
-	"ENOTSOCK", /* 38 */
-	"EDESTADDRREQ", /* 39 */
-	"EMSGSIZE", /* 40 */
-	"EPROTOTYPE", /* 41 */
-	"ENOPROTOOPT", /* 42 */
-	"EPROTONOSUPPORT", /* 43 */
-	"ESOCKTNOSUPPORT", /* 44 */
-	"EOPNOTSUPP", /* 45 */
-	"EPFNOSUPPORT", /* 46 */
-	"EAFNOSUPPORT", /* 47 */
-	"EADDRINUSE", /* 48 */
-	"EADDRNOTAVAIL", /* 49 */
-	"ENETDOWN", /* 50 */
-	"ENETUNREACH", /* 51 */
-	"ENETRESET", /* 52 */
-	"ECONNABORTED", /* 53 */
-	"ECONNRESET", /* 54 */
-	"ENOBUFS", /* 55 */
-	"EISCONN", /* 56 */
-	"ENOTCONN", /* 57 */
-	"ESHUTDOWN", /* 58 */
-	"ETOOMANYREFS", /* 59 */
-	"ETIMEDOUT", /* 60 */
-	"ECONNREFUSED", /* 61 */
-	"ELOOP", /* 62 */
-	"ENAMETOOLONG", /* 63 */
-	"EHOSTDOWN", /* 64 */
-	"EHOSTUNREACH", /* 65 */
-	"ENOTEMPTY", /* 66 */
-	"EPROCLIM", /* 67 */
-	"EUSERS", /* 68 */
-	"EDQUOT", /* 69 */
-	"ESTALE", /* 70 */
-	"EREMOTE", /* 71 */
-	"ENOSTR", /* 72 */
-	"ETIME", /* 73 */
-	"ENOSR", /* 74 */
-	"ENOMSG", /* 75 */
-	"EBADMSG", /* 76 */
-	"EIDRM", /* 77 */
-	"EDEADLK", /* 78 */
-	"ENOLCK", /* 79 */
-	"ENONET", /* 80 */
-	"ERREMOTE", /* 81 */
-	"ENOLINK", /* 82 */
-	"EADV", /* 83 */
-	"ESRMNT", /* 84 */
-	"ECOMM", /* 85 */
-	"EPROTO", /* 86 */
-	"EMULTIHOP", /* 87 */
-	"EDOTDOT", /* 88 */
-	"EREMCHG", /* 89 */
-	"ENOSYS", /* 90 */
-	"ESTRPIPE", /* 91 */
-	"EOVERFLOW", /* 92 */
-	"EBADFD", /* 93 */
-	"ECHRNG", /* 94 */
-	"EL2NSYNC", /* 95 */
-	"EL3HLT", /* 96 */
-	"EL3RST", /* 97 */
-	"ELNRNG", /* 98 */
-	"EUNATCH", /* 99 */
-	"ENOCSI", /* 100 */
-	"EL2HLT", /* 101 */
-	"EBADE", /* 102 */
-	"EBADR", /* 103 */
-	"EXFULL", /* 104 */
-	"ENOANO", /* 105 */
-	"EBADRQC", /* 106 */
-	"EBADSLT", /* 107 */
-	"EDEADLOCK", /* 108 */
-	"EBFONT", /* 109 */
-	"ELIBEXEC", /* 110 */
-	"ENODATA", /* 111 */
-	"ELIBBAD", /* 112 */
-	"ENOPKG", /* 113 */
-	"ELIBACC", /* 114 */
-	"ENOTUNIQ", /* 115 */
-	"ERESTART", /* 116 */
-	"EUCLEAN", /* 117 */
-	"ENOTNAM", /* 118 */
-	"ENAVAIL", /* 119 */
-	"EISNAM", /* 120 */
-	"EREMOTEIO", /* 121 */
-	"EILSEQ", /* 122 */
-	"ELIBMAX", /* 123 */
-	"ELIBSCN", /* 124 */
-	"ENOMEDIUM", /* 125 */
-	"EMEDIUMTYPE", /* 126 */
diff --git a/strace/linux/sparc/errnoent1.h b/strace/linux/sparc/errnoent1.h
deleted file mode 100644
index 4d750bd..0000000
--- a/strace/linux/sparc/errnoent1.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../svr4/errnoent.h"
diff --git a/strace/linux/sparc/gen.pl b/strace/linux/sparc/gen.pl
deleted file mode 100644
index 1a320ee..0000000
--- a/strace/linux/sparc/gen.pl
+++ /dev/null
@@ -1,38 +0,0 @@
-open SPARC, "syscallent.h" || die "no puedo abrir el de la sparc";
-open ALPHA, "../alpha/syscallent.h" || die "no puedo abrir el de la alpha";
-open PC, "../syscallent.h" || die "no puedo abrir PC\n";
-
-while (<SPARC>) {
-    chop;
-    ($i1, $i2, $i3, $syscall, $syscall_name) = split;
-    $strn[$index]   = $syscall_name;
-    $name[$index++] = $syscall;
-}
-
-while (<ALPHA>){
-    if (/\{/) {
-	($i1, $n, $pr, $syscall) = split;
-	$par{$syscall} = $n;
-	$prr{$syscall} = $pr;
-    }
-}
-
-while (<PC>){
-    if (/\{/) {
-	($i1, $n, $pr, $syscall) = split;
-	$par{$syscall} = $n;
-	$prr{$syscall} = $pr;
-    }
-}
-
-print "missing \n";
-
-for ($i = 0; $i < $index; $i++){
-    $x = $name[$i];
-    $y = $strn[$i];
-    $n = $par{$x};
-    $p = $prr{$x};
-    $j++;
-    print "\t{ $n\t$p\t$x\t$y },\t /* $j */\n";
-}
-
diff --git a/strace/linux/sparc/ioctlent.h b/strace/linux/sparc/ioctlent.h
deleted file mode 100644
index c1d6b8a..0000000
--- a/strace/linux/sparc/ioctlent.h
+++ /dev/null
@@ -1,838 +0,0 @@
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_DOS",	0x4d2},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_DOS",	0x4d3},
-	{"linux/umsdos_fs.h",	"UMSDOS_RMDIR_DOS",	0x4d4},
-	{"linux/umsdos_fs.h",	"UMSDOS_STAT_DOS",	0x4d5},
-	{"linux/umsdos_fs.h",	"UMSDOS_CREAT_EMD",	0x4d6},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_EMD",	0x4d7},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_EMD",	0x4d8},
-	{"linux/umsdos_fs.h",	"UMSDOS_GETVERSION",	0x4d9},
-	{"linux/umsdos_fs.h",	"UMSDOS_INIT_EMD",	0x4da},
-	{"linux/umsdos_fs.h",	"UMSDOS_DOS_SETUP",	0x4db},
-	{"linux/umsdos_fs.h",	"UMSDOS_RENAME_DOS",	0x4dc},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKPG",	0x1269},
-	{"linux/elevator.h",	"BLKELVGET",	0x126a},
-	{"linux/fs.h",	"BLKELVGET",	0x126a},
-	{"linux/elevator.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/fs.h",	"BLKGETSIZE64",	0x1272},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGREP",	0x4503},
-	{"linux/input.h",	"EVIOCSREP",	0x4503},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCSKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCGKEY",	0x4505},
-	{"linux/input.h",	"EVIOCGBUS",	0x4507},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCSGAIN",	0x4582},
-	{"linux/input.h",	"EVIOCSAUTOCENTER",	0x4583},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"asm/ioctls.h",	"TCGETS",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"asm/ioctls.h",	"TCSETS",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"asm/ioctls.h",	"TCSETSW",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"asm/ioctls.h",	"TCSETSF",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"asm/ioctls.h",	"TCGETA",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"asm/ioctls.h",	"TCSETA",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"asm/ioctls.h",	"TCSETAW",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"asm/ioctls.h",	"TCSETAF",	0x5408},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"asm/ioctls.h",	"TCSBRK",	0x5409},
-	{"asm/ioctls.h",	"TCXONC",	0x540a},
-	{"asm/ioctls.h",	"TCFLSH",	0x540b},
-	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
-	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
-	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
-	{"asm/ioctls.h",	"TIOCGPGRP",	0x540f},
-	{"asm/ioctls.h",	"TIOCSPGRP",	0x5410},
-	{"asm/ioctls.h",	"TIOCOUTQ",	0x5411},
-	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
-	{"asm/ioctls.h",	"TIOCGWINSZ",	0x5413},
-	{"asm/ioctls.h",	"TIOCSWINSZ",	0x5414},
-	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
-	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
-	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
-	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
-	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
-	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
-	{"asm/ioctls.h",	"FIONREAD",	0x541b},
-	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
-	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
-	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
-	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
-	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
-	{"asm/ioctls.h",	"FIONBIO",	0x5421},
-	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
-	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
-	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
-	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
-	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
-	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
-	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
-	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
-	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
-	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
-	{"asm/ioctls.h",	"FIONCLEX",	0x5450},
-	{"asm/ioctls.h",	"FIOCLEX",	0x5451},
-	{"asm/ioctls.h",	"FIOASYNC",	0x5452},
-	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
-	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
-	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
-	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
-	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
-	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
-	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
-	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
-	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
-	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
-	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
-	{"asm/ioctls.h",	"TIOCGHAYESESP",	0x545e},
-	{"asm/ioctls.h",	"TIOCSHAYESESP",	0x545f},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/watchdog.h",	"WDIOC_SETTIMEOUT",	0x5706},
-	{"linux/watchdog.h",	"WDIOC_GETTIMEOUT",	0x5707},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_GETTHIST",	0x6164},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETFLAGS",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/i8k.h",	"I8K_BIOS_VERSION",	0x6980},
-	{"linux/i8k.h",	"I8K_MACHINE_ID",	0x6981},
-	{"linux/i8k.h",	"I8K_POWER_STATUS",	0x6982},
-	{"linux/i8k.h",	"I8K_FN_STATUS",	0x6983},
-	{"linux/i8k.h",	"I8K_GET_TEMP",	0x6984},
-	{"linux/i8k.h",	"I8K_GET_SPEED",	0x6985},
-	{"linux/i8k.h",	"I8K_GET_FAN",	0x6986},
-	{"linux/i8k.h",	"I8K_SET_FAN",	0x6987},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID2",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO_V2",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETMOUNT",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETPID",	0x7004},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLOSE_JOURNALF",	0x7006},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/intermezzo_fs.h",	"PRESTO_SET_FSETROOT",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_FSETROOT",	0x7008},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETOPT",	0x7009},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETOPT",	0x700a},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_KMLSIZE",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_RECNO",	0x700c},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETATTR",	0x7010},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CREATE",	0x7011},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_LINK",	0x7012},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_UNLINK",	0x7013},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SYMLINK",	0x7014},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKDIR",	0x7015},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RMDIR",	0x7016},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKNOD",	0x7017},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RENAME",	0x7018},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CLOSE",	0x701a},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_IOPEN",	0x701b},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETEXTATTR",	0x701c},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_DELEXTATTR",	0x701d},
-	{"linux/intermezzo_fs.h",	"PRESTO_MARK",	0x7020},
-	{"linux/intermezzo_fs.h",	"PRESTO_RELEASE_PERMIT",	0x7021},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_ALL_FSETROOTS",	0x7022},
-	{"linux/intermezzo_fs.h",	"PRESTO_BACKFETCH_LML",	0x7023},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT",	0x7024},
-	{"linux/intermezzo_fs.h",	"PRESTO_CANCEL_LML",	0x7025},
-	{"linux/intermezzo_fs.h",	"PRESTO_RESET_FSET",	0x7026},
-	{"linux/intermezzo_fs.h",	"PRESTO_COMPLETE_CLOSES",	0x7027},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_BEGIN",	0x7030},
-	{"linux/intermezzo_fs.h",	"PRESTO_DO_REINT",	0x7031},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_END",	0x7032},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"OLD_PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/sonypi.h",	"SONYPI_IOCSBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION_OLD",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION_OLD",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1CAP",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1REM",	0x7603},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2CAP",	0x7604},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2REM",	0x7605},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/sonypi.h",	"SONYPI_IOCGBATFLAGS",	0x7607},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/sonypi.h",	"SONYPI_IOCGBLUE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/sonypi.h",	"SONYPI_IOCSBLUE",	0x7609},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"OSIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/dn.h",	"OSIOCGNETADDR",	0x89e1},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/lvm.h",	"VG_CREATE_OLD",	0xfe00},
-	{"linux/lvm.h",	"VG_REMOVE",	0xfe01},
-	{"linux/lvm.h",	"VG_EXTEND",	0xfe03},
-	{"linux/lvm.h",	"VG_REDUCE",	0xfe04},
-	{"linux/lvm.h",	"VG_STATUS",	0xfe05},
-	{"linux/lvm.h",	"VG_STATUS_GET_COUNT",	0xfe06},
-	{"linux/lvm.h",	"VG_STATUS_GET_NAMELIST",	0xfe07},
-	{"linux/lvm.h",	"VG_SET_EXTENDABLE",	0xfe08},
-	{"linux/lvm.h",	"VG_RENAME",	0xfe09},
-	{"linux/lvm.h",	"VG_CREATE",	0xfe0a},
-	{"linux/lvm.h",	"LV_CREATE",	0xfe20},
-	{"linux/lvm.h",	"LV_REMOVE",	0xfe21},
-	{"linux/lvm.h",	"LV_ACTIVATE",	0xfe22},
-	{"linux/lvm.h",	"LV_DEACTIVATE",	0xfe23},
-	{"linux/lvm.h",	"LV_EXTEND",	0xfe24},
-	{"linux/lvm.h",	"LV_REDUCE",	0xfe25},
-	{"linux/lvm.h",	"LV_STATUS_BYNAME",	0xfe26},
-	{"linux/lvm.h",	"LV_STATUS_BYINDEX",	0xfe27},
-	{"linux/lvm.h",	"LV_SET_ACCESS",	0xfe28},
-	{"linux/lvm.h",	"LV_SET_ALLOCATION",	0xfe29},
-	{"linux/lvm.h",	"LV_SET_STATUS",	0xfe2a},
-	{"linux/lvm.h",	"LE_REMAP",	0xfe2b},
-	{"linux/lvm.h",	"LV_SNAPSHOT_USE_RATE",	0xfe2c},
-	{"linux/lvm.h",	"LV_STATUS_BYDEV",	0xfe2e},
-	{"linux/lvm.h",	"LV_RENAME",	0xfe2f},
-	{"linux/lvm.h",	"LV_BMAP",	0xfe30},
-	{"linux/lvm.h",	"PV_STATUS",	0xfe40},
-	{"linux/lvm.h",	"PV_CHANGE",	0xfe41},
-	{"linux/lvm.h",	"PV_FLUSH",	0xfe42},
-	{"linux/lvm.h",	"PE_LOCK_UNLOCK",	0xfe50},
-	{"linux/lvm.h",	"LVM_GET_IOP_VERSION",	0xfe98},
-	{"linux/lvm.h",	"LVM_RESET",	0xfe99},
-	{"linux/lvm.h",	"LVM_LOCK_LVM",	0xff00},
diff --git a/strace/linux/sparc/ioctlent1.h b/strace/linux/sparc/ioctlent1.h
deleted file mode 100644
index 5d536cf..0000000
--- a/strace/linux/sparc/ioctlent1.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../svr4/ioctlent.h"
diff --git a/strace/linux/sparc/signalent.h b/strace/linux/sparc/signalent.h
deleted file mode 100644
index e059b5d..0000000
--- a/strace/linux/sparc/signalent.h
+++ /dev/null
@@ -1,32 +0,0 @@
-	"SIG_0",	/* 0 */
-	"SIGHUP",	/* 1 */
-	"SIGINT",	/* 2 */
-	"SIGQUIT",	/* 3 */
-	"SIGILL",	/* 4 */
-	"SIGTRAP",	/* 5 */
-	"SIGABRT",	/* 6 */
-	"SIGEMT",	/* 7 */
-	"SIGFPE",	/* 8 */
-	"SIGKILL",	/* 9 */
-	"SIGBUS",	/* 10 */
-	"SIGSEGV",	/* 11 */
-	"SIGSYS",	/* 12 */
-	"SIGPIPE",	/* 13 */
-	"SIGALRM",	/* 14 */
-	"SIGTERM",	/* 15 */
-	"SIGURG",	/* 16 */
-	"SIGSTOP",	/* 17 */
-	"SIGTSTP",	/* 18 */
-	"SIGCONT",	/* 19 */
-	"SIGCHLD",	/* 20 */
-	"SIGTTIN",	/* 21 */
-	"SIGTTOU",	/* 22 */
-	"SIGIO",	/* 23 */
-	"SIGXCPU",	/* 24 */
-	"SIGXFSZ",	/* 25 */
-	"SIGVTALRM",	/* 26 */
-	"SIGPROF",	/* 27 */
-	"SIGWINCH",	/* 28 */
-	"SIGLOST",	/* 29 */
-	"SIGUSR1",	/* 30 */
-	"SIGUSR2",	/* 31 */
diff --git a/strace/linux/sparc/signalent1.h b/strace/linux/sparc/signalent1.h
deleted file mode 100644
index 6be7a26..0000000
--- a/strace/linux/sparc/signalent1.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../svr4/signalent.h"
diff --git a/strace/linux/sparc/syscall.h b/strace/linux/sparc/syscall.h
deleted file mode 100644
index a259842..0000000
--- a/strace/linux/sparc/syscall.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
- * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscall.h,v 1.10 2005/02/02 20:32:13 roland Exp $
- */
-#include "dummy.h"
-
-int	sys_nosys();
-int	sys_nullsys();
-int	sys_errsys();
-
-/* 1.1 processes and protection */
-int	sys_gethostid(),sys_sethostname(),sys_gethostname(),sys_getpid();
-int	sys_setdomainname(),sys_getdomainname();
-int	sys_fork(),sys_clone(),sys_exit(),sys_execv(),sys_execve(),sys_wait4(),sys_waitpid();
-int	sys_setuid(),sys_setgid(),sys_getuid(),sys_setreuid(),sys_getgid(),sys_getgroups(),sys_setregid(),sys_setgroups();
-int	sys_getpgrp(),sys_setpgrp();
-int	sys_setsid(), sys_setpgid();
-int	sys_uname(), sys_sysinfo();
-
-/* 1.2 memory management */
-int	sys_brk(),sys_sbrk(),sys_sstk();
-int	sys_getpagesize(),sys_mmap(),sys_mctl(),sys_munmap(),sys_mprotect(),sys_mincore(), sys_mremap();
-int	sys_omsync(),sys_omadvise(), sys_madvise(),sys_mlockall();
-
-/* 1.3 signals */
-int	sys_sigvec(),sys_sigblock(),sys_sigsetmask(),sys_sigpause(),sys_sigstack(),sys_sigcleanup(), sys_sigreturn();
-int	sys_kill(), sys_killpg(), sys_sigpending(), sys_signal(), sys_sigaction(), sys_sigsuspend(), sys_sigprocmask();
-
-/* 1.4 timing and statistics */
-int	sys_gettimeofday(),sys_settimeofday();
-int	sys_adjtime(), sys_adjtimex();
-int	sys_getitimer(),sys_setitimer();
-
-/* 1.5 descriptors */
-int	sys_getdtablesize(),sys_dup(),sys_dup2(),sys_close();
-int	sys_oldselect(),sys_select(),sys_getdopt(),sys_setdopt(),sys_fcntl(),sys_flock();
-int	sys_epoll_create(), sys_epoll_ctl(), sys_epoll_wait();
-
-/* 1.6 resource controls */
-int	sys_getpriority(),sys_setpriority(),sys_getrusage(),sys_getrlimit(),sys_setrlimit();
-int	sys_oldquota(), sys_quotactl();
-int	sys_rtschedule(), sys_personality();
-
-/* 1.7 system operation support */
-int	sys_mount(),sys_unmount(),sys_swapon(),sys_pivotroot();
-int	sys_sync(),sys_reboot();
-int	sys_sysacct();
-int	sys_auditsys();
-
-/* 2.1 generic operations */
-int	sys_read(),sys_write(),sys_readv(),sys_writev(),sys_ioctl();
-
-/* 2.1.1 asynch operations */
-int	sys_aioread(), sys_aiowrite(), sys_aiowait(), sys_aiocancel();
-
-/* 2.2 file system */
-int	sys_chdir(),sys_chroot();
-int	sys_fchdir(),sys_fchroot();
-int	sys_mkdir(),sys_rmdir(),sys_getdirentries();
-int	sys_getdents(), sys_getdents64(), sys_readdir();
-int	sys_creat(),sys_open(),sys_mknod(),sys_unlink(),sys_stat(),sys_fstat(),sys_lstat();
-int	sys_chown(),sys_fchown(),sys_chmod(),sys_fchmod(),sys_utimes();
-int	sys_link(),sys_symlink(),sys_readlink(),sys_rename();
-int	sys_lseek(), sys_llseek();
-int	sys_truncate(),sys_ftruncate(),sys_access(),sys_fsync(),sys_sysctl();
-int	sys_statfs(),sys_fstatfs(),sys_msync();
-int sys_stat64(), sys_lstat64(), sys_fstat64();
-int sys_truncate64(), sys_ftruncate64();
-
-
-/* 2.3 communications */
-int	sys_socket(),sys_bind(),sys_listen(),sys_accept(),sys_connect();
-int	sys_socketpair(),sys_sendto(),sys_send(),sys_recvfrom(),sys_recv();
-int	sys_sendmsg(),sys_recvmsg(),sys_shutdown(),sys_setsockopt(),sys_getsockopt();
-int	sys_getsockname(),sys_getpeername(),sys_pipe();
-
-int sys_setresuid(), sys_setresgid(), sys_getresuid(), sys_getresgid(), sys_pread();
-int sys_pwrite(), sys_getcwd();
-int sys_sigaltstack(), sys_rt_sigprocmask(), sys_rt_sigaction();
-int sys_rt_sigpending(), sys_rt_sigsuspend(), sys_rt_sigqueueinfo();
-int sys_rt_sigtimedwait(), sys_prctl(), sys_poll();
-int sys_sendfile(), sys_query_module(), sys_capget(), sys_capset();
-int sys_create_module(), sys_init_module();
-
-int	sys_umask();		/* XXX */
-
-int sys_sched_setparam(), sys_sched_getparam();
-int sys_sched_setscheduler(), sys_sched_getscheduler(), sys_sched_yield();
-int sys_sched_get_priority_max(), sys_sched_get_priority_min();
-
-/* 2.3.1 SystemV-compatible IPC */
-int	sys_semsys(), sys_semctl(), sys_semget();
-#define SYS_semsys_subcall	200
-#define SYS_semsys_nsubcalls	3
-#define SYS_semctl		(SYS_semsys_subcall + 0)
-#define SYS_semget		(SYS_semsys_subcall + 1)
-#define SYS_semop		(SYS_semsys_subcall + 2)
-int	sys_msgsys(), sys_msgget(), sys_msgctl(), sys_msgrcv(), sys_msgsnd();
-#define SYS_msgsys_subcall	203
-#define SYS_msgsys_nsubcalls	4
-#define SYS_msgget		(SYS_msgsys_subcall + 0)
-#define SYS_msgctl		(SYS_msgsys_subcall + 1)
-#define SYS_msgrcv		(SYS_msgsys_subcall + 2)
-#define SYS_msgsnd		(SYS_msgsys_subcall + 3)
-int	sys_shmsys(), sys_shmat(), sys_shmctl(), sys_shmdt(), sys_shmget();
-#define SYS_shmsys_subcall	207
-#define SYS_shmsys_nsubcalls	4
-#define	SYS_shmat		(SYS_shmsys_subcall + 0)
-#define SYS_shmctl		(SYS_shmsys_subcall + 1)
-#define SYS_shmdt		(SYS_shmsys_subcall + 2)
-#define SYS_shmget		(SYS_shmsys_subcall + 3)
-
-/* 2.4 processes */
-int	sys_ptrace();
-
-/* 2.5 terminals */
-
-/* emulations for backwards compatibility */
-int	sys_otime();		/* now use gettimeofday */
-int	sys_ostime();		/* now use settimeofday */
-int	sys_oalarm();		/* now use setitimer */
-int	sys_outime();		/* now use utimes */
-int	sys_opause();		/* now use sigpause */
-int	sys_onice();		/* now use setpriority,getpriority */
-int	sys_oftime();		/* now use gettimeofday */
-int	sys_osetpgrp();		/* ??? */
-int	sys_otimes();		/* now use getrusage */
-int	sys_ossig();		/* now use sigvec, etc */
-int	sys_ovlimit();		/* now use setrlimit,getrlimit */
-int	sys_ovtimes();		/* now use getrusage */
-int	sys_osetuid();		/* now use setreuid */
-int	sys_osetgid();		/* now use setregid */
-int	sys_ostat();		/* now use stat */
-int	sys_ofstat();		/* now use fstat */
-
-/* BEGIN JUNK */
-int	sys_profil();		/* 'cuz sys calls are interruptible */
-int	sys_vhangup();		/* should just do in sys_exit() */
-int	sys_vfork();		/* XXX - was awaiting fork w/ copy on write */
-int	sys_ovadvise();		/* awaiting new madvise */
-int	sys_indir();		/* indirect system call */
-int	sys_ustat();		/* System V compatibility */
-int	sys_owait();		/* should use wait4 interface */
-int	sys_owait3();		/* should use wait4 interface */
-int	sys_umount();		/* still more Sys V (and 4.2?) compatibility */
-int	sys_umount2();
-int	sys_pathconf();		/* posix */
-int	sys_fpathconf();		/* posix */
-int	sys_sysconf();		/* posix */
-int     sys_delete_module();
-int sys_debug();
-/* END JUNK */
-
-int	sys_vtrace();		/* kernel event tracing */
-
-/* nfs */
-int	sys_async_daemon();		/* client async daemon */
-int	sys_nfs_svc();		/* run nfs server */
-int	sys_nfs_getfh();		/* get file handle */
-int	sys_exportfs();		/* export file systems */
-
-int  	sys_rfssys();		/* RFS-related calls */
-
-int	sys_getmsg();
-int	sys_putmsg();
-int	sys_poll();
-
-int	sys_vpixsys();		/* VP/ix system calls */
-
-int	sys_sendfile64(), sys_futex(), sys_gettid(), sys_sched_setaffinity();
-int	sys_sched_getaffinity(), sys_setxattr(), sys_lsetxattr();
-int	sys_fsetxattr(), sys_getxattr(), sys_lgetxattr(), sys_fgetxattr();
-int	sys_listxattr(), sys_llistxattr(), sys_flistxattr();
-int	sys_removexattr(), sys_lremovexattr(), sys_fremovexattr();
-int	sys_remap_file_pages(), sys_readahead(), sys_tgkill(), sys_statfs64();
-int	sys_fstatfs64(), sys_clock_settime(), sys_clock_gettime();
-int	sys_clock_getres(), sys_clock_nanosleep();
-int	sys_timer_create(), sys_timer_settime(), sys_timer_gettime();
-
-#include "syscall1.h"
diff --git a/strace/linux/sparc/syscall.h.2 b/strace/linux/sparc/syscall.h.2
deleted file mode 100644
index 60c0bca..0000000
--- a/strace/linux/sparc/syscall.h.2
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscall.h.2,v 1.1.1.1 1999/02/19 00:23:14 wichert Exp $
- */
-
-#include "dummy.h"
-
-/* primary syscalls */
-
-int sys_setup(), sys_exit(), sys_fork(), sys_read(), sys_write();
-int sys_open(), sys_close(), sys_waitpid(), sys_creat(), sys_link();
-int sys_unlink(), sys_execve(), sys_chdir(), sys_time(), sys_mknod();
-int sys_chmod(), sys_chown(), sys_break(), sys_oldstat();
-int sys_lseek(), sys_getpid(), sys_mount(), sys_umount();
-int sys_setuid(), sys_getuid(), sys_stime(), sys_ptrace();
-int sys_alarm(), sys_oldfstat(), sys_pause(), sys_utime();
-int sys_stty(), sys_gtty(), sys_access(), sys_nice(), sys_ftime();
-int sys_sync(), sys_kill(), sys_rename(), sys_mkdir(), sys_rmdir();
-int sys_dup(), sys_pipe(), sys_times(), sys_prof(), sys_brk();
-int sys_setgid(), sys_getgid(), sys_signal(), sys_geteuid();
-int sys_getegid(), sys_acct(), sys_phys(), sys_lock(), sys_ioctl();
-int sys_fcntl(), sys_mpx(), sys_setpgid(), sys_ulimit();
-int sys_olduname(), sys_umask(), sys_chroot(), sys_ustat();
-int sys_dup2(), sys_getppid(), sys_getpgrp(), sys_setsid();
-int sys_sigaction(), sys_siggetmask(), sys_sigsetmask();
-int sys_setreuid(), sys_setregid(), sys_sigsuspend();
-int sys_sigpending(), sys_sethostname(), sys_setrlimit();
-int sys_getrlimit(), sys_getrusage(), sys_gettimeofday();
-int sys_settimeofday(), sys_getgroups(), sys_setgroups();
-int sys_oldselect(), sys_symlink(), sys_oldlstat(), sys_readlink();
-int sys_uselib(), sys_swapon(), sys_reboot(), sys_readdir();
-int sys_mmap(), sys_munmap(), sys_truncate(), sys_ftruncate();
-int sys_fchmod(), sys_fchown(), sys_getpriority();
-int sys_setpriority(), sys_profil(), sys_statfs(), sys_fstatfs();
-int sys_ioperm(), sys_socketcall(), sys_syslog(), sys_setitimer();
-int sys_getitimer(), sys_stat(), sys_lstat(), sys_fstat();
-int sys_uname(), sys_iopl(), sys_vhangup(), sys_idle(), sys_vm86();
-int sys_wait4(), sys_swapoff(), sys_ipc(), sys_sigreturn();
-int sys_fsync(), sys_clone(), sys_setdomainname(), sys_sysinfo();
-int sys_modify_ldt(), sys_adjtimex(), sys_mprotect();
-int sys_sigprocmask(), sys_create_module(), sys_init_module();
-int sys_delete_module(), sys_get_kernel_syms(), sys_quotactl();
-int sys_getpgid(), sys_fchdir(), sys_bdflush();
-int sys_sysfs(), sys_personality(), sys_afs_syscall();
-int sys_setfsuid(), sys_setfsgid(), sys_llseek();
-int sys_getdents(), sys_flock(), sys_msync();
-int sys_readv(), sys_writev(), sys_select();
-int sys_getsid(), sys_fdatasync(), sys_sysctl();
-int sys_mlock(), sys_munlock(), sys_mlockall(), sys_munlockall();
-int sys_sched_setparam(), sys_sched_getparam();
-int sys_sched_setscheduler(), sys_sched_getscheduler(), sys_sched_yield();
-int sys_sched_get_priority_max(), sys_sched_get_priority_min();
-int sys_sched_rr_get_interval(), sys_nanosleep(), sys_mremap();
-int sys_sendmsg(), sys_recvmsg();
-
-/* sys_socketcall subcalls */
-
-int sys_socket(), sys_bind(), sys_connect(), sys_listen();
-int sys_accept(), sys_getsockname(), sys_getpeername(), sys_socketpair();
-int sys_send(), sys_recv(), sys_sendto(), sys_recvfrom();
-int sys_shutdown(), sys_setsockopt(), sys_getsockopt();
-
-#ifndef ALPHA
-#define SYS_socket_subcall	180
-#define SYS_socket		(SYS_socket_subcall + 1)
-#define SYS_bind		(SYS_socket_subcall + 2)
-#define SYS_connect		(SYS_socket_subcall + 3)
-#define SYS_listen		(SYS_socket_subcall + 4)
-#define SYS_accept		(SYS_socket_subcall + 5)
-#define SYS_getsockname		(SYS_socket_subcall + 6)
-#define SYS_getpeername		(SYS_socket_subcall + 7)
-#define SYS_socketpair		(SYS_socket_subcall + 8)
-#define SYS_send		(SYS_socket_subcall + 9)
-#define SYS_recv		(SYS_socket_subcall + 10)
-#define SYS_sendto		(SYS_socket_subcall + 11)
-#define SYS_recvfrom		(SYS_socket_subcall + 12)
-#define SYS_shutdown		(SYS_socket_subcall + 13)
-#define SYS_setsockopt		(SYS_socket_subcall + 14)
-#define SYS_getsockopt		(SYS_socket_subcall + 15)
-
-#define SYS_socket_nsubcalls	16
-#endif /* !ALPHA */
-
-/* sys_ipc subcalls */
-
-int sys_semget(), sys_semctl();
-int sys_msgsnd(), sys_msgrcv(), sys_msgget(), sys_msgctl();
-int sys_shmat(), sys_shmdt(), sys_shmget(), sys_shmctl();
-
-#ifndef ALPHA
-#define SYS_ipc_subcall		200
-#define SYS_semop		(SYS_ipc_subcall + 1)
-#define SYS_semget		(SYS_ipc_subcall + 2)
-#define SYS_semctl		(SYS_ipc_subcall + 3)
-#define SYS_msgsnd		(SYS_ipc_subcall + 11)
-#define SYS_msgrcv		(SYS_ipc_subcall + 12)
-#define SYS_msgget		(SYS_ipc_subcall + 13)
-#define SYS_msgctl		(SYS_ipc_subcall + 14)
-#define SYS_shmat		(SYS_ipc_subcall + 21)
-#define SYS_shmdt		(SYS_ipc_subcall + 22)
-#define SYS_shmget		(SYS_ipc_subcall + 23)
-#define SYS_shmctl		(SYS_ipc_subcall + 24)
-
-#define SYS_ipc_nsubcalls	25
-#endif /* ALPHA */
-
-#ifdef ALPHA
-int osf_statfs(), osf_fstatfs(), sys_getpagesize(), sys_madvise();
-int sys_setpgrp(), sys_gethostname(), sys_getdtablesize(), sys_utimes();
-#endif
-
-int sys__llseek(), sys__newselect(), sys__sysctl(), sys_klog();
-int sys_prev_fstat(), sys_prev_lstat(), sys_prev_mknod(), sys_prev_stat();
-int sys_prev_ustat(), sys_syscall_flock(), sys_syscall_readv();
-int sys_syscall_writev();
-
-#include "syscall1.h"
diff --git a/strace/linux/sparc/syscall1.h b/strace/linux/sparc/syscall1.h
deleted file mode 100644
index 7ed7624..0000000
--- a/strace/linux/sparc/syscall1.h
+++ /dev/null
@@ -1,501 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscall1.h,v 1.1.1.1 1999/02/19 00:23:16 wichert Exp $
- */
-
-#define	SOLARIS_syscall	0
-#define	SOLARIS_exit	1
-#define	SOLARIS_fork	2
-#define	SOLARIS_read	3
-#define	SOLARIS_write	4
-#define	SOLARIS_open	5
-#define	SOLARIS_close	6
-#define	SOLARIS_wait	7
-#define	SOLARIS_creat	8
-#define	SOLARIS_link	9
-#define	SOLARIS_unlink	10
-#define	SOLARIS_exec	11
-#define	SOLARIS_chdir	12
-#define	SOLARIS_time	13
-#define	SOLARIS_mknod	14
-#define	SOLARIS_chmod	15
-#define	SOLARIS_chown	16
-#define	SOLARIS_brk		17
-#define	SOLARIS_stat	18
-#define	SOLARIS_lseek	19
-#define	SOLARIS_getpid	20
-#define	SOLARIS_mount	21
-#define	SOLARIS_umount	22
-#define	SOLARIS_setuid	23
-#define	SOLARIS_getuid	24
-#define	SOLARIS_stime	25
-#define	SOLARIS_ptrace	26
-#define	SOLARIS_alarm	27
-#define	SOLARIS_fstat	28
-#define	SOLARIS_pause	29
-#define	SOLARIS_utime	30
-#define	SOLARIS_stty	31
-#define	SOLARIS_gtty	32
-#define	SOLARIS_access	33
-#define	SOLARIS_nice	34
-#define	SOLARIS_statfs	35
-#define	SOLARIS_sync	36
-#define	SOLARIS_kill	37
-#define	SOLARIS_fstatfs	38
-#define	SOLARIS_pgrpsys	39
-#define	SOLARIS_xenix	40
-#define	SOLARIS_dup		41
-#define	SOLARIS_pipe	42
-#define	SOLARIS_times	43
-#define	SOLARIS_profil	44
-#define	SOLARIS_plock	45
-#define	SOLARIS_setgid	46
-#define	SOLARIS_getgid	47
-#define	SOLARIS_signal	48
-#define	SOLARIS_msgsys	49
-#define	SOLARIS_syssun	50
-#define	SOLARIS_acct	51
-#define	SOLARIS_shmsys	52
-#define	SOLARIS_semsys	53
-#define	SOLARIS_ioctl	54
-#define	SOLARIS_uadmin	55
-#define	SOLARIS_utssys	57
-#define	SOLARIS_fdsync	58
-#define	SOLARIS_execve	59
-#define	SOLARIS_umask	60
-#define	SOLARIS_chroot	61
-#define	SOLARIS_fcntl	62
-#define	SOLARIS_ulimit	63
-#define	SOLARIS_rmdir	79
-#define	SOLARIS_mkdir	80
-#define	SOLARIS_getdents	81
-#define	SOLARIS_sysfs	84
-#define	SOLARIS_getmsg	85
-#define	SOLARIS_putmsg	86
-#define	SOLARIS_poll	87
-#define	SOLARIS_lstat	88
-#define	SOLARIS_symlink	89
-#define	SOLARIS_readlink	90
-#define	SOLARIS_setgroups	91
-#define	SOLARIS_getgroups	92
-#define	SOLARIS_fchmod	93
-#define	SOLARIS_fchown	94
-#define	SOLARIS_sigprocmask	95
-#define	SOLARIS_sigsuspend	96
-#define	SOLARIS_sigaltstack	97
-#define	SOLARIS_sigaction	98
-#define	SOLARIS_sigpending	99
-#define	SOLARIS_context	100
-#define	SOLARIS_evsys	101
-#define	SOLARIS_evtrapret	102
-#define	SOLARIS_statvfs	103
-#define	SOLARIS_fstatvfs	104
-#define	SOLARIS_nfssys	106
-#define	SOLARIS_waitsys	107
-#define	SOLARIS_sigsendsys	108
-#define	SOLARIS_hrtsys	109
-#define	SOLARIS_acancel	110
-#define	SOLARIS_async	111
-#define	SOLARIS_priocntlsys	112
-#define	SOLARIS_pathconf	113
-#define	SOLARIS_mincore	114
-#define	SOLARIS_mmap	115
-#define	SOLARIS_mprotect	116
-#define	SOLARIS_munmap	117
-#define	SOLARIS_fpathconf	118
-#define	SOLARIS_vfork	119
-#define	SOLARIS_fchdir	120
-#define	SOLARIS_readv	121
-#define	SOLARIS_writev	122
-#define	SOLARIS_xstat	123
-#define	SOLARIS_lxstat	124
-#define	SOLARIS_fxstat	125
-#define	SOLARIS_xmknod	126
-#define	SOLARIS_clocal	127
-#define	SOLARIS_setrlimit	128
-#define	SOLARIS_getrlimit	129
-#define	SOLARIS_lchown	130
-#define	SOLARIS_memcntl	131
-#define	SOLARIS_getpmsg	132
-#define	SOLARIS_putpmsg	133
-#define	SOLARIS_rename	134
-#define	SOLARIS_uname	135
-#define	SOLARIS_setegid	136
-#define	SOLARIS_sysconfig	137
-#define	SOLARIS_adjtime	138
-#define	SOLARIS_systeminfo	139
-#define	SOLARIS_seteuid	141
-#define	SOLARIS_vtrace	142
-#define	SOLARIS_fork1	143
-#define	SOLARIS_sigtimedwait	144
-#define	SOLARIS_lwp_info	145
-#define	SOLARIS_yield	146
-#define	SOLARIS_lwp_sema_wait	147
-#define	SOLARIS_lwp_sema_post	148
-#define	SOLARIS_modctl	152
-#define	SOLARIS_fchroot	153
-#define	SOLARIS_utimes	154
-#define	SOLARIS_vhangup	155
-#define	SOLARIS_gettimeofday	156
-#define	SOLARIS_getitimer		157
-#define	SOLARIS_setitimer		158
-#define	SOLARIS_lwp_create		159
-#define	SOLARIS_lwp_exit		160
-#define	SOLARIS_lwp_suspend		161
-#define	SOLARIS_lwp_continue	162
-#define	SOLARIS_lwp_kill		163
-#define	SOLARIS_lwp_self		164
-#define	SOLARIS_lwp_setprivate	165
-#define	SOLARIS_lwp_getprivate	166
-#define	SOLARIS_lwp_wait		167
-#define	SOLARIS_lwp_mutex_unlock	168
-#define	SOLARIS_lwp_mutex_lock	169
-#define	SOLARIS_lwp_cond_wait	170
-#define	SOLARIS_lwp_cond_signal	171
-#define	SOLARIS_lwp_cond_broadcast	172
-#define	SOLARIS_pread		173
-#define	SOLARIS_pwrite		174
-#define	SOLARIS_llseek		175
-#define	SOLARIS_inst_sync		176
-#define	SOLARIS_kaio		178
-#define	SOLARIS_tsolsys		184
-#define	SOLARIS_acl			185
-#define	SOLARIS_auditsys		186
-#define	SOLARIS_processor_bind	187
-#define	SOLARIS_processor_info	188
-#define	SOLARIS_p_online		189
-#define	SOLARIS_sigqueue		190
-#define	SOLARIS_clock_gettime	191
-#define	SOLARIS_clock_settime	192
-#define	SOLARIS_clock_getres	193
-#define	SOLARIS_timer_create	194
-#define	SOLARIS_timer_delete	195
-#define	SOLARIS_timer_settime	196
-#define	SOLARIS_timer_gettime	197
-#define	SOLARIS_timer_getoverrun	198
-#define	SOLARIS_nanosleep		199
-#define	SOLARIS_facl		200
-#define	SOLARIS_door		201
-#define	SOLARIS_setreuid		202
-#define	SOLARIS_setregid		203
-#define	SOLARIS_signotifywait	210
-#define	SOLARIS_lwp_sigredirect	211
-#define	SOLARIS_lwp_alarm		212
-
-#include "dummy2.h"
-
-extern int solaris_syscall();
-extern int solaris_exit();
-extern int solaris_fork();
-extern int solaris_read();
-extern int solaris_write();
-extern int solaris_open();
-extern int solaris_close();
-extern int solaris_wait();
-extern int solaris_creat();
-extern int solaris_link();
-extern int solaris_unlink();
-extern int solaris_exec();
-extern int solaris_chdir();
-extern int solaris_time();
-extern int solaris_mknod();
-extern int solaris_chmod();
-extern int solaris_chown();
-extern int solaris_brk();
-extern int solaris_stat();
-extern int solaris_lseek();
-extern int solaris_getpid();
-extern int solaris_mount();
-extern int solaris_umount();
-extern int solaris_setuid();
-extern int solaris_getuid();
-extern int solaris_stime();
-extern int solaris_ptrace();
-extern int solaris_alarm();
-extern int solaris_fstat();
-extern int solaris_pause();
-extern int solaris_utime();
-extern int solaris_stty();
-extern int solaris_gtty();
-extern int solaris_access();
-extern int solaris_nice();
-extern int solaris_statfs();
-extern int solaris_sync();
-extern int solaris_kill();
-extern int solaris_fstatfs();
-extern int solaris_pgrpsys();
-extern int solaris_setpgrp();
-extern int solaris_xenix();
-extern int solaris_syssgi();
-extern int solaris_dup();
-extern int solaris_pipe();
-extern int solaris_times();
-extern int solaris_profil();
-extern int solaris_plock();
-extern int solaris_setgid();
-extern int solaris_getgid();
-extern int solaris_sigcall();
-extern int solaris_msgsys();
-extern int solaris_syssun();
-extern int solaris_sysi86();
-extern int solaris_sysmips();
-extern int solaris_sysmachine();
-extern int solaris_acct();
-extern int solaris_shmsys();
-extern int solaris_semsys();
-extern int solaris_ioctl();
-extern int solaris_uadmin();
-extern int solaris_utssys();
-extern int solaris_fdsync();
-extern int solaris_execve();
-extern int solaris_umask();
-extern int solaris_chroot();
-extern int solaris_fcntl();
-extern int solaris_ulimit();
-extern int solaris_rmdir();
-extern int solaris_mkdir();
-extern int solaris_getdents();
-extern int solaris_sysfs();
-extern int solaris_getmsg();
-extern int solaris_putmsg();
-extern int solaris_poll();
-extern int solaris_lstat();
-extern int solaris_symlink();
-extern int solaris_readlink();
-extern int solaris_setgroups();
-extern int solaris_getgroups();
-extern int solaris_fchmod();
-extern int solaris_fchown();
-extern int solaris_sigprocmask();
-extern int solaris_sigsuspend();
-extern int solaris_sigaltstack();
-extern int solaris_sigaction();
-extern int solaris_spcall();
-extern int solaris_context();
-extern int solaris_evsys();
-extern int solaris_evtrapret();
-extern int solaris_statvfs();
-extern int solaris_fstatvfs();
-extern int solaris_nfssys();
-extern int solaris_waitid();
-extern int solaris_sigsendsys();
-extern int solaris_hrtsys();
-extern int solaris_acancel();
-extern int solaris_async();
-extern int solaris_priocntlsys();
-extern int solaris_pathconf();
-extern int solaris_mincore();
-extern int solaris_mmap();
-extern int solaris_mprotect();
-extern int solaris_munmap();
-extern int solaris_fpathconf();
-extern int solaris_vfork();
-extern int solaris_fchdir();
-extern int solaris_readv();
-extern int solaris_writev();
-extern int solaris_xstat();
-extern int solaris_lxstat();
-extern int solaris_fxstat();
-extern int solaris_xmknod();
-extern int solaris_clocal();
-extern int solaris_setrlimit();
-extern int solaris_getrlimit();
-extern int solaris_lchown();
-extern int solaris_memcntl();
-extern int solaris_getpmsg();
-extern int solaris_putpmsg();
-extern int solaris_rename();
-extern int solaris_uname();
-extern int solaris_setegid();
-extern int solaris_sysconfig();
-extern int solaris_adjtime();
-extern int solaris_sysinfo();
-extern int solaris_seteuid();
-extern int solaris_vtrace();
-extern int solaris_fork1();
-extern int solaris_sigtimedwait();
-extern int solaris_lwp_info();
-extern int solaris_yield();
-extern int solaris_lwp_sema_wait();
-extern int solaris_lwp_sema_post();
-extern int solaris_modctl();
-extern int solaris_fchroot();
-extern int solaris_utimes();
-extern int solaris_vhangup();
-extern int solaris_gettimeofday();
-extern int solaris_getitimer();
-extern int solaris_setitimer();
-extern int solaris_lwp_create();
-extern int solaris_lwp_exit();
-extern int solaris_lwp_suspend();
-extern int solaris_lwp_continue();
-extern int solaris_lwp_kill();
-extern int solaris_lwp_self();
-extern int solaris_lwp_setprivate();
-extern int solaris_lwp_getprivate();
-extern int solaris_lwp_wait();
-extern int solaris_lwp_mutex_unlock();
-extern int solaris_lwp_mutex_lock();
-extern int solaris_lwp_cond_wait();
-extern int solaris_lwp_cond_signal();
-extern int solaris_lwp_cond_broadcast();
-extern int solaris_pread();
-extern int solaris_pwrite();
-extern int solaris_llseek();
-extern int solaris_inst_sync();
-extern int solaris_auditsys();
-extern int solaris_processor_bind();
-extern int solaris_processor_info();
-extern int solaris_p_online();
-extern int solaris_sigqueue();
-extern int solaris_clock_gettime();
-extern int solaris_clock_settime();
-extern int solaris_clock_getres();
-extern int solaris_timer_create();
-extern int solaris_timer_delete();
-extern int solaris_timer_settime();
-extern int solaris_timer_gettime();
-extern int solaris_timer_getoverrun();
-extern int solaris_nanosleep();
-
-/* solaris_pgrpsys subcalls */
-
-extern int solaris_getpgrp(), solaris_setpgrp(), solaris_getsid();
-extern int solaris_setsid(), solaris_getpgid(), solaris_setpgid();
-
-#define SOLARIS_pgrpsys_subcall	300
-#define SOLARIS_getpgrp		(SOLARIS_pgrpsys_subcall + 0)
-#define SOLARIS_setpgrp		(SOLARIS_pgrpsys_subcall + 1)
-#define SOLARIS_getsid		(SOLARIS_pgrpsys_subcall + 2)
-#define SOLARIS_setsid		(SOLARIS_pgrpsys_subcall + 3)
-#define SOLARIS_getpgid		(SOLARIS_pgrpsys_subcall + 4)
-#define SOLARIS_setpgid		(SOLARIS_pgrpsys_subcall + 5)
-
-#define SOLARIS_pgrpsys_nsubcalls	6
-
-/* solaris_sigcall subcalls */
-
-#undef SOLARIS_signal
-#define SOLARIS_sigcall		48
-
-extern int solaris_signal(), solaris_sigset(), solaris_sighold();
-extern int solaris_sigrelse(), solaris_sigignore(), solaris_sigpause();
-
-#define SOLARIS_sigcall_subcall	310
-#define SOLARIS_signal		(SOLARIS_sigcall_subcall + 0)
-#define SOLARIS_sigset		(SOLARIS_sigcall_subcall + 1)
-#define SOLARIS_sighold		(SOLARIS_sigcall_subcall + 2)
-#define SOLARIS_sigrelse		(SOLARIS_sigcall_subcall + 3)
-#define SOLARIS_sigignore		(SOLARIS_sigcall_subcall + 4)
-#define SOLARIS_sigpause		(SOLARIS_sigcall_subcall + 5)
-
-#define SOLARIS_sigcall_nsubcalls	6
-
-/* msgsys subcalls */
-
-extern int solaris_msgget(), solaris_msgctl(), solaris_msgrcv(), solaris_msgsnd();
-
-#define SOLARIS_msgsys_subcall	320
-#define SOLARIS_msgget		(SOLARIS_msgsys_subcall + 0)
-#define SOLARIS_msgctl		(SOLARIS_msgsys_subcall + 1)
-#define SOLARIS_msgrcv		(SOLARIS_msgsys_subcall + 2)
-#define SOLARIS_msgsnd		(SOLARIS_msgsys_subcall + 3)
-
-#define SOLARIS_msgsys_nsubcalls	4
-
-/* shmsys subcalls */
-
-extern int solaris_shmat(), solaris_shmctl(), solaris_shmdt(), solaris_shmget();
-
-#define SOLARIS_shmsys_subcall	330
-#define SOLARIS_shmat		(SOLARIS_shmsys_subcall + 0)
-#define SOLARIS_shmctl		(SOLARIS_shmsys_subcall + 1)
-#define SOLARIS_shmdt		(SOLARIS_shmsys_subcall + 2)
-#define SOLARIS_shmget		(SOLARIS_shmsys_subcall + 3)
-
-#define SOLARIS_shmsys_nsubcalls	4
-
-/* semsys subcalls */
-
-extern int solaris_semctl(), solaris_semget(), solaris_semop();
-
-#define SOLARIS_semsys_subcall	340
-#define SOLARIS_semctl		(SOLARIS_semsys_subcall + 0)
-#define SOLARIS_semget		(SOLARIS_semsys_subcall + 1)
-#define SOLARIS_semop		(SOLARIS_semsys_subcall + 2)
-
-#define SOLARIS_semsys_nsubcalls	3
-
-/* utssys subcalls */
-
-extern int solaris_olduname(), solaris_ustat(), solaris_fusers();
-
-#define SOLARIS_utssys_subcall	350
-
-#define SOLARIS_olduname		(SOLARIS_utssys_subcall + 0)
-				/* 1 is unused */
-#define SOLARIS_ustat		(SOLARIS_utssys_subcall + 2)
-#define SOLARIS_fusers		(SOLARIS_utssys_subcall + 3)
-
-#define SOLARIS_utssys_nsubcalls	4
-
-/* sysfs subcalls */
-
-extern int solaris_sysfs1(), solaris_sysfs2(), solaris_sysfs3();
-
-#define SOLARIS_sysfs_subcall	360
-				/* 0 is unused */
-#define SOLARIS_sysfs1		(SOLARIS_sysfs_subcall + 1)
-#define SOLARIS_sysfs2		(SOLARIS_sysfs_subcall + 2)
-#define SOLARIS_sysfs3		(SOLARIS_sysfs_subcall + 3)
-
-#define SOLARIS_sysfs_nsubcalls	4
-
-/* solaris_spcall subcalls */
-
-#undef SOLARIS_sigpending
-#define SOLARIS_spcall		99
-
-extern int solaris_sigpending(), solaris_sigfillset();
-
-#define SOLARIS_spcall_subcall	370
-				/* 0 is unused */
-#define SOLARIS_sigpending		(SOLARIS_spcall_subcall + 1)
-#define SOLARIS_sigfillset		(SOLARIS_spcall_subcall + 2)
-
-#define SOLARIS_spcall_nsubcalls	3
-
-/* solaris_context subcalls */
-
-extern int solaris_getcontext(), solaris_setcontext();
-
-#define SOLARIS_context_subcall	380
-#define SOLARIS_getcontext		(SOLARIS_context_subcall + 0)
-#define SOLARIS_setcontext		(SOLARIS_context_subcall + 1)
-
-#define SOLARIS_context_nsubcalls	2
-
diff --git a/strace/linux/sparc/syscallent.h b/strace/linux/sparc/syscallent.h
deleted file mode 100644
index 2872946..0000000
--- a/strace/linux/sparc/syscallent.h
+++ /dev/null
@@ -1,353 +0,0 @@
-	{ 1,	0,	sys_setup,	"setup" },		/* 0 */
-	{ 1,	TP,	sys_exit,	"exit" },		/* 1 */
-	{ 0,	TP,	sys_fork,	"fork" },		/* 2 */
-	{ 3,	0,	sys_read,	"read" },		/* 3 */
-	{ 3,	0,	sys_write,	"write" },		/* 4 */
-	{ 3,	TF,	sys_open,	"open" },		/* 5 */
-	{ 1,	0,	sys_close,	"close" },		/* 6 */
-	{ 4,	TP,	sys_wait4,	"wait4" },		/* 7 */
-	{ 2,	TF,	sys_creat,	"creat" },		/* 8 */
-	{ 2,	TF,	sys_link,	"link" },		/* 9 */
-	{ 1,	TF,	sys_unlink,	"unlink" },		/* 10 */
-	{ 2,    TF|TP,	sys_execv,	"execv" },		/* 11 */
-	{ 1,	TF,	sys_chdir,	"chdir" },		/* 12 */
-        { 3,    TF,     sys_chown,      "chown"},		/* 13 */
-	{ 3,	TF,	sys_mknod,	"mknod" },		/* 14 */
-	{ 2,	TF,	sys_chmod,	"chmod" },		/* 15 */
-	{ 3,	TF,	sys_chown,	"lchown" },		/* 16 */
-	{ 1,	0,	sys_brk,	"brk" },		/* 17 */
-	{ 4,	0,	printargs,	"perfctr" },		/* 18 */
-	{ 3,	0,	sys_lseek,	"lseek" },		/* 19 */
-	{ 0,	0,	sys_getpid,	"getpid" },		/* 20 */
-	{ 2,	0,	sys_capget,	"capget" },		/* 21 */
-	{ 2,	0,	sys_capset,	"capset" },		/* 22 */
-	{ 1,	0,	sys_setuid,	"setuid" },		/* 23 */
-	{ 0,	0,	sys_getuid,	"getuid" },		/* 24 */
-	{ 1,	0,	sys_time,	"time" },		/* 25 */
-	{ 5,	0,	sys_ptrace,	"ptrace" },		/* 26 */
-	{ 1,	0,	sys_alarm,	"alarm" },		/* 27 */
-	{ 2,	TS,	sys_sigaltstack,"sigaltstack" },	/* 28 */
-	{ 0,	TS,	sys_pause,	"pause" },		/* 29 */
-	{ 2,	TF,	sys_utime,	"utime" },		/* 30 */
-	{ 3,	TF,	sys_chown,	"lchown32" },		/* 31 */
-	{ 3,	0,	sys_fchown,	"fchown32" },		/* 32 */
-	{ 2,	TF,	sys_access,	"access" },		/* 33 */
-	{ 1,	0,	sys_nice,	"nice" },		/* 34 */
-	{ 3,	TF,	sys_chown,	"chown32" },		/* 35 */
-	{ 0,	0,	sys_sync,	"sync" },		/* 36 */
-	{ 2,	TS,	sys_kill,	"kill" },		/* 37 */
-	{ 2,	TF,	sys_stat,	"stat" },		/* 38 */
-	{ 4,	TF,	sys_sendfile,	"sendfile" },		/* 39 */
-	{ 2,	TF,	sys_lstat,	"lstat" },		/* 40 */
-	{ 2,	0,	sys_dup,	"dup" },		/* 41 */
-	{ 0,	0,	sys_pipe,	"pipe" },		/* 42 */
-	{ 1,	0,	sys_times,	"times" },		/* 43 */
-	{ 0,	0,	sys_getuid,	"getuid32" },		/* 44 */
-	{ 2,	TF,	sys_umount2,	"umount" },		/* 45 */
-	{ 1,	0,	sys_setgid,	"setgid" },		/* 46 */
-	{ 0,	0,	sys_getgid,	"getgid" },		/* 47 */
-	{ 3,	TS,	sys_signal,	"signal" },		/* 48 */
-	{ 0,	0,	sys_geteuid,	"geteuid" },		/* 49 */
-	{ 0,	0,	sys_getegid,	"getegid" },		/* 50 */
-	{ 1,	TF,	sys_acct,	"acct" },		/* 51 */
-	{ 2,	0,	printargs,	"memory_ordering" },	/* 52 */
-	{ 0,	0,	sys_getgid,	"getgid32" },		/* 53 */
-	{ 3,	0,	sys_ioctl,	"ioctl" },		/* 54 */
-	{ 3,	0,	sys_reboot,	"reboot" },		/* 55 */
-	{ 6,	0,	sys_mmap,	"mmap2" },		/* 56 */
-	{ 2,	TF,	sys_symlink,	"symlink" },		/* 57 */
-	{ 3,	TF,	sys_readlink,	"readlink" },		/* 58 */
-	{ 3,	TF|TP,	sys_execve,	"execve" },		/* 59 */
-	{ 1,	0,	sys_umask,	"umask" },		/* 60 */
-	{ 1,	TF,	sys_chroot,	"chroot" },		/* 61 */
-	{ 2,	0,	sys_fstat,	"fstat" },		/* 62 */
-	{ 2,	TF,	sys_fstat64,	"fstat64" },		/* 63 */
-	{ 0,	0,	sys_getpagesize,"getpagesize" },	/* 64 */
-	{ 3,	0,	sys_msync,	"msync" },		/* 65 */
-	{ 0,	TP,	sys_vfork,	"vfork" },		/* 66 */
-	{ 5,	TF,	sys_pread,	"pread" },		/* 67 */
-	{ 5,	TF,	sys_pwrite,	"pwrite" },		/* 68 */
-	{ 0,    0,	sys_geteuid,	"geteuid32" },		/* 69 */
-	{ 0,	0,	sys_getegid,	"getegid32" },		/* 70 */
-	{ 6,	0,	sys_mmap,	"mmap" },		/* 71 */
-	{ 2,	0,	sys_setreuid,	"setreuid32" },		/* 72 */
-	{ 2,	0,	sys_munmap,	"munmap" },		/* 73 */
-	{ 3,	0,	sys_mprotect,	"mprotect" },		/* 74 */
-	{ 3,	0,	sys_madvise,	"madvise" },		/* 75 */
-	{ 0,	0,	sys_vhangup,	"vhangup" },		/* 76 */
-	{ 3,	TF,	sys_truncate64,	"truncate64" },		/* 77 */
-	{ 3,	0,	sys_mincore,	"mincore" },		/* 78 */
-	{ 2,	0,	sys_getgroups,	"getgroups" },		/* 79 */
-	{ 2,	0,	sys_setgroups,	"setgroups" },		/* 80 */
-	{ 0,	0,	sys_getpgrp,	"getpgrp" },		/* 81 */
-	{ 2,	0,	sys_setgroups,	"setgroups32" },	/* 82 */
-	{ 3,	0,	sys_setitimer,	"setitimer" },		/* 83 */
-	{ 2,	0,	sys_ftruncate,	"ftruncate64" },	/* 84 */
-	{ 1,	TF,	sys_swapon,	"swapon" },		/* 85 */
-	{ 2,	0,	sys_getitimer,	"getitimer" },		/* 86 */
-	{ 1,	0,	sys_setuid,	"setuid32" },		/* 87 */
-	{ 2,	0,	sys_sethostname,"sethostname" },	/* 88 */
-	{ 1,	0,	sys_setgid,	"setgid32" },		/* 89 */
-	{ 2,	0,	sys_dup2,	"dup2" },		/* 90 */
-	{ 1,	0,	sys_setfsuid,	"setfsuid32" },		/* 91 */
-	{ 3,	0,	sys_fcntl,	"fcntl" },		/* 92 */
-	{ 5,	0,	sys_select,	"select" },		/* 93 */
-	{ 1,	0,	sys_setfsgid,	"setfsgid32" },		/* 94 */
-	{ 1,	0,	sys_fsync,	"fsync" },		/* 95 */
-	{ 3,	0,	sys_setpriority,"setpriority" },	/* 96 */
-	{ 3,	TN,	sys_socket,	"socket" },		/* 97 */
-	{ 3,	TN,	sys_connect,	"connect" },		/* 98 */
-	{ 3,	TN,	sys_accept,	"accept" },		/* 99 */
-	{ 2,	0,	sys_getpriority,"getpriority" },	/* 100 */
-	{ 1,	TS,	printargs,	"rt_sigreturn" },	/* 101 */
-	{ 4,	TS,	sys_rt_sigaction,"rt_sigaction" },	/* 102 */
-	{ 4,	TS,	sys_rt_sigprocmask,"rt_sigprocmask" },	/* 103 */
-	{ 2,	TS,	sys_rt_sigpending,"rt_sigpending" },	/* 104 */
-	{ 4,	TS,	sys_rt_sigtimedwait,"rt_sigtimedwait" },/* 105 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,"rt_sigqueueinfo" },/* 106 */
-	{ 2,	TS,	sys_rt_sigsuspend,"rt_sigsuspend" },	/* 107 */
-	{ 3,	TS,	sys_setresuid,	"setresuid" },		/* 108 */
-	{ 3,    TS,	sys_getresuid,	"getresuid" },		/* 109 */
-	{ 3,	TS,	sys_setresgid,	"setresgid" },		/* 110 */
-	{ 3,	TS,	sys_getresgid,	"getresgid" },		/* 111 */
-	{ 2,	TS,	sys_setresgid,	"setresgid32" },	/* 112 */
-	{ 5,	TN,	sys_recvmsg,	"recvmsg" },		/* 113 */
-	{ 5,	TN,	sys_sendmsg,	"sendmsg" },		/* 114 */
-	{ 2,	0,	sys_getgroups,	"getgroups32" },	/* 115 */
-	{ 2,	0,	sys_gettimeofday,"gettimeofday" },	/* 116 */
-	{ 2,	0,	sys_getrusage,	"getrusage" },		/* 117 */
-	{ 5,	TN,	sys_getsockopt,	"getsockopt" },		/* 118 */
-	{ 2,	TF,	sys_getcwd,	"getcwd" },		/* 119 */
-	{ 3,	0,	sys_readv,	"readv" },		/* 120 */
-	{ 3,	0,	sys_writev,	"writev" },		/* 121 */
-	{ 2,	0,	sys_settimeofday,"settimeofday" },	/* 122 */
-	{ 3,	0,	sys_fchown,	"fchown" },		/* 123 */
-	{ 2,	0,	sys_fchmod,	"fchmod" },		/* 124 */
-	{ 6,	TN,	sys_recvfrom,	"recvfrom" },		/* 125 */
-	{ 2,	0,	sys_setreuid,	"setreuid" },		/* 126 */
-	{ 2,	0,	sys_setregid,	"setregid" },		/* 127 */
-	{ 2,	TF,	sys_rename,	"rename" },		/* 128 */
-	{ 2,	TF,	sys_truncate,	"truncate" },		/* 129 */
-	{ 2,	0,	sys_ftruncate,	"ftruncate" },		/* 130 */
-	{ 2,	0,	sys_flock,	"flock" },		/* 131 */
-	{ 2,	TF,	sys_lstat64,	"lstat64" },		/* 132 */
-	{ 6,	TN,	sys_sendto,	"sendto" },		/* 133 */
-	{ 2,	TN,	sys_shutdown,	"shutdown" },		/* 134 */
-	{ 4,	TN,	sys_socketpair,	"socketpair" },		/* 135 */
-	{ 2,	TF,	sys_mkdir,	"mkdir" },		/* 136 */
-	{ 1,	TF,	sys_rmdir,	"rmdir" },		/* 137 */
-	{ 2,	TF,	sys_utimes,	"utimes" },		/* 138 */
-	{ 2,	TF,	sys_stat64,	"stat64" },		/* 139 */
-	{ 4,    TF,	sys_sendfile64,	"sendfile64" },		/* 140 */
-	{ 3,	TN,	sys_getpeername,"getpeername" },	/* 141 */
-	{ 5,    0,	sys_futex,	"futex" },		/* 142 */
-	{ 0,	0,	printargs,	"gettid" },		/* 143 */
-	{ 2,	0,	sys_getrlimit,	"getrlimit" },		/* 144 */
-	{ 2,	0,	sys_setrlimit,	"setrlimit" },		/* 145 */
-	{ 2,	TF,	sys_pivotroot,	"pivot_root" },		/* 146 */
-	{ 5,	0,	sys_prctl,	"prctl" },		/* 147 */
-	{ 5,	0,	printargs,	"pciconfig_read" },	/* 148 */
-	{ 5,	0,	printargs,	"pciconfig_write" },	/* 149 */
-	{ 3,	TN,	sys_getsockname,"getsockname" },	/* 150 */
-	{ 4,	TN,	sys_getmsg,	"getmsg" },		/* 151 */
-	{ 4,	TN,	sys_putmsg,	"putmsg" },		/* 152 */
-	{ 3,	0,	sys_poll,	"poll" },		/* 153 */
-	{ 4,	0,	sys_getdents64,	"getdents64" },		/* 154 */
-	{ 3,	0,	sys_fcntl,	"fcntl64" },		/* 155 */
-	{ 4,	0,	printargs,	"getdirentries" },	/* 156 */
-	{ 2,	TF,	sys_statfs,	"statfs" },		/* 157 */
-	{ 2,	0,	sys_fstatfs,	"fstatfs" },		/* 158 */
-	{ 1,	TF,	sys_umount,	"oldumount" },		/* 159 */
-	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 160 */
-	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 161 */
-	{ 2,	0,	printargs,	"getdomainname" },	/* 162 */
-	{ 2,	0,	sys_setdomainname,"setdomainname" },	/* 163 */
-	{ 5,	0,	printargs,	"utrap_install" },	/* 164 */
-	{ 4,	0,	sys_quotactl,	"quotactl" },		/* 165 */
-	{ 1,	0,	printargs,	"set_tid_address" },	/* 166 */
-	{ 5,	TF,	sys_mount,	"mount" },		/* 167 */
-	{ 2,	0,	sys_ustat,	"ustat" },		/* 168 */
-	{ 5,	TF,	sys_setxattr,	"setxattr" },		/* 169 */
-	{ 5,	TF,	sys_setxattr,	"lsetxattr" },		/* 170 */
-	{ 5,	0,	sys_fsetxattr,	"fsetxattr" },		/* 171 */
-	{ 4,	TF,	sys_getxattr,	"getxattr" },		/* 172 */
-	{ 4,	TF,	sys_getxattr,	"lgetxattr" },		/* 173 */
-	{ 3,	0,	sys_getdents,	"getdents" },		/* 174 */
-	{ 0,	0,	sys_setsid,	"setsid" },		/* 175 */
-	{ 1,	0,	sys_fchdir,	"fchdir" },		/* 176 */
-	{ 4,    0,	sys_fgetxattr,	"fgetxattr" },		/* 177 */
-	{ 3,	TF,	sys_listxattr,	"listxattr" },		/* 178 */
-	{ 3,	TF,	sys_listxattr,	"llistxattr" },		/* 179 */
-	{ 3,	0,	sys_flistxattr,	"flistxattr" },		/* 180 */
-	{ 2,	TF,	sys_removexattr,"removexattr" },	/* 181 */
-	{ 2,	TF,	sys_removexattr,"lremovexattr" },	/* 182 */
-	{ 1,	TS,	sys_sigpending,	"sigpending" },		/* 183 */
-	{ 5,	0,	sys_query_module,"query_module" },	/* 184 */
-	{ 2,	0,	sys_setpgid,	"setpgid" },		/* 185 */
-	{ 2,	0,	sys_fremovexattr,"fremovexattr" },	/* 186 */
-	{ 2,	TS,	sys_kill,	"tkill" },		/* 187 */
-	{ 1,	TP,	sys_exit,	"exit_group" },		/* 188 */
-	{ 1,	0,	sys_uname,	"uname" },		/* 189 */
-	{ 2,	0,	sys_init_module,"init_module" },	/* 190 */
-	{ 1,	0,	sys_personality,"personality" },	/* 191 */
-	{ 5,	0,	sys_remap_file_pages,"remap_file_pages" },/* 192 */
-	{ 1,	0,	sys_epoll_create,"epoll_create" },	/* 193 */
-	{ 4,	0,	sys_epoll_ctl,	"epoll_ctl" },		/* 194 */
-	{ 4,	0,	sys_epoll_wait,	"epoll_wait" },		/* 195 */
-	{ 2,	0,	sys_ulimit,	"ulimit" },		/* 196 */
-	{ 0,	0,	sys_getppid,	"getppid" },		/* 197 */
-	{ 3,	TS,	sys_sigaction,	"sigaction" },		/* 198 */
-	{ 5,	0,	printargs,	"sgetmask" },		/* 199 */
-	{ 5,	0,	printargs,	"ssetmask" },		/* 200 */
-	{ 3,	TS,	sys_sigsuspend,	"sigsuspend" },		/* 201 */
-	{ 2,	TF,	sys_lstat,	"lstat" },		/* 202 */
-	{ 1,	TF,	sys_uselib,	"uselib" },		/* 203 */
-	{ 3,	0,	sys_readdir,	"readdir" },		/* 204 */
-	{ 4,	0,	sys_readahead,	"readahead" },		/* 205 */
-	{ 2,	0,	sys_socketcall,	"socketcall" },		/* 206 */
-	{ 3,	0,	sys_syslog,	"syslog" },		/* 207 */
-	{ 4,	0,	printargs,	"lookup_dcookie" },	/* 208 */
-	{ 6,	0,	printargs,	"fadvise64" },		/* 209 */
-	{ 6,	0,	printargs,	"fadvise64_64" },	/* 210 */
-	{ 3,	TS,	sys_tgkill,	"tgkill" },		/* 211 */
-	{ 3,	TP,	sys_waitpid,	"waitpid" },		/* 212 */
-	{ 1,	0,	sys_swapoff,	"swapoff" },		/* 213 */
-	{ 1,	0,	sys_sysinfo,	"sysinfo" },		/* 214 */
-	{ 5,	0,	sys_ipc,	"ipc" },		/* 215 */
-	{ 1,	TS,	sys_sigreturn,	"sigreturn" },		/* 216 */
-	{ 5,	TP,	sys_clone,	"clone" },		/* 217 */
-	{ 3,	0,	sys_modify_ldt,	"modify_ldt" },		/* 218 */
-	{ 1,	0,	sys_adjtimex,	"adjtimex" },		/* 219 */
-	{ 3,	TS,	sys_sigprocmask,"sigprocmask" },	/* 220 */
-	{ 2,	0,	sys_create_module,"create_module" },	/* 221 */
-	{ 1,	0,	sys_delete_module,"delete_module" },
-	{ 1,	0,	sys_get_kernel_syms,"get_kernel_syms"},	/* 223 */
-	{ 1,	0,	sys_getpgid,	"getpgid" },		/* 224 */
-	{ 0,	0,	sys_bdflush,	"bdflush" },		/* 225 */
-	{ 3,	0,	sys_sysfs,	"sysfs" },		/* 226 */
-	{ 5,	0,	sys_afs_syscall,"afs_syscall" },	/* 227 */
-	{ 1,	0,	sys_setfsuid,	"setfsuid" },		/* 228 */
-	{ 1,	0,	sys_setfsgid,	"setfsgid" },		/* 229 */
-	{ 5,	0,	sys_select,	"select" },		/* 230 */
-	{ 1,	0,	sys_time,	"time" },		/* 231 */
-	{ 2,	TF,	sys_stat,	"stat" },		/* 232 */
-	{ 1,	0,	sys_stime,	"stime" },		/* 233 */
-	{ 3,	TF,	sys_statfs64,	"statfs64" },		/* 234 */
-	{ 3,	0,	sys_fstatfs64,	"fstatfs64" },		/* 235 */
-	{ 5,	0,	sys_llseek,	"_llseek" },		/* 236 */
-	{ 2,	0,	sys_mlock,	"mlock" },		/* 237 */
-	{ 2,	0,	sys_munlock,	"munlock" },		/* 238 */
-	{ 2,	0,	sys_mlockall,	"mlockall" },		/* 239 */
-	{ 0,	0,	sys_munlockall,	"munlockall" },		/* 240 */
-	{ 2,	0,	sys_sched_setparam,"sched_setparam"},	/* 241 */
-	{ 2,	0,	sys_sched_getparam,"sched_getparam"},	/* 242 */
-	{ 3,	0,	sys_sched_setscheduler,"sched_setscheduler"},/* 243 */
-	{ 1,	0,	sys_sched_getscheduler,"sched_getscheduler"},/* 244 */
-	{ 0,	0,	sys_sched_yield,"sched_yield" },	/* 245 */
-	{ 1,0,sys_sched_get_priority_max,"sched_get_priority_max"},/* 246 */
-	{ 1,0,sys_sched_get_priority_min,"sched_get_priority_min"},/* 247 */
-	{ 2,	0,sys_sched_rr_get_interval,"sched_rr_get_interval"},/* 248 */
-	{ 2,	0,	sys_nanosleep,	"nanosleep" },		/* 249 */
-	{ 4,	0,	sys_mremap,	"mremap" },		/* 250 */
-	{ 1,	0,	sys_sysctl,	"_sysctl" },		/* 251 */
-	{ 1,	0,	sys_getsid,	"getsid" },		/* 252 */
-	{ 1,	0,	sys_fdatasync,	"fdatasync" },		/* 253 */
-	{ 3,	0,	printargs,	"nfsservctl" },		/* 254 */
-	{ 5,	0,	printargs,	"aplib" },		/* 255 */
-	{ 2,	0,	sys_clock_settime,"clock_settime" },	/* 256 */
-	{ 2,	0,	sys_clock_gettime,"clock_gettime" },	/* 257 */
-	{ 2,	0,	sys_clock_getres,"clock_getres" },	/* 258 */
-	{ 4,	0,	sys_clock_nanosleep,"clock_nanosleep" },/* 259 */
-	{ 3,	0,	sys_sched_setaffinity,"sched_setaffinity" },/* 260 */
-	{ 3,	0,	sys_sched_getaffinity,"sched_getaffinity" },/* 261 */
-	{ 4,	0,	sys_timer_settime,"timer_settime" },	/* 262 */
-	{ 2,	0,	sys_timer_gettime,"timer_gettime" },	/* 263 */
-	{ 1,	0,	sys_timer_getoverrun,"timer_getoverrun" },/* 264 */
-	{ 1,	0,	sys_timer_delete,"timer_delete" },	/* 265 */
-	{ 3,	0,	sys_timer_create,"timer_create" },	/* 266 */
-	{ 5,	0,	printargs,	"SYS_267" },		/* 267 */
-	{ 5,	0,	printargs,	"SYS_268" },		/* 268 */
-	{ 5,	0,	printargs,	"SYS_269" },		/* 269 */
-	{ 5,	0,	printargs,	"SYS_270" },		/* 270 */
-	{ 5,	0,	printargs,	"SYS_271" },		/* 271 */
-	{ 5,	0,	printargs,	"SYS_272" },		/* 272 */
-	{ 5,	0,	printargs,	"SYS_273" },		/* 273 */
-	{ 5,	0,	printargs,	"SYS_274" },		/* 274 */
-	{ 5,	0,	printargs,	"SYS_275" },		/* 275 */
-	{ 5,	0,	printargs,	"SYS_276" },		/* 276 */
-	{ 5,	0,	printargs,	"SYS_277" },		/* 277 */
-	{ 5,	0,	printargs,	"SYS_278" },		/* 278 */
-	{ 5,	0,	printargs,	"SYS_279" },		/* 279 */
-	{ 5,	0,	printargs,	"SYS_280" },		/* 280 */
-	{ 5,	0,	printargs,	"SYS_281" },		/* 281 */
-	{ 5,	0,	printargs,	"SYS_282" },		/* 282 */
-	{ 5,	0,	printargs,	"SYS_283" },		/* 283 */
-	{ 5,	0,	printargs,	"SYS_284" },		/* 284 */
-	{ 5,	0,	printargs,	"SYS_285" },		/* 285 */
-	{ 5,	0,	printargs,	"SYS_286" },		/* 286 */
-	{ 5,	0,	printargs,	"SYS_287" },		/* 287 */
-	{ 5,	0,	printargs,	"SYS_288" },		/* 288 */
-	{ 5,	0,	printargs,	"SYS_289" },		/* 289 */
-	{ 5,	0,	printargs,	"SYS_290" },		/* 290 */
-	{ 5,	0,	printargs,	"SYS_291" },		/* 291 */
-	{ 5,	0,	printargs,	"SYS_292" },		/* 292 */
-	{ 5,	0,	printargs,	"SYS_293" },		/* 293 */
-	{ 5,	0,	printargs,	"SYS_294" },		/* 294 */
-	{ 5,	0,	printargs,	"SYS_295" },		/* 295 */
-	{ 5,	0,	printargs,	"SYS_296" },		/* 296 */
-	{ 5,	0,	printargs,	"SYS_297" },		/* 297 */
-	{ 5,	0,	printargs,	"SYS_298" },		/* 298 */
-	{ 5,	0,	printargs,	"SYS_299" },		/* 299 */
-	{ 5,	0,	printargs,	"SYS_300" },		/* 300 */
-	{ 5,	0,	printargs,	"SYS_301" },		/* 301 */
-	{ 5,	0,	printargs,	"SYS_302" },		/* 302 */
-	{ 5,	0,	printargs,	"SYS_303" },		/* 303 */
-	{ 5,	0,	printargs,	"SYS_304" },		/* 304 */
-	{ 5,	0,	printargs,	"SYS_305" },		/* 305 */
-	{ 5,	0,	printargs,	"SYS_306" },		/* 306 */
-	{ 5,	0,	printargs,	"SYS_307" },		/* 307 */
-	{ 5,	0,	printargs,	"SYS_308" },		/* 308 */
-	{ 5,	0,	printargs,	"SYS_309" },		/* 309 */
-	{ 5,	0,	printargs,	"SYS_310" },		/* 310 */
-	{ 5,	0,	printargs,	"SYS_311" },		/* 311 */
-	{ 5,	0,	printargs,	"SYS_312" },		/* 312 */
-	{ 5,	0,	printargs,	"SYS_313" },		/* 313 */
-	{ 5,	0,	printargs,	"SYS_314" },		/* 314 */
-	{ 5,	0,	printargs,	"SYS_315" },		/* 315 */
-	{ 5,	0,	printargs,	"SYS_316" },		/* 316 */
-	{ 5,	0,	printargs,	"SYS_317" },		/* 317 */
-	{ 5,	0,	printargs,	"SYS_318" },		/* 318 */
-	{ 5,	0,	printargs,	"SYS_319" },		/* 319 */
-	{ 5,	0,	printargs,	"SYS_320" },		/* 320 */
-	{ 5,	0,	printargs,	"SYS_321" },		/* 321 */
-	{ 5,	0,	printargs,	"SYS_322" },		/* 322 */
-	{ 5,	0,	printargs,	"SYS_323" },		/* 323 */
-	{ 5,	0,	printargs,	"SYS_324" },		/* 324 */
-	{ 5,	0,	printargs,	"SYS_325" },		/* 325 */
-	{ 5,	0,	printargs,	"SYS_326" },		/* 326 */
-	{ 5,	0,	printargs,	"SYS_327" },		/* 327 */
-	{ 5,	0,	printargs,	"SYS_328" },		/* 328 */
-	{ 5,	0,	printargs,	"SYS_329" },		/* 329 */
-	{ 5,	0,	printargs,	"SYS_330" },		/* 330 */
-	{ 5,	0,	printargs,	"SYS_331" },		/* 331 */
-	{ 5,	0,	printargs,	"SYS_332" },		/* 332 */
-	{ 5,	0,	printargs,	"SYS_333" },		/* 333 */
-	{ 5,	0,	printargs,	"SYS_334" },		/* 334 */
-	{ 5,	0,	printargs,	"SYS_335" },		/* 335 */
-	{ 5,	0,	printargs,	"SYS_336" },		/* 336 */
-	{ 5,	0,	printargs,	"SYS_337" },		/* 337 */
-	{ 5,	0,	printargs,	"SYS_338" },		/* 338 */
-	{ 5,	0,	printargs,	"SYS_339" },		/* 339 */
-	{ 5,	0,	printargs,	"SYS_340" },		/* 340 */
-	{ 5,	0,	printargs,	"SYS_341" },		/* 341 */
-	{ 5,	0,	printargs,	"SYS_342" },		/* 342 */
-	{ 5,	0,	printargs,	"SYS_343" },		/* 343 */
-	{ 5,	0,	printargs,	"SYS_344" },		/* 344 */
-	{ 5,	0,	printargs,	"SYS_345" },		/* 345 */
-	{ 5,	0,	printargs,	"SYS_346" },		/* 346 */
-	{ 5,	0,	printargs,	"SYS_347" },		/* 347 */
-	{ 5,	0,	printargs,	"SYS_348" },		/* 348 */
-	{ 5,	0,	printargs,	"SYS_349" },		/* 349 */
-	{ 5,	0,	printargs,	"SYS_350" },		/* 350 */
-	{ 5,	0,	printargs,	"SYS_351" },		/* 351 */
-	{ 5,	0,	printargs,	"SYS_352" },		/* 352 */
diff --git a/strace/linux/sparc/syscallent1.h b/strace/linux/sparc/syscallent1.h
deleted file mode 100644
index 0b5c335..0000000
--- a/strace/linux/sparc/syscallent1.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscallent1.h,v 1.1.1.1 1999/02/19 00:23:19 wichert Exp $
- */
-
-	{ 6,	0,	solaris_syscall,	"syscall"	}, /* 0 */
-	{ 6,	TP,	solaris_exit,		"_exit"		}, /* 1 */
-	{ 6,	TP,	solaris_fork,		"fork"		}, /* 2 */
-	{ 6,	0,	solaris_read,		"read"		}, /* 3 */
-	{ 6,	0,	solaris_write,		"write"		}, /* 4 */
-	{ 6,	TF,	solaris_open,		"open"		}, /* 5 */
-	{ 6,	0,	solaris_close,		"close"		}, /* 6 */
-	{ 6,	TP,	solaris_wait,		"wait"		}, /* 7 */
-	{ 6,	TF,	solaris_creat,		"creat"		}, /* 8 */
-	{ 6,	TF,	solaris_link,		"link"		}, /* 9 */
-	{ 6,	TF,	solaris_unlink,		"unlink"	}, /* 10 */
-	{ 6,	TF|TP,	solaris_exec,		"exec"		}, /* 11 */
-	{ 6,	TF,	solaris_chdir,		"chdir"		}, /* 12 */
-	{ 6,	0,	solaris_time,		"time"		}, /* 13 */
-	{ 6,	TF,	solaris_mknod,		"mknod"		}, /* 14 */
-	{ 6,	TF,	solaris_chmod,		"chmod"		}, /* 15 */
-	{ 6,	TF,	solaris_chown,		"chown"		}, /* 16 */
-	{ 6,	0,	solaris_brk,		"brk"		}, /* 17 */
-	{ 6,	TF,	solaris_stat,		"stat"		}, /* 18 */
-	{ 6,	0,	solaris_lseek,		"lseek"		}, /* 19 */
-	{ 6,	0,	solaris_getpid,		"getpid"	}, /* 20 */
-	{ 6,	TF,	solaris_mount,		"mount"		}, /* 21 */
-	{ 6,	TF,	solaris_umount,		"umount"	}, /* 22 */
-	{ 6,	0,	solaris_setuid,		"setuid"	}, /* 23 */
-	{ 6,	0,	solaris_getuid,		"getuid"	}, /* 24 */
-	{ 6,	0,	solaris_stime,		"stime"		}, /* 25 */
-	{ 6,	0,	solaris_ptrace,		"ptrace"	}, /* 26 */
-	{ 6,	0,	solaris_alarm,		"alarm"		}, /* 27 */
-	{ 6,	0,	solaris_fstat,		"fstat"		}, /* 28 */
-	{ 6,	TS,	solaris_pause,		"pause"		}, /* 29 */
-	{ 6,	TF,	solaris_utime,		"utime"		}, /* 30 */
-	{ 6,	0,	solaris_stty,		"stty"		}, /* 31 */
-	{ 6,	0,	solaris_gtty,		"gtty"		}, /* 32 */
-	{ 6,	TF,	solaris_access,		"access"	}, /* 33 */
-	{ 6,	0,	solaris_nice,		"nice"		}, /* 34 */
-	{ 6,	TF,	solaris_statfs,		"statfs"	}, /* 35 */
-	{ 6,	0,	solaris_sync,		"sync"		}, /* 36 */
-	{ 6,	TS,	solaris_kill,		"kill"		}, /* 37 */
-	{ 6,	0,	solaris_fstatfs,	"fstatfs"	}, /* 38 */
-	{ 6,	0,	solaris_pgrpsys,	"pgrpsys"	}, /* 39 */
-	{ 6,	0,	solaris_xenix,		"xenix"		}, /* 40 */
-	{ 6,	0,	solaris_dup,		"dup"		}, /* 41 */
-	{ 6,	0,	solaris_pipe,		"pipe"		}, /* 42 */
-	{ 6,	0,	solaris_times,		"times"		}, /* 43 */
-	{ 6,	0,	solaris_profil,		"profil"	}, /* 44 */
-	{ 6,	0,	solaris_plock,		"plock"		}, /* 45 */
-	{ 6,	0,	solaris_setgid,		"setgid"	}, /* 46 */
-	{ 6,	0,	solaris_getgid,		"getgid"	}, /* 47 */
-	{ 6,	0,	solaris_sigcall,	"sigcall"	}, /* 48 */
-	{ 6,	TI,	solaris_msgsys,		"msgsys"	}, /* 49 */
-	{ 6,	0,	solaris_syssun,		"syssun"	}, /* 50 */
-	{ 6,	TF,	solaris_acct,		"acct"		}, /* 51 */
-	{ 6,	TI,	solaris_shmsys,		"shmsys"	}, /* 52 */
-	{ 6,	TI,	solaris_semsys,		"semsys"	}, /* 53 */
-	{ 6,	0,	solaris_ioctl,		"ioctl"		}, /* 54 */
-	{ 6,	0,	solaris_uadmin,		"uadmin"	}, /* 55 */
-	{ 6,	0,	solaris_sysmp,		"sysmp"		}, /* 56 */
-	{ 6,	0,	solaris_utssys,		"utssys"	}, /* 57 */
-	{ 6,	0,	solaris_fdsync,		"fdsync"	}, /* 58 */
-	{ 6,	TF|TP,	solaris_execve,		"execve"	}, /* 59 */
-	{ 6,	0,	solaris_umask,		"umask"		}, /* 60 */
-	{ 6,	TF,	solaris_chroot,		"chroot"	}, /* 61 */
-	{ 6,	0,	solaris_fcntl,		"fcntl"		}, /* 62 */
-	{ 6,	0,	solaris_ulimit,		"ulimit"	}, /* 63 */
-	{ 6,	0,	printargs,		"SYS_64"	}, /* 64 */
-	{ 6,	0,	printargs,		"SYS_65"	}, /* 65 */
-	{ 6,	0,	printargs,		"SYS_66"	}, /* 66 */
-	{ 6,	0,	printargs,		"SYS_67"	}, /* 67 */
-	{ 6,	0,	printargs,		"SYS_68"	}, /* 68 */
-	{ 6,	0,	printargs,		"SYS_69"	}, /* 69 */
-	{ 6,	0,	printargs,		"SYS_70"	}, /* 70 */
-	{ 6,	0,	printargs,		"SYS_71"	}, /* 71 */
-	{ 6,	0,	printargs,		"SYS_72"	}, /* 72 */
-	{ 6,	0,	printargs,		"SYS_73"	}, /* 73 */
-	{ 6,	0,	printargs,		"SYS_74"	}, /* 74 */
-	{ 6,	0,	printargs,		"SYS_75"	}, /* 75 */
-	{ 6,	0,	printargs,		"SYS_76"	}, /* 76 */
-	{ 6,	0,	printargs,		"SYS_77"	}, /* 77 */
-	{ 6,	0,	printargs,		"SYS_78"	}, /* 78 */
-	{ 6,	TF,	solaris_rmdir,		"rmdir"		}, /* 79 */
-	{ 6,	TF,	solaris_mkdir,		"mkdir"		}, /* 80 */
-	{ 6,	0,	solaris_getdents,	"getdents"	}, /* 81 */
-	{ 6,	0,	solaris_sginap,		"sginap"	}, /* 82 */
-	{ 6,	0,	solaris_sgikopt,	"sgikopt"	}, /* 83 */
-	{ 6,	0,	solaris_sysfs,		"sysfs"		}, /* 84 */
-	{ 6,	TN,	sys_getmsg,		"getmsg"	}, /* 85 */
-	{ 6,	TN,	sys_putmsg,		"putmsg"	}, /* 86 */
-	{ 6,	TN,	solaris_poll,		"poll"		}, /* 87 */
-	{ 6,	TF,	solaris_lstat,		"lstat"		}, /* 88 */
-	{ 6,	TF,	solaris_symlink,	"symlink"	}, /* 89 */
-	{ 6,	TF,	solaris_readlink,	"readlink"	}, /* 90 */
-	{ 6,	0,	solaris_setgroups,	"setgroups"	}, /* 91 */
-	{ 6,	0,	solaris_getgroups,	"getgroups"	}, /* 92 */
-	{ 6,	0,	solaris_fchmod,		"fchmod"	}, /* 93 */
-	{ 6,	0,	solaris_fchown,		"fchown"	}, /* 94 */
-	{ 6,	TS,	solaris_sigprocmask,	"sigprocmask"	}, /* 95 */
-	{ 6,	TS,	solaris_sigsuspend,	"sigsuspend"	}, /* 96 */
-	{ 6,	TS,	solaris_sigaltstack,	"sigaltstack"	}, /* 97 */
-	{ 6,	TS,	solaris_sigaction,	"sigaction"	}, /* 98 */
-	{ 6,	0,	solaris_spcall,		"spcall"	}, /* 99 */
-	{ 6,	0,	solaris_context,	"context"	}, /* 100 */
-	{ 6,	0,	solaris_evsys,		"evsys"		}, /* 101 */
-	{ 6,	0,	solaris_evtrapret,	"evtrapret"	}, /* 102 */
-	{ 6,	TF,	solaris_statvfs,	"statvfs"	}, /* 103 */
-	{ 6,	0,	solaris_fstatvfs,	"fstatvfs"	}, /* 104 */
-	{ 6,	0,	printargs,		"SYS_105"	}, /* 105 */
-	{ 6,	0,	solaris_nfssys,		"nfssys"	}, /* 106 */
-	{ 6,	TP,	solaris_waitid,		"waitid"	}, /* 107 */
-	{ 6,	0,	solaris_sigsendsys,	"sigsendsys"	}, /* 108 */
-	{ 6,	0,	solaris_hrtsys,		"hrtsys"	}, /* 109 */
-	{ 6,	0,	solaris_acancel,	"acancel"	}, /* 110 */
-	{ 6,	0,	solaris_async,		"async"		}, /* 111 */
-	{ 6,	0,	solaris_priocntlsys,	"priocntlsys"	}, /* 112 */
-	{ 6,	TF,	solaris_pathconf,	"pathconf"	}, /* 113 */
-	{ 6,	0,	solaris_mincore,	"mincore"	}, /* 114 */
-	{ 6,	0,	solaris_mmap,		"mmap"		}, /* 115 */
-	{ 6,	0,	solaris_mprotect,	"mprotect"	}, /* 116 */
-	{ 6,	0,	solaris_munmap,		"munmap"	}, /* 117 */
-	{ 6,	0,	solaris_fpathconf,	"fpathconf"	}, /* 118 */
-	{ 6,	TP,	solaris_vfork,		"vfork"		}, /* 119 */
-	{ 6,	0,	solaris_fchdir,		"fchdir"	}, /* 120 */
-	{ 6,	0,	solaris_readv,		"readv"		}, /* 121 */
-	{ 6,	0,	solaris_writev,		"writev"	}, /* 122 */
-	{ 6,	TF,	solaris_xstat,		"xstat"		}, /* 123 */
-	{ 6,	TF,	solaris_lxstat,		"lxstat"	}, /* 124 */
-	{ 6,	0,	solaris_fxstat,		"fxstat"	}, /* 125 */
-	{ 6,	TF,	solaris_xmknod,		"xmknod"	}, /* 126 */
-	{ 6,	0,	solaris_clocal,		"clocal"	}, /* 127 */
-	{ 6,	0,	solaris_setrlimit,	"setrlimit"	}, /* 128 */
-	{ 6,	0,	solaris_getrlimit,	"getrlimit"	}, /* 129 */
-	{ 6,	TF,	solaris_lchown,		"lchown"	}, /* 130 */
-	{ 6,	0,	solaris_memcntl,	"memcntl"	}, /* 131 */
-	{ 6,	TN,	solaris_getpmsg,	"getpmsg"	}, /* 132 */
-	{ 6,	TN,	solaris_putpmsg,	"putpmsg"	}, /* 133 */
-	{ 6,	TF,	solaris_rename,		"rename"	}, /* 134 */
-	{ 6,	0,	solaris_uname,		"uname"		}, /* 135 */
-	{ 6,	0,	solaris_setegid,	"setegid"	}, /* 136 */
-	{ 6,	0,	solaris_sysconfig,	"sysconfig"	}, /* 137 */
-	{ 6,	0,	solaris_adjtime,	"adjtime"	}, /* 138 */
-	{ 6,	0,	solaris_sysinfo,	"sysinfo"	}, /* 139 */
-	{ 6,	0,	printargs,		"SYS_140"	}, /* 140 */
-	{ 6,	0,	solaris_seteuid,	"seteuid"	}, /* 141 */
-	{ 6,	0,	solaris_vtrace,		"vtrace"	}, /* 142 */
-	{ 6,	TP,	solaris_fork1,		"fork1"		}, /* 143 */
-	{ 6,	TS,	solaris_sigtimedwait,	"sigtimedwait"	}, /* 144 */
-	{ 6,	0,	solaris_lwp_info,	"lwp_info"	}, /* 145 */
-	{ 6,	0,	solaris_yield,		"yield"		}, /* 146 */
-	{ 6,	0,	solaris_lwp_sema_wait,	"lwp_sema_wait"	}, /* 147 */
-	{ 6,	0,	solaris_lwp_sema_post,	"lwp_sema_post"	}, /* 148 */
-	{ 6,	0,	printargs,		"SYS_149"	}, /* 149 */
-	{ 6,	0,	printargs,		"SYS_150"	}, /* 150 */
-	{ 6,	0,	printargs,		"SYS_151"	}, /* 151 */
-	{ 6,	0,	solaris_modctl,		"modctl"	}, /* 152 */
-	{ 6,	0,	solaris_fchroot,	"fchroot"	}, /* 153 */
-	{ 6,	TF,	solaris_utimes,		"utimes"	}, /* 154 */
-	{ 6,	0,	solaris_vhangup,	"vhangup"	}, /* 155 */
-	{ 6,	0,	solaris_gettimeofday,	"gettimeofday"	}, /* 156 */
-	{ 6,	0,	solaris_getitimer,	"getitimer"	}, /* 157 */
-	{ 6,	0,	solaris_setitimer,	"setitimer"	}, /* 158 */
-	{ 6,	0,	solaris_lwp_create,	"lwp_create"	}, /* 159 */
-	{ 6,	0,	solaris_lwp_exit,	"lwp_exit"	}, /* 160 */
-	{ 6,	0,	solaris_lwp_suspend,	"lwp_suspend"	}, /* 161 */
-	{ 6,	0,	solaris_lwp_continue,	"lwp_continue"	}, /* 162 */
-	{ 6,	0,	solaris_lwp_kill,	"lwp_kill"	}, /* 163 */
-	{ 6,	0,	solaris_lwp_self,	"lwp_self"	}, /* 164 */
-	{ 6,	0,	solaris_lwp_setprivate,	"lwp_setprivate"}, /* 165 */
-	{ 6,	0,	solaris_lwp_getprivate,	"lwp_getprivate"}, /* 166 */
-	{ 6,	0,	solaris_lwp_wait,	"lwp_wait"	}, /* 167 */
-	{ 6,	0,	solaris_lwp_mutex_unlock,"lwp_mutex_unlock"}, /* 168 */
-	{ 6,	0,	solaris_lwp_mutex_lock,	"lwp_mutex_lock"}, /* 169 */
-	{ 6,	0,	solaris_lwp_cond_wait,	"lwp_cond_wait"}, /* 170 */
-	{ 6,	0,	solaris_lwp_cond_signal,"lwp_cond_signal"}, /* 171 */
-	{ 6,	0,	solaris_lwp_cond_broadcast,"lwp_cond_broadcast"}, /* 172 */
-	{ 6,	0,	solaris_pread,		"pread"		}, /* 173 */
-	{ 6,	0,	solaris_pwrite,		"pwrite"	}, /* 174 */
-	{ 6,	0,	solaris_llseek,		"llseek"	}, /* 175 */
-	{ 6,	0,	solaris_inst_sync,	"inst_sync"	}, /* 176 */
-	{ 6,	0,	printargs,		"SYS_177"	}, /* 177 */
-	{ 6,	0,	printargs,		"SYS_178"	}, /* 178 */
-	{ 6,	0,	printargs,		"SYS_179"	}, /* 179 */
-	{ 6,	0,	printargs,		"SYS_180"	}, /* 180 */
-	{ 6,	0,	printargs,		"SYS_181"	}, /* 181 */
-	{ 6,	0,	printargs,		"SYS_182"	}, /* 182 */
-	{ 6,	0,	printargs,		"SYS_183"	}, /* 183 */
-	{ 6,	0,	printargs,		"SYS_184"	}, /* 184 */
-	{ 6,	0,	printargs,		"SYS_185"	}, /* 185 */
-	{ 6,	0,	solaris_auditsys,	"auditsys"	}, /* 186 */
-	{ 6,	0,	solaris_processor_bind,	"processor_bind"}, /* 187 */
-	{ 6,	0,	solaris_processor_info,	"processor_info"}, /* 188 */
-	{ 6,	0,	solaris_p_online,	"p_online"	}, /* 189 */
-	{ 6,	0,	solaris_sigqueue,	"sigqueue"	}, /* 190 */
-	{ 6,	0,	solaris_clock_gettime,	"clock_gettime"	}, /* 191 */
-	{ 6,	0,	solaris_clock_settime,	"clock_settime"	}, /* 192 */
-	{ 6,	0,	solaris_clock_getres,	"clock_getres"	}, /* 193 */
-	{ 6,	0,	solaris_timer_create,	"timer_create"	}, /* 194 */
-	{ 6,	0,	solaris_timer_delete,	"timer_delete"	}, /* 195 */
-	{ 6,	0,	solaris_timer_settime,	"timer_settime"	}, /* 196 */
-	{ 6,	0,	solaris_timer_gettime,	"timer_gettime"	}, /* 197 */
-	{ 6,	0,	solaris_timer_getoverrun,"timer_getoverrun"}, /* 198 */
-	{ 6,	0,	solaris_nanosleep,	"nanosleep"	}, /* 199 */
-	{ 6,	0,	printargs,		"SYS_200"	}, /* 200 */
-	{ 6,	0,	printargs,		"SYS_201"	}, /* 201 */
-	{ 6,	0,	printargs,		"SYS_202"	}, /* 202 */
-	{ 6,	0,	printargs,		"SYS_203"	}, /* 203 */
-	{ 6,	0,	printargs,		"SYS_204"	}, /* 204 */
-	{ 6,	0,	printargs,		"SYS_205"	}, /* 205 */
-	{ 6,	0,	printargs,		"SYS_206"	}, /* 206 */
-	{ 6,	0,	printargs,		"SYS_207"	}, /* 207 */
-	{ 6,	0,	printargs,		"SYS_208"	}, /* 208 */
-	{ 6,	0,	printargs,		"SYS_209"	}, /* 209 */
-	{ 6,	0,	printargs,		"SYS_210"	}, /* 210 */
-	{ 6,	0,	printargs,		"SYS_211"	}, /* 211 */
-	{ 6,	0,	printargs,		"SYS_212"	}, /* 212 */
-	{ 6,	0,	printargs,		"SYS_213"	}, /* 213 */
-	{ 6,	0,	printargs,		"SYS_214"	}, /* 214 */
-	{ 6,	0,	printargs,		"SYS_215"	}, /* 215 */
-	{ 6,	0,	printargs,		"SYS_216"	}, /* 216 */
-	{ 6,	0,	printargs,		"SYS_217"	}, /* 217 */
-	{ 6,	0,	printargs,		"SYS_218"	}, /* 218 */
-	{ 6,	0,	printargs,		"SYS_219"	}, /* 219 */
-	{ 6,	0,	printargs,		"SYS_220"	}, /* 220 */
-	{ 6,	0,	printargs,		"SYS_221"	}, /* 221 */
-	{ 6,	0,	printargs,		"SYS_222"	}, /* 222 */
-	{ 6,	0,	printargs,		"SYS_223"	}, /* 223 */
-	{ 6,	0,	printargs,		"SYS_224"	}, /* 224 */
-	{ 6,	0,	printargs,		"SYS_225"	}, /* 225 */
-	{ 6,	0,	printargs,		"SYS_226"	}, /* 226 */
-	{ 6,	0,	printargs,		"SYS_227"	}, /* 227 */
-	{ 6,	0,	printargs,		"SYS_228"	}, /* 228 */
-	{ 6,	0,	printargs,		"SYS_229"	}, /* 229 */
-	{ 6,	0,	printargs,		"SYS_230"	}, /* 230 */
-	{ 6,	0,	printargs,		"SYS_231"	}, /* 231 */
-	{ 6,	0,	printargs,		"SYS_232"	}, /* 232 */
-	{ 6,	0,	printargs,		"SYS_233"	}, /* 233 */
-	{ 6,	0,	printargs,		"SYS_234"	}, /* 234 */
-	{ 6,	0,	printargs,		"SYS_235"	}, /* 235 */
-	{ 6,	0,	printargs,		"SYS_236"	}, /* 236 */
-	{ 6,	0,	printargs,		"SYS_237"	}, /* 237 */
-	{ 6,	0,	printargs,		"SYS_238"	}, /* 238 */
-	{ 6,	0,	printargs,		"SYS_239"	}, /* 239 */
-	{ 6,	0,	printargs,		"SYS_240"	}, /* 240 */
-	{ 6,	0,	printargs,		"SYS_241"	}, /* 241 */
-	{ 6,	0,	printargs,		"SYS_242"	}, /* 242 */
-	{ 6,	0,	printargs,		"SYS_243"	}, /* 243 */
-	{ 6,	0,	printargs,		"SYS_244"	}, /* 244 */
-	{ 6,	0,	printargs,		"SYS_245"	}, /* 245 */
-	{ 6,	0,	printargs,		"SYS_246"	}, /* 246 */
-	{ 6,	0,	printargs,		"SYS_247"	}, /* 247 */
-	{ 6,	0,	printargs,		"SYS_248"	}, /* 248 */
-	{ 6,	0,	printargs,		"SYS_249"	}, /* 249 */
-	{ 6,	0,	printargs,		"SYS_250"	}, /* 250 */
-	{ 6,	0,	printargs,		"SYS_251"	}, /* 251 */
-	{ 6,	0,	printargs,		"SYS_252"	}, /* 252 */
-	{ 6,	0,	printargs,		"SYS_253"	}, /* 253 */
-	{ 6,	0,	printargs,		"SYS_254"	}, /* 254 */
-	{ 6,	0,	printargs,		"SYS_255"	}, /* 255 */
-	{ 6,	0,	printargs,		"SYS_256"	}, /* 256 */
-	{ 6,	0,	printargs,		"SYS_257"	}, /* 257 */
-	{ 6,	0,	printargs,		"SYS_258"	}, /* 258 */
-	{ 6,	0,	printargs,		"SYS_259"	}, /* 259 */
-	{ 6,	0,	printargs,		"SYS_260"	}, /* 260 */
-	{ 6,	0,	printargs,		"SYS_261"	}, /* 261 */
-	{ 6,	0,	printargs,		"SYS_262"	}, /* 262 */
-	{ 6,	0,	printargs,		"SYS_263"	}, /* 263 */
-	{ 6,	0,	printargs,		"SYS_264"	}, /* 264 */
-	{ 6,	0,	printargs,		"SYS_265"	}, /* 265 */
-	{ 6,	0,	printargs,		"SYS_266"	}, /* 266 */
-	{ 6,	0,	printargs,		"SYS_267"	}, /* 267 */
-	{ 6,	0,	printargs,		"SYS_268"	}, /* 268 */
-	{ 6,	0,	printargs,		"SYS_269"	}, /* 269 */
-	{ 6,	0,	printargs,		"SYS_270"	}, /* 270 */
-	{ 6,	0,	printargs,		"SYS_271"	}, /* 271 */
-	{ 6,	0,	printargs,		"SYS_272"	}, /* 272 */
-	{ 6,	0,	printargs,		"SYS_273"	}, /* 273 */
-	{ 6,	0,	printargs,		"SYS_274"	}, /* 274 */
-	{ 6,	0,	printargs,		"SYS_275"	}, /* 275 */
-	{ 6,	0,	printargs,		"SYS_276"	}, /* 276 */
-	{ 6,	0,	printargs,		"SYS_277"	}, /* 277 */
-	{ 6,	0,	printargs,		"SYS_278"	}, /* 278 */
-	{ 6,	0,	printargs,		"SYS_279"	}, /* 279 */
-	{ 6,	0,	printargs,		"SYS_280"	}, /* 280 */
-	{ 6,	0,	printargs,		"SYS_281"	}, /* 281 */
-	{ 6,	0,	printargs,		"SYS_282"	}, /* 282 */
-	{ 6,	0,	printargs,		"SYS_283"	}, /* 283 */
-	{ 6,	0,	printargs,		"SYS_284"	}, /* 284 */
-	{ 6,	0,	printargs,		"SYS_285"	}, /* 285 */
-	{ 6,	0,	printargs,		"SYS_286"	}, /* 286 */
-	{ 6,	0,	printargs,		"SYS_287"	}, /* 287 */
-	{ 6,	0,	printargs,		"SYS_288"	}, /* 288 */
-	{ 6,	0,	printargs,		"SYS_289"	}, /* 289 */
-	{ 6,	0,	printargs,		"SYS_290"	}, /* 290 */
-	{ 6,	0,	printargs,		"SYS_291"	}, /* 291 */
-	{ 6,	0,	printargs,		"SYS_292"	}, /* 292 */
-	{ 6,	0,	printargs,		"SYS_293"	}, /* 293 */
-	{ 6,	0,	printargs,		"SYS_294"	}, /* 294 */
-	{ 6,	0,	printargs,		"SYS_295"	}, /* 295 */
-	{ 6,	0,	printargs,		"SYS_296"	}, /* 296 */
-	{ 6,	0,	printargs,		"SYS_297"	}, /* 297 */
-	{ 6,	0,	printargs,		"SYS_298"	}, /* 298 */
-	{ 6,	0,	printargs,		"SYS_299"	}, /* 299 */
-
-	{ 6,	0,	solaris_getpgrp,	"getpgrp"	}, /* 300 */
-	{ 6,	0,	solaris_setpgrp,	"setpgrp"	}, /* 301 */
-	{ 6,	0,	solaris_getsid,		"getsid"	}, /* 302 */
-	{ 6,	0,	solaris_setsid,		"setsid"	}, /* 303 */
-	{ 6,	0,	solaris_getpgid,	"getpgid"	}, /* 304 */
-	{ 6,	0,	solaris_setpgid,	"setpgid"	}, /* 305 */
-	{ 6,	0,	printargs,		"SYS_306"	}, /* 306 */
-	{ 6,	0,	printargs,		"SYS_307"	}, /* 307 */
-	{ 6,	0,	printargs,		"SYS_308"	}, /* 308 */
-	{ 6,	0,	printargs,		"SYS_309"	}, /* 309 */
-
-	{ 6,	TS,	solaris_signal,		"signal"	}, /* 310 */
-	{ 6,	TS,	solaris_sigset,		"sigset"	}, /* 311 */
-	{ 6,	TS,	solaris_sighold,	"sighold"	}, /* 312 */
-	{ 6,	TS,	solaris_sigrelse,	"sigrelse"	}, /* 313 */
-	{ 6,	TS,	solaris_sigignore,	"sigignore"	}, /* 314 */
-	{ 6,	TS,	solaris_sigpause,	"sigpause"	}, /* 315 */
-	{ 6,	0,	printargs,		"SYS_316"	}, /* 316 */
-	{ 6,	0,	printargs,		"SYS_317"	}, /* 317 */
-	{ 6,	0,	printargs,		"SYS_318"	}, /* 318 */
-	{ 6,	0,	printargs,		"SYS_319"	}, /* 319 */
-
-	{ 6,	TI,	solaris_msgget,		"msgget"	}, /* 320 */
-	{ 6,	TI,	solaris_msgctl,		"msgctl"	}, /* 321 */
-	{ 6,	TI,	solaris_msgrcv,		"msgrcv"	}, /* 322 */
-	{ 6,	TI,	solaris_msgsnd,		"msgsnd"	}, /* 323 */
-	{ 6,	0,	printargs,		"SYS_324"	}, /* 324 */
-	{ 6,	0,	printargs,		"SYS_325"	}, /* 325 */
-	{ 6,	0,	printargs,		"SYS_326"	}, /* 326 */
-	{ 6,	0,	printargs,		"SYS_327"	}, /* 327 */
-	{ 6,	0,	printargs,		"SYS_328"	}, /* 328 */
-	{ 6,	0,	printargs,		"SYS_329"	}, /* 329 */
-
-	{ 6,	TI,	solaris_shmat,		"shmat"		}, /* 330 */
-	{ 6,	TI,	solaris_shmctl,		"shmctl"	}, /* 331 */
-	{ 6,	TI,	solaris_shmdt,		"shmdt"		}, /* 332 */
-	{ 6,	TI,	solaris_shmget,		"shmget"	}, /* 333 */
-	{ 6,	0,	printargs,		"SYS_334"	}, /* 334 */
-	{ 6,	0,	printargs,		"SYS_335"	}, /* 335 */
-	{ 6,	0,	printargs,		"SYS_336"	}, /* 336 */
-	{ 6,	0,	printargs,		"SYS_337"	}, /* 337 */
-	{ 6,	0,	printargs,		"SYS_338"	}, /* 338 */
-	{ 6,	0,	printargs,		"SYS_339"	}, /* 339 */
-
-	{ 6,	TI,	solaris_semctl,		"semctl"	}, /* 340 */
-	{ 6,	TI,	solaris_semget,		"semget"	}, /* 341 */
-	{ 6,	TI,	solaris_semop,		"semop"		}, /* 342 */
-	{ 6,	0,	printargs,		"SYS_343"	}, /* 343 */
-	{ 6,	0,	printargs,		"SYS_344"	}, /* 344 */
-	{ 6,	0,	printargs,		"SYS_345"	}, /* 345 */
-	{ 6,	0,	printargs,		"SYS_346"	}, /* 346 */
-	{ 6,	0,	printargs,		"SYS_347"	}, /* 347 */
-	{ 6,	0,	printargs,		"SYS_348"	}, /* 348 */
-	{ 6,	0,	printargs,		"SYS_349"	}, /* 349 */
-
-	{ 6,	0,	solaris_olduname,	"olduname"	}, /* 350 */
-	{ 6,	0,	printargs,		"utssys1"	}, /* 351 */
-	{ 6,	0,	solaris_ustat,		"ustat"		}, /* 352 */
-	{ 6,	0,	solaris_fusers,		"fusers"	}, /* 353 */
-	{ 6,	0,	printargs,		"SYS_354"	}, /* 354 */
-	{ 6,	0,	printargs,		"SYS_355"	}, /* 355 */
-	{ 6,	0,	printargs,		"SYS_356"	}, /* 356 */
-	{ 6,	0,	printargs,		"SYS_357"	}, /* 357 */
-	{ 6,	0,	printargs,		"SYS_358"	}, /* 358 */
-	{ 6,	0,	printargs,		"SYS_359"	}, /* 359 */
-
-	{ 6,	0,	printargs,		"sysfs0"	}, /* 360 */
-	{ 6,	0,	solaris_sysfs1,		"sysfs1"	}, /* 361 */
-	{ 6,	0,	solaris_sysfs2,		"sysfs2"	}, /* 362 */
-	{ 6,	0,	solaris_sysfs3,		"sysfs3"	}, /* 363 */
-	{ 6,	0,	printargs,		"SYS_364"	}, /* 364 */
-	{ 6,	0,	printargs,		"SYS_365"	}, /* 365 */
-	{ 6,	0,	printargs,		"SYS_366"	}, /* 366 */
-	{ 6,	0,	printargs,		"SYS_367"	}, /* 367 */
-	{ 6,	0,	printargs,		"SYS_368"	}, /* 368 */
-	{ 6,	0,	printargs,		"SYS_369"	}, /* 369 */
-
-	{ 6,	0,	printargs,		"spcall0"	}, /* 370 */
-	{ 6,	TS,	solaris_sigpending,	"sigpending"	}, /* 371 */
-	{ 6,	TS,	solaris_sigfillset,	"sigfillset"	}, /* 372 */
-	{ 6,	0,	printargs,		"SYS_373"	}, /* 373 */
-	{ 6,	0,	printargs,		"SYS_374"	}, /* 374 */
-	{ 6,	0,	printargs,		"SYS_375"	}, /* 375 */
-	{ 6,	0,	printargs,		"SYS_376"	}, /* 376 */
-	{ 6,	0,	printargs,		"SYS_377"	}, /* 377 */
-	{ 6,	0,	printargs,		"SYS_378"	}, /* 378 */
-	{ 6,	0,	printargs,		"SYS_379"	}, /* 379 */
-
-	{ 6,	0,	solaris_getcontext,	"getcontext"	}, /* 380 */
-	{ 6,	0,	solaris_setcontext,	"setcontext"	}, /* 381 */
-	{ 6,	0,	printargs,		"SYS_382"	}, /* 382 */
-	{ 6,	0,	printargs,		"SYS_383"	}, /* 383 */
-	{ 6,	0,	printargs,		"SYS_384"	}, /* 384 */
-	{ 6,	0,	printargs,		"SYS_385"	}, /* 385 */
-	{ 6,	0,	printargs,		"SYS_386"	}, /* 386 */
-	{ 6,	0,	printargs,		"SYS_387"	}, /* 387 */
-	{ 6,	0,	printargs,		"SYS_388"	}, /* 388 */
-	{ 6,	0,	printargs,		"SYS_389"	}, /* 389 */
-
-	{ 6,	0,	printargs,		"SYS_390"	}, /* 390 */
-	{ 6,	0,	printargs,		"SYS_391"	}, /* 391 */
-	{ 6,	0,	printargs,		"SYS_392"	}, /* 392 */
-	{ 6,	0,	printargs,		"SYS_393"	}, /* 393 */
-	{ 6,	0,	printargs,		"SYS_394"	}, /* 394 */
-	{ 6,	0,	printargs,		"SYS_395"	}, /* 395 */
-	{ 6,	0,	printargs,		"SYS_396"	}, /* 396 */
-	{ 6,	0,	printargs,		"SYS_397"	}, /* 397 */
-	{ 6,	0,	printargs,		"SYS_398"	}, /* 398 */
-	{ 6,	0,	printargs,		"SYS_399"	}, /* 399 */
diff --git a/strace/linux/sparc64/dummy2.h b/strace/linux/sparc64/dummy2.h
deleted file mode 100644
index df32c6b..0000000
--- a/strace/linux/sparc64/dummy2.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: dummy2.h,v 1.1 2004/07/12 07:44:08 roland Exp $
- */
-
-/* still unfinished */
-
-#define solaris_sysmp printargs
-#define solaris_sginap printargs
-#define solaris_sgikopt printargs
-#define solaris_sysmips printargs
-#define solaris_sigreturn printargs
-#define solaris_recvmsg printargs
-#define solaris_sendmsg printargs
-#define solaris_nfssvc printargs
-#define solaris_getfh printargs
-#define solaris_async_daemon printargs
-#define solaris_exportfs printargs
-#define solaris_BSD_getime printargs
-#define solaris_sproc printargs
-#define solaris_procblk printargs
-#define solaris_sprocsp printargs
-#define solaris_msync printargs
-#define solaris_madvise printargs
-#define solaris_pagelock printargs
-#define solaris_quotactl printargs
-#define solaris_cacheflush printargs
-#define solaris_cachectl printargs
-#define solaris_nuname printargs
-#define solaris_sigpoll printargs
-#define solaris_swapctl printargs
-#define solaris_sigstack printargs
-#define solaris_sigsendset printargs
-#define solaris_priocntl printargs
-#define solaris_ksigqueue printargs
-#define solaris_lwp_sema_wait printargs
-#define solaris_memcntl printargs
-#define solaris_syscall printargs
-#define solaris_clocal printargs
-#define solaris_syssun printargs
-#define solaris_sysi86 printargs
-#define solaris_sysmachine printargs
-#define solaris_plock printargs
-#define solaris_pathconf printargs
-#define solaris_sigtimedwait printargs
-#define solaris_ulimit printargs
-#define solaris_ptrace printargs
-#define solaris_stty printargs
-#define solaris_lwp_info printargs
-#define solaris_priocntlsys printargs
-#define solaris_hrtsys printargs
-#define solaris_xenix printargs
-#define solaris_statfs printargs
-#define solaris_fstatfs printargs
-#define solaris_statvfs printargs
-#define solaris_fstatvfs printargs
-#define solaris_fork1 printargs
-#define solaris_sigsendsys printargs
-#define solaris_gtty printargs
-#define solaris_vtrace printargs
-#define solaris_fpathconf printargs
-#define solaris_evsys printargs
-#define solaris_acct printargs
-#define solaris_exec printargs
-#define solaris_lwp_sema_post printargs
-#define solaris_nfssys printargs
-#define solaris_sigaltstack printargs
-#define solaris_uadmin printargs
-#define solaris_umount printargs
-#define solaris_modctl printargs
-#define solaris_acancel printargs
-#define solaris_async printargs
-#define solaris_evtrapret printargs
-#define solaris_lwp_create printargs
-#define solaris_lwp_exit printargs
-#define solaris_lwp_suspend printargs
-#define solaris_lwp_continue printargs
-#define solaris_lwp_kill printargs
-#define solaris_lwp_self printargs
-#define solaris_lwp_setprivate printargs
-#define solaris_lwp_getprivate printargs
-#define solaris_lwp_wait printargs
-#define solaris_lwp_mutex_unlock printargs
-#define solaris_lwp_mutex_lock printargs
-#define solaris_lwp_cond_wait printargs
-#define solaris_lwp_cond_signal printargs
-#define solaris_lwp_cond_broadcast printargs
-#define solaris_llseek printargs
-#define solaris_inst_sync printargs
-#define solaris_auditsys printargs
-#define solaris_processor_bind printargs
-#define solaris_processor_info printargs
-#define solaris_p_online printargs
-#define solaris_sigqueue printargs
-#define solaris_clock_gettime printargs
-#define solaris_clock_settime printargs
-#define solaris_clock_getres printargs
-#define solaris_nanosleep printargs
-#define solaris_timer_create printargs
-#define solaris_timer_delete printargs
-#define solaris_timer_settime printargs
-#define solaris_timer_gettime printargs
-#define solaris_timer_getoverrun printargs
-#define solaris_signal printargs
-#define solaris_sigset printargs
-#define solaris_sighold printargs
-#define solaris_sigrelse printargs
-#define solaris_sigignore printargs
-#define solaris_sigpause printargs
-#define solaris_msgctl printargs
-#define solaris_msgget printargs
-#define solaris_msgrcv printargs
-#define solaris_msgsnd printargs
-#define solaris_shmat printargs
-#define solaris_shmctl printargs
-#define solaris_shmdt printargs
-#define solaris_shmget printargs
-#define solaris_semctl printargs
-#define solaris_semget printargs
-#define solaris_semop printargs
-#define solaris_olduname printargs
-#define solaris_ustat printargs
-#define solaris_fusers printargs
-#define solaris_sysfs1 printargs
-#define solaris_sysfs2 printargs
-#define solaris_sysfs3 printargs
-
-/* like another call */
-#define solaris_lchown solaris_chown
-#define solaris_setuid solaris_close
-#define solaris_seteuid solaris_close
-#define solaris_setgid solaris_close
-#define solaris_setegid solaris_close
-#define solaris_vhangup solaris_close
-#define solaris_fdsync solaris_close
-#define solaris_sigfillset solaris_sigpending
-#define solaris_vfork solaris_fork
-#define solaris_ksigaction solaris_sigaction
-#define solaris_BSDgetpgrp solaris_getpgrp
-#define solaris_BSDsetpgrp solaris_setpgrp
-#define solaris_waitsys solaris_waitid
-
-/* printargs does the right thing */
-#define solaris_sync printargs
-#define solaris_profil printargs
-#define solaris_yield printargs
-#define solaris_pause printargs
-#define solaris_sethostid printargs
-
-/* subfunction entry points */
-#define solaris_pgrpsys printargs
-#define solaris_sigcall printargs
-#define solaris_msgsys printargs
-#define solaris_shmsys printargs
-#define solaris_semsys printargs
-#define solaris_utssys printargs
-#define solaris_sysfs printargs
-#define solaris_spcall printargs
-#define solaris_context printargs
-
-/* same as linux */
-#define solaris_exit sys_exit
-#define solaris_fork sys_fork
-#define solaris_read sys_read
-#define solaris_write sys_write
-#define solaris_close sys_close
-#define solaris_creat sys_creat
-#define solaris_link sys_link
-#define solaris_unlink sys_unlink
-#define solaris_chdir sys_chdir
-#define solaris_time sys_time
-#define solaris_chmod sys_chmod
-#define solaris_lseek sys_lseek
-#define solaris_stime sys_stime
-#define solaris_alarm sys_alarm
-#define solaris_utime sys_utime
-#define solaris_access sys_access
-#define solaris_nice sys_nice
-#define solaris_dup sys_dup
-#define solaris_pipe sys_pipe
-#define solaris_times sys_times
-#define solaris_execve sys_execve
-#define solaris_umask sys_umask
-#define solaris_chroot sys_chroot
-#define solaris_rmdir sys_rmdir
-#define solaris_mkdir sys_mkdir
-#define solaris_getdents sys_getdents
-#define solaris_poll sys_poll
-#define solaris_symlink sys_symlink
-#define solaris_readlink sys_readlink
-#define solaris_setgroups sys_setgroups
-#define solaris_getgroups sys_getgroups
-#define solaris_fchmod sys_fchmod
-#define solaris_fchown sys_fchown
-#define solaris_mprotect sys_mprotect
-#define solaris_munmap sys_munmap
-#define solaris_readv sys_readv
-#define solaris_writev sys_writev
-#define solaris_chown sys_chown
-#define solaris_rename sys_rename
-#define solaris_gettimeofday sys_gettimeofday
-#define solaris_getitimer sys_getitimer
-#define solaris_setitimer sys_setitimer
-#define solaris_brk sys_brk
-#define solaris_mmap sys_mmap
-#define solaris_getsid sys_getsid
-#define solaris_setsid sys_setsid
-#define solaris_getpgid sys_getpgid
-#define solaris_setpgid sys_setpgid
-#define solaris_getpgrp sys_getpgrp
-
-/* These are handled according to current_personality */
-#define solaris_xstat sys_xstat
-#define solaris_fxstat sys_fxstat
-#define solaris_lxstat sys_lxstat
-#define solaris_xmknod sys_xmknod
-#define solaris_stat sys_stat
-#define solaris_fstat sys_fstat
-#define solaris_lstat sys_lstat
-#define solaris_pread sys_pread
-#define solaris_pwrite sys_pwrite
-#define solaris_ioctl sys_ioctl
-#define solaris_mknod sys_mknod
-
-/* To be done */
-#define solaris_mount printargs
-#define solaris_sysinfo printargs
-#define solaris_sysconfig printargs
-#define solaris_getpmsg printargs
-#define solaris_putpmsg printargs
-#define solaris_wait printargs
-#define solaris_waitid printargs
-#define solaris_sigsuspend printargs
-#define solaris_setpgrp printargs
-#define solaris_getcontext printargs
-#define solaris_setcontext printargs
-#define solaris_getpid printargs
-#define solaris_getuid printargs
-#define solaris_kill printargs
-#define solaris_getgid printargs
-#define solaris_fcntl printargs
-#define solaris_getmsg printargs
-#define solaris_putmsg printargs
-#define solaris_sigprocmask printargs
-#define solaris_sigaction printargs
-#define solaris_sigpending printargs
-#define solaris_mincore printargs
-#define solaris_fchdir printargs
-#define solaris_setrlimit printargs
-#define solaris_getrlimit printargs
-#define solaris_uname printargs
-#define solaris_adjtime printargs
-#define solaris_fchroot printargs
-#define solaris_utimes printargs
-
-#if DONE
-#define solaris_open printargs
-#endif
diff --git a/strace/linux/sparc64/errnoent.h b/strace/linux/sparc64/errnoent.h
deleted file mode 100644
index d243699..0000000
--- a/strace/linux/sparc64/errnoent.h
+++ /dev/null
@@ -1,127 +0,0 @@
-	"ERRNO_0", /* 0 */
-	"EPERM", /* 1 */
-	"ENOENT", /* 2 */
-	"ESRCH", /* 3 */
-	"EINTR", /* 4 */
-	"EIO", /* 5 */
-	"ENXIO", /* 6 */
-	"E2BIG", /* 7 */
-	"ENOEXEC", /* 8 */
-	"EBADF", /* 9 */
-	"ECHILD", /* 10 */
-	"EAGAIN", /* 11 */
-	"ENOMEM", /* 12 */
-	"EACCES", /* 13 */
-	"EFAULT", /* 14 */
-	"ENOTBLK", /* 15 */
-	"EBUSY", /* 16 */
-	"EEXIST", /* 17 */
-	"EXDEV", /* 18 */
-	"ENODEV", /* 19 */
-	"ENOTDIR", /* 20 */
-	"EISDIR", /* 21 */
-	"EINVAL", /* 22 */
-	"ENFILE", /* 23 */
-	"EMFILE", /* 24 */
-	"ENOTTY", /* 25 */
-	"ETXTBSY", /* 26 */
-	"EFBIG", /* 27 */
-	"ENOSPC", /* 28 */
-	"ESPIPE", /* 29 */
-	"EROFS", /* 30 */
-	"EMLINK", /* 31 */
-	"EPIPE", /* 32 */
-	"EDOM", /* 33 */
-	"ERANGE", /* 34 */
-	"EWOULDBLOCK", /* 35 */
-	"EINPROGRESS", /* 36 */
-	"EALREADY", /* 37 */
-	"ENOTSOCK", /* 38 */
-	"EDESTADDRREQ", /* 39 */
-	"EMSGSIZE", /* 40 */
-	"EPROTOTYPE", /* 41 */
-	"ENOPROTOOPT", /* 42 */
-	"EPROTONOSUPPORT", /* 43 */
-	"ESOCKTNOSUPPORT", /* 44 */
-	"EOPNOTSUPP", /* 45 */
-	"EPFNOSUPPORT", /* 46 */
-	"EAFNOSUPPORT", /* 47 */
-	"EADDRINUSE", /* 48 */
-	"EADDRNOTAVAIL", /* 49 */
-	"ENETDOWN", /* 50 */
-	"ENETUNREACH", /* 51 */
-	"ENETRESET", /* 52 */
-	"ECONNABORTED", /* 53 */
-	"ECONNRESET", /* 54 */
-	"ENOBUFS", /* 55 */
-	"EISCONN", /* 56 */
-	"ENOTCONN", /* 57 */
-	"ESHUTDOWN", /* 58 */
-	"ETOOMANYREFS", /* 59 */
-	"ETIMEDOUT", /* 60 */
-	"ECONNREFUSED", /* 61 */
-	"ELOOP", /* 62 */
-	"ENAMETOOLONG", /* 63 */
-	"EHOSTDOWN", /* 64 */
-	"EHOSTUNREACH", /* 65 */
-	"ENOTEMPTY", /* 66 */
-	"EPROCLIM", /* 67 */
-	"EUSERS", /* 68 */
-	"EDQUOT", /* 69 */
-	"ESTALE", /* 70 */
-	"EREMOTE", /* 71 */
-	"ENOSTR", /* 72 */
-	"ETIME", /* 73 */
-	"ENOSR", /* 74 */
-	"ENOMSG", /* 75 */
-	"EBADMSG", /* 76 */
-	"EIDRM", /* 77 */
-	"EDEADLK", /* 78 */
-	"ENOLCK", /* 79 */
-	"ENONET", /* 80 */
-	"ERREMOTE", /* 81 */
-	"ENOLINK", /* 82 */
-	"EADV", /* 83 */
-	"ESRMNT", /* 84 */
-	"ECOMM", /* 85 */
-	"EPROTO", /* 86 */
-	"EMULTIHOP", /* 87 */
-	"EDOTDOT", /* 88 */
-	"EREMCHG", /* 89 */
-	"ENOSYS", /* 90 */
-	"ESTRPIPE", /* 91 */
-	"EOVERFLOW", /* 92 */
-	"EBADFD", /* 93 */
-	"ECHRNG", /* 94 */
-	"EL2NSYNC", /* 95 */
-	"EL3HLT", /* 96 */
-	"EL3RST", /* 97 */
-	"ELNRNG", /* 98 */
-	"EUNATCH", /* 99 */
-	"ENOCSI", /* 100 */
-	"EL2HLT", /* 101 */
-	"EBADE", /* 102 */
-	"EBADR", /* 103 */
-	"EXFULL", /* 104 */
-	"ENOANO", /* 105 */
-	"EBADRQC", /* 106 */
-	"EBADSLT", /* 107 */
-	"EDEADLOCK", /* 108 */
-	"EBFONT", /* 109 */
-	"ELIBEXEC", /* 110 */
-	"ENODATA", /* 111 */
-	"ELIBBAD", /* 112 */
-	"ENOPKG", /* 113 */
-	"ELIBACC", /* 114 */
-	"ENOTUNIQ", /* 115 */
-	"ERESTART", /* 116 */
-	"EUCLEAN", /* 117 */
-	"ENOTNAM", /* 118 */
-	"ENAVAIL", /* 119 */
-	"EISNAM", /* 120 */
-	"EREMOTEIO", /* 121 */
-	"EILSEQ", /* 122 */
-	"ELIBMAX", /* 123 */
-	"ELIBSCN", /* 124 */
-	"ENOMEDIUM", /* 125 */
-	"EMEDIUMTYPE", /* 126 */
diff --git a/strace/linux/sparc64/errnoent1.h b/strace/linux/sparc64/errnoent1.h
deleted file mode 100644
index 4d750bd..0000000
--- a/strace/linux/sparc64/errnoent1.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../svr4/errnoent.h"
diff --git a/strace/linux/sparc64/errnoent2.h b/strace/linux/sparc64/errnoent2.h
deleted file mode 100644
index d243699..0000000
--- a/strace/linux/sparc64/errnoent2.h
+++ /dev/null
@@ -1,127 +0,0 @@
-	"ERRNO_0", /* 0 */
-	"EPERM", /* 1 */
-	"ENOENT", /* 2 */
-	"ESRCH", /* 3 */
-	"EINTR", /* 4 */
-	"EIO", /* 5 */
-	"ENXIO", /* 6 */
-	"E2BIG", /* 7 */
-	"ENOEXEC", /* 8 */
-	"EBADF", /* 9 */
-	"ECHILD", /* 10 */
-	"EAGAIN", /* 11 */
-	"ENOMEM", /* 12 */
-	"EACCES", /* 13 */
-	"EFAULT", /* 14 */
-	"ENOTBLK", /* 15 */
-	"EBUSY", /* 16 */
-	"EEXIST", /* 17 */
-	"EXDEV", /* 18 */
-	"ENODEV", /* 19 */
-	"ENOTDIR", /* 20 */
-	"EISDIR", /* 21 */
-	"EINVAL", /* 22 */
-	"ENFILE", /* 23 */
-	"EMFILE", /* 24 */
-	"ENOTTY", /* 25 */
-	"ETXTBSY", /* 26 */
-	"EFBIG", /* 27 */
-	"ENOSPC", /* 28 */
-	"ESPIPE", /* 29 */
-	"EROFS", /* 30 */
-	"EMLINK", /* 31 */
-	"EPIPE", /* 32 */
-	"EDOM", /* 33 */
-	"ERANGE", /* 34 */
-	"EWOULDBLOCK", /* 35 */
-	"EINPROGRESS", /* 36 */
-	"EALREADY", /* 37 */
-	"ENOTSOCK", /* 38 */
-	"EDESTADDRREQ", /* 39 */
-	"EMSGSIZE", /* 40 */
-	"EPROTOTYPE", /* 41 */
-	"ENOPROTOOPT", /* 42 */
-	"EPROTONOSUPPORT", /* 43 */
-	"ESOCKTNOSUPPORT", /* 44 */
-	"EOPNOTSUPP", /* 45 */
-	"EPFNOSUPPORT", /* 46 */
-	"EAFNOSUPPORT", /* 47 */
-	"EADDRINUSE", /* 48 */
-	"EADDRNOTAVAIL", /* 49 */
-	"ENETDOWN", /* 50 */
-	"ENETUNREACH", /* 51 */
-	"ENETRESET", /* 52 */
-	"ECONNABORTED", /* 53 */
-	"ECONNRESET", /* 54 */
-	"ENOBUFS", /* 55 */
-	"EISCONN", /* 56 */
-	"ENOTCONN", /* 57 */
-	"ESHUTDOWN", /* 58 */
-	"ETOOMANYREFS", /* 59 */
-	"ETIMEDOUT", /* 60 */
-	"ECONNREFUSED", /* 61 */
-	"ELOOP", /* 62 */
-	"ENAMETOOLONG", /* 63 */
-	"EHOSTDOWN", /* 64 */
-	"EHOSTUNREACH", /* 65 */
-	"ENOTEMPTY", /* 66 */
-	"EPROCLIM", /* 67 */
-	"EUSERS", /* 68 */
-	"EDQUOT", /* 69 */
-	"ESTALE", /* 70 */
-	"EREMOTE", /* 71 */
-	"ENOSTR", /* 72 */
-	"ETIME", /* 73 */
-	"ENOSR", /* 74 */
-	"ENOMSG", /* 75 */
-	"EBADMSG", /* 76 */
-	"EIDRM", /* 77 */
-	"EDEADLK", /* 78 */
-	"ENOLCK", /* 79 */
-	"ENONET", /* 80 */
-	"ERREMOTE", /* 81 */
-	"ENOLINK", /* 82 */
-	"EADV", /* 83 */
-	"ESRMNT", /* 84 */
-	"ECOMM", /* 85 */
-	"EPROTO", /* 86 */
-	"EMULTIHOP", /* 87 */
-	"EDOTDOT", /* 88 */
-	"EREMCHG", /* 89 */
-	"ENOSYS", /* 90 */
-	"ESTRPIPE", /* 91 */
-	"EOVERFLOW", /* 92 */
-	"EBADFD", /* 93 */
-	"ECHRNG", /* 94 */
-	"EL2NSYNC", /* 95 */
-	"EL3HLT", /* 96 */
-	"EL3RST", /* 97 */
-	"ELNRNG", /* 98 */
-	"EUNATCH", /* 99 */
-	"ENOCSI", /* 100 */
-	"EL2HLT", /* 101 */
-	"EBADE", /* 102 */
-	"EBADR", /* 103 */
-	"EXFULL", /* 104 */
-	"ENOANO", /* 105 */
-	"EBADRQC", /* 106 */
-	"EBADSLT", /* 107 */
-	"EDEADLOCK", /* 108 */
-	"EBFONT", /* 109 */
-	"ELIBEXEC", /* 110 */
-	"ENODATA", /* 111 */
-	"ELIBBAD", /* 112 */
-	"ENOPKG", /* 113 */
-	"ELIBACC", /* 114 */
-	"ENOTUNIQ", /* 115 */
-	"ERESTART", /* 116 */
-	"EUCLEAN", /* 117 */
-	"ENOTNAM", /* 118 */
-	"ENAVAIL", /* 119 */
-	"EISNAM", /* 120 */
-	"EREMOTEIO", /* 121 */
-	"EILSEQ", /* 122 */
-	"ELIBMAX", /* 123 */
-	"ELIBSCN", /* 124 */
-	"ENOMEDIUM", /* 125 */
-	"EMEDIUMTYPE", /* 126 */
diff --git a/strace/linux/sparc64/ioctlent.h b/strace/linux/sparc64/ioctlent.h
deleted file mode 100644
index c1d6b8a..0000000
--- a/strace/linux/sparc64/ioctlent.h
+++ /dev/null
@@ -1,838 +0,0 @@
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_DOS",	0x4d2},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_DOS",	0x4d3},
-	{"linux/umsdos_fs.h",	"UMSDOS_RMDIR_DOS",	0x4d4},
-	{"linux/umsdos_fs.h",	"UMSDOS_STAT_DOS",	0x4d5},
-	{"linux/umsdos_fs.h",	"UMSDOS_CREAT_EMD",	0x4d6},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_EMD",	0x4d7},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_EMD",	0x4d8},
-	{"linux/umsdos_fs.h",	"UMSDOS_GETVERSION",	0x4d9},
-	{"linux/umsdos_fs.h",	"UMSDOS_INIT_EMD",	0x4da},
-	{"linux/umsdos_fs.h",	"UMSDOS_DOS_SETUP",	0x4db},
-	{"linux/umsdos_fs.h",	"UMSDOS_RENAME_DOS",	0x4dc},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKPG",	0x1269},
-	{"linux/elevator.h",	"BLKELVGET",	0x126a},
-	{"linux/fs.h",	"BLKELVGET",	0x126a},
-	{"linux/elevator.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/fs.h",	"BLKGETSIZE64",	0x1272},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGREP",	0x4503},
-	{"linux/input.h",	"EVIOCSREP",	0x4503},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCSKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCGKEY",	0x4505},
-	{"linux/input.h",	"EVIOCGBUS",	0x4507},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCSGAIN",	0x4582},
-	{"linux/input.h",	"EVIOCSAUTOCENTER",	0x4583},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"asm/ioctls.h",	"TCGETS",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"asm/ioctls.h",	"TCSETS",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"asm/ioctls.h",	"TCSETSW",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"asm/ioctls.h",	"TCSETSF",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"asm/ioctls.h",	"TCGETA",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"asm/ioctls.h",	"TCSETA",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"asm/ioctls.h",	"TCSETAW",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"asm/ioctls.h",	"TCSETAF",	0x5408},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"asm/ioctls.h",	"TCSBRK",	0x5409},
-	{"asm/ioctls.h",	"TCXONC",	0x540a},
-	{"asm/ioctls.h",	"TCFLSH",	0x540b},
-	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
-	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
-	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
-	{"asm/ioctls.h",	"TIOCGPGRP",	0x540f},
-	{"asm/ioctls.h",	"TIOCSPGRP",	0x5410},
-	{"asm/ioctls.h",	"TIOCOUTQ",	0x5411},
-	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
-	{"asm/ioctls.h",	"TIOCGWINSZ",	0x5413},
-	{"asm/ioctls.h",	"TIOCSWINSZ",	0x5414},
-	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
-	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
-	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
-	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
-	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
-	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
-	{"asm/ioctls.h",	"FIONREAD",	0x541b},
-	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
-	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
-	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
-	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
-	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
-	{"asm/ioctls.h",	"FIONBIO",	0x5421},
-	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
-	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
-	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
-	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
-	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
-	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
-	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
-	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
-	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
-	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
-	{"asm/ioctls.h",	"FIONCLEX",	0x5450},
-	{"asm/ioctls.h",	"FIOCLEX",	0x5451},
-	{"asm/ioctls.h",	"FIOASYNC",	0x5452},
-	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
-	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
-	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
-	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
-	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
-	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
-	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
-	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
-	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
-	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
-	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
-	{"asm/ioctls.h",	"TIOCGHAYESESP",	0x545e},
-	{"asm/ioctls.h",	"TIOCSHAYESESP",	0x545f},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/watchdog.h",	"WDIOC_SETTIMEOUT",	0x5706},
-	{"linux/watchdog.h",	"WDIOC_GETTIMEOUT",	0x5707},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_GETTHIST",	0x6164},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETFLAGS",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/i8k.h",	"I8K_BIOS_VERSION",	0x6980},
-	{"linux/i8k.h",	"I8K_MACHINE_ID",	0x6981},
-	{"linux/i8k.h",	"I8K_POWER_STATUS",	0x6982},
-	{"linux/i8k.h",	"I8K_FN_STATUS",	0x6983},
-	{"linux/i8k.h",	"I8K_GET_TEMP",	0x6984},
-	{"linux/i8k.h",	"I8K_GET_SPEED",	0x6985},
-	{"linux/i8k.h",	"I8K_GET_FAN",	0x6986},
-	{"linux/i8k.h",	"I8K_SET_FAN",	0x6987},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID2",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO_V2",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETMOUNT",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETPID",	0x7004},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLOSE_JOURNALF",	0x7006},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/intermezzo_fs.h",	"PRESTO_SET_FSETROOT",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_FSETROOT",	0x7008},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETOPT",	0x7009},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETOPT",	0x700a},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_KMLSIZE",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_RECNO",	0x700c},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETATTR",	0x7010},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CREATE",	0x7011},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_LINK",	0x7012},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_UNLINK",	0x7013},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SYMLINK",	0x7014},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKDIR",	0x7015},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RMDIR",	0x7016},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKNOD",	0x7017},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RENAME",	0x7018},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CLOSE",	0x701a},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_IOPEN",	0x701b},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETEXTATTR",	0x701c},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_DELEXTATTR",	0x701d},
-	{"linux/intermezzo_fs.h",	"PRESTO_MARK",	0x7020},
-	{"linux/intermezzo_fs.h",	"PRESTO_RELEASE_PERMIT",	0x7021},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_ALL_FSETROOTS",	0x7022},
-	{"linux/intermezzo_fs.h",	"PRESTO_BACKFETCH_LML",	0x7023},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT",	0x7024},
-	{"linux/intermezzo_fs.h",	"PRESTO_CANCEL_LML",	0x7025},
-	{"linux/intermezzo_fs.h",	"PRESTO_RESET_FSET",	0x7026},
-	{"linux/intermezzo_fs.h",	"PRESTO_COMPLETE_CLOSES",	0x7027},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_BEGIN",	0x7030},
-	{"linux/intermezzo_fs.h",	"PRESTO_DO_REINT",	0x7031},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_END",	0x7032},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"OLD_PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/sonypi.h",	"SONYPI_IOCSBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION_OLD",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION_OLD",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1CAP",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1REM",	0x7603},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2CAP",	0x7604},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2REM",	0x7605},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/sonypi.h",	"SONYPI_IOCGBATFLAGS",	0x7607},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/sonypi.h",	"SONYPI_IOCGBLUE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/sonypi.h",	"SONYPI_IOCSBLUE",	0x7609},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"OSIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/dn.h",	"OSIOCGNETADDR",	0x89e1},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/lvm.h",	"VG_CREATE_OLD",	0xfe00},
-	{"linux/lvm.h",	"VG_REMOVE",	0xfe01},
-	{"linux/lvm.h",	"VG_EXTEND",	0xfe03},
-	{"linux/lvm.h",	"VG_REDUCE",	0xfe04},
-	{"linux/lvm.h",	"VG_STATUS",	0xfe05},
-	{"linux/lvm.h",	"VG_STATUS_GET_COUNT",	0xfe06},
-	{"linux/lvm.h",	"VG_STATUS_GET_NAMELIST",	0xfe07},
-	{"linux/lvm.h",	"VG_SET_EXTENDABLE",	0xfe08},
-	{"linux/lvm.h",	"VG_RENAME",	0xfe09},
-	{"linux/lvm.h",	"VG_CREATE",	0xfe0a},
-	{"linux/lvm.h",	"LV_CREATE",	0xfe20},
-	{"linux/lvm.h",	"LV_REMOVE",	0xfe21},
-	{"linux/lvm.h",	"LV_ACTIVATE",	0xfe22},
-	{"linux/lvm.h",	"LV_DEACTIVATE",	0xfe23},
-	{"linux/lvm.h",	"LV_EXTEND",	0xfe24},
-	{"linux/lvm.h",	"LV_REDUCE",	0xfe25},
-	{"linux/lvm.h",	"LV_STATUS_BYNAME",	0xfe26},
-	{"linux/lvm.h",	"LV_STATUS_BYINDEX",	0xfe27},
-	{"linux/lvm.h",	"LV_SET_ACCESS",	0xfe28},
-	{"linux/lvm.h",	"LV_SET_ALLOCATION",	0xfe29},
-	{"linux/lvm.h",	"LV_SET_STATUS",	0xfe2a},
-	{"linux/lvm.h",	"LE_REMAP",	0xfe2b},
-	{"linux/lvm.h",	"LV_SNAPSHOT_USE_RATE",	0xfe2c},
-	{"linux/lvm.h",	"LV_STATUS_BYDEV",	0xfe2e},
-	{"linux/lvm.h",	"LV_RENAME",	0xfe2f},
-	{"linux/lvm.h",	"LV_BMAP",	0xfe30},
-	{"linux/lvm.h",	"PV_STATUS",	0xfe40},
-	{"linux/lvm.h",	"PV_CHANGE",	0xfe41},
-	{"linux/lvm.h",	"PV_FLUSH",	0xfe42},
-	{"linux/lvm.h",	"PE_LOCK_UNLOCK",	0xfe50},
-	{"linux/lvm.h",	"LVM_GET_IOP_VERSION",	0xfe98},
-	{"linux/lvm.h",	"LVM_RESET",	0xfe99},
-	{"linux/lvm.h",	"LVM_LOCK_LVM",	0xff00},
diff --git a/strace/linux/sparc64/ioctlent1.h b/strace/linux/sparc64/ioctlent1.h
deleted file mode 100644
index 5d536cf..0000000
--- a/strace/linux/sparc64/ioctlent1.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../svr4/ioctlent.h"
diff --git a/strace/linux/sparc64/ioctlent2.h b/strace/linux/sparc64/ioctlent2.h
deleted file mode 100644
index c1d6b8a..0000000
--- a/strace/linux/sparc64/ioctlent2.h
+++ /dev/null
@@ -1,838 +0,0 @@
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_DOS",	0x4d2},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_DOS",	0x4d3},
-	{"linux/umsdos_fs.h",	"UMSDOS_RMDIR_DOS",	0x4d4},
-	{"linux/umsdos_fs.h",	"UMSDOS_STAT_DOS",	0x4d5},
-	{"linux/umsdos_fs.h",	"UMSDOS_CREAT_EMD",	0x4d6},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_EMD",	0x4d7},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_EMD",	0x4d8},
-	{"linux/umsdos_fs.h",	"UMSDOS_GETVERSION",	0x4d9},
-	{"linux/umsdos_fs.h",	"UMSDOS_INIT_EMD",	0x4da},
-	{"linux/umsdos_fs.h",	"UMSDOS_DOS_SETUP",	0x4db},
-	{"linux/umsdos_fs.h",	"UMSDOS_RENAME_DOS",	0x4dc},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKPG",	0x1269},
-	{"linux/elevator.h",	"BLKELVGET",	0x126a},
-	{"linux/fs.h",	"BLKELVGET",	0x126a},
-	{"linux/elevator.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/fs.h",	"BLKGETSIZE64",	0x1272},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGREP",	0x4503},
-	{"linux/input.h",	"EVIOCSREP",	0x4503},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCSKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCGKEY",	0x4505},
-	{"linux/input.h",	"EVIOCGBUS",	0x4507},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCSGAIN",	0x4582},
-	{"linux/input.h",	"EVIOCSAUTOCENTER",	0x4583},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"asm/ioctls.h",	"TCGETS",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"asm/ioctls.h",	"TCSETS",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"asm/ioctls.h",	"TCSETSW",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"asm/ioctls.h",	"TCSETSF",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"asm/ioctls.h",	"TCGETA",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"asm/ioctls.h",	"TCSETA",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"asm/ioctls.h",	"TCSETAW",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"asm/ioctls.h",	"TCSETAF",	0x5408},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"asm/ioctls.h",	"TCSBRK",	0x5409},
-	{"asm/ioctls.h",	"TCXONC",	0x540a},
-	{"asm/ioctls.h",	"TCFLSH",	0x540b},
-	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
-	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
-	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
-	{"asm/ioctls.h",	"TIOCGPGRP",	0x540f},
-	{"asm/ioctls.h",	"TIOCSPGRP",	0x5410},
-	{"asm/ioctls.h",	"TIOCOUTQ",	0x5411},
-	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
-	{"asm/ioctls.h",	"TIOCGWINSZ",	0x5413},
-	{"asm/ioctls.h",	"TIOCSWINSZ",	0x5414},
-	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
-	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
-	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
-	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
-	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
-	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
-	{"asm/ioctls.h",	"FIONREAD",	0x541b},
-	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
-	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
-	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
-	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
-	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
-	{"asm/ioctls.h",	"FIONBIO",	0x5421},
-	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
-	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
-	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
-	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
-	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
-	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
-	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
-	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
-	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
-	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
-	{"asm/ioctls.h",	"FIONCLEX",	0x5450},
-	{"asm/ioctls.h",	"FIOCLEX",	0x5451},
-	{"asm/ioctls.h",	"FIOASYNC",	0x5452},
-	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
-	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
-	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
-	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
-	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
-	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
-	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
-	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
-	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
-	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
-	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
-	{"asm/ioctls.h",	"TIOCGHAYESESP",	0x545e},
-	{"asm/ioctls.h",	"TIOCSHAYESESP",	0x545f},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/watchdog.h",	"WDIOC_SETTIMEOUT",	0x5706},
-	{"linux/watchdog.h",	"WDIOC_GETTIMEOUT",	0x5707},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_GETTHIST",	0x6164},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETFLAGS",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/i8k.h",	"I8K_BIOS_VERSION",	0x6980},
-	{"linux/i8k.h",	"I8K_MACHINE_ID",	0x6981},
-	{"linux/i8k.h",	"I8K_POWER_STATUS",	0x6982},
-	{"linux/i8k.h",	"I8K_FN_STATUS",	0x6983},
-	{"linux/i8k.h",	"I8K_GET_TEMP",	0x6984},
-	{"linux/i8k.h",	"I8K_GET_SPEED",	0x6985},
-	{"linux/i8k.h",	"I8K_GET_FAN",	0x6986},
-	{"linux/i8k.h",	"I8K_SET_FAN",	0x6987},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID2",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO_V2",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETMOUNT",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETPID",	0x7004},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLOSE_JOURNALF",	0x7006},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/intermezzo_fs.h",	"PRESTO_SET_FSETROOT",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_FSETROOT",	0x7008},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETOPT",	0x7009},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETOPT",	0x700a},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_KMLSIZE",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_RECNO",	0x700c},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETATTR",	0x7010},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CREATE",	0x7011},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_LINK",	0x7012},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_UNLINK",	0x7013},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SYMLINK",	0x7014},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKDIR",	0x7015},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RMDIR",	0x7016},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKNOD",	0x7017},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RENAME",	0x7018},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CLOSE",	0x701a},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_IOPEN",	0x701b},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETEXTATTR",	0x701c},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_DELEXTATTR",	0x701d},
-	{"linux/intermezzo_fs.h",	"PRESTO_MARK",	0x7020},
-	{"linux/intermezzo_fs.h",	"PRESTO_RELEASE_PERMIT",	0x7021},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_ALL_FSETROOTS",	0x7022},
-	{"linux/intermezzo_fs.h",	"PRESTO_BACKFETCH_LML",	0x7023},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT",	0x7024},
-	{"linux/intermezzo_fs.h",	"PRESTO_CANCEL_LML",	0x7025},
-	{"linux/intermezzo_fs.h",	"PRESTO_RESET_FSET",	0x7026},
-	{"linux/intermezzo_fs.h",	"PRESTO_COMPLETE_CLOSES",	0x7027},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_BEGIN",	0x7030},
-	{"linux/intermezzo_fs.h",	"PRESTO_DO_REINT",	0x7031},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_END",	0x7032},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"OLD_PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/sonypi.h",	"SONYPI_IOCSBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION_OLD",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION_OLD",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1CAP",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1REM",	0x7603},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2CAP",	0x7604},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2REM",	0x7605},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/sonypi.h",	"SONYPI_IOCGBATFLAGS",	0x7607},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/sonypi.h",	"SONYPI_IOCGBLUE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/sonypi.h",	"SONYPI_IOCSBLUE",	0x7609},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"OSIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/dn.h",	"OSIOCGNETADDR",	0x89e1},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/lvm.h",	"VG_CREATE_OLD",	0xfe00},
-	{"linux/lvm.h",	"VG_REMOVE",	0xfe01},
-	{"linux/lvm.h",	"VG_EXTEND",	0xfe03},
-	{"linux/lvm.h",	"VG_REDUCE",	0xfe04},
-	{"linux/lvm.h",	"VG_STATUS",	0xfe05},
-	{"linux/lvm.h",	"VG_STATUS_GET_COUNT",	0xfe06},
-	{"linux/lvm.h",	"VG_STATUS_GET_NAMELIST",	0xfe07},
-	{"linux/lvm.h",	"VG_SET_EXTENDABLE",	0xfe08},
-	{"linux/lvm.h",	"VG_RENAME",	0xfe09},
-	{"linux/lvm.h",	"VG_CREATE",	0xfe0a},
-	{"linux/lvm.h",	"LV_CREATE",	0xfe20},
-	{"linux/lvm.h",	"LV_REMOVE",	0xfe21},
-	{"linux/lvm.h",	"LV_ACTIVATE",	0xfe22},
-	{"linux/lvm.h",	"LV_DEACTIVATE",	0xfe23},
-	{"linux/lvm.h",	"LV_EXTEND",	0xfe24},
-	{"linux/lvm.h",	"LV_REDUCE",	0xfe25},
-	{"linux/lvm.h",	"LV_STATUS_BYNAME",	0xfe26},
-	{"linux/lvm.h",	"LV_STATUS_BYINDEX",	0xfe27},
-	{"linux/lvm.h",	"LV_SET_ACCESS",	0xfe28},
-	{"linux/lvm.h",	"LV_SET_ALLOCATION",	0xfe29},
-	{"linux/lvm.h",	"LV_SET_STATUS",	0xfe2a},
-	{"linux/lvm.h",	"LE_REMAP",	0xfe2b},
-	{"linux/lvm.h",	"LV_SNAPSHOT_USE_RATE",	0xfe2c},
-	{"linux/lvm.h",	"LV_STATUS_BYDEV",	0xfe2e},
-	{"linux/lvm.h",	"LV_RENAME",	0xfe2f},
-	{"linux/lvm.h",	"LV_BMAP",	0xfe30},
-	{"linux/lvm.h",	"PV_STATUS",	0xfe40},
-	{"linux/lvm.h",	"PV_CHANGE",	0xfe41},
-	{"linux/lvm.h",	"PV_FLUSH",	0xfe42},
-	{"linux/lvm.h",	"PE_LOCK_UNLOCK",	0xfe50},
-	{"linux/lvm.h",	"LVM_GET_IOP_VERSION",	0xfe98},
-	{"linux/lvm.h",	"LVM_RESET",	0xfe99},
-	{"linux/lvm.h",	"LVM_LOCK_LVM",	0xff00},
diff --git a/strace/linux/sparc64/signalent.h b/strace/linux/sparc64/signalent.h
deleted file mode 100644
index e059b5d..0000000
--- a/strace/linux/sparc64/signalent.h
+++ /dev/null
@@ -1,32 +0,0 @@
-	"SIG_0",	/* 0 */
-	"SIGHUP",	/* 1 */
-	"SIGINT",	/* 2 */
-	"SIGQUIT",	/* 3 */
-	"SIGILL",	/* 4 */
-	"SIGTRAP",	/* 5 */
-	"SIGABRT",	/* 6 */
-	"SIGEMT",	/* 7 */
-	"SIGFPE",	/* 8 */
-	"SIGKILL",	/* 9 */
-	"SIGBUS",	/* 10 */
-	"SIGSEGV",	/* 11 */
-	"SIGSYS",	/* 12 */
-	"SIGPIPE",	/* 13 */
-	"SIGALRM",	/* 14 */
-	"SIGTERM",	/* 15 */
-	"SIGURG",	/* 16 */
-	"SIGSTOP",	/* 17 */
-	"SIGTSTP",	/* 18 */
-	"SIGCONT",	/* 19 */
-	"SIGCHLD",	/* 20 */
-	"SIGTTIN",	/* 21 */
-	"SIGTTOU",	/* 22 */
-	"SIGIO",	/* 23 */
-	"SIGXCPU",	/* 24 */
-	"SIGXFSZ",	/* 25 */
-	"SIGVTALRM",	/* 26 */
-	"SIGPROF",	/* 27 */
-	"SIGWINCH",	/* 28 */
-	"SIGLOST",	/* 29 */
-	"SIGUSR1",	/* 30 */
-	"SIGUSR2",	/* 31 */
diff --git a/strace/linux/sparc64/signalent1.h b/strace/linux/sparc64/signalent1.h
deleted file mode 100644
index 6be7a26..0000000
--- a/strace/linux/sparc64/signalent1.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../svr4/signalent.h"
diff --git a/strace/linux/sparc64/signalent2.h b/strace/linux/sparc64/signalent2.h
deleted file mode 100644
index e059b5d..0000000
--- a/strace/linux/sparc64/signalent2.h
+++ /dev/null
@@ -1,32 +0,0 @@
-	"SIG_0",	/* 0 */
-	"SIGHUP",	/* 1 */
-	"SIGINT",	/* 2 */
-	"SIGQUIT",	/* 3 */
-	"SIGILL",	/* 4 */
-	"SIGTRAP",	/* 5 */
-	"SIGABRT",	/* 6 */
-	"SIGEMT",	/* 7 */
-	"SIGFPE",	/* 8 */
-	"SIGKILL",	/* 9 */
-	"SIGBUS",	/* 10 */
-	"SIGSEGV",	/* 11 */
-	"SIGSYS",	/* 12 */
-	"SIGPIPE",	/* 13 */
-	"SIGALRM",	/* 14 */
-	"SIGTERM",	/* 15 */
-	"SIGURG",	/* 16 */
-	"SIGSTOP",	/* 17 */
-	"SIGTSTP",	/* 18 */
-	"SIGCONT",	/* 19 */
-	"SIGCHLD",	/* 20 */
-	"SIGTTIN",	/* 21 */
-	"SIGTTOU",	/* 22 */
-	"SIGIO",	/* 23 */
-	"SIGXCPU",	/* 24 */
-	"SIGXFSZ",	/* 25 */
-	"SIGVTALRM",	/* 26 */
-	"SIGPROF",	/* 27 */
-	"SIGWINCH",	/* 28 */
-	"SIGLOST",	/* 29 */
-	"SIGUSR1",	/* 30 */
-	"SIGUSR2",	/* 31 */
diff --git a/strace/linux/sparc64/syscall.h b/strace/linux/sparc64/syscall.h
deleted file mode 100644
index b56e08d..0000000
--- a/strace/linux/sparc64/syscall.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../sparc/syscall.h"
diff --git a/strace/linux/sparc64/syscall1.h b/strace/linux/sparc64/syscall1.h
deleted file mode 100644
index 141f8da..0000000
--- a/strace/linux/sparc64/syscall1.h
+++ /dev/null
@@ -1,501 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscall1.h,v 1.1 2004/07/12 07:44:08 roland Exp $
- */
-
-#define	SOLARIS_syscall	0
-#define	SOLARIS_exit	1
-#define	SOLARIS_fork	2
-#define	SOLARIS_read	3
-#define	SOLARIS_write	4
-#define	SOLARIS_open	5
-#define	SOLARIS_close	6
-#define	SOLARIS_wait	7
-#define	SOLARIS_creat	8
-#define	SOLARIS_link	9
-#define	SOLARIS_unlink	10
-#define	SOLARIS_exec	11
-#define	SOLARIS_chdir	12
-#define	SOLARIS_time	13
-#define	SOLARIS_mknod	14
-#define	SOLARIS_chmod	15
-#define	SOLARIS_chown	16
-#define	SOLARIS_brk		17
-#define	SOLARIS_stat	18
-#define	SOLARIS_lseek	19
-#define	SOLARIS_getpid	20
-#define	SOLARIS_mount	21
-#define	SOLARIS_umount	22
-#define	SOLARIS_setuid	23
-#define	SOLARIS_getuid	24
-#define	SOLARIS_stime	25
-#define	SOLARIS_ptrace	26
-#define	SOLARIS_alarm	27
-#define	SOLARIS_fstat	28
-#define	SOLARIS_pause	29
-#define	SOLARIS_utime	30
-#define	SOLARIS_stty	31
-#define	SOLARIS_gtty	32
-#define	SOLARIS_access	33
-#define	SOLARIS_nice	34
-#define	SOLARIS_statfs	35
-#define	SOLARIS_sync	36
-#define	SOLARIS_kill	37
-#define	SOLARIS_fstatfs	38
-#define	SOLARIS_pgrpsys	39
-#define	SOLARIS_xenix	40
-#define	SOLARIS_dup		41
-#define	SOLARIS_pipe	42
-#define	SOLARIS_times	43
-#define	SOLARIS_profil	44
-#define	SOLARIS_plock	45
-#define	SOLARIS_setgid	46
-#define	SOLARIS_getgid	47
-#define	SOLARIS_signal	48
-#define	SOLARIS_msgsys	49
-#define	SOLARIS_syssun	50
-#define	SOLARIS_acct	51
-#define	SOLARIS_shmsys	52
-#define	SOLARIS_semsys	53
-#define	SOLARIS_ioctl	54
-#define	SOLARIS_uadmin	55
-#define	SOLARIS_utssys	57
-#define	SOLARIS_fdsync	58
-#define	SOLARIS_execve	59
-#define	SOLARIS_umask	60
-#define	SOLARIS_chroot	61
-#define	SOLARIS_fcntl	62
-#define	SOLARIS_ulimit	63
-#define	SOLARIS_rmdir	79
-#define	SOLARIS_mkdir	80
-#define	SOLARIS_getdents	81
-#define	SOLARIS_sysfs	84
-#define	SOLARIS_getmsg	85
-#define	SOLARIS_putmsg	86
-#define	SOLARIS_poll	87
-#define	SOLARIS_lstat	88
-#define	SOLARIS_symlink	89
-#define	SOLARIS_readlink	90
-#define	SOLARIS_setgroups	91
-#define	SOLARIS_getgroups	92
-#define	SOLARIS_fchmod	93
-#define	SOLARIS_fchown	94
-#define	SOLARIS_sigprocmask	95
-#define	SOLARIS_sigsuspend	96
-#define	SOLARIS_sigaltstack	97
-#define	SOLARIS_sigaction	98
-#define	SOLARIS_sigpending	99
-#define	SOLARIS_context	100
-#define	SOLARIS_evsys	101
-#define	SOLARIS_evtrapret	102
-#define	SOLARIS_statvfs	103
-#define	SOLARIS_fstatvfs	104
-#define	SOLARIS_nfssys	106
-#define	SOLARIS_waitsys	107
-#define	SOLARIS_sigsendsys	108
-#define	SOLARIS_hrtsys	109
-#define	SOLARIS_acancel	110
-#define	SOLARIS_async	111
-#define	SOLARIS_priocntlsys	112
-#define	SOLARIS_pathconf	113
-#define	SOLARIS_mincore	114
-#define	SOLARIS_mmap	115
-#define	SOLARIS_mprotect	116
-#define	SOLARIS_munmap	117
-#define	SOLARIS_fpathconf	118
-#define	SOLARIS_vfork	119
-#define	SOLARIS_fchdir	120
-#define	SOLARIS_readv	121
-#define	SOLARIS_writev	122
-#define	SOLARIS_xstat	123
-#define	SOLARIS_lxstat	124
-#define	SOLARIS_fxstat	125
-#define	SOLARIS_xmknod	126
-#define	SOLARIS_clocal	127
-#define	SOLARIS_setrlimit	128
-#define	SOLARIS_getrlimit	129
-#define	SOLARIS_lchown	130
-#define	SOLARIS_memcntl	131
-#define	SOLARIS_getpmsg	132
-#define	SOLARIS_putpmsg	133
-#define	SOLARIS_rename	134
-#define	SOLARIS_uname	135
-#define	SOLARIS_setegid	136
-#define	SOLARIS_sysconfig	137
-#define	SOLARIS_adjtime	138
-#define	SOLARIS_systeminfo	139
-#define	SOLARIS_seteuid	141
-#define	SOLARIS_vtrace	142
-#define	SOLARIS_fork1	143
-#define	SOLARIS_sigtimedwait	144
-#define	SOLARIS_lwp_info	145
-#define	SOLARIS_yield	146
-#define	SOLARIS_lwp_sema_wait	147
-#define	SOLARIS_lwp_sema_post	148
-#define	SOLARIS_modctl	152
-#define	SOLARIS_fchroot	153
-#define	SOLARIS_utimes	154
-#define	SOLARIS_vhangup	155
-#define	SOLARIS_gettimeofday	156
-#define	SOLARIS_getitimer		157
-#define	SOLARIS_setitimer		158
-#define	SOLARIS_lwp_create		159
-#define	SOLARIS_lwp_exit		160
-#define	SOLARIS_lwp_suspend		161
-#define	SOLARIS_lwp_continue	162
-#define	SOLARIS_lwp_kill		163
-#define	SOLARIS_lwp_self		164
-#define	SOLARIS_lwp_setprivate	165
-#define	SOLARIS_lwp_getprivate	166
-#define	SOLARIS_lwp_wait		167
-#define	SOLARIS_lwp_mutex_unlock	168
-#define	SOLARIS_lwp_mutex_lock	169
-#define	SOLARIS_lwp_cond_wait	170
-#define	SOLARIS_lwp_cond_signal	171
-#define	SOLARIS_lwp_cond_broadcast	172
-#define	SOLARIS_pread		173
-#define	SOLARIS_pwrite		174
-#define	SOLARIS_llseek		175
-#define	SOLARIS_inst_sync		176
-#define	SOLARIS_kaio		178
-#define	SOLARIS_tsolsys		184
-#define	SOLARIS_acl			185
-#define	SOLARIS_auditsys		186
-#define	SOLARIS_processor_bind	187
-#define	SOLARIS_processor_info	188
-#define	SOLARIS_p_online		189
-#define	SOLARIS_sigqueue		190
-#define	SOLARIS_clock_gettime	191
-#define	SOLARIS_clock_settime	192
-#define	SOLARIS_clock_getres	193
-#define	SOLARIS_timer_create	194
-#define	SOLARIS_timer_delete	195
-#define	SOLARIS_timer_settime	196
-#define	SOLARIS_timer_gettime	197
-#define	SOLARIS_timer_getoverrun	198
-#define	SOLARIS_nanosleep		199
-#define	SOLARIS_facl		200
-#define	SOLARIS_door		201
-#define	SOLARIS_setreuid		202
-#define	SOLARIS_setregid		203
-#define	SOLARIS_signotifywait	210
-#define	SOLARIS_lwp_sigredirect	211
-#define	SOLARIS_lwp_alarm		212
-
-#include "dummy2.h"
-
-extern int solaris_syscall();
-extern int solaris_exit();
-extern int solaris_fork();
-extern int solaris_read();
-extern int solaris_write();
-extern int solaris_open();
-extern int solaris_close();
-extern int solaris_wait();
-extern int solaris_creat();
-extern int solaris_link();
-extern int solaris_unlink();
-extern int solaris_exec();
-extern int solaris_chdir();
-extern int solaris_time();
-extern int solaris_mknod();
-extern int solaris_chmod();
-extern int solaris_chown();
-extern int solaris_brk();
-extern int solaris_stat();
-extern int solaris_lseek();
-extern int solaris_getpid();
-extern int solaris_mount();
-extern int solaris_umount();
-extern int solaris_setuid();
-extern int solaris_getuid();
-extern int solaris_stime();
-extern int solaris_ptrace();
-extern int solaris_alarm();
-extern int solaris_fstat();
-extern int solaris_pause();
-extern int solaris_utime();
-extern int solaris_stty();
-extern int solaris_gtty();
-extern int solaris_access();
-extern int solaris_nice();
-extern int solaris_statfs();
-extern int solaris_sync();
-extern int solaris_kill();
-extern int solaris_fstatfs();
-extern int solaris_pgrpsys();
-extern int solaris_setpgrp();
-extern int solaris_xenix();
-extern int solaris_syssgi();
-extern int solaris_dup();
-extern int solaris_pipe();
-extern int solaris_times();
-extern int solaris_profil();
-extern int solaris_plock();
-extern int solaris_setgid();
-extern int solaris_getgid();
-extern int solaris_sigcall();
-extern int solaris_msgsys();
-extern int solaris_syssun();
-extern int solaris_sysi86();
-extern int solaris_sysmips();
-extern int solaris_sysmachine();
-extern int solaris_acct();
-extern int solaris_shmsys();
-extern int solaris_semsys();
-extern int solaris_ioctl();
-extern int solaris_uadmin();
-extern int solaris_utssys();
-extern int solaris_fdsync();
-extern int solaris_execve();
-extern int solaris_umask();
-extern int solaris_chroot();
-extern int solaris_fcntl();
-extern int solaris_ulimit();
-extern int solaris_rmdir();
-extern int solaris_mkdir();
-extern int solaris_getdents();
-extern int solaris_sysfs();
-extern int solaris_getmsg();
-extern int solaris_putmsg();
-extern int solaris_poll();
-extern int solaris_lstat();
-extern int solaris_symlink();
-extern int solaris_readlink();
-extern int solaris_setgroups();
-extern int solaris_getgroups();
-extern int solaris_fchmod();
-extern int solaris_fchown();
-extern int solaris_sigprocmask();
-extern int solaris_sigsuspend();
-extern int solaris_sigaltstack();
-extern int solaris_sigaction();
-extern int solaris_spcall();
-extern int solaris_context();
-extern int solaris_evsys();
-extern int solaris_evtrapret();
-extern int solaris_statvfs();
-extern int solaris_fstatvfs();
-extern int solaris_nfssys();
-extern int solaris_waitid();
-extern int solaris_sigsendsys();
-extern int solaris_hrtsys();
-extern int solaris_acancel();
-extern int solaris_async();
-extern int solaris_priocntlsys();
-extern int solaris_pathconf();
-extern int solaris_mincore();
-extern int solaris_mmap();
-extern int solaris_mprotect();
-extern int solaris_munmap();
-extern int solaris_fpathconf();
-extern int solaris_vfork();
-extern int solaris_fchdir();
-extern int solaris_readv();
-extern int solaris_writev();
-extern int solaris_xstat();
-extern int solaris_lxstat();
-extern int solaris_fxstat();
-extern int solaris_xmknod();
-extern int solaris_clocal();
-extern int solaris_setrlimit();
-extern int solaris_getrlimit();
-extern int solaris_lchown();
-extern int solaris_memcntl();
-extern int solaris_getpmsg();
-extern int solaris_putpmsg();
-extern int solaris_rename();
-extern int solaris_uname();
-extern int solaris_setegid();
-extern int solaris_sysconfig();
-extern int solaris_adjtime();
-extern int solaris_sysinfo();
-extern int solaris_seteuid();
-extern int solaris_vtrace();
-extern int solaris_fork1();
-extern int solaris_sigtimedwait();
-extern int solaris_lwp_info();
-extern int solaris_yield();
-extern int solaris_lwp_sema_wait();
-extern int solaris_lwp_sema_post();
-extern int solaris_modctl();
-extern int solaris_fchroot();
-extern int solaris_utimes();
-extern int solaris_vhangup();
-extern int solaris_gettimeofday();
-extern int solaris_getitimer();
-extern int solaris_setitimer();
-extern int solaris_lwp_create();
-extern int solaris_lwp_exit();
-extern int solaris_lwp_suspend();
-extern int solaris_lwp_continue();
-extern int solaris_lwp_kill();
-extern int solaris_lwp_self();
-extern int solaris_lwp_setprivate();
-extern int solaris_lwp_getprivate();
-extern int solaris_lwp_wait();
-extern int solaris_lwp_mutex_unlock();
-extern int solaris_lwp_mutex_lock();
-extern int solaris_lwp_cond_wait();
-extern int solaris_lwp_cond_signal();
-extern int solaris_lwp_cond_broadcast();
-extern int solaris_pread();
-extern int solaris_pwrite();
-extern int solaris_llseek();
-extern int solaris_inst_sync();
-extern int solaris_auditsys();
-extern int solaris_processor_bind();
-extern int solaris_processor_info();
-extern int solaris_p_online();
-extern int solaris_sigqueue();
-extern int solaris_clock_gettime();
-extern int solaris_clock_settime();
-extern int solaris_clock_getres();
-extern int solaris_timer_create();
-extern int solaris_timer_delete();
-extern int solaris_timer_settime();
-extern int solaris_timer_gettime();
-extern int solaris_timer_getoverrun();
-extern int solaris_nanosleep();
-
-/* solaris_pgrpsys subcalls */
-
-extern int solaris_getpgrp(), solaris_setpgrp(), solaris_getsid();
-extern int solaris_setsid(), solaris_getpgid(), solaris_setpgid();
-
-#define SOLARIS_pgrpsys_subcall	300
-#define SOLARIS_getpgrp		(SOLARIS_pgrpsys_subcall + 0)
-#define SOLARIS_setpgrp		(SOLARIS_pgrpsys_subcall + 1)
-#define SOLARIS_getsid		(SOLARIS_pgrpsys_subcall + 2)
-#define SOLARIS_setsid		(SOLARIS_pgrpsys_subcall + 3)
-#define SOLARIS_getpgid		(SOLARIS_pgrpsys_subcall + 4)
-#define SOLARIS_setpgid		(SOLARIS_pgrpsys_subcall + 5)
-
-#define SOLARIS_pgrpsys_nsubcalls	6
-
-/* solaris_sigcall subcalls */
-
-#undef SOLARIS_signal
-#define SOLARIS_sigcall		48
-
-extern int solaris_signal(), solaris_sigset(), solaris_sighold();
-extern int solaris_sigrelse(), solaris_sigignore(), solaris_sigpause();
-
-#define SOLARIS_sigcall_subcall	310
-#define SOLARIS_signal		(SOLARIS_sigcall_subcall + 0)
-#define SOLARIS_sigset		(SOLARIS_sigcall_subcall + 1)
-#define SOLARIS_sighold		(SOLARIS_sigcall_subcall + 2)
-#define SOLARIS_sigrelse		(SOLARIS_sigcall_subcall + 3)
-#define SOLARIS_sigignore		(SOLARIS_sigcall_subcall + 4)
-#define SOLARIS_sigpause		(SOLARIS_sigcall_subcall + 5)
-
-#define SOLARIS_sigcall_nsubcalls	6
-
-/* msgsys subcalls */
-
-extern int solaris_msgget(), solaris_msgctl(), solaris_msgrcv(), solaris_msgsnd();
-
-#define SOLARIS_msgsys_subcall	320
-#define SOLARIS_msgget		(SOLARIS_msgsys_subcall + 0)
-#define SOLARIS_msgctl		(SOLARIS_msgsys_subcall + 1)
-#define SOLARIS_msgrcv		(SOLARIS_msgsys_subcall + 2)
-#define SOLARIS_msgsnd		(SOLARIS_msgsys_subcall + 3)
-
-#define SOLARIS_msgsys_nsubcalls	4
-
-/* shmsys subcalls */
-
-extern int solaris_shmat(), solaris_shmctl(), solaris_shmdt(), solaris_shmget();
-
-#define SOLARIS_shmsys_subcall	330
-#define SOLARIS_shmat		(SOLARIS_shmsys_subcall + 0)
-#define SOLARIS_shmctl		(SOLARIS_shmsys_subcall + 1)
-#define SOLARIS_shmdt		(SOLARIS_shmsys_subcall + 2)
-#define SOLARIS_shmget		(SOLARIS_shmsys_subcall + 3)
-
-#define SOLARIS_shmsys_nsubcalls	4
-
-/* semsys subcalls */
-
-extern int solaris_semctl(), solaris_semget(), solaris_semop();
-
-#define SOLARIS_semsys_subcall	340
-#define SOLARIS_semctl		(SOLARIS_semsys_subcall + 0)
-#define SOLARIS_semget		(SOLARIS_semsys_subcall + 1)
-#define SOLARIS_semop		(SOLARIS_semsys_subcall + 2)
-
-#define SOLARIS_semsys_nsubcalls	3
-
-/* utssys subcalls */
-
-extern int solaris_olduname(), solaris_ustat(), solaris_fusers();
-
-#define SOLARIS_utssys_subcall	350
-
-#define SOLARIS_olduname		(SOLARIS_utssys_subcall + 0)
-				/* 1 is unused */
-#define SOLARIS_ustat		(SOLARIS_utssys_subcall + 2)
-#define SOLARIS_fusers		(SOLARIS_utssys_subcall + 3)
-
-#define SOLARIS_utssys_nsubcalls	4
-
-/* sysfs subcalls */
-
-extern int solaris_sysfs1(), solaris_sysfs2(), solaris_sysfs3();
-
-#define SOLARIS_sysfs_subcall	360
-				/* 0 is unused */
-#define SOLARIS_sysfs1		(SOLARIS_sysfs_subcall + 1)
-#define SOLARIS_sysfs2		(SOLARIS_sysfs_subcall + 2)
-#define SOLARIS_sysfs3		(SOLARIS_sysfs_subcall + 3)
-
-#define SOLARIS_sysfs_nsubcalls	4
-
-/* solaris_spcall subcalls */
-
-#undef SOLARIS_sigpending
-#define SOLARIS_spcall		99
-
-extern int solaris_sigpending(), solaris_sigfillset();
-
-#define SOLARIS_spcall_subcall	370
-				/* 0 is unused */
-#define SOLARIS_sigpending		(SOLARIS_spcall_subcall + 1)
-#define SOLARIS_sigfillset		(SOLARIS_spcall_subcall + 2)
-
-#define SOLARIS_spcall_nsubcalls	3
-
-/* solaris_context subcalls */
-
-extern int solaris_getcontext(), solaris_setcontext();
-
-#define SOLARIS_context_subcall	380
-#define SOLARIS_getcontext		(SOLARIS_context_subcall + 0)
-#define SOLARIS_setcontext		(SOLARIS_context_subcall + 1)
-
-#define SOLARIS_context_nsubcalls	2
-
diff --git a/strace/linux/sparc64/syscallent.h b/strace/linux/sparc64/syscallent.h
deleted file mode 100644
index 2872946..0000000
--- a/strace/linux/sparc64/syscallent.h
+++ /dev/null
@@ -1,353 +0,0 @@
-	{ 1,	0,	sys_setup,	"setup" },		/* 0 */
-	{ 1,	TP,	sys_exit,	"exit" },		/* 1 */
-	{ 0,	TP,	sys_fork,	"fork" },		/* 2 */
-	{ 3,	0,	sys_read,	"read" },		/* 3 */
-	{ 3,	0,	sys_write,	"write" },		/* 4 */
-	{ 3,	TF,	sys_open,	"open" },		/* 5 */
-	{ 1,	0,	sys_close,	"close" },		/* 6 */
-	{ 4,	TP,	sys_wait4,	"wait4" },		/* 7 */
-	{ 2,	TF,	sys_creat,	"creat" },		/* 8 */
-	{ 2,	TF,	sys_link,	"link" },		/* 9 */
-	{ 1,	TF,	sys_unlink,	"unlink" },		/* 10 */
-	{ 2,    TF|TP,	sys_execv,	"execv" },		/* 11 */
-	{ 1,	TF,	sys_chdir,	"chdir" },		/* 12 */
-        { 3,    TF,     sys_chown,      "chown"},		/* 13 */
-	{ 3,	TF,	sys_mknod,	"mknod" },		/* 14 */
-	{ 2,	TF,	sys_chmod,	"chmod" },		/* 15 */
-	{ 3,	TF,	sys_chown,	"lchown" },		/* 16 */
-	{ 1,	0,	sys_brk,	"brk" },		/* 17 */
-	{ 4,	0,	printargs,	"perfctr" },		/* 18 */
-	{ 3,	0,	sys_lseek,	"lseek" },		/* 19 */
-	{ 0,	0,	sys_getpid,	"getpid" },		/* 20 */
-	{ 2,	0,	sys_capget,	"capget" },		/* 21 */
-	{ 2,	0,	sys_capset,	"capset" },		/* 22 */
-	{ 1,	0,	sys_setuid,	"setuid" },		/* 23 */
-	{ 0,	0,	sys_getuid,	"getuid" },		/* 24 */
-	{ 1,	0,	sys_time,	"time" },		/* 25 */
-	{ 5,	0,	sys_ptrace,	"ptrace" },		/* 26 */
-	{ 1,	0,	sys_alarm,	"alarm" },		/* 27 */
-	{ 2,	TS,	sys_sigaltstack,"sigaltstack" },	/* 28 */
-	{ 0,	TS,	sys_pause,	"pause" },		/* 29 */
-	{ 2,	TF,	sys_utime,	"utime" },		/* 30 */
-	{ 3,	TF,	sys_chown,	"lchown32" },		/* 31 */
-	{ 3,	0,	sys_fchown,	"fchown32" },		/* 32 */
-	{ 2,	TF,	sys_access,	"access" },		/* 33 */
-	{ 1,	0,	sys_nice,	"nice" },		/* 34 */
-	{ 3,	TF,	sys_chown,	"chown32" },		/* 35 */
-	{ 0,	0,	sys_sync,	"sync" },		/* 36 */
-	{ 2,	TS,	sys_kill,	"kill" },		/* 37 */
-	{ 2,	TF,	sys_stat,	"stat" },		/* 38 */
-	{ 4,	TF,	sys_sendfile,	"sendfile" },		/* 39 */
-	{ 2,	TF,	sys_lstat,	"lstat" },		/* 40 */
-	{ 2,	0,	sys_dup,	"dup" },		/* 41 */
-	{ 0,	0,	sys_pipe,	"pipe" },		/* 42 */
-	{ 1,	0,	sys_times,	"times" },		/* 43 */
-	{ 0,	0,	sys_getuid,	"getuid32" },		/* 44 */
-	{ 2,	TF,	sys_umount2,	"umount" },		/* 45 */
-	{ 1,	0,	sys_setgid,	"setgid" },		/* 46 */
-	{ 0,	0,	sys_getgid,	"getgid" },		/* 47 */
-	{ 3,	TS,	sys_signal,	"signal" },		/* 48 */
-	{ 0,	0,	sys_geteuid,	"geteuid" },		/* 49 */
-	{ 0,	0,	sys_getegid,	"getegid" },		/* 50 */
-	{ 1,	TF,	sys_acct,	"acct" },		/* 51 */
-	{ 2,	0,	printargs,	"memory_ordering" },	/* 52 */
-	{ 0,	0,	sys_getgid,	"getgid32" },		/* 53 */
-	{ 3,	0,	sys_ioctl,	"ioctl" },		/* 54 */
-	{ 3,	0,	sys_reboot,	"reboot" },		/* 55 */
-	{ 6,	0,	sys_mmap,	"mmap2" },		/* 56 */
-	{ 2,	TF,	sys_symlink,	"symlink" },		/* 57 */
-	{ 3,	TF,	sys_readlink,	"readlink" },		/* 58 */
-	{ 3,	TF|TP,	sys_execve,	"execve" },		/* 59 */
-	{ 1,	0,	sys_umask,	"umask" },		/* 60 */
-	{ 1,	TF,	sys_chroot,	"chroot" },		/* 61 */
-	{ 2,	0,	sys_fstat,	"fstat" },		/* 62 */
-	{ 2,	TF,	sys_fstat64,	"fstat64" },		/* 63 */
-	{ 0,	0,	sys_getpagesize,"getpagesize" },	/* 64 */
-	{ 3,	0,	sys_msync,	"msync" },		/* 65 */
-	{ 0,	TP,	sys_vfork,	"vfork" },		/* 66 */
-	{ 5,	TF,	sys_pread,	"pread" },		/* 67 */
-	{ 5,	TF,	sys_pwrite,	"pwrite" },		/* 68 */
-	{ 0,    0,	sys_geteuid,	"geteuid32" },		/* 69 */
-	{ 0,	0,	sys_getegid,	"getegid32" },		/* 70 */
-	{ 6,	0,	sys_mmap,	"mmap" },		/* 71 */
-	{ 2,	0,	sys_setreuid,	"setreuid32" },		/* 72 */
-	{ 2,	0,	sys_munmap,	"munmap" },		/* 73 */
-	{ 3,	0,	sys_mprotect,	"mprotect" },		/* 74 */
-	{ 3,	0,	sys_madvise,	"madvise" },		/* 75 */
-	{ 0,	0,	sys_vhangup,	"vhangup" },		/* 76 */
-	{ 3,	TF,	sys_truncate64,	"truncate64" },		/* 77 */
-	{ 3,	0,	sys_mincore,	"mincore" },		/* 78 */
-	{ 2,	0,	sys_getgroups,	"getgroups" },		/* 79 */
-	{ 2,	0,	sys_setgroups,	"setgroups" },		/* 80 */
-	{ 0,	0,	sys_getpgrp,	"getpgrp" },		/* 81 */
-	{ 2,	0,	sys_setgroups,	"setgroups32" },	/* 82 */
-	{ 3,	0,	sys_setitimer,	"setitimer" },		/* 83 */
-	{ 2,	0,	sys_ftruncate,	"ftruncate64" },	/* 84 */
-	{ 1,	TF,	sys_swapon,	"swapon" },		/* 85 */
-	{ 2,	0,	sys_getitimer,	"getitimer" },		/* 86 */
-	{ 1,	0,	sys_setuid,	"setuid32" },		/* 87 */
-	{ 2,	0,	sys_sethostname,"sethostname" },	/* 88 */
-	{ 1,	0,	sys_setgid,	"setgid32" },		/* 89 */
-	{ 2,	0,	sys_dup2,	"dup2" },		/* 90 */
-	{ 1,	0,	sys_setfsuid,	"setfsuid32" },		/* 91 */
-	{ 3,	0,	sys_fcntl,	"fcntl" },		/* 92 */
-	{ 5,	0,	sys_select,	"select" },		/* 93 */
-	{ 1,	0,	sys_setfsgid,	"setfsgid32" },		/* 94 */
-	{ 1,	0,	sys_fsync,	"fsync" },		/* 95 */
-	{ 3,	0,	sys_setpriority,"setpriority" },	/* 96 */
-	{ 3,	TN,	sys_socket,	"socket" },		/* 97 */
-	{ 3,	TN,	sys_connect,	"connect" },		/* 98 */
-	{ 3,	TN,	sys_accept,	"accept" },		/* 99 */
-	{ 2,	0,	sys_getpriority,"getpriority" },	/* 100 */
-	{ 1,	TS,	printargs,	"rt_sigreturn" },	/* 101 */
-	{ 4,	TS,	sys_rt_sigaction,"rt_sigaction" },	/* 102 */
-	{ 4,	TS,	sys_rt_sigprocmask,"rt_sigprocmask" },	/* 103 */
-	{ 2,	TS,	sys_rt_sigpending,"rt_sigpending" },	/* 104 */
-	{ 4,	TS,	sys_rt_sigtimedwait,"rt_sigtimedwait" },/* 105 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,"rt_sigqueueinfo" },/* 106 */
-	{ 2,	TS,	sys_rt_sigsuspend,"rt_sigsuspend" },	/* 107 */
-	{ 3,	TS,	sys_setresuid,	"setresuid" },		/* 108 */
-	{ 3,    TS,	sys_getresuid,	"getresuid" },		/* 109 */
-	{ 3,	TS,	sys_setresgid,	"setresgid" },		/* 110 */
-	{ 3,	TS,	sys_getresgid,	"getresgid" },		/* 111 */
-	{ 2,	TS,	sys_setresgid,	"setresgid32" },	/* 112 */
-	{ 5,	TN,	sys_recvmsg,	"recvmsg" },		/* 113 */
-	{ 5,	TN,	sys_sendmsg,	"sendmsg" },		/* 114 */
-	{ 2,	0,	sys_getgroups,	"getgroups32" },	/* 115 */
-	{ 2,	0,	sys_gettimeofday,"gettimeofday" },	/* 116 */
-	{ 2,	0,	sys_getrusage,	"getrusage" },		/* 117 */
-	{ 5,	TN,	sys_getsockopt,	"getsockopt" },		/* 118 */
-	{ 2,	TF,	sys_getcwd,	"getcwd" },		/* 119 */
-	{ 3,	0,	sys_readv,	"readv" },		/* 120 */
-	{ 3,	0,	sys_writev,	"writev" },		/* 121 */
-	{ 2,	0,	sys_settimeofday,"settimeofday" },	/* 122 */
-	{ 3,	0,	sys_fchown,	"fchown" },		/* 123 */
-	{ 2,	0,	sys_fchmod,	"fchmod" },		/* 124 */
-	{ 6,	TN,	sys_recvfrom,	"recvfrom" },		/* 125 */
-	{ 2,	0,	sys_setreuid,	"setreuid" },		/* 126 */
-	{ 2,	0,	sys_setregid,	"setregid" },		/* 127 */
-	{ 2,	TF,	sys_rename,	"rename" },		/* 128 */
-	{ 2,	TF,	sys_truncate,	"truncate" },		/* 129 */
-	{ 2,	0,	sys_ftruncate,	"ftruncate" },		/* 130 */
-	{ 2,	0,	sys_flock,	"flock" },		/* 131 */
-	{ 2,	TF,	sys_lstat64,	"lstat64" },		/* 132 */
-	{ 6,	TN,	sys_sendto,	"sendto" },		/* 133 */
-	{ 2,	TN,	sys_shutdown,	"shutdown" },		/* 134 */
-	{ 4,	TN,	sys_socketpair,	"socketpair" },		/* 135 */
-	{ 2,	TF,	sys_mkdir,	"mkdir" },		/* 136 */
-	{ 1,	TF,	sys_rmdir,	"rmdir" },		/* 137 */
-	{ 2,	TF,	sys_utimes,	"utimes" },		/* 138 */
-	{ 2,	TF,	sys_stat64,	"stat64" },		/* 139 */
-	{ 4,    TF,	sys_sendfile64,	"sendfile64" },		/* 140 */
-	{ 3,	TN,	sys_getpeername,"getpeername" },	/* 141 */
-	{ 5,    0,	sys_futex,	"futex" },		/* 142 */
-	{ 0,	0,	printargs,	"gettid" },		/* 143 */
-	{ 2,	0,	sys_getrlimit,	"getrlimit" },		/* 144 */
-	{ 2,	0,	sys_setrlimit,	"setrlimit" },		/* 145 */
-	{ 2,	TF,	sys_pivotroot,	"pivot_root" },		/* 146 */
-	{ 5,	0,	sys_prctl,	"prctl" },		/* 147 */
-	{ 5,	0,	printargs,	"pciconfig_read" },	/* 148 */
-	{ 5,	0,	printargs,	"pciconfig_write" },	/* 149 */
-	{ 3,	TN,	sys_getsockname,"getsockname" },	/* 150 */
-	{ 4,	TN,	sys_getmsg,	"getmsg" },		/* 151 */
-	{ 4,	TN,	sys_putmsg,	"putmsg" },		/* 152 */
-	{ 3,	0,	sys_poll,	"poll" },		/* 153 */
-	{ 4,	0,	sys_getdents64,	"getdents64" },		/* 154 */
-	{ 3,	0,	sys_fcntl,	"fcntl64" },		/* 155 */
-	{ 4,	0,	printargs,	"getdirentries" },	/* 156 */
-	{ 2,	TF,	sys_statfs,	"statfs" },		/* 157 */
-	{ 2,	0,	sys_fstatfs,	"fstatfs" },		/* 158 */
-	{ 1,	TF,	sys_umount,	"oldumount" },		/* 159 */
-	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 160 */
-	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 161 */
-	{ 2,	0,	printargs,	"getdomainname" },	/* 162 */
-	{ 2,	0,	sys_setdomainname,"setdomainname" },	/* 163 */
-	{ 5,	0,	printargs,	"utrap_install" },	/* 164 */
-	{ 4,	0,	sys_quotactl,	"quotactl" },		/* 165 */
-	{ 1,	0,	printargs,	"set_tid_address" },	/* 166 */
-	{ 5,	TF,	sys_mount,	"mount" },		/* 167 */
-	{ 2,	0,	sys_ustat,	"ustat" },		/* 168 */
-	{ 5,	TF,	sys_setxattr,	"setxattr" },		/* 169 */
-	{ 5,	TF,	sys_setxattr,	"lsetxattr" },		/* 170 */
-	{ 5,	0,	sys_fsetxattr,	"fsetxattr" },		/* 171 */
-	{ 4,	TF,	sys_getxattr,	"getxattr" },		/* 172 */
-	{ 4,	TF,	sys_getxattr,	"lgetxattr" },		/* 173 */
-	{ 3,	0,	sys_getdents,	"getdents" },		/* 174 */
-	{ 0,	0,	sys_setsid,	"setsid" },		/* 175 */
-	{ 1,	0,	sys_fchdir,	"fchdir" },		/* 176 */
-	{ 4,    0,	sys_fgetxattr,	"fgetxattr" },		/* 177 */
-	{ 3,	TF,	sys_listxattr,	"listxattr" },		/* 178 */
-	{ 3,	TF,	sys_listxattr,	"llistxattr" },		/* 179 */
-	{ 3,	0,	sys_flistxattr,	"flistxattr" },		/* 180 */
-	{ 2,	TF,	sys_removexattr,"removexattr" },	/* 181 */
-	{ 2,	TF,	sys_removexattr,"lremovexattr" },	/* 182 */
-	{ 1,	TS,	sys_sigpending,	"sigpending" },		/* 183 */
-	{ 5,	0,	sys_query_module,"query_module" },	/* 184 */
-	{ 2,	0,	sys_setpgid,	"setpgid" },		/* 185 */
-	{ 2,	0,	sys_fremovexattr,"fremovexattr" },	/* 186 */
-	{ 2,	TS,	sys_kill,	"tkill" },		/* 187 */
-	{ 1,	TP,	sys_exit,	"exit_group" },		/* 188 */
-	{ 1,	0,	sys_uname,	"uname" },		/* 189 */
-	{ 2,	0,	sys_init_module,"init_module" },	/* 190 */
-	{ 1,	0,	sys_personality,"personality" },	/* 191 */
-	{ 5,	0,	sys_remap_file_pages,"remap_file_pages" },/* 192 */
-	{ 1,	0,	sys_epoll_create,"epoll_create" },	/* 193 */
-	{ 4,	0,	sys_epoll_ctl,	"epoll_ctl" },		/* 194 */
-	{ 4,	0,	sys_epoll_wait,	"epoll_wait" },		/* 195 */
-	{ 2,	0,	sys_ulimit,	"ulimit" },		/* 196 */
-	{ 0,	0,	sys_getppid,	"getppid" },		/* 197 */
-	{ 3,	TS,	sys_sigaction,	"sigaction" },		/* 198 */
-	{ 5,	0,	printargs,	"sgetmask" },		/* 199 */
-	{ 5,	0,	printargs,	"ssetmask" },		/* 200 */
-	{ 3,	TS,	sys_sigsuspend,	"sigsuspend" },		/* 201 */
-	{ 2,	TF,	sys_lstat,	"lstat" },		/* 202 */
-	{ 1,	TF,	sys_uselib,	"uselib" },		/* 203 */
-	{ 3,	0,	sys_readdir,	"readdir" },		/* 204 */
-	{ 4,	0,	sys_readahead,	"readahead" },		/* 205 */
-	{ 2,	0,	sys_socketcall,	"socketcall" },		/* 206 */
-	{ 3,	0,	sys_syslog,	"syslog" },		/* 207 */
-	{ 4,	0,	printargs,	"lookup_dcookie" },	/* 208 */
-	{ 6,	0,	printargs,	"fadvise64" },		/* 209 */
-	{ 6,	0,	printargs,	"fadvise64_64" },	/* 210 */
-	{ 3,	TS,	sys_tgkill,	"tgkill" },		/* 211 */
-	{ 3,	TP,	sys_waitpid,	"waitpid" },		/* 212 */
-	{ 1,	0,	sys_swapoff,	"swapoff" },		/* 213 */
-	{ 1,	0,	sys_sysinfo,	"sysinfo" },		/* 214 */
-	{ 5,	0,	sys_ipc,	"ipc" },		/* 215 */
-	{ 1,	TS,	sys_sigreturn,	"sigreturn" },		/* 216 */
-	{ 5,	TP,	sys_clone,	"clone" },		/* 217 */
-	{ 3,	0,	sys_modify_ldt,	"modify_ldt" },		/* 218 */
-	{ 1,	0,	sys_adjtimex,	"adjtimex" },		/* 219 */
-	{ 3,	TS,	sys_sigprocmask,"sigprocmask" },	/* 220 */
-	{ 2,	0,	sys_create_module,"create_module" },	/* 221 */
-	{ 1,	0,	sys_delete_module,"delete_module" },
-	{ 1,	0,	sys_get_kernel_syms,"get_kernel_syms"},	/* 223 */
-	{ 1,	0,	sys_getpgid,	"getpgid" },		/* 224 */
-	{ 0,	0,	sys_bdflush,	"bdflush" },		/* 225 */
-	{ 3,	0,	sys_sysfs,	"sysfs" },		/* 226 */
-	{ 5,	0,	sys_afs_syscall,"afs_syscall" },	/* 227 */
-	{ 1,	0,	sys_setfsuid,	"setfsuid" },		/* 228 */
-	{ 1,	0,	sys_setfsgid,	"setfsgid" },		/* 229 */
-	{ 5,	0,	sys_select,	"select" },		/* 230 */
-	{ 1,	0,	sys_time,	"time" },		/* 231 */
-	{ 2,	TF,	sys_stat,	"stat" },		/* 232 */
-	{ 1,	0,	sys_stime,	"stime" },		/* 233 */
-	{ 3,	TF,	sys_statfs64,	"statfs64" },		/* 234 */
-	{ 3,	0,	sys_fstatfs64,	"fstatfs64" },		/* 235 */
-	{ 5,	0,	sys_llseek,	"_llseek" },		/* 236 */
-	{ 2,	0,	sys_mlock,	"mlock" },		/* 237 */
-	{ 2,	0,	sys_munlock,	"munlock" },		/* 238 */
-	{ 2,	0,	sys_mlockall,	"mlockall" },		/* 239 */
-	{ 0,	0,	sys_munlockall,	"munlockall" },		/* 240 */
-	{ 2,	0,	sys_sched_setparam,"sched_setparam"},	/* 241 */
-	{ 2,	0,	sys_sched_getparam,"sched_getparam"},	/* 242 */
-	{ 3,	0,	sys_sched_setscheduler,"sched_setscheduler"},/* 243 */
-	{ 1,	0,	sys_sched_getscheduler,"sched_getscheduler"},/* 244 */
-	{ 0,	0,	sys_sched_yield,"sched_yield" },	/* 245 */
-	{ 1,0,sys_sched_get_priority_max,"sched_get_priority_max"},/* 246 */
-	{ 1,0,sys_sched_get_priority_min,"sched_get_priority_min"},/* 247 */
-	{ 2,	0,sys_sched_rr_get_interval,"sched_rr_get_interval"},/* 248 */
-	{ 2,	0,	sys_nanosleep,	"nanosleep" },		/* 249 */
-	{ 4,	0,	sys_mremap,	"mremap" },		/* 250 */
-	{ 1,	0,	sys_sysctl,	"_sysctl" },		/* 251 */
-	{ 1,	0,	sys_getsid,	"getsid" },		/* 252 */
-	{ 1,	0,	sys_fdatasync,	"fdatasync" },		/* 253 */
-	{ 3,	0,	printargs,	"nfsservctl" },		/* 254 */
-	{ 5,	0,	printargs,	"aplib" },		/* 255 */
-	{ 2,	0,	sys_clock_settime,"clock_settime" },	/* 256 */
-	{ 2,	0,	sys_clock_gettime,"clock_gettime" },	/* 257 */
-	{ 2,	0,	sys_clock_getres,"clock_getres" },	/* 258 */
-	{ 4,	0,	sys_clock_nanosleep,"clock_nanosleep" },/* 259 */
-	{ 3,	0,	sys_sched_setaffinity,"sched_setaffinity" },/* 260 */
-	{ 3,	0,	sys_sched_getaffinity,"sched_getaffinity" },/* 261 */
-	{ 4,	0,	sys_timer_settime,"timer_settime" },	/* 262 */
-	{ 2,	0,	sys_timer_gettime,"timer_gettime" },	/* 263 */
-	{ 1,	0,	sys_timer_getoverrun,"timer_getoverrun" },/* 264 */
-	{ 1,	0,	sys_timer_delete,"timer_delete" },	/* 265 */
-	{ 3,	0,	sys_timer_create,"timer_create" },	/* 266 */
-	{ 5,	0,	printargs,	"SYS_267" },		/* 267 */
-	{ 5,	0,	printargs,	"SYS_268" },		/* 268 */
-	{ 5,	0,	printargs,	"SYS_269" },		/* 269 */
-	{ 5,	0,	printargs,	"SYS_270" },		/* 270 */
-	{ 5,	0,	printargs,	"SYS_271" },		/* 271 */
-	{ 5,	0,	printargs,	"SYS_272" },		/* 272 */
-	{ 5,	0,	printargs,	"SYS_273" },		/* 273 */
-	{ 5,	0,	printargs,	"SYS_274" },		/* 274 */
-	{ 5,	0,	printargs,	"SYS_275" },		/* 275 */
-	{ 5,	0,	printargs,	"SYS_276" },		/* 276 */
-	{ 5,	0,	printargs,	"SYS_277" },		/* 277 */
-	{ 5,	0,	printargs,	"SYS_278" },		/* 278 */
-	{ 5,	0,	printargs,	"SYS_279" },		/* 279 */
-	{ 5,	0,	printargs,	"SYS_280" },		/* 280 */
-	{ 5,	0,	printargs,	"SYS_281" },		/* 281 */
-	{ 5,	0,	printargs,	"SYS_282" },		/* 282 */
-	{ 5,	0,	printargs,	"SYS_283" },		/* 283 */
-	{ 5,	0,	printargs,	"SYS_284" },		/* 284 */
-	{ 5,	0,	printargs,	"SYS_285" },		/* 285 */
-	{ 5,	0,	printargs,	"SYS_286" },		/* 286 */
-	{ 5,	0,	printargs,	"SYS_287" },		/* 287 */
-	{ 5,	0,	printargs,	"SYS_288" },		/* 288 */
-	{ 5,	0,	printargs,	"SYS_289" },		/* 289 */
-	{ 5,	0,	printargs,	"SYS_290" },		/* 290 */
-	{ 5,	0,	printargs,	"SYS_291" },		/* 291 */
-	{ 5,	0,	printargs,	"SYS_292" },		/* 292 */
-	{ 5,	0,	printargs,	"SYS_293" },		/* 293 */
-	{ 5,	0,	printargs,	"SYS_294" },		/* 294 */
-	{ 5,	0,	printargs,	"SYS_295" },		/* 295 */
-	{ 5,	0,	printargs,	"SYS_296" },		/* 296 */
-	{ 5,	0,	printargs,	"SYS_297" },		/* 297 */
-	{ 5,	0,	printargs,	"SYS_298" },		/* 298 */
-	{ 5,	0,	printargs,	"SYS_299" },		/* 299 */
-	{ 5,	0,	printargs,	"SYS_300" },		/* 300 */
-	{ 5,	0,	printargs,	"SYS_301" },		/* 301 */
-	{ 5,	0,	printargs,	"SYS_302" },		/* 302 */
-	{ 5,	0,	printargs,	"SYS_303" },		/* 303 */
-	{ 5,	0,	printargs,	"SYS_304" },		/* 304 */
-	{ 5,	0,	printargs,	"SYS_305" },		/* 305 */
-	{ 5,	0,	printargs,	"SYS_306" },		/* 306 */
-	{ 5,	0,	printargs,	"SYS_307" },		/* 307 */
-	{ 5,	0,	printargs,	"SYS_308" },		/* 308 */
-	{ 5,	0,	printargs,	"SYS_309" },		/* 309 */
-	{ 5,	0,	printargs,	"SYS_310" },		/* 310 */
-	{ 5,	0,	printargs,	"SYS_311" },		/* 311 */
-	{ 5,	0,	printargs,	"SYS_312" },		/* 312 */
-	{ 5,	0,	printargs,	"SYS_313" },		/* 313 */
-	{ 5,	0,	printargs,	"SYS_314" },		/* 314 */
-	{ 5,	0,	printargs,	"SYS_315" },		/* 315 */
-	{ 5,	0,	printargs,	"SYS_316" },		/* 316 */
-	{ 5,	0,	printargs,	"SYS_317" },		/* 317 */
-	{ 5,	0,	printargs,	"SYS_318" },		/* 318 */
-	{ 5,	0,	printargs,	"SYS_319" },		/* 319 */
-	{ 5,	0,	printargs,	"SYS_320" },		/* 320 */
-	{ 5,	0,	printargs,	"SYS_321" },		/* 321 */
-	{ 5,	0,	printargs,	"SYS_322" },		/* 322 */
-	{ 5,	0,	printargs,	"SYS_323" },		/* 323 */
-	{ 5,	0,	printargs,	"SYS_324" },		/* 324 */
-	{ 5,	0,	printargs,	"SYS_325" },		/* 325 */
-	{ 5,	0,	printargs,	"SYS_326" },		/* 326 */
-	{ 5,	0,	printargs,	"SYS_327" },		/* 327 */
-	{ 5,	0,	printargs,	"SYS_328" },		/* 328 */
-	{ 5,	0,	printargs,	"SYS_329" },		/* 329 */
-	{ 5,	0,	printargs,	"SYS_330" },		/* 330 */
-	{ 5,	0,	printargs,	"SYS_331" },		/* 331 */
-	{ 5,	0,	printargs,	"SYS_332" },		/* 332 */
-	{ 5,	0,	printargs,	"SYS_333" },		/* 333 */
-	{ 5,	0,	printargs,	"SYS_334" },		/* 334 */
-	{ 5,	0,	printargs,	"SYS_335" },		/* 335 */
-	{ 5,	0,	printargs,	"SYS_336" },		/* 336 */
-	{ 5,	0,	printargs,	"SYS_337" },		/* 337 */
-	{ 5,	0,	printargs,	"SYS_338" },		/* 338 */
-	{ 5,	0,	printargs,	"SYS_339" },		/* 339 */
-	{ 5,	0,	printargs,	"SYS_340" },		/* 340 */
-	{ 5,	0,	printargs,	"SYS_341" },		/* 341 */
-	{ 5,	0,	printargs,	"SYS_342" },		/* 342 */
-	{ 5,	0,	printargs,	"SYS_343" },		/* 343 */
-	{ 5,	0,	printargs,	"SYS_344" },		/* 344 */
-	{ 5,	0,	printargs,	"SYS_345" },		/* 345 */
-	{ 5,	0,	printargs,	"SYS_346" },		/* 346 */
-	{ 5,	0,	printargs,	"SYS_347" },		/* 347 */
-	{ 5,	0,	printargs,	"SYS_348" },		/* 348 */
-	{ 5,	0,	printargs,	"SYS_349" },		/* 349 */
-	{ 5,	0,	printargs,	"SYS_350" },		/* 350 */
-	{ 5,	0,	printargs,	"SYS_351" },		/* 351 */
-	{ 5,	0,	printargs,	"SYS_352" },		/* 352 */
diff --git a/strace/linux/sparc64/syscallent1.h b/strace/linux/sparc64/syscallent1.h
deleted file mode 100644
index 4c4d813..0000000
--- a/strace/linux/sparc64/syscallent1.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscallent1.h,v 1.1 2004/07/12 07:44:08 roland Exp $
- */
-
-	{ 6,	0,	solaris_syscall,	"syscall"	}, /* 0 */
-	{ 6,	TP,	solaris_exit,		"_exit"		}, /* 1 */
-	{ 6,	TP,	solaris_fork,		"fork"		}, /* 2 */
-	{ 6,	0,	solaris_read,		"read"		}, /* 3 */
-	{ 6,	0,	solaris_write,		"write"		}, /* 4 */
-	{ 6,	TF,	solaris_open,		"open"		}, /* 5 */
-	{ 6,	0,	solaris_close,		"close"		}, /* 6 */
-	{ 6,	TP,	solaris_wait,		"wait"		}, /* 7 */
-	{ 6,	TF,	solaris_creat,		"creat"		}, /* 8 */
-	{ 6,	TF,	solaris_link,		"link"		}, /* 9 */
-	{ 6,	TF,	solaris_unlink,		"unlink"	}, /* 10 */
-	{ 6,	TF|TP,	solaris_exec,		"exec"		}, /* 11 */
-	{ 6,	TF,	solaris_chdir,		"chdir"		}, /* 12 */
-	{ 6,	0,	solaris_time,		"time"		}, /* 13 */
-	{ 6,	TF,	solaris_mknod,		"mknod"		}, /* 14 */
-	{ 6,	TF,	solaris_chmod,		"chmod"		}, /* 15 */
-	{ 6,	TF,	solaris_chown,		"chown"		}, /* 16 */
-	{ 6,	0,	solaris_brk,		"brk"		}, /* 17 */
-	{ 6,	TF,	solaris_stat,		"stat"		}, /* 18 */
-	{ 6,	0,	solaris_lseek,		"lseek"		}, /* 19 */
-	{ 6,	0,	solaris_getpid,		"getpid"	}, /* 20 */
-	{ 6,	TF,	solaris_mount,		"mount"		}, /* 21 */
-	{ 6,	TF,	solaris_umount,		"umount"	}, /* 22 */
-	{ 6,	0,	solaris_setuid,		"setuid"	}, /* 23 */
-	{ 6,	0,	solaris_getuid,		"getuid"	}, /* 24 */
-	{ 6,	0,	solaris_stime,		"stime"		}, /* 25 */
-	{ 6,	0,	solaris_ptrace,		"ptrace"	}, /* 26 */
-	{ 6,	0,	solaris_alarm,		"alarm"		}, /* 27 */
-	{ 6,	0,	solaris_fstat,		"fstat"		}, /* 28 */
-	{ 6,	TS,	solaris_pause,		"pause"		}, /* 29 */
-	{ 6,	TF,	solaris_utime,		"utime"		}, /* 30 */
-	{ 6,	0,	solaris_stty,		"stty"		}, /* 31 */
-	{ 6,	0,	solaris_gtty,		"gtty"		}, /* 32 */
-	{ 6,	TF,	solaris_access,		"access"	}, /* 33 */
-	{ 6,	0,	solaris_nice,		"nice"		}, /* 34 */
-	{ 6,	TF,	solaris_statfs,		"statfs"	}, /* 35 */
-	{ 6,	0,	solaris_sync,		"sync"		}, /* 36 */
-	{ 6,	TS,	solaris_kill,		"kill"		}, /* 37 */
-	{ 6,	0,	solaris_fstatfs,	"fstatfs"	}, /* 38 */
-	{ 6,	0,	solaris_pgrpsys,	"pgrpsys"	}, /* 39 */
-	{ 6,	0,	solaris_xenix,		"xenix"		}, /* 40 */
-	{ 6,	0,	solaris_dup,		"dup"		}, /* 41 */
-	{ 6,	0,	solaris_pipe,		"pipe"		}, /* 42 */
-	{ 6,	0,	solaris_times,		"times"		}, /* 43 */
-	{ 6,	0,	solaris_profil,		"profil"	}, /* 44 */
-	{ 6,	0,	solaris_plock,		"plock"		}, /* 45 */
-	{ 6,	0,	solaris_setgid,		"setgid"	}, /* 46 */
-	{ 6,	0,	solaris_getgid,		"getgid"	}, /* 47 */
-	{ 6,	0,	solaris_sigcall,	"sigcall"	}, /* 48 */
-	{ 6,	TI,	solaris_msgsys,		"msgsys"	}, /* 49 */
-	{ 6,	0,	solaris_syssun,		"syssun"	}, /* 50 */
-	{ 6,	TF,	solaris_acct,		"acct"		}, /* 51 */
-	{ 6,	TI,	solaris_shmsys,		"shmsys"	}, /* 52 */
-	{ 6,	TI,	solaris_semsys,		"semsys"	}, /* 53 */
-	{ 6,	0,	solaris_ioctl,		"ioctl"		}, /* 54 */
-	{ 6,	0,	solaris_uadmin,		"uadmin"	}, /* 55 */
-	{ 6,	0,	solaris_sysmp,		"sysmp"		}, /* 56 */
-	{ 6,	0,	solaris_utssys,		"utssys"	}, /* 57 */
-	{ 6,	0,	solaris_fdsync,		"fdsync"	}, /* 58 */
-	{ 6,	TF|TP,	solaris_execve,		"execve"	}, /* 59 */
-	{ 6,	0,	solaris_umask,		"umask"		}, /* 60 */
-	{ 6,	TF,	solaris_chroot,		"chroot"	}, /* 61 */
-	{ 6,	0,	solaris_fcntl,		"fcntl"		}, /* 62 */
-	{ 6,	0,	solaris_ulimit,		"ulimit"	}, /* 63 */
-	{ 6,	0,	printargs,		"SYS_64"	}, /* 64 */
-	{ 6,	0,	printargs,		"SYS_65"	}, /* 65 */
-	{ 6,	0,	printargs,		"SYS_66"	}, /* 66 */
-	{ 6,	0,	printargs,		"SYS_67"	}, /* 67 */
-	{ 6,	0,	printargs,		"SYS_68"	}, /* 68 */
-	{ 6,	0,	printargs,		"SYS_69"	}, /* 69 */
-	{ 6,	0,	printargs,		"SYS_70"	}, /* 70 */
-	{ 6,	0,	printargs,		"SYS_71"	}, /* 71 */
-	{ 6,	0,	printargs,		"SYS_72"	}, /* 72 */
-	{ 6,	0,	printargs,		"SYS_73"	}, /* 73 */
-	{ 6,	0,	printargs,		"SYS_74"	}, /* 74 */
-	{ 6,	0,	printargs,		"SYS_75"	}, /* 75 */
-	{ 6,	0,	printargs,		"SYS_76"	}, /* 76 */
-	{ 6,	0,	printargs,		"SYS_77"	}, /* 77 */
-	{ 6,	0,	printargs,		"SYS_78"	}, /* 78 */
-	{ 6,	TF,	solaris_rmdir,		"rmdir"		}, /* 79 */
-	{ 6,	TF,	solaris_mkdir,		"mkdir"		}, /* 80 */
-	{ 6,	0,	solaris_getdents,	"getdents"	}, /* 81 */
-	{ 6,	0,	solaris_sginap,		"sginap"	}, /* 82 */
-	{ 6,	0,	solaris_sgikopt,	"sgikopt"	}, /* 83 */
-	{ 6,	0,	solaris_sysfs,		"sysfs"		}, /* 84 */
-	{ 6,	TN,	sys_getmsg,		"getmsg"	}, /* 85 */
-	{ 6,	TN,	sys_putmsg,		"putmsg"	}, /* 86 */
-	{ 6,	TN,	solaris_poll,		"poll"		}, /* 87 */
-	{ 6,	TF,	solaris_lstat,		"lstat"		}, /* 88 */
-	{ 6,	TF,	solaris_symlink,	"symlink"	}, /* 89 */
-	{ 6,	TF,	solaris_readlink,	"readlink"	}, /* 90 */
-	{ 6,	0,	solaris_setgroups,	"setgroups"	}, /* 91 */
-	{ 6,	0,	solaris_getgroups,	"getgroups"	}, /* 92 */
-	{ 6,	0,	solaris_fchmod,		"fchmod"	}, /* 93 */
-	{ 6,	0,	solaris_fchown,		"fchown"	}, /* 94 */
-	{ 6,	TS,	solaris_sigprocmask,	"sigprocmask"	}, /* 95 */
-	{ 6,	TS,	solaris_sigsuspend,	"sigsuspend"	}, /* 96 */
-	{ 6,	TS,	solaris_sigaltstack,	"sigaltstack"	}, /* 97 */
-	{ 6,	TS,	solaris_sigaction,	"sigaction"	}, /* 98 */
-	{ 6,	0,	solaris_spcall,		"spcall"	}, /* 99 */
-	{ 6,	0,	solaris_context,	"context"	}, /* 100 */
-	{ 6,	0,	solaris_evsys,		"evsys"		}, /* 101 */
-	{ 6,	0,	solaris_evtrapret,	"evtrapret"	}, /* 102 */
-	{ 6,	TF,	solaris_statvfs,	"statvfs"	}, /* 103 */
-	{ 6,	0,	solaris_fstatvfs,	"fstatvfs"	}, /* 104 */
-	{ 6,	0,	printargs,		"SYS_105"	}, /* 105 */
-	{ 6,	0,	solaris_nfssys,		"nfssys"	}, /* 106 */
-	{ 6,	TP,	solaris_waitid,		"waitid"	}, /* 107 */
-	{ 6,	0,	solaris_sigsendsys,	"sigsendsys"	}, /* 108 */
-	{ 6,	0,	solaris_hrtsys,		"hrtsys"	}, /* 109 */
-	{ 6,	0,	solaris_acancel,	"acancel"	}, /* 110 */
-	{ 6,	0,	solaris_async,		"async"		}, /* 111 */
-	{ 6,	0,	solaris_priocntlsys,	"priocntlsys"	}, /* 112 */
-	{ 6,	TF,	solaris_pathconf,	"pathconf"	}, /* 113 */
-	{ 6,	0,	solaris_mincore,	"mincore"	}, /* 114 */
-	{ 6,	0,	solaris_mmap,		"mmap"		}, /* 115 */
-	{ 6,	0,	solaris_mprotect,	"mprotect"	}, /* 116 */
-	{ 6,	0,	solaris_munmap,		"munmap"	}, /* 117 */
-	{ 6,	0,	solaris_fpathconf,	"fpathconf"	}, /* 118 */
-	{ 6,	TP,	solaris_vfork,		"vfork"		}, /* 119 */
-	{ 6,	0,	solaris_fchdir,		"fchdir"	}, /* 120 */
-	{ 6,	0,	solaris_readv,		"readv"		}, /* 121 */
-	{ 6,	0,	solaris_writev,		"writev"	}, /* 122 */
-	{ 6,	TF,	solaris_xstat,		"xstat"		}, /* 123 */
-	{ 6,	TF,	solaris_lxstat,		"lxstat"	}, /* 124 */
-	{ 6,	0,	solaris_fxstat,		"fxstat"	}, /* 125 */
-	{ 6,	TF,	solaris_xmknod,		"xmknod"	}, /* 126 */
-	{ 6,	0,	solaris_clocal,		"clocal"	}, /* 127 */
-	{ 6,	0,	solaris_setrlimit,	"setrlimit"	}, /* 128 */
-	{ 6,	0,	solaris_getrlimit,	"getrlimit"	}, /* 129 */
-	{ 6,	TF,	solaris_lchown,		"lchown"	}, /* 130 */
-	{ 6,	0,	solaris_memcntl,	"memcntl"	}, /* 131 */
-	{ 6,	TN,	solaris_getpmsg,	"getpmsg"	}, /* 132 */
-	{ 6,	TN,	solaris_putpmsg,	"putpmsg"	}, /* 133 */
-	{ 6,	TF,	solaris_rename,		"rename"	}, /* 134 */
-	{ 6,	0,	solaris_uname,		"uname"		}, /* 135 */
-	{ 6,	0,	solaris_setegid,	"setegid"	}, /* 136 */
-	{ 6,	0,	solaris_sysconfig,	"sysconfig"	}, /* 137 */
-	{ 6,	0,	solaris_adjtime,	"adjtime"	}, /* 138 */
-	{ 6,	0,	solaris_sysinfo,	"sysinfo"	}, /* 139 */
-	{ 6,	0,	printargs,		"SYS_140"	}, /* 140 */
-	{ 6,	0,	solaris_seteuid,	"seteuid"	}, /* 141 */
-	{ 6,	0,	solaris_vtrace,		"vtrace"	}, /* 142 */
-	{ 6,	TP,	solaris_fork1,		"fork1"		}, /* 143 */
-	{ 6,	TS,	solaris_sigtimedwait,	"sigtimedwait"	}, /* 144 */
-	{ 6,	0,	solaris_lwp_info,	"lwp_info"	}, /* 145 */
-	{ 6,	0,	solaris_yield,		"yield"		}, /* 146 */
-	{ 6,	0,	solaris_lwp_sema_wait,	"lwp_sema_wait"	}, /* 147 */
-	{ 6,	0,	solaris_lwp_sema_post,	"lwp_sema_post"	}, /* 148 */
-	{ 6,	0,	printargs,		"SYS_149"	}, /* 149 */
-	{ 6,	0,	printargs,		"SYS_150"	}, /* 150 */
-	{ 6,	0,	printargs,		"SYS_151"	}, /* 151 */
-	{ 6,	0,	solaris_modctl,		"modctl"	}, /* 152 */
-	{ 6,	0,	solaris_fchroot,	"fchroot"	}, /* 153 */
-	{ 6,	TF,	solaris_utimes,		"utimes"	}, /* 154 */
-	{ 6,	0,	solaris_vhangup,	"vhangup"	}, /* 155 */
-	{ 6,	0,	solaris_gettimeofday,	"gettimeofday"	}, /* 156 */
-	{ 6,	0,	solaris_getitimer,	"getitimer"	}, /* 157 */
-	{ 6,	0,	solaris_setitimer,	"setitimer"	}, /* 158 */
-	{ 6,	0,	solaris_lwp_create,	"lwp_create"	}, /* 159 */
-	{ 6,	0,	solaris_lwp_exit,	"lwp_exit"	}, /* 160 */
-	{ 6,	0,	solaris_lwp_suspend,	"lwp_suspend"	}, /* 161 */
-	{ 6,	0,	solaris_lwp_continue,	"lwp_continue"	}, /* 162 */
-	{ 6,	0,	solaris_lwp_kill,	"lwp_kill"	}, /* 163 */
-	{ 6,	0,	solaris_lwp_self,	"lwp_self"	}, /* 164 */
-	{ 6,	0,	solaris_lwp_setprivate,	"lwp_setprivate"}, /* 165 */
-	{ 6,	0,	solaris_lwp_getprivate,	"lwp_getprivate"}, /* 166 */
-	{ 6,	0,	solaris_lwp_wait,	"lwp_wait"	}, /* 167 */
-	{ 6,	0,	solaris_lwp_mutex_unlock,"lwp_mutex_unlock"}, /* 168 */
-	{ 6,	0,	solaris_lwp_mutex_lock,	"lwp_mutex_lock"}, /* 169 */
-	{ 6,	0,	solaris_lwp_cond_wait,	"lwp_cond_wait"}, /* 170 */
-	{ 6,	0,	solaris_lwp_cond_signal,"lwp_cond_signal"}, /* 171 */
-	{ 6,	0,	solaris_lwp_cond_broadcast,"lwp_cond_broadcast"}, /* 172 */
-	{ 6,	0,	solaris_pread,		"pread"		}, /* 173 */
-	{ 6,	0,	solaris_pwrite,		"pwrite"	}, /* 174 */
-	{ 6,	0,	solaris_llseek,		"llseek"	}, /* 175 */
-	{ 6,	0,	solaris_inst_sync,	"inst_sync"	}, /* 176 */
-	{ 6,	0,	printargs,		"SYS_177"	}, /* 177 */
-	{ 6,	0,	printargs,		"SYS_178"	}, /* 178 */
-	{ 6,	0,	printargs,		"SYS_179"	}, /* 179 */
-	{ 6,	0,	printargs,		"SYS_180"	}, /* 180 */
-	{ 6,	0,	printargs,		"SYS_181"	}, /* 181 */
-	{ 6,	0,	printargs,		"SYS_182"	}, /* 182 */
-	{ 6,	0,	printargs,		"SYS_183"	}, /* 183 */
-	{ 6,	0,	printargs,		"SYS_184"	}, /* 184 */
-	{ 6,	0,	printargs,		"SYS_185"	}, /* 185 */
-	{ 6,	0,	solaris_auditsys,	"auditsys"	}, /* 186 */
-	{ 6,	0,	solaris_processor_bind,	"processor_bind"}, /* 187 */
-	{ 6,	0,	solaris_processor_info,	"processor_info"}, /* 188 */
-	{ 6,	0,	solaris_p_online,	"p_online"	}, /* 189 */
-	{ 6,	0,	solaris_sigqueue,	"sigqueue"	}, /* 190 */
-	{ 6,	0,	solaris_clock_gettime,	"clock_gettime"	}, /* 191 */
-	{ 6,	0,	solaris_clock_settime,	"clock_settime"	}, /* 192 */
-	{ 6,	0,	solaris_clock_getres,	"clock_getres"	}, /* 193 */
-	{ 6,	0,	solaris_timer_create,	"timer_create"	}, /* 194 */
-	{ 6,	0,	solaris_timer_delete,	"timer_delete"	}, /* 195 */
-	{ 6,	0,	solaris_timer_settime,	"timer_settime"	}, /* 196 */
-	{ 6,	0,	solaris_timer_gettime,	"timer_gettime"	}, /* 197 */
-	{ 6,	0,	solaris_timer_getoverrun,"timer_getoverrun"}, /* 198 */
-	{ 6,	0,	solaris_nanosleep,	"nanosleep"	}, /* 199 */
-	{ 6,	0,	printargs,		"SYS_200"	}, /* 200 */
-	{ 6,	0,	printargs,		"SYS_201"	}, /* 201 */
-	{ 6,	0,	printargs,		"SYS_202"	}, /* 202 */
-	{ 6,	0,	printargs,		"SYS_203"	}, /* 203 */
-	{ 6,	0,	printargs,		"SYS_204"	}, /* 204 */
-	{ 6,	0,	printargs,		"SYS_205"	}, /* 205 */
-	{ 6,	0,	printargs,		"SYS_206"	}, /* 206 */
-	{ 6,	0,	printargs,		"SYS_207"	}, /* 207 */
-	{ 6,	0,	printargs,		"SYS_208"	}, /* 208 */
-	{ 6,	0,	printargs,		"SYS_209"	}, /* 209 */
-	{ 6,	0,	printargs,		"SYS_210"	}, /* 210 */
-	{ 6,	0,	printargs,		"SYS_211"	}, /* 211 */
-	{ 6,	0,	printargs,		"SYS_212"	}, /* 212 */
-	{ 6,	0,	printargs,		"SYS_213"	}, /* 213 */
-	{ 6,	0,	printargs,		"SYS_214"	}, /* 214 */
-	{ 6,	0,	printargs,		"SYS_215"	}, /* 215 */
-	{ 6,	0,	printargs,		"SYS_216"	}, /* 216 */
-	{ 6,	0,	printargs,		"SYS_217"	}, /* 217 */
-	{ 6,	0,	printargs,		"SYS_218"	}, /* 218 */
-	{ 6,	0,	printargs,		"SYS_219"	}, /* 219 */
-	{ 6,	0,	printargs,		"SYS_220"	}, /* 220 */
-	{ 6,	0,	printargs,		"SYS_221"	}, /* 221 */
-	{ 6,	0,	printargs,		"SYS_222"	}, /* 222 */
-	{ 6,	0,	printargs,		"SYS_223"	}, /* 223 */
-	{ 6,	0,	printargs,		"SYS_224"	}, /* 224 */
-	{ 6,	0,	printargs,		"SYS_225"	}, /* 225 */
-	{ 6,	0,	printargs,		"SYS_226"	}, /* 226 */
-	{ 6,	0,	printargs,		"SYS_227"	}, /* 227 */
-	{ 6,	0,	printargs,		"SYS_228"	}, /* 228 */
-	{ 6,	0,	printargs,		"SYS_229"	}, /* 229 */
-	{ 6,	0,	printargs,		"SYS_230"	}, /* 230 */
-	{ 6,	0,	printargs,		"SYS_231"	}, /* 231 */
-	{ 6,	0,	printargs,		"SYS_232"	}, /* 232 */
-	{ 6,	0,	printargs,		"SYS_233"	}, /* 233 */
-	{ 6,	0,	printargs,		"SYS_234"	}, /* 234 */
-	{ 6,	0,	printargs,		"SYS_235"	}, /* 235 */
-	{ 6,	0,	printargs,		"SYS_236"	}, /* 236 */
-	{ 6,	0,	printargs,		"SYS_237"	}, /* 237 */
-	{ 6,	0,	printargs,		"SYS_238"	}, /* 238 */
-	{ 6,	0,	printargs,		"SYS_239"	}, /* 239 */
-	{ 6,	0,	printargs,		"SYS_240"	}, /* 240 */
-	{ 6,	0,	printargs,		"SYS_241"	}, /* 241 */
-	{ 6,	0,	printargs,		"SYS_242"	}, /* 242 */
-	{ 6,	0,	printargs,		"SYS_243"	}, /* 243 */
-	{ 6,	0,	printargs,		"SYS_244"	}, /* 244 */
-	{ 6,	0,	printargs,		"SYS_245"	}, /* 245 */
-	{ 6,	0,	printargs,		"SYS_246"	}, /* 246 */
-	{ 6,	0,	printargs,		"SYS_247"	}, /* 247 */
-	{ 6,	0,	printargs,		"SYS_248"	}, /* 248 */
-	{ 6,	0,	printargs,		"SYS_249"	}, /* 249 */
-	{ 6,	0,	printargs,		"SYS_250"	}, /* 250 */
-	{ 6,	0,	printargs,		"SYS_251"	}, /* 251 */
-	{ 6,	0,	printargs,		"SYS_252"	}, /* 252 */
-	{ 6,	0,	printargs,		"SYS_253"	}, /* 253 */
-	{ 6,	0,	printargs,		"SYS_254"	}, /* 254 */
-	{ 6,	0,	printargs,		"SYS_255"	}, /* 255 */
-	{ 6,	0,	printargs,		"SYS_256"	}, /* 256 */
-	{ 6,	0,	printargs,		"SYS_257"	}, /* 257 */
-	{ 6,	0,	printargs,		"SYS_258"	}, /* 258 */
-	{ 6,	0,	printargs,		"SYS_259"	}, /* 259 */
-	{ 6,	0,	printargs,		"SYS_260"	}, /* 260 */
-	{ 6,	0,	printargs,		"SYS_261"	}, /* 261 */
-	{ 6,	0,	printargs,		"SYS_262"	}, /* 262 */
-	{ 6,	0,	printargs,		"SYS_263"	}, /* 263 */
-	{ 6,	0,	printargs,		"SYS_264"	}, /* 264 */
-	{ 6,	0,	printargs,		"SYS_265"	}, /* 265 */
-	{ 6,	0,	printargs,		"SYS_266"	}, /* 266 */
-	{ 6,	0,	printargs,		"SYS_267"	}, /* 267 */
-	{ 6,	0,	printargs,		"SYS_268"	}, /* 268 */
-	{ 6,	0,	printargs,		"SYS_269"	}, /* 269 */
-	{ 6,	0,	printargs,		"SYS_270"	}, /* 270 */
-	{ 6,	0,	printargs,		"SYS_271"	}, /* 271 */
-	{ 6,	0,	printargs,		"SYS_272"	}, /* 272 */
-	{ 6,	0,	printargs,		"SYS_273"	}, /* 273 */
-	{ 6,	0,	printargs,		"SYS_274"	}, /* 274 */
-	{ 6,	0,	printargs,		"SYS_275"	}, /* 275 */
-	{ 6,	0,	printargs,		"SYS_276"	}, /* 276 */
-	{ 6,	0,	printargs,		"SYS_277"	}, /* 277 */
-	{ 6,	0,	printargs,		"SYS_278"	}, /* 278 */
-	{ 6,	0,	printargs,		"SYS_279"	}, /* 279 */
-	{ 6,	0,	printargs,		"SYS_280"	}, /* 280 */
-	{ 6,	0,	printargs,		"SYS_281"	}, /* 281 */
-	{ 6,	0,	printargs,		"SYS_282"	}, /* 282 */
-	{ 6,	0,	printargs,		"SYS_283"	}, /* 283 */
-	{ 6,	0,	printargs,		"SYS_284"	}, /* 284 */
-	{ 6,	0,	printargs,		"SYS_285"	}, /* 285 */
-	{ 6,	0,	printargs,		"SYS_286"	}, /* 286 */
-	{ 6,	0,	printargs,		"SYS_287"	}, /* 287 */
-	{ 6,	0,	printargs,		"SYS_288"	}, /* 288 */
-	{ 6,	0,	printargs,		"SYS_289"	}, /* 289 */
-	{ 6,	0,	printargs,		"SYS_290"	}, /* 290 */
-	{ 6,	0,	printargs,		"SYS_291"	}, /* 291 */
-	{ 6,	0,	printargs,		"SYS_292"	}, /* 292 */
-	{ 6,	0,	printargs,		"SYS_293"	}, /* 293 */
-	{ 6,	0,	printargs,		"SYS_294"	}, /* 294 */
-	{ 6,	0,	printargs,		"SYS_295"	}, /* 295 */
-	{ 6,	0,	printargs,		"SYS_296"	}, /* 296 */
-	{ 6,	0,	printargs,		"SYS_297"	}, /* 297 */
-	{ 6,	0,	printargs,		"SYS_298"	}, /* 298 */
-	{ 6,	0,	printargs,		"SYS_299"	}, /* 299 */
-
-	{ 6,	0,	solaris_getpgrp,	"getpgrp"	}, /* 300 */
-	{ 6,	0,	solaris_setpgrp,	"setpgrp"	}, /* 301 */
-	{ 6,	0,	solaris_getsid,		"getsid"	}, /* 302 */
-	{ 6,	0,	solaris_setsid,		"setsid"	}, /* 303 */
-	{ 6,	0,	solaris_getpgid,	"getpgid"	}, /* 304 */
-	{ 6,	0,	solaris_setpgid,	"setpgid"	}, /* 305 */
-	{ 6,	0,	printargs,		"SYS_306"	}, /* 306 */
-	{ 6,	0,	printargs,		"SYS_307"	}, /* 307 */
-	{ 6,	0,	printargs,		"SYS_308"	}, /* 308 */
-	{ 6,	0,	printargs,		"SYS_309"	}, /* 309 */
-
-	{ 6,	TS,	solaris_signal,		"signal"	}, /* 310 */
-	{ 6,	TS,	solaris_sigset,		"sigset"	}, /* 311 */
-	{ 6,	TS,	solaris_sighold,	"sighold"	}, /* 312 */
-	{ 6,	TS,	solaris_sigrelse,	"sigrelse"	}, /* 313 */
-	{ 6,	TS,	solaris_sigignore,	"sigignore"	}, /* 314 */
-	{ 6,	TS,	solaris_sigpause,	"sigpause"	}, /* 315 */
-	{ 6,	0,	printargs,		"SYS_316"	}, /* 316 */
-	{ 6,	0,	printargs,		"SYS_317"	}, /* 317 */
-	{ 6,	0,	printargs,		"SYS_318"	}, /* 318 */
-	{ 6,	0,	printargs,		"SYS_319"	}, /* 319 */
-
-	{ 6,	TI,	solaris_msgget,		"msgget"	}, /* 320 */
-	{ 6,	TI,	solaris_msgctl,		"msgctl"	}, /* 321 */
-	{ 6,	TI,	solaris_msgrcv,		"msgrcv"	}, /* 322 */
-	{ 6,	TI,	solaris_msgsnd,		"msgsnd"	}, /* 323 */
-	{ 6,	0,	printargs,		"SYS_324"	}, /* 324 */
-	{ 6,	0,	printargs,		"SYS_325"	}, /* 325 */
-	{ 6,	0,	printargs,		"SYS_326"	}, /* 326 */
-	{ 6,	0,	printargs,		"SYS_327"	}, /* 327 */
-	{ 6,	0,	printargs,		"SYS_328"	}, /* 328 */
-	{ 6,	0,	printargs,		"SYS_329"	}, /* 329 */
-
-	{ 6,	TI,	solaris_shmat,		"shmat"		}, /* 330 */
-	{ 6,	TI,	solaris_shmctl,		"shmctl"	}, /* 331 */
-	{ 6,	TI,	solaris_shmdt,		"shmdt"		}, /* 332 */
-	{ 6,	TI,	solaris_shmget,		"shmget"	}, /* 333 */
-	{ 6,	0,	printargs,		"SYS_334"	}, /* 334 */
-	{ 6,	0,	printargs,		"SYS_335"	}, /* 335 */
-	{ 6,	0,	printargs,		"SYS_336"	}, /* 336 */
-	{ 6,	0,	printargs,		"SYS_337"	}, /* 337 */
-	{ 6,	0,	printargs,		"SYS_338"	}, /* 338 */
-	{ 6,	0,	printargs,		"SYS_339"	}, /* 339 */
-
-	{ 6,	TI,	solaris_semctl,		"semctl"	}, /* 340 */
-	{ 6,	TI,	solaris_semget,		"semget"	}, /* 341 */
-	{ 6,	TI,	solaris_semop,		"semop"		}, /* 342 */
-	{ 6,	0,	printargs,		"SYS_343"	}, /* 343 */
-	{ 6,	0,	printargs,		"SYS_344"	}, /* 344 */
-	{ 6,	0,	printargs,		"SYS_345"	}, /* 345 */
-	{ 6,	0,	printargs,		"SYS_346"	}, /* 346 */
-	{ 6,	0,	printargs,		"SYS_347"	}, /* 347 */
-	{ 6,	0,	printargs,		"SYS_348"	}, /* 348 */
-	{ 6,	0,	printargs,		"SYS_349"	}, /* 349 */
-
-	{ 6,	0,	solaris_olduname,	"olduname"	}, /* 350 */
-	{ 6,	0,	printargs,		"utssys1"	}, /* 351 */
-	{ 6,	0,	solaris_ustat,		"ustat"		}, /* 352 */
-	{ 6,	0,	solaris_fusers,		"fusers"	}, /* 353 */
-	{ 6,	0,	printargs,		"SYS_354"	}, /* 354 */
-	{ 6,	0,	printargs,		"SYS_355"	}, /* 355 */
-	{ 6,	0,	printargs,		"SYS_356"	}, /* 356 */
-	{ 6,	0,	printargs,		"SYS_357"	}, /* 357 */
-	{ 6,	0,	printargs,		"SYS_358"	}, /* 358 */
-	{ 6,	0,	printargs,		"SYS_359"	}, /* 359 */
-
-	{ 6,	0,	printargs,		"sysfs0"	}, /* 360 */
-	{ 6,	0,	solaris_sysfs1,		"sysfs1"	}, /* 361 */
-	{ 6,	0,	solaris_sysfs2,		"sysfs2"	}, /* 362 */
-	{ 6,	0,	solaris_sysfs3,		"sysfs3"	}, /* 363 */
-	{ 6,	0,	printargs,		"SYS_364"	}, /* 364 */
-	{ 6,	0,	printargs,		"SYS_365"	}, /* 365 */
-	{ 6,	0,	printargs,		"SYS_366"	}, /* 366 */
-	{ 6,	0,	printargs,		"SYS_367"	}, /* 367 */
-	{ 6,	0,	printargs,		"SYS_368"	}, /* 368 */
-	{ 6,	0,	printargs,		"SYS_369"	}, /* 369 */
-
-	{ 6,	0,	printargs,		"spcall0"	}, /* 370 */
-	{ 6,	TS,	solaris_sigpending,	"sigpending"	}, /* 371 */
-	{ 6,	TS,	solaris_sigfillset,	"sigfillset"	}, /* 372 */
-	{ 6,	0,	printargs,		"SYS_373"	}, /* 373 */
-	{ 6,	0,	printargs,		"SYS_374"	}, /* 374 */
-	{ 6,	0,	printargs,		"SYS_375"	}, /* 375 */
-	{ 6,	0,	printargs,		"SYS_376"	}, /* 376 */
-	{ 6,	0,	printargs,		"SYS_377"	}, /* 377 */
-	{ 6,	0,	printargs,		"SYS_378"	}, /* 378 */
-	{ 6,	0,	printargs,		"SYS_379"	}, /* 379 */
-
-	{ 6,	0,	solaris_getcontext,	"getcontext"	}, /* 380 */
-	{ 6,	0,	solaris_setcontext,	"setcontext"	}, /* 381 */
-	{ 6,	0,	printargs,		"SYS_382"	}, /* 382 */
-	{ 6,	0,	printargs,		"SYS_383"	}, /* 383 */
-	{ 6,	0,	printargs,		"SYS_384"	}, /* 384 */
-	{ 6,	0,	printargs,		"SYS_385"	}, /* 385 */
-	{ 6,	0,	printargs,		"SYS_386"	}, /* 386 */
-	{ 6,	0,	printargs,		"SYS_387"	}, /* 387 */
-	{ 6,	0,	printargs,		"SYS_388"	}, /* 388 */
-	{ 6,	0,	printargs,		"SYS_389"	}, /* 389 */
-
-	{ 6,	0,	printargs,		"SYS_390"	}, /* 390 */
-	{ 6,	0,	printargs,		"SYS_391"	}, /* 391 */
-	{ 6,	0,	printargs,		"SYS_392"	}, /* 392 */
-	{ 6,	0,	printargs,		"SYS_393"	}, /* 393 */
-	{ 6,	0,	printargs,		"SYS_394"	}, /* 394 */
-	{ 6,	0,	printargs,		"SYS_395"	}, /* 395 */
-	{ 6,	0,	printargs,		"SYS_396"	}, /* 396 */
-	{ 6,	0,	printargs,		"SYS_397"	}, /* 397 */
-	{ 6,	0,	printargs,		"SYS_398"	}, /* 398 */
-	{ 6,	0,	printargs,		"SYS_399"	}, /* 399 */
diff --git a/strace/linux/sparc64/syscallent2.h b/strace/linux/sparc64/syscallent2.h
deleted file mode 100644
index 2872946..0000000
--- a/strace/linux/sparc64/syscallent2.h
+++ /dev/null
@@ -1,353 +0,0 @@
-	{ 1,	0,	sys_setup,	"setup" },		/* 0 */
-	{ 1,	TP,	sys_exit,	"exit" },		/* 1 */
-	{ 0,	TP,	sys_fork,	"fork" },		/* 2 */
-	{ 3,	0,	sys_read,	"read" },		/* 3 */
-	{ 3,	0,	sys_write,	"write" },		/* 4 */
-	{ 3,	TF,	sys_open,	"open" },		/* 5 */
-	{ 1,	0,	sys_close,	"close" },		/* 6 */
-	{ 4,	TP,	sys_wait4,	"wait4" },		/* 7 */
-	{ 2,	TF,	sys_creat,	"creat" },		/* 8 */
-	{ 2,	TF,	sys_link,	"link" },		/* 9 */
-	{ 1,	TF,	sys_unlink,	"unlink" },		/* 10 */
-	{ 2,    TF|TP,	sys_execv,	"execv" },		/* 11 */
-	{ 1,	TF,	sys_chdir,	"chdir" },		/* 12 */
-        { 3,    TF,     sys_chown,      "chown"},		/* 13 */
-	{ 3,	TF,	sys_mknod,	"mknod" },		/* 14 */
-	{ 2,	TF,	sys_chmod,	"chmod" },		/* 15 */
-	{ 3,	TF,	sys_chown,	"lchown" },		/* 16 */
-	{ 1,	0,	sys_brk,	"brk" },		/* 17 */
-	{ 4,	0,	printargs,	"perfctr" },		/* 18 */
-	{ 3,	0,	sys_lseek,	"lseek" },		/* 19 */
-	{ 0,	0,	sys_getpid,	"getpid" },		/* 20 */
-	{ 2,	0,	sys_capget,	"capget" },		/* 21 */
-	{ 2,	0,	sys_capset,	"capset" },		/* 22 */
-	{ 1,	0,	sys_setuid,	"setuid" },		/* 23 */
-	{ 0,	0,	sys_getuid,	"getuid" },		/* 24 */
-	{ 1,	0,	sys_time,	"time" },		/* 25 */
-	{ 5,	0,	sys_ptrace,	"ptrace" },		/* 26 */
-	{ 1,	0,	sys_alarm,	"alarm" },		/* 27 */
-	{ 2,	TS,	sys_sigaltstack,"sigaltstack" },	/* 28 */
-	{ 0,	TS,	sys_pause,	"pause" },		/* 29 */
-	{ 2,	TF,	sys_utime,	"utime" },		/* 30 */
-	{ 3,	TF,	sys_chown,	"lchown32" },		/* 31 */
-	{ 3,	0,	sys_fchown,	"fchown32" },		/* 32 */
-	{ 2,	TF,	sys_access,	"access" },		/* 33 */
-	{ 1,	0,	sys_nice,	"nice" },		/* 34 */
-	{ 3,	TF,	sys_chown,	"chown32" },		/* 35 */
-	{ 0,	0,	sys_sync,	"sync" },		/* 36 */
-	{ 2,	TS,	sys_kill,	"kill" },		/* 37 */
-	{ 2,	TF,	sys_stat,	"stat" },		/* 38 */
-	{ 4,	TF,	sys_sendfile,	"sendfile" },		/* 39 */
-	{ 2,	TF,	sys_lstat,	"lstat" },		/* 40 */
-	{ 2,	0,	sys_dup,	"dup" },		/* 41 */
-	{ 0,	0,	sys_pipe,	"pipe" },		/* 42 */
-	{ 1,	0,	sys_times,	"times" },		/* 43 */
-	{ 0,	0,	sys_getuid,	"getuid32" },		/* 44 */
-	{ 2,	TF,	sys_umount2,	"umount" },		/* 45 */
-	{ 1,	0,	sys_setgid,	"setgid" },		/* 46 */
-	{ 0,	0,	sys_getgid,	"getgid" },		/* 47 */
-	{ 3,	TS,	sys_signal,	"signal" },		/* 48 */
-	{ 0,	0,	sys_geteuid,	"geteuid" },		/* 49 */
-	{ 0,	0,	sys_getegid,	"getegid" },		/* 50 */
-	{ 1,	TF,	sys_acct,	"acct" },		/* 51 */
-	{ 2,	0,	printargs,	"memory_ordering" },	/* 52 */
-	{ 0,	0,	sys_getgid,	"getgid32" },		/* 53 */
-	{ 3,	0,	sys_ioctl,	"ioctl" },		/* 54 */
-	{ 3,	0,	sys_reboot,	"reboot" },		/* 55 */
-	{ 6,	0,	sys_mmap,	"mmap2" },		/* 56 */
-	{ 2,	TF,	sys_symlink,	"symlink" },		/* 57 */
-	{ 3,	TF,	sys_readlink,	"readlink" },		/* 58 */
-	{ 3,	TF|TP,	sys_execve,	"execve" },		/* 59 */
-	{ 1,	0,	sys_umask,	"umask" },		/* 60 */
-	{ 1,	TF,	sys_chroot,	"chroot" },		/* 61 */
-	{ 2,	0,	sys_fstat,	"fstat" },		/* 62 */
-	{ 2,	TF,	sys_fstat64,	"fstat64" },		/* 63 */
-	{ 0,	0,	sys_getpagesize,"getpagesize" },	/* 64 */
-	{ 3,	0,	sys_msync,	"msync" },		/* 65 */
-	{ 0,	TP,	sys_vfork,	"vfork" },		/* 66 */
-	{ 5,	TF,	sys_pread,	"pread" },		/* 67 */
-	{ 5,	TF,	sys_pwrite,	"pwrite" },		/* 68 */
-	{ 0,    0,	sys_geteuid,	"geteuid32" },		/* 69 */
-	{ 0,	0,	sys_getegid,	"getegid32" },		/* 70 */
-	{ 6,	0,	sys_mmap,	"mmap" },		/* 71 */
-	{ 2,	0,	sys_setreuid,	"setreuid32" },		/* 72 */
-	{ 2,	0,	sys_munmap,	"munmap" },		/* 73 */
-	{ 3,	0,	sys_mprotect,	"mprotect" },		/* 74 */
-	{ 3,	0,	sys_madvise,	"madvise" },		/* 75 */
-	{ 0,	0,	sys_vhangup,	"vhangup" },		/* 76 */
-	{ 3,	TF,	sys_truncate64,	"truncate64" },		/* 77 */
-	{ 3,	0,	sys_mincore,	"mincore" },		/* 78 */
-	{ 2,	0,	sys_getgroups,	"getgroups" },		/* 79 */
-	{ 2,	0,	sys_setgroups,	"setgroups" },		/* 80 */
-	{ 0,	0,	sys_getpgrp,	"getpgrp" },		/* 81 */
-	{ 2,	0,	sys_setgroups,	"setgroups32" },	/* 82 */
-	{ 3,	0,	sys_setitimer,	"setitimer" },		/* 83 */
-	{ 2,	0,	sys_ftruncate,	"ftruncate64" },	/* 84 */
-	{ 1,	TF,	sys_swapon,	"swapon" },		/* 85 */
-	{ 2,	0,	sys_getitimer,	"getitimer" },		/* 86 */
-	{ 1,	0,	sys_setuid,	"setuid32" },		/* 87 */
-	{ 2,	0,	sys_sethostname,"sethostname" },	/* 88 */
-	{ 1,	0,	sys_setgid,	"setgid32" },		/* 89 */
-	{ 2,	0,	sys_dup2,	"dup2" },		/* 90 */
-	{ 1,	0,	sys_setfsuid,	"setfsuid32" },		/* 91 */
-	{ 3,	0,	sys_fcntl,	"fcntl" },		/* 92 */
-	{ 5,	0,	sys_select,	"select" },		/* 93 */
-	{ 1,	0,	sys_setfsgid,	"setfsgid32" },		/* 94 */
-	{ 1,	0,	sys_fsync,	"fsync" },		/* 95 */
-	{ 3,	0,	sys_setpriority,"setpriority" },	/* 96 */
-	{ 3,	TN,	sys_socket,	"socket" },		/* 97 */
-	{ 3,	TN,	sys_connect,	"connect" },		/* 98 */
-	{ 3,	TN,	sys_accept,	"accept" },		/* 99 */
-	{ 2,	0,	sys_getpriority,"getpriority" },	/* 100 */
-	{ 1,	TS,	printargs,	"rt_sigreturn" },	/* 101 */
-	{ 4,	TS,	sys_rt_sigaction,"rt_sigaction" },	/* 102 */
-	{ 4,	TS,	sys_rt_sigprocmask,"rt_sigprocmask" },	/* 103 */
-	{ 2,	TS,	sys_rt_sigpending,"rt_sigpending" },	/* 104 */
-	{ 4,	TS,	sys_rt_sigtimedwait,"rt_sigtimedwait" },/* 105 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,"rt_sigqueueinfo" },/* 106 */
-	{ 2,	TS,	sys_rt_sigsuspend,"rt_sigsuspend" },	/* 107 */
-	{ 3,	TS,	sys_setresuid,	"setresuid" },		/* 108 */
-	{ 3,    TS,	sys_getresuid,	"getresuid" },		/* 109 */
-	{ 3,	TS,	sys_setresgid,	"setresgid" },		/* 110 */
-	{ 3,	TS,	sys_getresgid,	"getresgid" },		/* 111 */
-	{ 2,	TS,	sys_setresgid,	"setresgid32" },	/* 112 */
-	{ 5,	TN,	sys_recvmsg,	"recvmsg" },		/* 113 */
-	{ 5,	TN,	sys_sendmsg,	"sendmsg" },		/* 114 */
-	{ 2,	0,	sys_getgroups,	"getgroups32" },	/* 115 */
-	{ 2,	0,	sys_gettimeofday,"gettimeofday" },	/* 116 */
-	{ 2,	0,	sys_getrusage,	"getrusage" },		/* 117 */
-	{ 5,	TN,	sys_getsockopt,	"getsockopt" },		/* 118 */
-	{ 2,	TF,	sys_getcwd,	"getcwd" },		/* 119 */
-	{ 3,	0,	sys_readv,	"readv" },		/* 120 */
-	{ 3,	0,	sys_writev,	"writev" },		/* 121 */
-	{ 2,	0,	sys_settimeofday,"settimeofday" },	/* 122 */
-	{ 3,	0,	sys_fchown,	"fchown" },		/* 123 */
-	{ 2,	0,	sys_fchmod,	"fchmod" },		/* 124 */
-	{ 6,	TN,	sys_recvfrom,	"recvfrom" },		/* 125 */
-	{ 2,	0,	sys_setreuid,	"setreuid" },		/* 126 */
-	{ 2,	0,	sys_setregid,	"setregid" },		/* 127 */
-	{ 2,	TF,	sys_rename,	"rename" },		/* 128 */
-	{ 2,	TF,	sys_truncate,	"truncate" },		/* 129 */
-	{ 2,	0,	sys_ftruncate,	"ftruncate" },		/* 130 */
-	{ 2,	0,	sys_flock,	"flock" },		/* 131 */
-	{ 2,	TF,	sys_lstat64,	"lstat64" },		/* 132 */
-	{ 6,	TN,	sys_sendto,	"sendto" },		/* 133 */
-	{ 2,	TN,	sys_shutdown,	"shutdown" },		/* 134 */
-	{ 4,	TN,	sys_socketpair,	"socketpair" },		/* 135 */
-	{ 2,	TF,	sys_mkdir,	"mkdir" },		/* 136 */
-	{ 1,	TF,	sys_rmdir,	"rmdir" },		/* 137 */
-	{ 2,	TF,	sys_utimes,	"utimes" },		/* 138 */
-	{ 2,	TF,	sys_stat64,	"stat64" },		/* 139 */
-	{ 4,    TF,	sys_sendfile64,	"sendfile64" },		/* 140 */
-	{ 3,	TN,	sys_getpeername,"getpeername" },	/* 141 */
-	{ 5,    0,	sys_futex,	"futex" },		/* 142 */
-	{ 0,	0,	printargs,	"gettid" },		/* 143 */
-	{ 2,	0,	sys_getrlimit,	"getrlimit" },		/* 144 */
-	{ 2,	0,	sys_setrlimit,	"setrlimit" },		/* 145 */
-	{ 2,	TF,	sys_pivotroot,	"pivot_root" },		/* 146 */
-	{ 5,	0,	sys_prctl,	"prctl" },		/* 147 */
-	{ 5,	0,	printargs,	"pciconfig_read" },	/* 148 */
-	{ 5,	0,	printargs,	"pciconfig_write" },	/* 149 */
-	{ 3,	TN,	sys_getsockname,"getsockname" },	/* 150 */
-	{ 4,	TN,	sys_getmsg,	"getmsg" },		/* 151 */
-	{ 4,	TN,	sys_putmsg,	"putmsg" },		/* 152 */
-	{ 3,	0,	sys_poll,	"poll" },		/* 153 */
-	{ 4,	0,	sys_getdents64,	"getdents64" },		/* 154 */
-	{ 3,	0,	sys_fcntl,	"fcntl64" },		/* 155 */
-	{ 4,	0,	printargs,	"getdirentries" },	/* 156 */
-	{ 2,	TF,	sys_statfs,	"statfs" },		/* 157 */
-	{ 2,	0,	sys_fstatfs,	"fstatfs" },		/* 158 */
-	{ 1,	TF,	sys_umount,	"oldumount" },		/* 159 */
-	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 160 */
-	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 161 */
-	{ 2,	0,	printargs,	"getdomainname" },	/* 162 */
-	{ 2,	0,	sys_setdomainname,"setdomainname" },	/* 163 */
-	{ 5,	0,	printargs,	"utrap_install" },	/* 164 */
-	{ 4,	0,	sys_quotactl,	"quotactl" },		/* 165 */
-	{ 1,	0,	printargs,	"set_tid_address" },	/* 166 */
-	{ 5,	TF,	sys_mount,	"mount" },		/* 167 */
-	{ 2,	0,	sys_ustat,	"ustat" },		/* 168 */
-	{ 5,	TF,	sys_setxattr,	"setxattr" },		/* 169 */
-	{ 5,	TF,	sys_setxattr,	"lsetxattr" },		/* 170 */
-	{ 5,	0,	sys_fsetxattr,	"fsetxattr" },		/* 171 */
-	{ 4,	TF,	sys_getxattr,	"getxattr" },		/* 172 */
-	{ 4,	TF,	sys_getxattr,	"lgetxattr" },		/* 173 */
-	{ 3,	0,	sys_getdents,	"getdents" },		/* 174 */
-	{ 0,	0,	sys_setsid,	"setsid" },		/* 175 */
-	{ 1,	0,	sys_fchdir,	"fchdir" },		/* 176 */
-	{ 4,    0,	sys_fgetxattr,	"fgetxattr" },		/* 177 */
-	{ 3,	TF,	sys_listxattr,	"listxattr" },		/* 178 */
-	{ 3,	TF,	sys_listxattr,	"llistxattr" },		/* 179 */
-	{ 3,	0,	sys_flistxattr,	"flistxattr" },		/* 180 */
-	{ 2,	TF,	sys_removexattr,"removexattr" },	/* 181 */
-	{ 2,	TF,	sys_removexattr,"lremovexattr" },	/* 182 */
-	{ 1,	TS,	sys_sigpending,	"sigpending" },		/* 183 */
-	{ 5,	0,	sys_query_module,"query_module" },	/* 184 */
-	{ 2,	0,	sys_setpgid,	"setpgid" },		/* 185 */
-	{ 2,	0,	sys_fremovexattr,"fremovexattr" },	/* 186 */
-	{ 2,	TS,	sys_kill,	"tkill" },		/* 187 */
-	{ 1,	TP,	sys_exit,	"exit_group" },		/* 188 */
-	{ 1,	0,	sys_uname,	"uname" },		/* 189 */
-	{ 2,	0,	sys_init_module,"init_module" },	/* 190 */
-	{ 1,	0,	sys_personality,"personality" },	/* 191 */
-	{ 5,	0,	sys_remap_file_pages,"remap_file_pages" },/* 192 */
-	{ 1,	0,	sys_epoll_create,"epoll_create" },	/* 193 */
-	{ 4,	0,	sys_epoll_ctl,	"epoll_ctl" },		/* 194 */
-	{ 4,	0,	sys_epoll_wait,	"epoll_wait" },		/* 195 */
-	{ 2,	0,	sys_ulimit,	"ulimit" },		/* 196 */
-	{ 0,	0,	sys_getppid,	"getppid" },		/* 197 */
-	{ 3,	TS,	sys_sigaction,	"sigaction" },		/* 198 */
-	{ 5,	0,	printargs,	"sgetmask" },		/* 199 */
-	{ 5,	0,	printargs,	"ssetmask" },		/* 200 */
-	{ 3,	TS,	sys_sigsuspend,	"sigsuspend" },		/* 201 */
-	{ 2,	TF,	sys_lstat,	"lstat" },		/* 202 */
-	{ 1,	TF,	sys_uselib,	"uselib" },		/* 203 */
-	{ 3,	0,	sys_readdir,	"readdir" },		/* 204 */
-	{ 4,	0,	sys_readahead,	"readahead" },		/* 205 */
-	{ 2,	0,	sys_socketcall,	"socketcall" },		/* 206 */
-	{ 3,	0,	sys_syslog,	"syslog" },		/* 207 */
-	{ 4,	0,	printargs,	"lookup_dcookie" },	/* 208 */
-	{ 6,	0,	printargs,	"fadvise64" },		/* 209 */
-	{ 6,	0,	printargs,	"fadvise64_64" },	/* 210 */
-	{ 3,	TS,	sys_tgkill,	"tgkill" },		/* 211 */
-	{ 3,	TP,	sys_waitpid,	"waitpid" },		/* 212 */
-	{ 1,	0,	sys_swapoff,	"swapoff" },		/* 213 */
-	{ 1,	0,	sys_sysinfo,	"sysinfo" },		/* 214 */
-	{ 5,	0,	sys_ipc,	"ipc" },		/* 215 */
-	{ 1,	TS,	sys_sigreturn,	"sigreturn" },		/* 216 */
-	{ 5,	TP,	sys_clone,	"clone" },		/* 217 */
-	{ 3,	0,	sys_modify_ldt,	"modify_ldt" },		/* 218 */
-	{ 1,	0,	sys_adjtimex,	"adjtimex" },		/* 219 */
-	{ 3,	TS,	sys_sigprocmask,"sigprocmask" },	/* 220 */
-	{ 2,	0,	sys_create_module,"create_module" },	/* 221 */
-	{ 1,	0,	sys_delete_module,"delete_module" },
-	{ 1,	0,	sys_get_kernel_syms,"get_kernel_syms"},	/* 223 */
-	{ 1,	0,	sys_getpgid,	"getpgid" },		/* 224 */
-	{ 0,	0,	sys_bdflush,	"bdflush" },		/* 225 */
-	{ 3,	0,	sys_sysfs,	"sysfs" },		/* 226 */
-	{ 5,	0,	sys_afs_syscall,"afs_syscall" },	/* 227 */
-	{ 1,	0,	sys_setfsuid,	"setfsuid" },		/* 228 */
-	{ 1,	0,	sys_setfsgid,	"setfsgid" },		/* 229 */
-	{ 5,	0,	sys_select,	"select" },		/* 230 */
-	{ 1,	0,	sys_time,	"time" },		/* 231 */
-	{ 2,	TF,	sys_stat,	"stat" },		/* 232 */
-	{ 1,	0,	sys_stime,	"stime" },		/* 233 */
-	{ 3,	TF,	sys_statfs64,	"statfs64" },		/* 234 */
-	{ 3,	0,	sys_fstatfs64,	"fstatfs64" },		/* 235 */
-	{ 5,	0,	sys_llseek,	"_llseek" },		/* 236 */
-	{ 2,	0,	sys_mlock,	"mlock" },		/* 237 */
-	{ 2,	0,	sys_munlock,	"munlock" },		/* 238 */
-	{ 2,	0,	sys_mlockall,	"mlockall" },		/* 239 */
-	{ 0,	0,	sys_munlockall,	"munlockall" },		/* 240 */
-	{ 2,	0,	sys_sched_setparam,"sched_setparam"},	/* 241 */
-	{ 2,	0,	sys_sched_getparam,"sched_getparam"},	/* 242 */
-	{ 3,	0,	sys_sched_setscheduler,"sched_setscheduler"},/* 243 */
-	{ 1,	0,	sys_sched_getscheduler,"sched_getscheduler"},/* 244 */
-	{ 0,	0,	sys_sched_yield,"sched_yield" },	/* 245 */
-	{ 1,0,sys_sched_get_priority_max,"sched_get_priority_max"},/* 246 */
-	{ 1,0,sys_sched_get_priority_min,"sched_get_priority_min"},/* 247 */
-	{ 2,	0,sys_sched_rr_get_interval,"sched_rr_get_interval"},/* 248 */
-	{ 2,	0,	sys_nanosleep,	"nanosleep" },		/* 249 */
-	{ 4,	0,	sys_mremap,	"mremap" },		/* 250 */
-	{ 1,	0,	sys_sysctl,	"_sysctl" },		/* 251 */
-	{ 1,	0,	sys_getsid,	"getsid" },		/* 252 */
-	{ 1,	0,	sys_fdatasync,	"fdatasync" },		/* 253 */
-	{ 3,	0,	printargs,	"nfsservctl" },		/* 254 */
-	{ 5,	0,	printargs,	"aplib" },		/* 255 */
-	{ 2,	0,	sys_clock_settime,"clock_settime" },	/* 256 */
-	{ 2,	0,	sys_clock_gettime,"clock_gettime" },	/* 257 */
-	{ 2,	0,	sys_clock_getres,"clock_getres" },	/* 258 */
-	{ 4,	0,	sys_clock_nanosleep,"clock_nanosleep" },/* 259 */
-	{ 3,	0,	sys_sched_setaffinity,"sched_setaffinity" },/* 260 */
-	{ 3,	0,	sys_sched_getaffinity,"sched_getaffinity" },/* 261 */
-	{ 4,	0,	sys_timer_settime,"timer_settime" },	/* 262 */
-	{ 2,	0,	sys_timer_gettime,"timer_gettime" },	/* 263 */
-	{ 1,	0,	sys_timer_getoverrun,"timer_getoverrun" },/* 264 */
-	{ 1,	0,	sys_timer_delete,"timer_delete" },	/* 265 */
-	{ 3,	0,	sys_timer_create,"timer_create" },	/* 266 */
-	{ 5,	0,	printargs,	"SYS_267" },		/* 267 */
-	{ 5,	0,	printargs,	"SYS_268" },		/* 268 */
-	{ 5,	0,	printargs,	"SYS_269" },		/* 269 */
-	{ 5,	0,	printargs,	"SYS_270" },		/* 270 */
-	{ 5,	0,	printargs,	"SYS_271" },		/* 271 */
-	{ 5,	0,	printargs,	"SYS_272" },		/* 272 */
-	{ 5,	0,	printargs,	"SYS_273" },		/* 273 */
-	{ 5,	0,	printargs,	"SYS_274" },		/* 274 */
-	{ 5,	0,	printargs,	"SYS_275" },		/* 275 */
-	{ 5,	0,	printargs,	"SYS_276" },		/* 276 */
-	{ 5,	0,	printargs,	"SYS_277" },		/* 277 */
-	{ 5,	0,	printargs,	"SYS_278" },		/* 278 */
-	{ 5,	0,	printargs,	"SYS_279" },		/* 279 */
-	{ 5,	0,	printargs,	"SYS_280" },		/* 280 */
-	{ 5,	0,	printargs,	"SYS_281" },		/* 281 */
-	{ 5,	0,	printargs,	"SYS_282" },		/* 282 */
-	{ 5,	0,	printargs,	"SYS_283" },		/* 283 */
-	{ 5,	0,	printargs,	"SYS_284" },		/* 284 */
-	{ 5,	0,	printargs,	"SYS_285" },		/* 285 */
-	{ 5,	0,	printargs,	"SYS_286" },		/* 286 */
-	{ 5,	0,	printargs,	"SYS_287" },		/* 287 */
-	{ 5,	0,	printargs,	"SYS_288" },		/* 288 */
-	{ 5,	0,	printargs,	"SYS_289" },		/* 289 */
-	{ 5,	0,	printargs,	"SYS_290" },		/* 290 */
-	{ 5,	0,	printargs,	"SYS_291" },		/* 291 */
-	{ 5,	0,	printargs,	"SYS_292" },		/* 292 */
-	{ 5,	0,	printargs,	"SYS_293" },		/* 293 */
-	{ 5,	0,	printargs,	"SYS_294" },		/* 294 */
-	{ 5,	0,	printargs,	"SYS_295" },		/* 295 */
-	{ 5,	0,	printargs,	"SYS_296" },		/* 296 */
-	{ 5,	0,	printargs,	"SYS_297" },		/* 297 */
-	{ 5,	0,	printargs,	"SYS_298" },		/* 298 */
-	{ 5,	0,	printargs,	"SYS_299" },		/* 299 */
-	{ 5,	0,	printargs,	"SYS_300" },		/* 300 */
-	{ 5,	0,	printargs,	"SYS_301" },		/* 301 */
-	{ 5,	0,	printargs,	"SYS_302" },		/* 302 */
-	{ 5,	0,	printargs,	"SYS_303" },		/* 303 */
-	{ 5,	0,	printargs,	"SYS_304" },		/* 304 */
-	{ 5,	0,	printargs,	"SYS_305" },		/* 305 */
-	{ 5,	0,	printargs,	"SYS_306" },		/* 306 */
-	{ 5,	0,	printargs,	"SYS_307" },		/* 307 */
-	{ 5,	0,	printargs,	"SYS_308" },		/* 308 */
-	{ 5,	0,	printargs,	"SYS_309" },		/* 309 */
-	{ 5,	0,	printargs,	"SYS_310" },		/* 310 */
-	{ 5,	0,	printargs,	"SYS_311" },		/* 311 */
-	{ 5,	0,	printargs,	"SYS_312" },		/* 312 */
-	{ 5,	0,	printargs,	"SYS_313" },		/* 313 */
-	{ 5,	0,	printargs,	"SYS_314" },		/* 314 */
-	{ 5,	0,	printargs,	"SYS_315" },		/* 315 */
-	{ 5,	0,	printargs,	"SYS_316" },		/* 316 */
-	{ 5,	0,	printargs,	"SYS_317" },		/* 317 */
-	{ 5,	0,	printargs,	"SYS_318" },		/* 318 */
-	{ 5,	0,	printargs,	"SYS_319" },		/* 319 */
-	{ 5,	0,	printargs,	"SYS_320" },		/* 320 */
-	{ 5,	0,	printargs,	"SYS_321" },		/* 321 */
-	{ 5,	0,	printargs,	"SYS_322" },		/* 322 */
-	{ 5,	0,	printargs,	"SYS_323" },		/* 323 */
-	{ 5,	0,	printargs,	"SYS_324" },		/* 324 */
-	{ 5,	0,	printargs,	"SYS_325" },		/* 325 */
-	{ 5,	0,	printargs,	"SYS_326" },		/* 326 */
-	{ 5,	0,	printargs,	"SYS_327" },		/* 327 */
-	{ 5,	0,	printargs,	"SYS_328" },		/* 328 */
-	{ 5,	0,	printargs,	"SYS_329" },		/* 329 */
-	{ 5,	0,	printargs,	"SYS_330" },		/* 330 */
-	{ 5,	0,	printargs,	"SYS_331" },		/* 331 */
-	{ 5,	0,	printargs,	"SYS_332" },		/* 332 */
-	{ 5,	0,	printargs,	"SYS_333" },		/* 333 */
-	{ 5,	0,	printargs,	"SYS_334" },		/* 334 */
-	{ 5,	0,	printargs,	"SYS_335" },		/* 335 */
-	{ 5,	0,	printargs,	"SYS_336" },		/* 336 */
-	{ 5,	0,	printargs,	"SYS_337" },		/* 337 */
-	{ 5,	0,	printargs,	"SYS_338" },		/* 338 */
-	{ 5,	0,	printargs,	"SYS_339" },		/* 339 */
-	{ 5,	0,	printargs,	"SYS_340" },		/* 340 */
-	{ 5,	0,	printargs,	"SYS_341" },		/* 341 */
-	{ 5,	0,	printargs,	"SYS_342" },		/* 342 */
-	{ 5,	0,	printargs,	"SYS_343" },		/* 343 */
-	{ 5,	0,	printargs,	"SYS_344" },		/* 344 */
-	{ 5,	0,	printargs,	"SYS_345" },		/* 345 */
-	{ 5,	0,	printargs,	"SYS_346" },		/* 346 */
-	{ 5,	0,	printargs,	"SYS_347" },		/* 347 */
-	{ 5,	0,	printargs,	"SYS_348" },		/* 348 */
-	{ 5,	0,	printargs,	"SYS_349" },		/* 349 */
-	{ 5,	0,	printargs,	"SYS_350" },		/* 350 */
-	{ 5,	0,	printargs,	"SYS_351" },		/* 351 */
-	{ 5,	0,	printargs,	"SYS_352" },		/* 352 */
diff --git a/strace/linux/syscall.h b/strace/linux/syscall.h
deleted file mode 100644
index b0a5993..0000000
--- a/strace/linux/syscall.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscall.h,v 1.45 2005/06/07 23:21:28 roland Exp $
- */
-
-#include "dummy.h"
-
-/* primary syscalls */
-
-int sys_setup(), sys_exit(), sys_fork(), sys_read(), sys_write();
-int sys_open(), sys_close(), sys_waitpid(), sys_creat(), sys_link();
-int sys_unlink(), sys_execve(), sys_chdir(), sys_time(), sys_mknod();
-int sys_chmod(), sys_chown(), sys_break(), sys_oldstat();
-int sys_lseek(), sys_getpid(), sys_mount(), sys_umount(), sys_umount2();
-int sys_setuid(), sys_getuid(), sys_stime(), sys_ptrace();
-int sys_alarm(), sys_oldfstat(), sys_pause(), sys_utime();
-int sys_stty(), sys_gtty(), sys_access(), sys_nice(), sys_ftime();
-int sys_sync(), sys_kill(), sys_rename(), sys_mkdir(), sys_rmdir();
-int sys_dup(), sys_pipe(), sys_times(), sys_prof(), sys_brk();
-int sys_setgid(), sys_getgid(), sys_signal(), sys_geteuid();
-int sys_getegid(), sys_acct(), sys_phys(), sys_lock(), sys_ioctl();
-int sys_fcntl(), sys_mpx(), sys_setpgid(), sys_ulimit();
-int sys_olduname(), sys_umask(), sys_chroot(), sys_ustat();
-int sys_dup2(), sys_getppid(), sys_getpgrp(), sys_setsid();
-int sys_sigaction(), sys_siggetmask(), sys_sigsetmask();
-int sys_setreuid(), sys_setregid(), sys_sigsuspend();
-int sys_sigpending(), sys_sethostname(), sys_setrlimit();
-int sys_getrlimit(), sys_getrusage(), sys_gettimeofday();
-int sys_settimeofday(), sys_getgroups(), sys_setgroups();
-int sys_setgroups32(), sys_getgroups32();
-int sys_oldselect(), sys_symlink(), sys_oldlstat(), sys_readlink();
-int sys_uselib(), sys_swapon(), sys_reboot(), sys_readdir();
-int sys_mmap(), sys_munmap(), sys_truncate(), sys_ftruncate();
-int sys_fchmod(), sys_fchown(), sys_getpriority();
-int sys_setpriority(), sys_profil(), sys_statfs(), sys_fstatfs();
-int sys_ioperm(), sys_socketcall(), sys_syslog(), sys_setitimer();
-int sys_getitimer(), sys_stat(), sys_lstat(), sys_fstat();
-int sys_uname(), sys_iopl(), sys_vhangup(), sys_idle(), sys_vm86();
-int sys_wait4(), sys_swapoff(), sys_ipc(), sys_sigreturn();
-int sys_fsync(), sys_clone(), sys_setdomainname(), sys_sysinfo();
-int sys_modify_ldt(), sys_adjtimex(), sys_mprotect();
-int sys_sigprocmask(), sys_create_module(), sys_init_module();
-int sys_delete_module(), sys_get_kernel_syms(), sys_quotactl();
-int sys_getpgid(), sys_fchdir(), sys_bdflush();
-int sys_sysfs(), sys_personality(), sys_afs_syscall();
-int sys_setfsuid(), sys_setfsgid(), sys_llseek();
-int sys_getdents(), sys_flock(), sys_msync();
-int sys_readv(), sys_writev(), sys_select();
-int sys_getsid(), sys_fdatasync(), sys_sysctl();
-int sys_mlock(), sys_munlock(), sys_mlockall(), sys_munlockall(), sys_madvise();
-int sys_sched_setparam(), sys_sched_getparam();
-int sys_sched_setscheduler(), sys_sched_getscheduler(), sys_sched_yield();
-int sys_sched_get_priority_max(), sys_sched_get_priority_min();
-int sys_sched_rr_get_interval(), sys_nanosleep(), sys_mremap();
-int sys_sendmsg(), sys_recvmsg(), sys_setresuid(), sys_setresgid();
-int sys_getresuid(), sys_getresgid(), sys_pread(), sys_pwrite(), sys_getcwd();
-int sys_sigaltstack(), sys_rt_sigprocmask(), sys_rt_sigaction();
-int sys_rt_sigpending(), sys_rt_sigsuspend(), sys_rt_sigqueueinfo();
-int sys_rt_sigtimedwait(), sys_prctl(), sys_poll(), sys_vfork();
-int sys_sendfile(), sys_old_mmap(), sys_stat64(), sys_lstat64(), sys_fstat64();
-int sys_truncate64(), sys_ftruncate64(), sys_pivotroot();
-int sys_getdents64();
-int sys_getpmsg(), sys_putpmsg(), sys_readahead(), sys_sendfile64();
-int sys_setxattr(), sys_fsetxattr(), sys_getxattr(), sys_fgetxattr();
-int sys_listxattr(), sys_flistxattr(), sys_removexattr(), sys_fremovexattr();
-int sys_sched_setaffinity(), sys_sched_getaffinity(), sys_futex();
-int sys_set_thread_area(), sys_get_thread_area(), sys_remap_file_pages();
-int sys_timer_create(), sys_timer_delete(), sys_timer_getoverrun();
-int sys_timer_gettime(), sys_timer_settime(), sys_clock_settime();
-int sys_clock_gettime(), sys_clock_getres(), sys_clock_nanosleep();
-int sys_semtimedop(), sys_statfs64(), sys_fstatfs64(), sys_tgkill();
-int sys_mq_open(), sys_mq_timedsend(), sys_mq_timedreceive();
-int sys_mq_notify(), sys_mq_getsetattr();
-int sys_epoll_create(), sys_epoll_ctl(), sys_epoll_wait();
-int sys_waitid(), sys_fadvise64(), sys_fadvise64_64();
-int sys_mbind(), sys_get_mempolicy(), sys_set_mempolicy();
-int sys_arch_prctl();
-int sys_io_setup(), sys_io_submit(), sys_io_cancel(), sys_io_getevents(), sys_io_destroy();
-
-/* sys_socketcall subcalls */
-
-int sys_socket(), sys_bind(), sys_connect(), sys_listen();
-int sys_accept(), sys_getsockname(), sys_getpeername(), sys_socketpair();
-int sys_send(), sys_recv(), sys_sendto(), sys_recvfrom();
-int sys_shutdown(), sys_setsockopt(), sys_getsockopt();
-
-/* new ones */
-int sys_query_module();
-int sys_poll();
-int sys_mincore();
-
-/* architecture-specific calls */
-#ifdef ALPHA
-int sys_osf_select();
-int sys_osf_gettimeofday();
-int sys_osf_settimeofday();
-int sys_osf_getitimer();
-int sys_osf_setitimer();
-int sys_osf_getrusage();
-int sys_osf_wait4();
-int sys_osf_utimes();
-#endif
-
-
-#ifndef SYS_waitid
-# ifdef I386
-#  define SYS_waitid 284
-# elif defined ALPHA
-#  define SYS_waitid 438
-# elif defined ARM
-#  define SYS_waitid (NR_SYSCALL_BASE + 280)
-# elif defined IA64
-#  define SYS_waitid 1270
-# elif defined M68K
-#  define SYS_waitid 277
-# elif defined POWERPC
-#  define SYS_waitid 272
-# elif defined S390 || defined S390X
-#  define SYS_waitid 281
-# elif defined SH64
-#  define SYS_waitid 312
-# elif defined SH64
-#  define SYS_waitid 312
-# elif defined SH
-#  define SYS_waitid 284
-# elif defined SPARC || defined SPARC64
-#  define SYS_waitid 279
-# elif defined X86_64
-#  define SYS_waitid 247
-# endif
-#endif
-
-#if !defined(ALPHA) && !defined(MIPS) && !defined(HPPA)
-# ifdef	IA64
-/*
- *  IA64 syscall numbers (the only ones available from standard header
- *  files) are disjoint from IA32 syscall numbers.  We need to define
- *  the IA32 socket call number here.
- */
-#  define SYS_socketcall	102
-
-#  undef SYS_socket
-#  undef SYS_bind
-#  undef SYS_connect
-#  undef SYS_listen
-#  undef SYS_accept
-#  undef SYS_getsockname
-#  undef SYS_getpeername
-#  undef SYS_socketpair
-#  undef SYS_send
-#  undef SYS_recv
-#  undef SYS_sendto
-#  undef SYS_recvfrom
-#  undef SYS_shutdown
-#  undef SYS_setsockopt
-#  undef SYS_getsockopt
-#  undef SYS_sendmsg
-#  undef SYS_recvmsg
-# endif /* IA64 */
-#  define SYS_socket_subcall	300
-#define SYS_sub_socket		(SYS_socket_subcall + 1)
-#define SYS_sub_bind		(SYS_socket_subcall + 2)
-#define SYS_sub_connect		(SYS_socket_subcall + 3)
-#define SYS_sub_listen		(SYS_socket_subcall + 4)
-#define SYS_sub_accept		(SYS_socket_subcall + 5)
-#define SYS_sub_getsockname	(SYS_socket_subcall + 6)
-#define SYS_sub_getpeername	(SYS_socket_subcall + 7)
-#define SYS_sub_socketpair	(SYS_socket_subcall + 8)
-#define SYS_sub_send		(SYS_socket_subcall + 9)
-#define SYS_sub_recv		(SYS_socket_subcall + 10)
-#define SYS_sub_sendto		(SYS_socket_subcall + 11)
-#define SYS_sub_recvfrom	(SYS_socket_subcall + 12)
-#define SYS_sub_shutdown	(SYS_socket_subcall + 13)
-#define SYS_sub_setsockopt	(SYS_socket_subcall + 14)
-#define SYS_sub_getsockopt	(SYS_socket_subcall + 15)
-#define SYS_sub_sendmsg		(SYS_socket_subcall + 16)
-#define SYS_sub_recvmsg		(SYS_socket_subcall + 17)
-
-#define SYS_socket_nsubcalls	18
-#endif /* !(ALPHA || MIPS || HPPA) */
-
-/* sys_ipc subcalls */
-
-int sys_semget(), sys_semctl(), sys_semop();
-int sys_msgsnd(), sys_msgrcv(), sys_msgget(), sys_msgctl();
-int sys_shmat(), sys_shmdt(), sys_shmget(), sys_shmctl();
-
-#if !defined(ALPHA) && !defined(MIPS) && !defined(SPARC) && !defined(HPPA)
-# ifdef	IA64
-   /*
-    * IA64 syscall numbers (the only ones available from standard
-    * header files) are disjoint from IA32 syscall numbers.  We need
-    * to define the IA32 socket call number here.  Fortunately, this
-    * symbol, `SYS_ipc', is not used by any of the IA64 code so
-    * re-defining this symbol will not cause a problem.
-   */
-#  undef SYS_ipc
-#  define SYS_ipc		117
-#  undef SYS_semop
-#  undef SYS_semget
-#  undef SYS_semctl
-#  undef SYS_semtimedop
-#  undef SYS_msgsnd
-#  undef SYS_msgrcv
-#  undef SYS_msgget
-#  undef SYS_msgctl
-#  undef SYS_shmat
-#  undef SYS_shmdt
-#  undef SYS_shmget
-#  undef SYS_shmctl
-# endif /* IA64 */
-#define SYS_ipc_subcall		((SYS_socket_subcall)+(SYS_socket_nsubcalls))
-#define SYS_sub_semop		(SYS_ipc_subcall + 1)
-#define SYS_sub_semget		(SYS_ipc_subcall + 2)
-#define SYS_sub_semctl		(SYS_ipc_subcall + 3)
-#define SYS_sub_semtimedop	(SYS_ipc_subcall + 4)
-#define SYS_sub_msgsnd		(SYS_ipc_subcall + 11)
-#define SYS_sub_msgrcv		(SYS_ipc_subcall + 12)
-#define SYS_sub_msgget		(SYS_ipc_subcall + 13)
-#define SYS_sub_msgctl		(SYS_ipc_subcall + 14)
-#define SYS_sub_shmat		(SYS_ipc_subcall + 21)
-#define SYS_sub_shmdt		(SYS_ipc_subcall + 22)
-#define SYS_sub_shmget		(SYS_ipc_subcall + 23)
-#define SYS_sub_shmctl		(SYS_ipc_subcall + 24)
-
-#define SYS_ipc_nsubcalls	25
-#endif /* !(ALPHA || MIPS || SPARC || HPPA) */
-
-#if defined SYS_ipc_subcall && !defined SYS_ipc
-# define SYS_ipc SYS_ipc_subcall
-#endif
-#if defined SYS_socket_subcall && !defined SYS_socketcall
-# define SYS_socketcall SYS_socket_subcall
-#endif
-
-#ifdef IA64
-  /*
-   * IA64 syscall numbers (the only ones available from standard header
-   * files) are disjoint from IA32 syscall numbers.  We need to define
-   * some IA32 specific syscalls here.
-   */
-# define SYS_fork	2
-# define SYS_vfork	190
-# define SYS32_exit	1
-# define SYS_waitpid	7
-# define SYS32_wait4	114
-# define SYS32_execve	11
-#endif /* IA64 */
-
-#if defined(ALPHA) || defined(IA64)
-int sys_getpagesize();
-#endif
-
-#ifdef ALPHA
-int osf_statfs(), osf_fstatfs();
-#endif
-
-#ifdef IA64
-int sys_getpmsg(), sys_putpmsg();	/* STREAMS stuff */
-#endif
-
-#ifdef MIPS
-int sys_sysmips();
-#endif
-
-int sys_setpgrp(), sys_gethostname(), sys_getdtablesize(), sys_utimes();
-int sys_capget(), sys_capset();
-
-#ifdef M68K
-int sys_cacheflush();
-#endif
diff --git a/strace/linux/syscallent.h b/strace/linux/syscallent.h
deleted file mode 100644
index f8505fe..0000000
--- a/strace/linux/syscallent.h
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: syscallent.h,v 1.34 2005/06/07 23:21:24 roland Exp $
- */
-
-	{ 0,	0,	sys_setup,		"setup"		}, /* 0 */
-	{ 1,	TP,	sys_exit,		"_exit", SYS_exit }, /* 1 */
-	{ 0,	TP,	sys_fork,		"fork", SYS_fork }, /* 2 */
-	{ 3,	0,	sys_read,		"read", SYS_read }, /* 3 */
-	{ 3,	0,	sys_write,		"write", SYS_write }, /* 4 */
-	{ 3,	TF,	sys_open,		"open"		}, /* 5 */
-	{ 1,	0,	sys_close,		"close"		}, /* 6 */
-	{ 3,	TP,	sys_waitpid,		"waitpid", SYS_wait4 }, /* 7 */
-	{ 2,	TF,	sys_creat,		"creat"		}, /* 8 */
-	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
-	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
-	{ 3,	TF|TP,	sys_execve,		"execve", SYS_execve }, /* 11 */
-	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
-	{ 1,	0,	sys_time,		"time"		}, /* 13 */
-	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
-	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
-#ifdef M68K
-	{ 3,	TF,	sys_chown,		"chown"		}, /* 16 */
-#else
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 16 */
-#endif
-	{ 0,	0,	sys_break,		"break"		}, /* 17 */
-	{ 2,	TF,	sys_oldstat,		"oldstat"	}, /* 18 */
-	{ 3,	0,	sys_lseek,		"lseek"		}, /* 19 */
-	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
-	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
-	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
-	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 24 */
-	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
-	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
-	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
-	{ 2,	0,	sys_oldfstat,		"oldfstat"	}, /* 28 */
-	{ 0,	TS,	sys_pause,		"pause"		}, /* 29 */
-	{ 2,	TF,	sys_utime,		"utime"		}, /* 30 */
-	{ 2,	0,	sys_stty,		"stty"		}, /* 31 */
-	{ 2,	0,	sys_gtty,		"gtty"		}, /* 32 */
-	{ 2,	TF,	sys_access,		"access"	}, /* 33 */
-	{ 1,	0,	sys_nice,		"nice"		}, /* 34 */
-	{ 0,	0,	sys_ftime,		"ftime"		}, /* 35 */
-	{ 0,	0,	sys_sync,		"sync"		}, /* 36 */
-	{ 2,	TS,	sys_kill,		"kill"		}, /* 37 */
-	{ 2,	TF,	sys_rename,		"rename"	}, /* 38 */
-	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 39 */
-	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 40 */
-	{ 1,	0,	sys_dup,		"dup"		}, /* 41 */
-	{ 1,	0,	sys_pipe,		"pipe"		}, /* 42 */
-	{ 1,	0,	sys_times,		"times"		}, /* 43 */
-	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
-	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
-	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 47 */
-	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 50 */
-	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
-	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
-	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
-	{ 3,	0,	sys_ioctl,		"ioctl"		}, /* 54 */
-	{ 3,	0,	sys_fcntl,		"fcntl"		}, /* 55 */
-	{ 0,	0,	sys_mpx,		"mpx"		}, /* 56 */
-	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 57 */
-	{ 2,	0,	sys_ulimit,		"ulimit"	}, /* 58 */
-	{ 1,	0,	sys_oldolduname,	"oldolduname"	}, /* 59 */
-	{ 1,	0,	sys_umask,		"umask"		}, /* 60 */
-	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 61 */
-	{ 2,	0,	sys_ustat,		"ustat"		}, /* 62 */
-	{ 2,	0,	sys_dup2,		"dup2"		}, /* 63 */
-	{ 0,	0,	sys_getppid,		"getppid"	}, /* 64 */
-	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
-	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
-	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
-	{ 0,	TS,	sys_siggetmask,		"siggetmask"	}, /* 68 */
-	{ 1,	TS,	sys_sigsetmask,		"sigsetmask"	}, /* 69 */
-	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
-	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
-	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
-	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
-	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
-	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 75 */
-	{ 2,	0,	sys_getrlimit,		"old_getrlimit"	}, /* 76 */
-	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 77 */
-	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 78 */
-	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 79 */
-	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 80 */
-	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 81 */
-	{ 1,	0,	sys_oldselect,		"oldselect"	}, /* 82 */
-	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 83 */
-	{ 2,	TF,	sys_oldlstat,		"oldlstat"	}, /* 84 */
-	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
-	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
-	{ 3,	0,	sys_readdir,		"readdir"	}, /* 89 */
-	{ 6,	0,	sys_old_mmap,		"old_mmap"	}, /* 90 */
-	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
-	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
-	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 93 */
-	{ 2,	0,	sys_fchmod,		"fchmod"	}, /* 94 */
-	{ 3,	0,	sys_fchown,		"fchown"	}, /* 95 */
-	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
-	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
-	{ 4,	0,	sys_profil,		"profil"	}, /* 98 */
-	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
-	{ 2,	0,	sys_fstatfs,		"fstatfs"	}, /* 100 */
-	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
-	{ 2,	0,	sys_socketcall,		"socketcall", SYS_socketcall }, /* 102 */
-	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
-	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
-	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
-	{ 2,	TF,	sys_stat,		"stat"		}, /* 106 */
-	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 107 */
-	{ 2,	0,	sys_fstat,		"fstat"		}, /* 108 */
-	{ 1,	0,	sys_olduname,		"olduname"	}, /* 109 */
-	{ 1,	0,	sys_iopl,		"iopl"		}, /* 110 */
-	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
-	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
-	{ 1,	0,	sys_vm86old,		"vm86old"	}, /* 113 */
-	{ 4,	TP,	sys_wait4,		"wait4", SYS_wait4 }, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
-	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
-	{ 6,	0,	sys_ipc,		"ipc", SYS_ipc }, /* 117 */
-	{ 1,	0,	sys_fsync,		"fsync"		}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
-	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */
-	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
-	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
-#ifdef M68K
-	{ 4,	0,	sys_cacheflush,		"cacheflush"	}, /* 123 */
-#else
-	{ 3,	0,	sys_modify_ldt,		"modify_ldt"	}, /* 123 */
-#endif
-	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 124 */
-	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 125 */
-	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
-	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
-	{ 2,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
-	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
-	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
-	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
-	{ 1,	0,	sys_fchdir,		"fchdir"	}, /* 133 */
-	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
-	{ 3,	0,	sys_sysfs,		"sysfs", SYS_sysfs }, /* 135 */
-	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
-	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 139 */
-	{ 5,	0,	sys_llseek,		"_llseek"	}, /* 140 */
-	{ 3,	0,	sys_getdents,		"getdents"	}, /* 141 */
-	{ 5,	0,	sys_select,		"select"	}, /* 142 */
-	{ 2,	0,	sys_flock,		"flock"		}, /* 143 */
-	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
-	{ 3,	0,	sys_readv,		"readv", SYS_readv }, /* 145 */
-	{ 3,	0,	sys_writev,		"writev", SYS_writev }, /* 146 */
-	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
-	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 148 */
-	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
-	{ 2,	0,	sys_mlock,		"mlock"		}, /* 150 */
-	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
-	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
-	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
-	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
-	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 156 */
-	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 157 */
-	{ 0,	0,	sys_sched_yield,	"sched_yield"}, /* 158 */
-	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
-	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
-	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
-	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 163 */
-	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
-	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
-#ifdef M68K
-	{ 5,	0,	printargs,		"SYS_166"	}, /* 166 */
-#else
-	{ 5,	0,	printargs,		"vm86"		}, /* 166 */
-#endif
-	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
-	{ 3,	0,	sys_poll,		"poll"		}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
-	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
-	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
-	{ 5,	0,	printargs,		"prctl"		}, /* 172 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 173 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"  }, /* 174 */
-	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
-	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
-	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
-	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
-
-	{ 5,	TF,	sys_pread,		"pread64", SYS_read }, /* 180 */
-	{ 5,	TF,	sys_pwrite,		"pwrite64", SYS_write }, /* 181 */
-#ifdef M68K
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 182 */
-#else
-	{ 3,	TF,	sys_chown,		"chown"		}, /* 182 */
-#endif
-	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
-	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
-	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */
-	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	}, /* 186 */
-	{ 4,	TF,	sys_sendfile,		"sendfile"	}, /* 187 */
-	{ 5,	0,	sys_getpmsg,		"getpmsg"	}, /* 188 */
-	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 189 */
-	{ 0,	TP,	sys_vfork,		"vfork", SYS_vfork }, /* 190 */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 191 */
-	{ 6,	0,	sys_mmap,		"mmap2"		}, /* 192 */
-	{ 3,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
-	{ 3,	TF,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
-	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
-	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
-	{ 2,	TF,	sys_fstat64,		"fstat64"	}, /* 197 */
-	{ 3,	TF,	sys_chown,		"lchown32"	}, /* 198 */
-	{ 0,	0,	sys_getuid,		"getuid32"	}, /* 199 */
-
-	{ 0,	0,	sys_getgid,		"getgid32"	}, /* 200 */
-	{ 0,	0,	sys_geteuid,		"geteuid32"	}, /* 201 */
-	{ 0,	0,	sys_geteuid,		"getegid32"	}, /* 202 */
-	{ 2,	0,	sys_setreuid,		"setreuid32"	}, /* 203 */
-	{ 2,	0,	sys_setregid,		"setregid32"	}, /* 204 */
-	{ 2,	0,	sys_getgroups32,	"getgroups32"	}, /* 205 */
-	{ 2,	0,	sys_setgroups32,	"setgroups32"	}, /* 206 */
-	{ 3,	0,	sys_fchown,		"fchown32"	}, /* 207 */
-	{ 3,	0,	sys_setresuid,		"setresuid32"	}, /* 208 */
-	{ 3,	0,	sys_getresuid,		"getresuid32"	}, /* 209 */
-	{ 3,	0,	sys_setresgid,		"setresgid32"	}, /* 210 */
-	{ 3,	0,	sys_getresgid,		"getresgid32"	}, /* 211 */
-	{ 3,	TF,	sys_chown,		"chown32"	}, /* 212 */
-	{ 1,	0,	sys_setuid,		"setuid32"	}, /* 213 */
-	{ 1,	0,	sys_setgid,		"setgid32"	}, /* 214 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
-	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
-	{ 3,	0,	sys_mincore,		"mincore"	}, /* 218 */
-	{ 3,	0,	sys_madvise,		"madvise"	}, /* 219 */
-	{ 4,	0,	sys_getdents64,		"getdents64"	}, /* 220 */
-	{ 3,	0,	sys_fcntl,		"fcntl64"	}, /* 221 */
-	{ 4,	0,	printargs,		"SYS_222"	}, /* 222 */
-/*TODO*/{ 5,	0,	printargs,		"security"	}, /* 223 */
-	{ 0,	0,	printargs,		"gettid"	}, /* 224 */
-	{ 4,	0,	sys_readahead,		"readahead"	}, /* 225 */
-	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 226 */
-	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 227 */
-	{ 5,	0,	sys_fsetxattr,		"fsetxattr"	}, /* 228 */
-	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 229 */
-	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 230 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"	}, /* 231 */
-	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 232 */
-	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 233 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"	}, /* 234 */
-	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 235 */
-	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 236 */
-	{ 2,	0,	sys_fremovexattr,	"fremovexattr"	}, /* 237 */
-	{ 2,	TS,	sys_kill,		"tkill"		}, /* 238 */
-	{ 4,	TF,	sys_sendfile64,		"sendfile64"	}, /* 239 */
-	{ 5,	0,	sys_futex,		"futex"		}, /* 240 */
-	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 241 */
-	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 242 */
-	{ 1,	0,	sys_set_thread_area,	"set_thread_area" }, /* 243 */
-	{ 1,	0,	sys_get_thread_area,	"get_thread_area" }, /* 244 */
-	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 245 */
-	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 246 */
-	{ 5,	0,	sys_io_getevents,	"io_getevents"	}, /* 247 */
-	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 248 */
-	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
-	{ 5,	TF,	sys_fadvise64,		"fadvise64"	}, /* 250 */
-	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */
-	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 252 */
-	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 253 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 254 */
-	{ 4,	0,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
-	{ 4,	0,	sys_epoll_wait,		"epoll_wait"	}, /* 256 */
-	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 257 */
-	{ 1,	0,	printargs,		"set_tid_address"}, /* 258 */
-	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 259 */
-	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 260 */
-	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 261 */
-	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"}, /* 262 */
-	{ 1,	0,	sys_timer_delete,	"timer_delete"	}, /* 263 */
-	{ 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 264 */
-	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 265 */
-	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 266 */
-	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"}, /* 267 */
-	{ 3,	TF,	sys_statfs64,		"statfs64"	}, /* 268 */
-	{ 3,	TF,	sys_fstatfs64,		"fstatfs64"	}, /* 269 */
-	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 270 */
-	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 271 */
-	{ 6,	TF,	sys_fadvise64_64,	"fadvise64_64"	}, /* 272 */
-	{ 5,	0,	printargs,		"vserver"	}, /* 273 */
-	{ 6,	0,	sys_mbind,		"mbind"		}, /* 274 */
-	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"	}, /* 275 */
-	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"	}, /* 276 */
-	{ 4,	0,	sys_mq_open,		"mq_open"	}, /* 277 */
-	{ 1,	0,	sys_mq_unlink,		"mq_unlink"	}, /* 278 */
-	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"	}, /* 279 */
-	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 280 */
-	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 281 */
-	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 282 */
-	{ 5,	0,	printargs,		"sys_kexec_load" }, /* 283 */
-	{ 5,	TP,	sys_waitid,		"waitid", SYS_waitid }, /* 284 */
-	{ 5,	0,	printargs,		"SYS_285"	}, /* 285 */
-	{ 5,	0,	printargs,		"SYS_286"	}, /* 286 */
-	{ 5,	0,	printargs,		"SYS_287"	}, /* 287 */
-	{ 5,	0,	printargs,		"SYS_288"	}, /* 288 */
-	{ 5,	0,	printargs,		"SYS_289"	}, /* 289 */
-	{ 5,	0,	printargs,		"SYS_290"	}, /* 290 */
-	{ 5,	0,	printargs,		"SYS_291"	}, /* 291 */
-	{ 5,	0,	printargs,		"SYS_292"	}, /* 292 */
-	{ 5,	0,	printargs,		"SYS_293"	}, /* 293 */
-	{ 5,	0,	printargs,		"SYS_294"	}, /* 294 */
-	{ 5,	0,	printargs,		"SYS_295"	}, /* 295 */
-	{ 5,	0,	printargs,		"SYS_296"	}, /* 296 */
-	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
-	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
-
-#if SYS_socket_subcall != 300
- #error fix me
-#endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send", SYS_sub_send }, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv }, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto }, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom }, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
-
-#if SYS_ipc_subcall != 318
- #error fix me
-#endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
diff --git a/strace/linux/x86_64/gentab.pl b/strace/linux/x86_64/gentab.pl
deleted file mode 100644
index 3251b43..0000000
--- a/strace/linux/x86_64/gentab.pl
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/perl -w
-#generate syscall table from a template file (usually the master i386 syscall
-#ent.h) and the x86_64 unistd.h
-%conv =  (
-	"exit" => "_exit",
-); 	
-
-%known = (
-	"mmap" => "sys_mmap",
-	"sched_yield" => "printargs",	
-); 	
-
-# only used when the template file has no entry
-%args = (
-	"arch_prctl" => 2,
-	"tkill" => 2,
-	"gettid" => 0,
-	"readahead" => 3,
-	# should decode all these:
-	"setxattr" => 5, 
-	"lsetxattr" => 5,
-	"fsetxattr" => 5,
-	"getxattr" => 4,
-	"lgetxattr" => 4,
-	"fgetxattr" => 4,
-	"listxattr" => 3,
-	"llistxattr" => 3,
-	"flistxattr" => 3,
-	"removexattr" => 2,
-	"lremovexattr" => 2,
-	"fremovexattr" => 2,
-	"mmap" => 6,
-	"sched_yield" => 0, 
-); 	
-
-open(F,$ARGV[0]) || die "cannot open template file $ARGV[0]\n"; 
-
-while (<F>) { 
-	next unless /{/; 
-	s/\/\*.*\*\///; 
-	($name) = /"([^"]+)"/;
-	chomp; 
-	$call{$name} = $_; 
-} 
-
-open(SL, ">syscallnum.h") || die "cannot create syscallnum.h\n"; 
-
-
-
-open(S,$ARGV[1]) || die "cannot open syscall file $ARGV[1]\n";  
-while (<S>) { 
-	$name = ""; 
-	next unless  (($name, $num) = /define\s+__NR_(\S+)\s+(\d+)/); 
-	next if $name eq ""; 
-
-	$name = $conv{$name} if defined($conv{$name}); 
-
-	if (!defined($call{$name})) { 
-		unless (defined($args{$name})) { 
-			print STDERR "unknown call $name $num\n"; 
-			$na = 3; 
-		} else { 
-			$na = $args{$name}; 
-		} 	
-		if (defined($known{$name})) { 
-			$func = $known{$name}; 
-		} else { 
-			$func = "printargs"; 
-		} 	
-		print "\t{ $na,\t0,\t$func,\t\"$name\" }, /* $num */\n"; 
-	} else { 
-		print "$call{$name} /* $num */\n"; 
-	} 
-	print SL "#define SYS_$name $num\n"
-} 
-
-
diff --git a/strace/linux/x86_64/syscallent.h b/strace/linux/x86_64/syscallent.h
deleted file mode 100644
index afd9d96..0000000
--- a/strace/linux/x86_64/syscallent.h
+++ /dev/null
@@ -1,254 +0,0 @@
-	{ 3,	0,	sys_read,		"read"		},  /* 0 */
-	{ 3,	0,	sys_write,		"write"		},  /* 1 */
-	{ 3,	TF,	sys_open,		"open"		},  /* 2 */
-	{ 1,	0,	sys_close,		"close"		},  /* 3 */
-	{ 2,	TF,	sys_stat,		"stat"		},  /* 4 */
-	{ 2,	0,	sys_fstat,		"fstat"		},  /* 5 */
-	{ 2,	TF,	sys_lstat,		"lstat"		},  /* 6 */
-	{ 3,	0,	sys_poll,		"poll"		},  /* 7 */
-	{ 3,	0,	sys_lseek,		"lseek"		},  /* 8 */
-	{ 6,	0,	sys_mmap,	"mmap" }, /* 9 */
-	{ 3,	0,	sys_mprotect,		"mprotect"	},  /* 10 */
-	{ 2,	0,	sys_munmap,		"munmap"	},  /* 11 */
-	{ 1,	0,	sys_brk,		"brk"		},  /* 12 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"  },  /* 13 */
-	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"},  /* 14 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"	},  /* 15 */
-	{ 3,	0,	sys_ioctl,		"ioctl"		},  /* 16 */
-	{ 5,	TF,	sys_pread,		"pread"		},  /* 17 */
-	{ 5,	TF,	sys_pwrite,		"pwrite"	},  /* 18 */
-	{ 3,	0,	sys_readv,		"readv"		},  /* 19 */
-	{ 3,	0,	sys_writev,		"writev"	},  /* 20 */
-	{ 2,	TF,	sys_access,		"access"	},  /* 21 */
-	{ 1,	0,	sys_pipe,		"pipe"		},  /* 22 */
-	{ 5,	0,	sys_select,		"select"	},  /* 23 */
-	{ 0,	0,	sys_sched_yield,	"sched_yield"},  /* 24 */
-	{ 4,	0,	sys_mremap,		"mremap"	},  /* 25 */
-	{ 3,	0,	sys_msync,		"msync"		},  /* 26 */
-	{ 3,	0,	sys_mincore,		"mincore"	},  /* 27 */
-	{ 3,	0,	sys_madvise,		"madvise"	},  /* 28 */
-	{ 4,	TI,	sys_shmget,		"shmget"	},  /* 29 */
-	{ 4,	TI,	sys_shmat,		"shmat"		},  /* 30 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	},  /* 31 */
-	{ 1,	0,	sys_dup,		"dup"		},  /* 32 */
-	{ 2,	0,	sys_dup2,		"dup2"		},  /* 33 */
-	{ 0,	TS,	sys_pause,		"pause"		},  /* 34 */
-	{ 2,	0,	sys_nanosleep,		"nanosleep"	},  /* 35 */
-	{ 2,	0,	sys_getitimer,		"getitimer"	},  /* 36 */
-	{ 1,	0,	sys_alarm,		"alarm"		},  /* 37 */
-	{ 3,	0,	sys_setitimer,		"setitimer"	},  /* 38 */
-	{ 0,	0,	sys_getpid,		"getpid"	},  /* 39 */
-	{ 4,	TF,	sys_sendfile,		"sendfile"	},  /* 40 */
-	{ 3,	TN,	sys_socket,		"socket"	},  /* 41 */
-	{ 3,	TN,	sys_connect,		"connect"	},  /* 42 */
-	{ 3,	TN,	sys_accept,		"accept"	},  /* 43 */
-	{ 6,	TN,	sys_sendto,		"sendto"	},  /* 44 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	},  /* 45 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	},  /* 46 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	},  /* 47 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	},  /* 48 */
-	{ 3,	TN,	sys_bind,		"bind"		},  /* 49 */
-	{ 2,	TN,	sys_listen,		"listen"	},  /* 50 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	},  /* 51 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	},  /* 52 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	},  /* 53 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	},  /* 54 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	},  /* 55 */
-	{ 5,	TP,	sys_clone,		"clone"		},  /* 56 */
-	{ 0,	TP,	sys_fork,		"fork"		},  /* 57 */
-	{ 0,	TP,	sys_vfork,		"vfork"		},  /* 58 */
-	{ 3,	TF|TP,	sys_execve,		"execve"	},  /* 59 */
-	{ 1,	TP,	sys_exit,		"_exit"		},  /* 60 */
-	{ 4,	TP,	sys_wait4,		"wait4"		},  /* 61 */
-	{ 2,	TS,	sys_kill,		"kill"		},  /* 62 */
-	{ 1,	0,	sys_uname,		"uname"		},  /* 63 */
-	{ 4,	TI,	sys_semget,		"semget"	},  /* 64 */
-	{ 4,	TI,	sys_semop,		"semop"		},  /* 65 */
-	{ 4,	TI,	sys_semctl,		"semctl"	},  /* 66 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		},  /* 67 */
-	{ 4,	TI,	sys_msgget,		"msgget"	},  /* 68 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	},  /* 69 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	},  /* 70 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	},  /* 71 */
-	{ 3,	0,	sys_fcntl,		"fcntl"		},  /* 72 */
-	{ 2,	0,	sys_flock,		"flock"		},  /* 73 */
-	{ 1,	0,	sys_fsync,		"fsync"		},  /* 74 */
-	{ 1,	0,	sys_fdatasync,		"fdatasync"	},  /* 75 */
-	{ 2,	TF,	sys_truncate,		"truncate"	},  /* 76 */
-	{ 2,	0,	sys_ftruncate,		"ftruncate"	},  /* 77 */
-	{ 3,	0,	sys_getdents,		"getdents"	},  /* 78 */
-	{ 2,	TF,	sys_getcwd,		"getcwd"	},  /* 79 */
-	{ 1,	TF,	sys_chdir,		"chdir"		},  /* 80 */
-	{ 1,	0,	sys_fchdir,		"fchdir"	},  /* 81 */
-	{ 2,	TF,	sys_rename,		"rename"	},  /* 82 */
-	{ 2,	TF,	sys_mkdir,		"mkdir"		},  /* 83 */
-	{ 1,	TF,	sys_rmdir,		"rmdir"		},  /* 84 */
-	{ 2,	TF,	sys_creat,		"creat"		},  /* 85 */
-	{ 2,	TF,	sys_link,		"link"		},  /* 86 */
-	{ 1,	TF,	sys_unlink,		"unlink"	},  /* 87 */
-	{ 2,	TF,	sys_symlink,		"symlink"	},  /* 88 */
-	{ 3,	TF,	sys_readlink,		"readlink"	},  /* 89 */
-	{ 2,	TF,	sys_chmod,		"chmod"		},  /* 90 */
-	{ 2,	0,	sys_fchmod,		"fchmod"	},  /* 91 */
-	{ 3,	TF,	sys_chown,		"chown"		},  /* 92 */
-	{ 3,	0,	sys_fchown,		"fchown"	},  /* 93 */
-	{ 3,	TF,	sys_chown,		"lchown"	},  /* 94 */
-	{ 1,	0,	sys_umask,		"umask"		},  /* 95 */
-	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	},  /* 96 */
-	{ 2,	0,	sys_getrlimit,		"getrlimit"	},  /* 97 */
-	{ 2,	0,	sys_getrusage,		"getrusage"	},  /* 98 */
-	{ 1,	0,	sys_sysinfo,		"sysinfo"	},  /* 99 */
-	{ 1,	0,	sys_times,		"times"		},  /* 100 */
-	{ 4,	0,	sys_ptrace,		"ptrace"	},  /* 101 */
-	{ 0,	0,	sys_getuid,		"getuid"	},  /* 102 */
-	{ 3,	0,	sys_syslog,		"syslog"	},  /* 103 */
-	{ 0,	0,	sys_getgid,		"getgid"	},  /* 104 */
-	{ 1,	0,	sys_setuid,		"setuid"	},  /* 105 */
-	{ 1,	0,	sys_setgid,		"setgid"	},  /* 106 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	},  /* 107 */
-	{ 0,	0,	sys_getegid,		"getegid"	},  /* 108 */
-	{ 2,	0,	sys_setpgid,		"setpgid"	},  /* 109 */
-	{ 0,	0,	sys_getppid,		"getppid"	},  /* 110 */
-	{ 0,	0,	sys_getpgrp,		"getpgrp"	},  /* 111 */
-	{ 0,	0,	sys_setsid,		"setsid"	},  /* 112 */
-	{ 2,	0,	sys_setreuid,		"setreuid"	},  /* 113 */
-	{ 2,	0,	sys_setregid,		"setregid"	},  /* 114 */
-	{ 2,	0,	sys_getgroups,		"getgroups"	},  /* 115 */
-	{ 2,	0,	sys_setgroups,		"setgroups"	},  /* 116 */
-	{ 3,	0,	sys_setresuid,		"setresuid"	},  /* 117 */
-	{ 3,	0,	sys_getresuid,		"getresuid"	},  /* 118 */
-	{ 3,	0,	sys_setresgid,		"setresgid"	},  /* 119 */
-	{ 3,	0,	sys_getresgid,		"getresgid"	},  /* 120 */
-	{ 1,	0,	sys_getpgid,		"getpgid"	},  /* 121 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	},  /* 122 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	},  /* 123 */
-	{ 1,	0,	sys_getsid,		"getsid"	},  /* 124 */
-	{ 2,	0,	sys_capget,		"capget"	},  /* 125 */
-	{ 2,	0,	sys_capset,		"capset"	},  /* 126 */
-	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	},  /* 127 */
-	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"	},  /* 128 */
-	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo"	},  /* 129 */
-	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	},  /* 130 */
-	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	},  /* 131 */
-	{ 2,	TF,	sys_utime,		"utime"		},  /* 132 */
-	{ 3,	TF,	sys_mknod,		"mknod"		},  /* 133 */
-	{ 1,	TF,	sys_uselib,		"uselib"	},  /* 134 */
-	{ 1,	0,	sys_personality,	"personality"	},  /* 135 */
-	{ 2,	0,	sys_ustat,		"ustat"		},  /* 136 */
-	{ 2,	TF,	sys_statfs,		"statfs"	},  /* 137 */
-	{ 2,	0,	sys_fstatfs,		"fstatfs"	},  /* 138 */
-	{ 3,	0,	sys_sysfs,		"sysfs"		},  /* 139 */
-	{ 2,	0,	sys_getpriority,	"getpriority"	},  /* 140 */
-	{ 3,	0,	sys_setpriority,	"setpriority"	},  /* 141 */
-	{ 0,	0,	sys_sched_setparam,	"sched_setparam"	},  /* 142 */
-	{ 2,	0,	sys_sched_getparam,	"sched_getparam"	},  /* 143 */
-	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"	},  /* 144 */
-	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"	},  /* 145 */
-	{ 1,	0,	sys_sched_get_priority_max,	"sched_get_priority_max"	},  /* 146 */
-	{ 1,	0,	sys_sched_get_priority_min,	"sched_get_priority_min"	},  /* 147 */
-	{ 2,	0,	sys_sched_rr_get_interval,	"sched_rr_get_interval"	},  /* 148 */
-	{ 2,	0,	sys_mlock,		"mlock"		},  /* 149 */
-	{ 2,	0,	sys_munlock,		"munlock"	},  /* 150 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	},  /* 151 */
-	{ 0,	0,	sys_munlockall,		"munlockall"	},  /* 152 */
-	{ 0,	0,	sys_vhangup,		"vhangup"	},  /* 153 */
-	{ 3,	0,	sys_modify_ldt,		"modify_ldt"	},  /* 154 */
-	{ 2,	TF,	sys_pivotroot,		"pivot_root"	},  /* 155 */
-	{ 1,	0,	sys_sysctl,		"_sysctl"	},  /* 156 */
-	{ 5,	0,	printargs,		"prctl"		},  /* 157 */
-	{ 2,	TP,	sys_arch_prctl,		"arch_prctl"	},  /* 158 */
-	{ 1,	0,	sys_adjtimex,		"adjtimex"	},  /* 159 */
-	{ 2,	0,	sys_setrlimit,		"setrlimit"	},  /* 160 */
-	{ 1,	TF,	sys_chroot,		"chroot"	},  /* 161 */
-	{ 0,	0,	sys_sync,		"sync"		},  /* 162 */
-	{ 1,	TF,	sys_acct,		"acct"		},  /* 163 */
-	{ 2,	0,	sys_settimeofday,	"settimeofday"	},  /* 164 */
-	{ 5,	TF,	sys_mount,		"mount"		},  /* 165 */
-	{ 2,	TF,	sys_umount2,		"umount"	}, /* 166 */
-	{ 1,	TF,	sys_swapon,		"swapon"	},  /* 167 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	},  /* 168 */
-	{ 3,	0,	sys_reboot,		"reboot"	},  /* 169 */
-	{ 2,	0,	sys_sethostname,	"sethostname"	},  /* 170 */
-	{ 2,	0,	sys_setdomainname,	"setdomainname"	},  /* 171 */
-	{ 1,	0,	sys_iopl,		"iopl"		},  /* 172 */
-	{ 3,	0,	sys_ioperm,		"ioperm"	},  /* 173 */
-	{ 2,	0,	sys_create_module,	"create_module"	},  /* 174 */
-	{ 2,	0,	sys_init_module,	"init_module"	},  /* 175 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	},  /* 176 */
-	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"},  /* 177 */
-	{ 5,	0,	sys_query_module,	"query_module"	},  /* 178 */
-	{ 4,	0,	sys_quotactl,		"quotactl"	},  /* 179 */
-	{ 3,	0,	printargs,		"nfsservctl"	},  /* 180 */
-	{ 5,	0,	sys_getpmsg,		"getpmsg"	}, /* 181 */
-	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 182 */
-	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	},  /* 183 */
-	{ 3,	0,	printargs,		"tuxcall"	}, /* 184 */
-	{ 3,	0,	printargs,		"security"	}, /* 185 */
-	{ 0,	0,	printargs,		"gettid"	}, /* 186 */
-	{ 4,	0,	sys_readahead,		"readahead"	}, /* 187 */
-	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 188 */
-	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 189 */
-	{ 5,	0,	sys_fsetxattr,		"fsetxattr"	}, /* 190 */
-	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 191 */
-	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 192 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"	}, /* 193 */
-	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 194 */
-	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 195 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"	}, /* 196 */
-	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 197 */
-	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 198 */
-	{ 2,	0,	sys_fremovexattr,	"fremovexattr"	}, /* 199 */
-	{ 2,	0,	sys_kill,		"tkill"		}, /* 200 */
-	{ 1,	0,	sys_time,		"time"		},  /* 201 */
-	{ 5,	0,	sys_futex,		"futex"		}, /* 202 */
-	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 203 */
-	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 204 */
-	{ 1,	0,	sys_set_thread_area,	"set_thread_area" }, /* 205 */
-	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 206 */
-	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 207 */
-	{ 5,	0,	sys_io_getevents,		"io_getevents"	}, /* 208 */
-	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 209 */
-	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 210 */
-	{ 1,	0,	sys_get_thread_area,	"get_thread_area" }, /* 211 */
-	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 212 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 213 */
-	{ 4,	0,	printargs,		"epoll_ctl_old"	}, /* 214 */
-	{ 4,	0,	printargs,		"epoll_wait_old"}, /* 215 */
-	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 216 */
-	{ 4,	0,	sys_getdents64,		"getdents64"	}, /* 217 */
-	{ 1,	0,	printargs,		"set_tid_address"}, /* 218 */
-	{ 5,	0,	printargs,		"restart_syscall"}, /* 219 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 220 */
-	{ 4,	TF,	sys_fadvise64_64,	"fadvise64"	}, /* 221 */
-	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 222 */
-	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 223 */
-	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 224 */
-	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"}, /* 225 */
-	{ 1,	0,	sys_timer_delete,	"timer_delete"	}, /* 226 */
-	{ 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 227 */
-	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 228 */
-	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 229 */
-	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"}, /* 230 */
-	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 231 */
-	{ 5,	0,	sys_epoll_wait,		"epoll_wait"	}, /* 232 */
-	{ 5,	0,	sys_epoll_ctl,		"epoll_ctl"	}, /* 233 */
-	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 234 */
-	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 235 */
-	{ 5,	0,	printargs,		"vserver"	}, /* 236 */
-	{ 6,	0,	sys_mbind,		"mbind"		}, /* 237 */
-	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"	}, /* 238 */
-	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"	}, /* 239 */
-	{ 4,	0,	sys_mq_open,		"mq_open"	}, /* 240 */
-	{ 1,	0,	sys_mq_unlink,		"mq_unlink"	}, /* 241 */
-	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"	}, /* 242 */
-	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 243 */
-	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 244 */
-	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 245 */
-	{ 5,	0,	printargs,		"kexec_load"	}, /* 246 */
-	{ 5,	TP,	sys_waitid,		"waitid"	}, /* 247 */
-	{ 5,	0,	printargs,		"SYS_248"	}, /* 248 */
-	{ 5,	0,	printargs,		"SYS_249"	}, /* 249 */
-	{ 5,	0,	printargs,		"SYS_250"	}, /* 250 */
-	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */
-	{ 5,	0,	printargs,		"SYS_252"	}, /* 252 */
-	{ 5,	0,	printargs,		"SYS_253"	}, /* 253 */
diff --git a/strace/linux/x86_64/syscallent1.h b/strace/linux/x86_64/syscallent1.h
deleted file mode 100644
index f6bf143..0000000
--- a/strace/linux/x86_64/syscallent1.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Our second set comes from the i386 files.
-   Only a couple of calls we cannot support without the i386 headers.  */
-
-#define sys_oldstat printargs
-#define sys_oldfstat printargs
-#define sys_oldlstat printargs
-#include "../syscallent.h"
diff --git a/stream.c b/stream.c
index 0029c3d..eb4e396 100644
--- a/stream.c
+++ b/stream.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: stream.c,v 1.24 2005/06/01 19:22:07 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -55,9 +55,9 @@
 #ifndef HAVE_STROPTS_H
 #define RS_HIPRI 1
 struct strbuf {
-        int     maxlen;                 /* no. of bytes in buffer */
-        int     len;                    /* no. of bytes returned */
-        char    *buf;                   /* pointer to data */
+	int     maxlen;                 /* no. of bytes in buffer */
+	int     len;                    /* no. of bytes returned */
+	const char *buf;                /* pointer to data */
 };
 #define MORECTL 1
 #define MOREDATA 2
@@ -129,6 +129,7 @@
 	return 0;
 }
 
+#if defined(SPARC) || defined(SPARC64) || defined(SUNOS4) || defined(SVR4)
 int
 sys_getmsg(tcp)
 struct tcb *tcp;
@@ -175,6 +176,7 @@
 	}
 	return RVAL_HEX | RVAL_STR;
 }
+#endif /* SPARC || SPARC64 || SUNOS4 || SVR4 */
 
 #if defined SYS_putpmsg || defined SYS_getpmsg
 static const struct xlat pmsgflags[] = {
@@ -294,79 +296,181 @@
 	{ 0,		NULL		},
 };
 
-int
-sys_poll(tcp)
-struct tcb *tcp;
+static int
+decode_poll(struct tcb *tcp, long pts)
 {
 	struct pollfd fds;
 	unsigned nfds;
 	unsigned long size, start, cur, end, abbrev_end;
 	int failed = 0;
 
-	if (entering(tcp))
-		return 0;
-
-	nfds = tcp->u_arg[1];
-	size = sizeof(fds) * nfds;
-	start = tcp->u_arg[0];
-	end = start + size;
-	if (nfds == 0 || size / sizeof(fds) != nfds || end < start) {
-		tprintf("%#lx, %d, %ld",
-			tcp->u_arg[0], nfds, tcp->u_arg[2]);
-		return 0;
-	}
-	if (abbrev(tcp)) {
-		abbrev_end = start + max_strlen * sizeof(fds);
-		if (abbrev_end < start)
+	if (entering(tcp)) {
+		nfds = tcp->u_arg[1];
+		size = sizeof(fds) * nfds;
+		start = tcp->u_arg[0];
+		end = start + size;
+		if (nfds == 0 || size / sizeof(fds) != nfds || end < start) {
+			tprintf("%#lx, %d, ",
+				tcp->u_arg[0], nfds);
+			return 0;
+		}
+		if (abbrev(tcp)) {
+			abbrev_end = start + max_strlen * sizeof(fds);
+			if (abbrev_end < start)
+				abbrev_end = end;
+		} else {
 			abbrev_end = end;
+		}
+		tprintf("[");
+		for (cur = start; cur < end; cur += sizeof(fds)) {
+			if (cur > start)
+				tprintf(", ");
+			if (cur >= abbrev_end) {
+				tprintf("...");
+				break;
+			}
+			if (umoven(tcp, cur, sizeof fds, (char *) &fds) < 0) {
+				tprintf("?");
+				failed = 1;
+				break;
+			}
+			if (fds.fd < 0) {
+				tprintf("{fd=%d}", fds.fd);
+				continue;
+			}
+			tprintf("{fd=");
+			printfd(tcp, fds.fd);
+			tprintf(", events=");
+			printflags(pollflags, fds.events, "POLL???");
+			tprintf("}");
+		}
+		tprintf("]");
+		if (failed)
+			tprintf(" %#lx", start);
+		tprintf(", %d, ", nfds);
+		return 0;
 	} else {
-		abbrev_end = end;
+		static char outstr[1024];
+		char str[64];
+		const char *flagstr;
+		unsigned int cumlen;
+
+		if (syserror(tcp))
+			return 0;
+		if (tcp->u_rval == 0) {
+			tcp->auxstr = "Timeout";
+			return RVAL_STR;
+		}
+
+		nfds = tcp->u_arg[1];
+		size = sizeof(fds) * nfds;
+		start = tcp->u_arg[0];
+		end = start + size;
+		if (nfds == 0 || size / sizeof(fds) != nfds || end < start)
+			return 0;
+		if (abbrev(tcp)) {
+			abbrev_end = start + max_strlen * sizeof(fds);
+			if (abbrev_end < start)
+				abbrev_end = end;
+		} else {
+			abbrev_end = end;
+		}
+
+		outstr[0] = '\0';
+		cumlen = 0;
+
+		for (cur = start; cur < end; cur += sizeof(fds)) {
+			if (umoven(tcp, cur, sizeof fds, (char *) &fds) < 0) {
+				++cumlen;
+				if (cumlen < sizeof(outstr))
+					strcat(outstr, "?");
+				failed = 1;
+				break;
+			}
+			if (!fds.revents)
+				continue;
+			if (!cumlen) {
+				++cumlen;
+				strcat(outstr, "[");
+			} else {
+				cumlen += 2;
+				if (cumlen < sizeof(outstr))
+					strcat(outstr, ", ");
+			}
+			if (cur >= abbrev_end) {
+				cumlen += 3;
+				if (cumlen < sizeof(outstr))
+					strcat(outstr, "...");
+				break;
+			}
+			sprintf(str, "{fd=%d, revents=", fds.fd);
+			flagstr=sprintflags("", pollflags, fds.revents);
+			cumlen += strlen(str) + strlen(flagstr) + 1;
+			if (cumlen < sizeof(outstr)) {
+				strcat(outstr, str);
+				strcat(outstr, flagstr);
+				strcat(outstr, "}");
+			}
+		}
+		if (failed)
+			return 0;
+
+		if (cumlen && ++cumlen < sizeof(outstr))
+			strcat(outstr, "]");
+
+		if (pts) {
+			char str[128];
+
+			sprintf(str, "%sleft ", cumlen ? ", " : "");
+			sprint_timespec(str + strlen(str), tcp, pts);
+			if ((cumlen += strlen(str)) < sizeof(outstr))
+				strcat(outstr, str);
+		}
+
+		if (!outstr[0])
+			return 0;
+
+		tcp->auxstr = outstr;
+		return RVAL_STR;
 	}
-	tprintf("[");
-	for (cur = start; cur < end; cur += sizeof(fds)) {
-		if (cur > start)
-			tprintf(", ");
-		if (cur >= abbrev_end) {
-			tprintf("...");
-			break;
-		}
-		if (umoven(tcp, cur, sizeof fds, (char *) &fds) < 0) {
-			tprintf("?");
-			failed = 1;
-			break;
-		}
-		if (fds.fd < 0) {
-			tprintf("{fd=%d}", fds.fd);
-			continue;
-		}
-		tprintf("{fd=%d, events=", fds.fd);
-		printflags(pollflags, fds.events, "POLL???");
-		if (!syserror(tcp) && fds.revents) {
-			tprintf(", revents=");
-			printflags(pollflags, fds.revents, "POLL???");
-		}
-		tprintf("}");
-	}
-	tprintf("]");
-	if (failed)
-		tprintf(" %#lx", start);
-	tprintf(", %d, ", nfds);
-#ifdef INFTIM
-	if (tcp->u_arg[2] == INFTIM)
-		tprintf("INFTIM");
-	else
-#endif
-		tprintf("%ld", tcp->u_arg[2]);
-	return 0;
 }
 
+int
+sys_poll(struct tcb *tcp)
+{
+	int rc = decode_poll(tcp, 0);
+	if (entering(tcp)) {
+#ifdef INFTIM
+		if (tcp->u_arg[2] == INFTIM)
+			tprintf("INFTIM");
+		else
+#endif
+			tprintf("%ld", tcp->u_arg[2]);
+	}
+	return rc;
+}
+
+#ifdef LINUX
+int
+sys_ppoll(struct tcb *tcp)
+{
+	int rc = decode_poll(tcp, tcp->u_arg[2]);
+	if (entering(tcp)) {
+		print_timespec(tcp, tcp->u_arg[2]);
+		tprintf(", ");
+		print_sigset(tcp, tcp->u_arg[3], 0);
+		tprintf(", %lu", tcp->u_arg[4]);
+	}
+	return rc;
+}
+#endif
 
 #else /* !HAVE_SYS_POLL_H */
 int
 sys_poll(tcp)
 struct tcb *tcp;
 {
-    	return 0;
+	return 0;
 }
 #endif
 
@@ -931,10 +1035,7 @@
 #endif /* TI_BIND */
 
 
-static int
-internal_stream_ioctl(tcp, arg)
-struct tcb *tcp;
-int arg;
+static int internal_stream_ioctl(struct tcb *tcp, int arg)
 {
 	struct strioctl si;
 	struct ioctlent *iop;
@@ -1049,9 +1150,6 @@
 	case SI_GETUDATA:
 		if (entering(tcp))
 			break;
-#if 0
-		tprintf("struct si_udata ");
-#endif
 		if (umove(tcp, (int) si.ic_dp, &udata) < 0)
 			tprintf("{...}");
 		else {
@@ -1062,9 +1160,6 @@
 			tprintf("servtype=%d, so_state=%d, ",
 				udata.servtype, udata.so_state);
 			tprintf("so_options=%d", udata.so_options);
-#if 0
-			tprintf(", tsdusize=%d", udata.tsdusize);
-#endif
 			tprintf("}");
 		}
 		break;
@@ -1075,7 +1170,7 @@
 	}
 	if (exiting(tcp)) {
 		tprintf("}");
-		if (timod && tcp->u_rval) {
+		if (timod && tcp->u_rval && !syserror(tcp)) {
 			tcp->auxstr = xlookup (tli_errors, tcp->u_rval);
 			return RVAL_STR + 1;
 		}
diff --git a/syscall.c b/syscall.c
index fa9c454..34af217 100644
--- a/syscall.c
+++ b/syscall.c
@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscall.c,v 1.79 2005/06/08 20:45:28 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -44,18 +44,8 @@
 #include <sys/syscall.h>
 #include <sys/param.h>
 
-#if HAVE_ASM_REG_H
-#if defined (SPARC) || defined (SPARC64)
-#  define fpq kernel_fpq
-#  define fq kernel_fq
-#  define fpu kernel_fpu
-#endif
-#include <asm/reg.h>
-#if defined (SPARC) || defined (SPARC64)
-#  undef fpq
-#  undef fq
-#  undef fpu
-#endif
+#ifdef HAVE_ANDROID_OS
+#include "syscall-android.h"
 #endif
 
 #ifdef HAVE_SYS_REG_H
@@ -77,7 +67,6 @@
 #endif
 
 #if defined (LINUX) && defined (SPARC64)
-# define r_pc r_tpc
 # undef PTRACE_GETREGS
 # define PTRACE_GETREGS PTRACE_GETREGS64
 # undef PTRACE_SETREGS
@@ -117,26 +106,29 @@
 #endif
 #endif /* LINUX */
 
-#include "syscall-android.h"
 #include "syscall.h"
 
 /* Define these shorthand notations to simplify the syscallent files. */
+#define TD TRACE_DESC
 #define TF TRACE_FILE
 #define TI TRACE_IPC
 #define TN TRACE_NETWORK
 #define TP TRACE_PROCESS
 #define TS TRACE_SIGNAL
+#define NF SYSCALL_NEVER_FAILS
 
 static const struct sysent sysent0[] = {
 #include "syscallent.h"
 };
 static const int nsyscalls0 = sizeof sysent0 / sizeof sysent0[0];
+int qual_flags0[MAX_QUALS];
 
 #if SUPPORTED_PERSONALITIES >= 2
 static const struct sysent sysent1[] = {
 #include "syscallent1.h"
 };
 static const int nsyscalls1 = sizeof sysent1 / sizeof sysent1[0];
+int qual_flags1[MAX_QUALS];
 #endif /* SUPPORTED_PERSONALITIES >= 2 */
 
 #if SUPPORTED_PERSONALITIES >= 3
@@ -144,17 +136,21 @@
 #include "syscallent2.h"
 };
 static const int nsyscalls2 = sizeof sysent2 / sizeof sysent2[0];
+int qual_flags2[MAX_QUALS];
 #endif /* SUPPORTED_PERSONALITIES >= 3 */
 
 const struct sysent *sysent;
+int *qual_flags;
 int nsyscalls;
 
 /* Now undef them since short defines cause wicked namespace pollution. */
+#undef TD
 #undef TF
 #undef TI
 #undef TN
 #undef TP
 #undef TS
+#undef NF
 
 static const char *const errnoent0[] = {
 #include "errnoent.h"
@@ -180,9 +176,21 @@
 
 int current_personality;
 
+#ifndef PERSONALITY0_WORDSIZE
+# define PERSONALITY0_WORDSIZE sizeof(long)
+#endif
+const int personality_wordsize[SUPPORTED_PERSONALITIES] = {
+	PERSONALITY0_WORDSIZE,
+#if SUPPORTED_PERSONALITIES > 1
+	PERSONALITY1_WORDSIZE,
+#endif
+#if SUPPORTED_PERSONALITIES > 2
+	PERSONALITY2_WORDSIZE,
+#endif
+};;
+
 int
-set_personality(personality)
-int personality;
+set_personality(int personality)
 {
 	switch (personality) {
 	case 0:
@@ -194,6 +202,7 @@
 		nioctlents = nioctlents0;
 		signalent = signalent0;
 		nsignals = nsignals0;
+		qual_flags = qual_flags0;
 		break;
 
 #if SUPPORTED_PERSONALITIES >= 2
@@ -206,6 +215,7 @@
 		nioctlents = nioctlents1;
 		signalent = signalent1;
 		nsignals = nsignals1;
+		qual_flags = qual_flags1;
 		break;
 #endif /* SUPPORTED_PERSONALITIES >= 2 */
 
@@ -219,6 +229,7 @@
 		nioctlents = nioctlents2;
 		signalent = signalent2;
 		nsignals = nsignals2;
+		qual_flags = qual_flags2;
 		break;
 #endif /* SUPPORTED_PERSONALITIES >= 3 */
 
@@ -230,25 +241,14 @@
 	return 0;
 }
 
-int qual_flags[MAX_QUALS];
-
-
-struct call_counts {
-	struct timeval time;
-	int calls, errors;
-};
-
-static struct call_counts *counts;
-
-static struct timeval shortest = { 1000000, 0 };
 
 static int qual_syscall(), qual_signal(), qual_fault(), qual_desc();
 
 static const struct qual_options {
 	int bitflag;
-	char *option_name;
-	int (*qualify)();
-	char *argument_name;
+	const char *option_name;
+	int (*qualify)(const char *, int, int);
+	const char *argument_name;
 } qual_options[] = {
 	{ QUAL_TRACE,	"trace",	qual_syscall,	"system call"	},
 	{ QUAL_TRACE,	"t",		qual_syscall,	"system call"	},
@@ -274,95 +274,120 @@
 };
 
 static void
-qualify_one(n, opt, not)
-	int n;
-	const struct qual_options *opt;
-	int not;
+qualify_one(int n, int bitflag, int not, int pers)
 {
-	if (not)
-		qual_flags[n] &= ~opt->bitflag;
-	else
-		qual_flags[n] |= opt->bitflag;
+	if (pers == 0 || pers < 0) {
+		if (not)
+			qual_flags0[n] &= ~bitflag;
+		else
+			qual_flags0[n] |= bitflag;
+	}
+
+#if SUPPORTED_PERSONALITIES >= 2
+	if (pers == 1 || pers < 0) {
+		if (not)
+			qual_flags1[n] &= ~bitflag;
+		else
+			qual_flags1[n] |= bitflag;
+	}
+#endif /* SUPPORTED_PERSONALITIES >= 2 */
+
+#if SUPPORTED_PERSONALITIES >= 3
+	if (pers == 2 || pers < 0) {
+		if (not)
+			qual_flags2[n] &= ~bitflag;
+		else
+			qual_flags2[n] |= bitflag;
+	}
+#endif /* SUPPORTED_PERSONALITIES >= 3 */
 }
 
 static int
-qual_syscall(s, opt, not)
-	char *s;
-	const struct qual_options *opt;
-	int not;
+qual_syscall(const char *s, int bitflag, int not)
 {
 	int i;
 	int rc = -1;
 
-	for (i = 0; i < nsyscalls; i++) {
-		if (strcmp(s, sysent[i].sys_name) == 0) {
-			qualify_one(i, opt, not);
+	if (isdigit((unsigned char)*s)) {
+		int i = atoi(s);
+		if (i < 0 || i >= MAX_QUALS)
+			return -1;
+		qualify_one(i, bitflag, not, -1);
+		return 0;
+	}
+	for (i = 0; i < nsyscalls0; i++)
+		if (strcmp(s, sysent0[i].sys_name) == 0) {
+			qualify_one(i, bitflag, not, 0);
 			rc = 0;
 		}
-	}
+
+#if SUPPORTED_PERSONALITIES >= 2
+	for (i = 0; i < nsyscalls1; i++)
+		if (strcmp(s, sysent1[i].sys_name) == 0) {
+			qualify_one(i, bitflag, not, 1);
+			rc = 0;
+		}
+#endif /* SUPPORTED_PERSONALITIES >= 2 */
+
+#if SUPPORTED_PERSONALITIES >= 3
+	for (i = 0; i < nsyscalls2; i++)
+		if (strcmp(s, sysent2[i].sys_name) == 0) {
+			qualify_one(i, bitflag, not, 2);
+			rc = 0;
+		}
+#endif /* SUPPORTED_PERSONALITIES >= 3 */
+
 	return rc;
 }
 
 static int
-qual_signal(s, opt, not)
-	char *s;
-	const struct qual_options *opt;
-	int not;
+qual_signal(const char *s, int bitflag, int not)
 {
 	int i;
 	char buf[32];
 
-  	if (s && *s && isdigit((unsigned char)*s)) {
- 		int signo = atoi(s);
- 		if (signo < 0 || signo >= MAX_QUALS)
- 			return -1;
- 		qualify_one(signo, opt, not);
- 		return 0;
+	if (isdigit((unsigned char)*s)) {
+		int signo = atoi(s);
+		if (signo < 0 || signo >= MAX_QUALS)
+			return -1;
+		qualify_one(signo, bitflag, not, -1);
+		return 0;
 	}
 	if (strlen(s) >= sizeof buf)
 		return -1;
 	strcpy(buf, s);
 	s = buf;
-	for (i = 0; s[i]; i++)
-		s[i] = toupper((unsigned char)(s[i]));
-	if (strncmp(s, "SIG", 3) == 0)
+	if (strncasecmp(s, "SIG", 3) == 0)
 		s += 3;
 	for (i = 0; i <= NSIG; i++)
-		if (strcmp(s, signame(i) + 3) == 0) {
-			qualify_one(i, opt, not);
+		if (strcasecmp(s, signame(i) + 3) == 0) {
+			qualify_one(i, bitflag, not, -1);
 			return 0;
 		}
 	return -1;
 }
 
 static int
-qual_fault(s, opt, not)
-	char *s;
-	const struct qual_options *opt;
-	int not;
+qual_fault(const char *s, int bitflag, int not)
 {
 	return -1;
 }
 
 static int
-qual_desc(s, opt, not)
-	char *s;
-	const struct qual_options *opt;
-	int not;
+qual_desc(const char *s, int bitflag, int not)
 {
-	if (s && *s && isdigit((unsigned char)*s)) {
+	if (isdigit((unsigned char)*s)) {
 		int desc = atoi(s);
 		if (desc < 0 || desc >= MAX_QUALS)
 			return -1;
-		qualify_one(desc, opt, not);
+		qualify_one(desc, bitflag, not, -1);
 		return 0;
 	}
 	return -1;
 }
 
 static int
-lookup_class(s)
-	char *s;
+lookup_class(const char *s)
 {
 	if (strcmp(s, "file") == 0)
 		return TRACE_FILE;
@@ -374,16 +399,18 @@
 		return TRACE_PROCESS;
 	if (strcmp(s, "signal") == 0)
 		return TRACE_SIGNAL;
+	if (strcmp(s, "desc") == 0)
+		return TRACE_DESC;
 	return -1;
 }
 
 void
-qualify(s)
-char *s;
+qualify(const char *s)
 {
 	const struct qual_options *opt;
 	int not;
-	char *p;
+	char *copy;
+	const char *p;
 	int i, n;
 
 	opt = &qual_options[0];
@@ -406,102 +433,79 @@
 	}
 	if (strcmp(s, "all") == 0) {
 		for (i = 0; i < MAX_QUALS; i++) {
-			if (not)
-				qual_flags[i] &= ~opt->bitflag;
-			else
-				qual_flags[i] |= opt->bitflag;
+			qualify_one(i, opt->bitflag, not, -1);
 		}
 		return;
 	}
 	for (i = 0; i < MAX_QUALS; i++) {
-		if (not)
-			qual_flags[i] |= opt->bitflag;
-		else
-			qual_flags[i] &= ~opt->bitflag;
+		qualify_one(i, opt->bitflag, !not, -1);
 	}
-	for (p = strtok(s, ","); p; p = strtok(NULL, ",")) {
+	if (!(copy = strdup(s))) {
+		fprintf(stderr, "out of memory\n");
+		exit(1);
+	}
+	for (p = strtok(copy, ","); p; p = strtok(NULL, ",")) {
 		if (opt->bitflag == QUAL_TRACE && (n = lookup_class(p)) > 0) {
-			for (i = 0; i < MAX_QUALS; i++) {
-				if (sysent[i].sys_flags & n) {
-					if (not)
-						qual_flags[i] &= ~opt->bitflag;
-					else
-						qual_flags[i] |= opt->bitflag;
-				}
-			}
+			for (i = 0; i < nsyscalls0; i++)
+				if (sysent0[i].sys_flags & n)
+					qualify_one(i, opt->bitflag, not, 0);
+
+#if SUPPORTED_PERSONALITIES >= 2
+			for (i = 0; i < nsyscalls1; i++)
+				if (sysent1[i].sys_flags & n)
+					qualify_one(i, opt->bitflag, not, 1);
+#endif /* SUPPORTED_PERSONALITIES >= 2 */
+
+#if SUPPORTED_PERSONALITIES >= 3
+			for (i = 0; i < nsyscalls2; i++)
+				if (sysent2[i].sys_flags & n)
+					qualify_one(i, opt->bitflag, not, 2);
+#endif /* SUPPORTED_PERSONALITIES >= 3 */
+
 			continue;
 		}
-		if (opt->qualify(p, opt, not)) {
+		if (opt->qualify(p, opt->bitflag, not)) {
 			fprintf(stderr, "strace: invalid %s `%s'\n",
 				opt->argument_name, p);
 			exit(1);
 		}
 	}
+	free(copy);
 	return;
 }
 
 static void
-dumpio(tcp)
-struct tcb *tcp;
+dumpio(struct tcb *tcp)
 {
 	if (syserror(tcp))
 		return;
 	if (tcp->u_arg[0] < 0 || tcp->u_arg[0] >= MAX_QUALS)
 		return;
-	switch (known_scno(tcp)) {
-	case SYS_read:
-#ifdef SYS_pread64
-	case SYS_pread64:
-#endif
-#if defined SYS_pread && SYS_pread64 != SYS_pread
-	case SYS_pread:
-#endif
-#ifdef SYS_recv
-	case SYS_recv:
-#elif defined SYS_sub_recv
-	case SYS_sub_recv:
-#endif
-#ifdef SYS_recvfrom
-	case SYS_recvfrom:
-#elif defined SYS_sub_recvfrom
-	case SYS_sub_recvfrom:
-#endif
-		if (qual_flags[tcp->u_arg[0]] & QUAL_READ)
+	if (tcp->scno < 0 || tcp->scno >= nsyscalls)
+		return;
+	if (sysent[tcp->scno].sys_func == printargs)
+		return;
+	if (qual_flags[tcp->u_arg[0]] & QUAL_READ) {
+		if (sysent[tcp->scno].sys_func == sys_read ||
+		    sysent[tcp->scno].sys_func == sys_pread ||
+		    sysent[tcp->scno].sys_func == sys_pread64 ||
+		    sysent[tcp->scno].sys_func == sys_recv ||
+		    sysent[tcp->scno].sys_func == sys_recvfrom)
 			dumpstr(tcp, tcp->u_arg[1], tcp->u_rval);
-		break;
-	case SYS_write:
-#ifdef SYS_pwrite64
-	case SYS_pwrite64:
-#endif
-#if defined SYS_pwrite && SYS_pwrite64 != SYS_pwrite
-	case SYS_pwrite:
-#endif
-#ifdef SYS_send
-	case SYS_send:
-#elif defined SYS_sub_send
-	case SYS_sub_send:
-#endif
-#ifdef SYS_sendto
-	case SYS_sendto:
-#elif defined SYS_sub_sendto
-	case SYS_sub_sendto:
-#endif
-		if (qual_flags[tcp->u_arg[0]] & QUAL_WRITE)
+		else if (sysent[tcp->scno].sys_func == sys_readv)
+			dumpiov(tcp, tcp->u_arg[2], tcp->u_arg[1]);
+		return;
+	}
+	if (qual_flags[tcp->u_arg[0]] & QUAL_WRITE) {
+		if (sysent[tcp->scno].sys_func == sys_write ||
+		    sysent[tcp->scno].sys_func == sys_pwrite ||
+		    sysent[tcp->scno].sys_func == sys_pwrite64 ||
+		    sysent[tcp->scno].sys_func == sys_send ||
+		    sysent[tcp->scno].sys_func == sys_sendto)
 			dumpstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-		break;
-#ifdef SYS_readv
-        case SYS_readv:
-                if (qual_flags[tcp->u_arg[0]] & QUAL_READ)
-                        dumpiov(tcp, tcp->u_arg[2], tcp->u_arg[1]);
-                break;
-#endif
-#ifdef SYS_writev
-        case SYS_writev:
-
-                if (qual_flags[tcp->u_arg[0]] & QUAL_WRITE)
-                        dumpiov(tcp, tcp->u_arg[2], tcp->u_arg[1]);
-                break;
-#endif
+		else if (sysent[tcp->scno].sys_func == sys_writev)
+			dumpiov(tcp, tcp->u_arg[2], tcp->u_arg[1]);
+		return;
 	}
 }
 
@@ -527,51 +531,7 @@
 };
 #endif /* FREEBSD */
 
-#if !(defined(LINUX) && ( defined(ALPHA) || defined(MIPS) ))
-
-static const int socket_map [] = {
-	       /* SYS_SOCKET      */ 97,
-	       /* SYS_BIND        */ 104,
-	       /* SYS_CONNECT     */ 98,
-	       /* SYS_LISTEN      */ 106,
-	       /* SYS_ACCEPT      */ 99,
-	       /* SYS_GETSOCKNAME */ 150,
-	       /* SYS_GETPEERNAME */ 141,
-	       /* SYS_SOCKETPAIR  */ 135,
-	       /* SYS_SEND        */ 101,
-	       /* SYS_RECV        */ 102,
-	       /* SYS_SENDTO      */ 133,
-	       /* SYS_RECVFROM    */ 125,
-	       /* SYS_SHUTDOWN    */ 134,
-	       /* SYS_SETSOCKOPT  */ 105,
-	       /* SYS_GETSOCKOPT  */ 118,
-	       /* SYS_SENDMSG     */ 114,
-	       /* SYS_RECVMSG     */ 113
-};
-
-#if defined (SPARC) || defined (SPARC64)
-static void
-sparc_socket_decode (tcp)
-struct tcb *tcp;
-{
-	volatile long addr;
-	volatile int i, n;
-
-	if (tcp->u_arg [0] < 1 || tcp->u_arg [0] > sizeof(socket_map)/sizeof(int)+1){
-		return;
-	}
-	tcp->scno = socket_map [tcp->u_arg [0]-1];
-	n = tcp->u_nargs = sysent [tcp->scno].nargs;
-	addr = tcp->u_arg [1];
-	for (i = 0; i < n; i++){
-	        int arg;
-		if (umoven (tcp, addr, sizeof (arg), (void *) &arg) < 0)
-			arg = 0;
-		tcp->u_arg [i] = arg;
-		addr += sizeof (arg);
-	}
-}
-#endif
+#if !(defined(LINUX) && ( defined(ALPHA) || defined(MIPS) || defined(__ARM_EABI__) ))
 
 static void
 decode_subcall(tcp, subcall, nsubcalls, style)
@@ -580,8 +540,9 @@
 int nsubcalls;
 enum subcall_style style;
 {
-	long addr, mask, arg;
+	unsigned long addr, mask;
 	int i;
+	int size = personality_wordsize[current_personality];
 
 	switch (style) {
 	case shift_style:
@@ -601,10 +562,21 @@
 		tcp->scno = subcall + tcp->u_arg[0];
 		addr = tcp->u_arg[1];
 		for (i = 0; i < sysent[tcp->scno].nargs; i++) {
-			if (umove(tcp, addr, &arg) < 0)
-				arg = 0;
-			tcp->u_arg[i] = arg;
-			addr += sizeof(arg);
+			if (size == sizeof(int)) {
+				unsigned int arg;
+				if (umove(tcp, addr, &arg) < 0)
+					arg = 0;
+				tcp->u_arg[i] = arg;
+			}
+			else if (size == sizeof(long)) {
+				unsigned long arg;
+				if (umove(tcp, addr, &arg) < 0)
+					arg = 0;
+				tcp->u_arg[i] = arg;
+			}
+			else
+				abort();
+			addr += size;
 		}
 		tcp->u_nargs = sysent[tcp->scno].nargs;
 		break;
@@ -651,98 +623,62 @@
 struct tcb *tcp_last = NULL;
 
 static int
-internal_syscall(tcp)
-struct tcb *tcp;
+internal_syscall(struct tcb *tcp)
 {
 	/*
 	 * We must always trace a few critical system calls in order to
 	 * correctly support following forks in the presence of tracing
 	 * qualifiers.
 	 */
-	switch (known_scno(tcp)) {
-#ifdef SYS_fork
-	case SYS_fork:
-#endif
-#ifdef SYS_vfork
-	case SYS_vfork:
-#endif
-#ifdef SYS_fork1
-	case SYS_fork1:
-#endif
-#ifdef SYS_forkall
-	case SYS_forkall:
-#endif
-#ifdef SYS_rfork1
-	case SYS_rfork1:
-#endif
-#ifdef SYS_rforkall
-	case SYS_rforkall:
-#endif
-#ifdef SYS_rfork
-	case SYS_rfork:
-#endif
-		internal_fork(tcp);
-		break;
-#ifdef SYS_clone
-	case SYS_clone:
-		internal_clone(tcp);
-		break;
-#endif
-#ifdef SYS_clone2
-	case SYS_clone2:
-		internal_clone(tcp);
-		break;
-#endif
-#ifdef SYS_execv
-	case SYS_execv:
-#endif
-#ifdef SYS_execve
-	case SYS_execve:
-#endif
-#ifdef SYS_rexecve
-	case SYS_rexecve:
-#endif
-		internal_exec(tcp);
-		break;
+	int	(*func)();
 
-#ifdef SYS_wait
-	case SYS_wait:
+	if (tcp->scno < 0 || tcp->scno >= nsyscalls)
+		return 0;
+
+	func = sysent[tcp->scno].sys_func;
+
+	if (sys_exit == func)
+		return internal_exit(tcp);
+
+	if (   sys_fork == func
+#if defined(FREEBSD) || defined(LINUX) || defined(SUNOS4)
+	    || sys_vfork == func
 #endif
-#ifdef SYS_wait4
-	case SYS_wait4:
+#ifdef LINUX
+	    || sys_clone == func
 #endif
-#ifdef SYS32_wait4
-	case SYS32_wait4:
+#if UNIXWARE > 2
+	    || sys_rfork == func
 #endif
-#ifdef SYS_waitpid
-	case SYS_waitpid:
+	   )
+		return internal_fork(tcp);
+
+	if (   sys_execve == func
+#if defined(SPARC) || defined(SPARC64) || defined(SUNOS4)
+	    || sys_execv == func
 #endif
-#ifdef SYS_waitsys
-	case SYS_waitsys:
+#if UNIXWARE > 2
+	    || sys_rexecve == func
 #endif
-		internal_wait(tcp, 2);
-		break;
-#ifdef SYS_waitid
-	case SYS_waitid:
-		internal_wait(tcp, 3);
-		break;
+	   )
+		return internal_exec(tcp);
+
+	if (   sys_waitpid == func
+	    || sys_wait4 == func
+#if defined(SVR4) || defined(FREEBSD) || defined(SUNOS4)
+	    || sys_wait == func
+#endif
+#ifdef ALPHA
+	    || sys_osf_wait4 == func
+#endif
+	   )
+		return internal_wait(tcp, 2);
+
+#if defined(LINUX) || defined(SVR4)
+	if (sys_waitid == func)
+		return internal_wait(tcp, 3);
 #endif
 
-#ifdef SYS_exit
-	case SYS_exit:
-#endif
-#ifdef SYS32_exit
-	case SYS32_exit:
-#endif
-#ifdef __NR_exit_group
-	case __NR_exit_group:
-#endif
-#ifdef IA64
-	case 252: /* IA-32 __NR_exit_group */
-#endif
-		internal_exit(tcp);
-		break;
-	}
 	return 0;
 }
 
@@ -756,15 +692,22 @@
 #elif defined (POWERPC)
 	static long result,flags;
 #elif defined (M68K)
-	static int d0;
+	static long d0;
+#elif defined(BFIN)
+	static long r0;
 #elif defined (ARM)
 	static struct pt_regs regs;
 #elif defined (ALPHA)
 	static long r0;
 	static long a3;
+#elif defined(AVR32)
+	static struct pt_regs regs;
 #elif defined (SPARC) || defined (SPARC64)
-	static struct regs regs;
+	static struct pt_regs regs;
 	static unsigned long trap;
+#elif defined(LINUX_MIPSN32)
+	static long long a3;
+	static long long r2;
 #elif defined(MIPS)
 	static long a3;
 	static long r2;
@@ -775,11 +718,15 @@
 #elif defined(HPPA)
 	static long r28;
 #elif defined(SH)
-       static long r0;
+	static long r0;
 #elif defined(SH64)
-       static long r9;
+	static long r9;
 #elif defined(X86_64)
-       static long rax;
+	static long rax;
+#elif defined(CRISV10) || defined(CRISV32)
+	static long r10;
+#elif defined(MICROBLAZE)
+	static long r3;
 #endif
 #endif /* LINUX */
 #ifdef FREEBSD
@@ -787,16 +734,12 @@
 #endif /* FREEBSD */
 
 int
-get_scno(tcp)
-struct tcb *tcp;
+get_scno(struct tcb *tcp)
 {
 	long scno = 0;
-#ifndef USE_PROCFS
-	int pid = tcp->pid;
-#endif /* !PROCFS */
 
 #ifdef LINUX
-#if defined(S390) || defined(S390X)
+# if defined(S390) || defined(S390X)
 	if (tcp->flags & TCB_WAITEXECVE) {
 		/*
 		 * When the execve system call completes successfully, the
@@ -817,16 +760,16 @@
 		return 0;
 	}
 
-	if (upeek(pid, PT_GPR2, &syscall_mode) < 0)
+	if (upeek(tcp, PT_GPR2, &syscall_mode) < 0)
 			return -1;
 
 	if (syscall_mode != -ENOSYS) {
 		/*
- 		 * Since kernel version 2.5.44 the scno gets passed in gpr2.
+		 * Since kernel version 2.5.44 the scno gets passed in gpr2.
 		 */
 		scno = syscall_mode;
 	} else {
-	       	/*
+		/*
 		 * Old style of "passing" the scno via the SVC instruction.
 		 */
 
@@ -837,10 +780,10 @@
 				      PT_GPR8,  PT_GPR9,  PT_GPR10,    PT_GPR11,
 				      PT_GPR12, PT_GPR13, PT_GPR14,    PT_GPR15};
 
-		if (upeek(pid, PT_PSWADDR, &pc) < 0)
+		if (upeek(tcp, PT_PSWADDR, &pc) < 0)
 			return -1;
 		errno = 0;
-		opcode = ptrace(PTRACE_PEEKTEXT, pid, (char *)(pc-sizeof(long)), 0);
+		opcode = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)(pc-sizeof(long)), 0);
 		if (errno) {
 			perror("peektext(pc-oneword)");
 			return -1;
@@ -871,34 +814,34 @@
 
 			tmp = 0;
 			offset_reg = (opcode & 0x000f0000) >> 16;
-			if (offset_reg && (upeek(pid, gpr_offset[offset_reg], &tmp) < 0))
+			if (offset_reg && (upeek(tcp, gpr_offset[offset_reg], &tmp) < 0))
 				return -1;
 			svc_addr += tmp;
 
 			tmp = 0;
 			offset_reg = (opcode & 0x0000f000) >> 12;
-			if (offset_reg && (upeek(pid, gpr_offset[offset_reg], &tmp) < 0))
+			if (offset_reg && (upeek(tcp, gpr_offset[offset_reg], &tmp) < 0))
 				return -1;
 			svc_addr += tmp;
 
-			scno = ptrace(PTRACE_PEEKTEXT, pid, svc_addr, 0);
+			scno = ptrace(PTRACE_PEEKTEXT, tcp->pid, svc_addr, 0);
 			if (errno)
 				return -1;
-#if defined(S390X)
+#  if defined(S390X)
 			scno >>= 48;
-#else
+#  else
 			scno >>= 16;
-#endif
+#  endif
 			tmp = 0;
 			offset_reg = (opcode & 0x00f00000) >> 20;
-			if (offset_reg && (upeek(pid, gpr_offset[offset_reg], &tmp) < 0))
+			if (offset_reg && (upeek(tcp, gpr_offset[offset_reg], &tmp) < 0))
 				return -1;
 
 			scno = (scno | tmp) & 0xff;
 		}
 	}
-#elif defined (POWERPC)
-	if (upeek(pid, sizeof(unsigned long)*PT_R0, &scno) < 0)
+# elif defined (POWERPC)
+	if (upeek(tcp, sizeof(unsigned long)*PT_R0, &scno) < 0)
 		return -1;
 	if (!(tcp->flags & TCB_INSYSCALL)) {
 		/* Check if we return from execve. */
@@ -907,16 +850,62 @@
 			return 0;
 		}
 	}
-#elif defined (I386)
-	if (upeek(pid, 4*ORIG_EAX, &scno) < 0)
+
+#  ifdef POWERPC64
+	if (!(tcp->flags & TCB_INSYSCALL)) {
+		static int currpers = -1;
+		long val;
+		int pid = tcp->pid;
+
+		/* Check for 64/32 bit mode. */
+		if (upeek(tcp, sizeof (unsigned long)*PT_MSR, &val) < 0)
+			return -1;
+		/* SF is bit 0 of MSR */
+		if (val < 0)
+			currpers = 0;
+		else
+			currpers = 1;
+		if (currpers != current_personality) {
+			static const char *const names[] = {"64 bit", "32 bit"};
+			set_personality(currpers);
+			fprintf(stderr, "[ Process PID=%d runs in %s mode. ]\n",
+					pid, names[current_personality]);
+		}
+	}
+#  endif
+# elif defined(AVR32)
+	/*
+	 * Read complete register set in one go.
+	 */
+	if (ptrace(PTRACE_GETREGS, tcp->pid, NULL, &regs) < 0)
 		return -1;
-#elif defined (X86_64)
-	if (upeek(pid, 8*ORIG_RAX, &scno) < 0)
+
+	/*
+	 * We only need to grab the syscall number on syscall entry.
+	 */
+	if (!(tcp->flags & TCB_INSYSCALL)) {
+		scno = regs.r8;
+
+		/* Check if we return from execve. */
+		if (tcp->flags & TCB_WAITEXECVE) {
+			tcp->flags &= ~TCB_WAITEXECVE;
+			return 0;
+		}
+	}
+# elif defined(BFIN)
+	if (upeek(tcp, PT_ORIG_P0, &scno))
+		return -1;
+# elif defined (I386)
+	if (upeek(tcp, 4*ORIG_EAX, &scno) < 0)
+		return -1;
+# elif defined (X86_64)
+	if (upeek(tcp, 8*ORIG_RAX, &scno) < 0)
 		return -1;
 
 	if (!(tcp->flags & TCB_INSYSCALL)) {
-	  	static int currpers=-1;
+		static int currpers = -1;
 		long val;
+		int pid = tcp->pid;
 
 		/* Check CS register value. On x86-64 linux it is:
 		 * 	0x33	for long mode (64 bit)
@@ -924,10 +913,9 @@
 		 * It takes only one ptrace and thus doesn't need
 		 * to be cached.
 		 */
-		if (upeek(pid, 8*CS, &val) < 0)
+		if (upeek(tcp, 8*CS, &val) < 0)
 			return -1;
-		switch(val)
-		{
+		switch (val) {
 			case 0x23: currpers = 1; break;
 			case 0x33: currpers = 0; break;
 			default:
@@ -937,26 +925,25 @@
 				currpers = current_personality;
 				break;
 		}
-#if 0
+#  if 0
 		/* This version analyzes the opcode of a syscall instruction.
 		 * (int 0x80 on i386 vs. syscall on x86-64)
 		 * It works, but is too complicated.
 		 */
 		unsigned long val, rip, i;
 
-		if(upeek(pid, 8*RIP, &rip)<0)
+		if (upeek(tcp, 8*RIP, &rip) < 0)
 			perror("upeek(RIP)");
 
 		/* sizeof(syscall) == sizeof(int 0x80) == 2 */
-		rip-=2;
+		rip -= 2;
 		errno = 0;
 
-		call = ptrace(PTRACE_PEEKTEXT,pid,(char *)rip,0);
+		call = ptrace(PTRACE_PEEKTEXT, pid, (char *)rip, (char *)0);
 		if (errno)
-			printf("ptrace_peektext failed: %s\n",
+			fprintf(stderr, "ptrace_peektext failed: %s\n",
 					strerror(errno));
-		switch (call & 0xffff)
-		{
+		switch (call & 0xffff) {
 			/* x86-64: syscall = 0x0f 0x05 */
 			case 0x050f: currpers = 0; break;
 			/* i386: int 0x80 = 0xcd 0x80 */
@@ -969,25 +956,24 @@
 					"PID=%d\n", (int)call, pid);
 				break;
 		}
-#endif
-		if(currpers != current_personality)
-		{
-			char *names[]={"64 bit", "32 bit"};
+#  endif
+		if (currpers != current_personality) {
+			static const char *const names[] = {"64 bit", "32 bit"};
 			set_personality(currpers);
-			printf("[ Process PID=%d runs in %s mode. ]\n",
+			fprintf(stderr, "[ Process PID=%d runs in %s mode. ]\n",
 					pid, names[current_personality]);
 		}
 	}
-#elif defined(IA64)
+# elif defined(IA64)
 #	define IA64_PSR_IS	((long)1 << 34)
-	if (upeek (pid, PT_CR_IPSR, &psr) >= 0)
+	if (upeek (tcp, PT_CR_IPSR, &psr) >= 0)
 		ia32 = (psr & IA64_PSR_IS) != 0;
 	if (!(tcp->flags & TCB_INSYSCALL)) {
 		if (ia32) {
-			if (upeek(pid, PT_R1, &scno) < 0)	/* orig eax */
+			if (upeek(tcp, PT_R1, &scno) < 0)	/* orig eax */
 				return -1;
 		} else {
-			if (upeek (pid, PT_R15, &scno) < 0)
+			if (upeek (tcp, PT_R15, &scno) < 0)
 				return -1;
 		}
 		/* Check if we return from execve. */
@@ -997,16 +983,16 @@
 		}
 	} else {
 		/* syscall in progress */
-		if (upeek (pid, PT_R8, &r8) < 0)
+		if (upeek (tcp, PT_R8, &r8) < 0)
 			return -1;
-		if (upeek (pid, PT_R10, &r10) < 0)
+		if (upeek (tcp, PT_R10, &r10) < 0)
 			return -1;
 	}
-#elif defined (ARM)
+# elif defined (ARM)
 	/*
 	 * Read complete register set in one go.
 	 */
-	if (ptrace(PTRACE_GETREGS, pid, NULL, (void *)&regs) == -1)
+	if (ptrace(PTRACE_GETREGS, tcp->pid, NULL, (void *)&regs) == -1)
 		return -1;
 
 	/*
@@ -1034,7 +1020,7 @@
 			 * Get the ARM-mode system call number
 			 */
 			errno = 0;
-			scno = ptrace(PTRACE_PEEKTEXT, pid, (void *)(regs.ARM_pc - 4), NULL);
+			scno = ptrace(PTRACE_PEEKTEXT, tcp->pid, (void *)(regs.ARM_pc - 4), NULL);
 			if (errno)
 				return -1;
 
@@ -1063,6 +1049,14 @@
 				scno &= 0x000fffff;
 			}
 		}
+		if (scno & 0x0f0000) {
+			/*
+			 * Handle ARM specific syscall
+			 */
+			set_personality(1);
+			scno &= 0x0000ffff;
+		} else
+			set_personality(0);
 
 		if (tcp->flags & TCB_INSYSCALL) {
 			fprintf(stderr, "pid %d stray syscall entry\n", tcp->pid);
@@ -1074,16 +1068,46 @@
 			tcp->flags |= TCB_INSYSCALL;
 		}
 	}
-#elif defined (M68K)
-	if (upeek(pid, 4*PT_ORIG_D0, &scno) < 0)
+# elif defined (M68K)
+	if (upeek(tcp, 4*PT_ORIG_D0, &scno) < 0)
 		return -1;
-#elif defined (MIPS)
-	if (upeek(pid, REG_A3, &a3) < 0)
-	  	return -1;
+# elif defined (LINUX_MIPSN32)
+	unsigned long long regs[38];
+
+	if (ptrace (PTRACE_GETREGS, tcp->pid, NULL, (long) &regs) < 0)
+		return -1;
+	a3 = regs[REG_A3];
+	r2 = regs[REG_V0];
 
 	if(!(tcp->flags & TCB_INSYSCALL)) {
-	  	if (upeek(pid, REG_V0, &scno) < 0)
-		  	return -1;
+		scno = r2;
+
+		/* Check if we return from execve. */
+		if (scno == 0 && tcp->flags & TCB_WAITEXECVE) {
+			tcp->flags &= ~TCB_WAITEXECVE;
+			return 0;
+		}
+
+		if (scno < 0 || scno > nsyscalls) {
+			if(a3 == 0 || a3 == -1) {
+				if(debug)
+					fprintf (stderr, "stray syscall exit: v0 = %ld\n", scno);
+				return 0;
+			}
+		}
+	}
+# elif defined (MIPS)
+	if (upeek(tcp, REG_A3, &a3) < 0)
+		return -1;
+	if(!(tcp->flags & TCB_INSYSCALL)) {
+		if (upeek(tcp, REG_V0, &scno) < 0)
+			return -1;
+
+		/* Check if we return from execve. */
+		if (scno == 0 && tcp->flags & TCB_WAITEXECVE) {
+			tcp->flags &= ~TCB_WAITEXECVE;
+			return 0;
+		}
 
 		if (scno < 0 || scno > nsyscalls) {
 			if(a3 == 0 || a3 == -1) {
@@ -1093,15 +1117,15 @@
 			}
 		}
 	} else {
-	  	if (upeek(pid, REG_V0, &r2) < 0)
-	    		return -1;
+		if (upeek(tcp, REG_V0, &r2) < 0)
+			return -1;
 	}
-#elif defined (ALPHA)
-	if (upeek(pid, REG_A3, &a3) < 0)
+# elif defined (ALPHA)
+	if (upeek(tcp, REG_A3, &a3) < 0)
 		return -1;
 
 	if (!(tcp->flags & TCB_INSYSCALL)) {
-		if (upeek(pid, REG_R0, &scno) < 0)
+		if (upeek(tcp, REG_R0, &scno) < 0)
 			return -1;
 
 		/* Check if we return from execve. */
@@ -1123,22 +1147,24 @@
 		}
 	}
 	else {
-		if (upeek(pid, REG_R0, &r0) < 0)
+		if (upeek(tcp, REG_R0, &r0) < 0)
 			return -1;
 	}
-#elif defined (SPARC) || defined (SPARC64)
+# elif defined (SPARC) || defined (SPARC64)
 	/* Everything we need is in the current register set. */
-	if (ptrace(PTRACE_GETREGS,pid,(char *)&regs,0) < 0)
+	if (ptrace(PTRACE_GETREGS, tcp->pid, (char *)&regs, 0) < 0)
 		return -1;
 
-        /* If we are entering, then disassemble the syscall trap. */
+	/* If we are entering, then disassemble the syscall trap. */
 	if (!(tcp->flags & TCB_INSYSCALL)) {
 		/* Retrieve the syscall trap instruction. */
 		errno = 0;
-		trap = ptrace(PTRACE_PEEKTEXT,pid,(char *)regs.r_pc,0);
-#if defined(SPARC64)
+#  if defined(SPARC64)
+		trap = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)regs.tpc, 0);
 		trap >>= 32;
-#endif
+#  else
+		trap = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)regs.pc, 0);
+#  endif
 		if (errno)
 			return -1;
 
@@ -1174,11 +1200,11 @@
 				tcp->flags &= ~TCB_WAITEXECVE;
 				return 0;
 			}
-#if defined (SPARC64)
-			fprintf(stderr,"syscall: unknown syscall trap %08lx %016lx\n", trap, regs.r_tpc);
-#else
-			fprintf(stderr,"syscall: unknown syscall trap %08x %08x\n", trap, regs.r_pc);
-#endif
+#  if defined (SPARC64)
+			fprintf(stderr,"syscall: unknown syscall trap %08lx %016lx\n", trap, regs.tpc);
+#  else
+			fprintf(stderr,"syscall: unknown syscall trap %08lx %08lx\n", trap, regs.pc);
+#  endif
 			return -1;
 		}
 
@@ -1186,14 +1212,14 @@
 		if (trap == 0x91d02027)
 			scno = 156;
 		else
-			scno = regs.r_g1;
+			scno = regs.u_regs[U_REG_G1];
 		if (scno == 0) {
-			scno = regs.r_o0;
-			memmove (&regs.r_o0, &regs.r_o1, 7*sizeof(regs.r_o0));
+			scno = regs.u_regs[U_REG_O0];
+			memmove (&regs.u_regs[U_REG_O0], &regs.u_regs[U_REG_O1], 7*sizeof(regs.u_regs[0]));
 		}
 	}
-#elif defined(HPPA)
-	if (upeek(pid, PT_GR20, &scno) < 0)
+# elif defined(HPPA)
+	if (upeek(tcp, PT_GR20, &scno) < 0)
 		return -1;
 	if (!(tcp->flags & TCB_INSYSCALL)) {
 		/* Check if we return from execve. */
@@ -1202,39 +1228,38 @@
 			return 0;
 		}
 	}
-#elif defined(SH)
-       /*
-        * In the new syscall ABI, the system call number is in R3.
-        */
-       if (upeek(pid, 4*(REG_REG0+3), &scno) < 0)
-               return -1;
-
-       if (scno < 0) {
-           /* Odd as it may seem, a glibc bug has been known to cause
-              glibc to issue bogus negative syscall numbers.  So for
-              our purposes, make strace print what it *should* have been */
-           long correct_scno = (scno & 0xff);
-           if (debug)
-               fprintf(stderr,
-                   "Detected glibc bug: bogus system call number = %ld, "
-		   "correcting to %ld\n",
-                   scno,
-                   correct_scno);
-           scno = correct_scno;
-       }
-
-
-       if (!(tcp->flags & TCB_INSYSCALL)) {
-               /* Check if we return from execve. */
-               if (scno == 0 && tcp->flags & TCB_WAITEXECVE) {
-                       tcp->flags &= ~TCB_WAITEXECVE;
-                       return 0;
-               }
-       }
-#elif defined(SH64)
-	if (upeek(pid, REG_SYSCALL, &scno) < 0)
+# elif defined(SH)
+	/*
+	 * In the new syscall ABI, the system call number is in R3.
+	 */
+	if (upeek(tcp, 4*(REG_REG0+3), &scno) < 0)
 		return -1;
-        scno &= 0xFFFF;
+
+	if (scno < 0) {
+		/* Odd as it may seem, a glibc bug has been known to cause
+		   glibc to issue bogus negative syscall numbers.  So for
+		   our purposes, make strace print what it *should* have been */
+		long correct_scno = (scno & 0xff);
+		if (debug)
+			fprintf(stderr,
+				"Detected glibc bug: bogus system call"
+				" number = %ld, correcting to %ld\n",
+				scno,
+				correct_scno);
+		scno = correct_scno;
+	}
+
+	if (!(tcp->flags & TCB_INSYSCALL)) {
+		/* Check if we return from execve. */
+		if (scno == 0 && tcp->flags & TCB_WAITEXECVE) {
+			tcp->flags &= ~TCB_WAITEXECVE;
+			return 0;
+		}
+	}
+# elif defined(SH64)
+	if (upeek(tcp, REG_SYSCALL, &scno) < 0)
+		return -1;
+	scno &= 0xFFFF;
 
 	if (!(tcp->flags & TCB_INSYSCALL)) {
 		/* Check if we return from execve. */
@@ -1243,44 +1268,63 @@
 			return 0;
 		}
 	}
-#endif /* SH64 */
+# elif defined(CRISV10) || defined(CRISV32)
+	if (upeek(tcp, 4*PT_R9, &scno) < 0)
+		return -1;
+# elif defined(TILE)
+	if (upeek(tcp, PTREGS_OFFSET_REG(10), &scno) < 0)
+		return -1;
+
+	if (!(tcp->flags & TCB_INSYSCALL)) {
+		/* Check if we return from execve. */
+		if (tcp->flags & TCB_WAITEXECVE) {
+			tcp->flags &= ~TCB_WAITEXECVE;
+			return 0;
+		}
+	}
+# elif defined(MICROBLAZE)
+	if (upeek(tcp, 0, &scno) < 0)
+		return -1;
+# endif
 #endif /* LINUX */
+
 #ifdef SUNOS4
-	if (upeek(pid, uoff(u_arg[7]), &scno) < 0)
+	if (upeek(tcp, uoff(u_arg[7]), &scno) < 0)
 		return -1;
 #elif defined(SH)
-        /* new syscall ABI returns result in R0 */
-        if (upeek(pid, 4*REG_REG0, (long *)&r0) < 0)
-                return -1;
+	/* new syscall ABI returns result in R0 */
+	if (upeek(tcp, 4*REG_REG0, (long *)&r0) < 0)
+		return -1;
 #elif defined(SH64)
-        /* ABI defines result returned in r9 */
-        if (upeek(pid, REG_GENERAL(9), (long *)&r9) < 0)
-                return -1;
-
+	/* ABI defines result returned in r9 */
+	if (upeek(tcp, REG_GENERAL(9), (long *)&r9) < 0)
+		return -1;
 #endif
+
 #ifdef USE_PROCFS
-#ifdef HAVE_PR_SYSCALL
+# ifdef HAVE_PR_SYSCALL
 	scno = tcp->status.PR_SYSCALL;
-#else /* !HAVE_PR_SYSCALL */
-#ifndef FREEBSD
+# else
+#  ifndef FREEBSD
 	scno = tcp->status.PR_WHAT;
-#else /* FREEBSD */
+#  else
 	if (pread(tcp->pfd_reg, &regs, sizeof(regs), 0) < 0) {
-	        perror("pread");
-                return -1;
-        }
+		perror("pread");
+		return -1;
+	}
 	switch (regs.r_eax) {
 	case SYS_syscall:
 	case SYS___syscall:
-    	        pread(tcp->pfd, &scno, sizeof(scno), regs.r_esp + sizeof(int));
-	        break;
+		pread(tcp->pfd, &scno, sizeof(scno), regs.r_esp + sizeof(int));
+		break;
 	default:
-	        scno = regs.r_eax;
-	        break;
+		scno = regs.r_eax;
+		break;
 	}
-#endif /* FREEBSD */
-#endif /* !HAVE_PR_SYSCALL */
+#  endif /* FREEBSD */
+# endif /* !HAVE_PR_SYSCALL */
 #endif /* USE_PROCFS */
+
 	if (!(tcp->flags & TCB_INSYSCALL))
 		tcp->scno = scno;
 	return 1;
@@ -1288,24 +1332,29 @@
 
 
 long
-known_scno(tcp)
-struct tcb *tcp;
+known_scno(struct tcb *tcp)
 {
 	long scno = tcp->scno;
+#if SUPPORTED_PERSONALITIES > 1
 	if (scno >= 0 && scno < nsyscalls && sysent[scno].native_scno != 0)
 		scno = sysent[scno].native_scno;
 	else
+#endif
 		scno += NR_SYSCALL_BASE;
 	return scno;
 }
 
+/* Called in trace_syscall() at each syscall entry and exit.
+ * Returns:
+ * 0: "ignore this syscall", bail out of trace_syscall() silently.
+ * 1: ok, continue in trace_syscall().
+ * other: error, trace_syscall() should print error indicator
+ *    ("????" etc) and bail out.
+ */
 static int
-syscall_fixup(tcp)
-struct tcb *tcp;
+syscall_fixup(struct tcb *tcp)
 {
-#ifndef USE_PROCFS
-	int pid = tcp->pid;
-#else /* USE_PROCFS */
+#ifdef USE_PROCFS
 	int scno = known_scno(tcp);
 
 	if (!(tcp->flags & TCB_INSYSCALL)) {
@@ -1369,7 +1418,7 @@
 #endif /* SUNOS4 */
 #ifdef LINUX
 #if defined (I386)
-	if (upeek(pid, 4*EAX, &eax) < 0)
+	if (upeek(tcp, 4*EAX, &eax) < 0)
 		return -1;
 	if (eax != -ENOSYS && !(tcp->flags & TCB_INSYSCALL)) {
 		if (debug)
@@ -1377,7 +1426,7 @@
 		return 0;
 	}
 #elif defined (X86_64)
-	if (upeek(pid, 8*RAX, &rax) < 0)
+	if (upeek(tcp, 8*RAX, &rax) < 0)
 		return -1;
 	if (current_personality == 1)
 		rax = (long int)(int)rax; /* sign extend from 32 bits */
@@ -1387,7 +1436,7 @@
 		return 0;
 	}
 #elif defined (S390) || defined (S390X)
-	if (upeek(pid, PT_GPR2, &gpr2) < 0)
+	if (upeek(tcp, PT_GPR2, &gpr2) < 0)
 		return -1;
 	if (syscall_mode != -ENOSYS)
 		syscall_mode = tcp->scno;
@@ -1407,14 +1456,14 @@
 	}
 #elif defined (POWERPC)
 # define SO_MASK 0x10000000
-	if (upeek(pid, sizeof(unsigned long)*PT_CCR, &flags) < 0)
+	if (upeek(tcp, sizeof(unsigned long)*PT_CCR, &flags) < 0)
 		return -1;
-	if (upeek(pid, sizeof(unsigned long)*PT_R3, &result) < 0)
+	if (upeek(tcp, sizeof(unsigned long)*PT_R3, &result) < 0)
 		return -1;
 	if (flags & SO_MASK)
 		result = -result;
 #elif defined (M68K)
-	if (upeek(pid, 4*PT_D0, &d0) < 0)
+	if (upeek(tcp, 4*PT_D0, &d0) < 0)
 		return -1;
 	if (d0 != -ENOSYS && !(tcp->flags & TCB_INSYSCALL)) {
 		if (debug)
@@ -1425,94 +1474,129 @@
 	/*
 	 * Nothing required
 	 */
+#elif defined(BFIN)
+	if (upeek(tcp, PT_R0, &r0) < 0)
+		return -1;
 #elif defined (HPPA)
-	if (upeek(pid, PT_GR28, &r28) < 0)
+	if (upeek(tcp, PT_GR28, &r28) < 0)
 		return -1;
 #elif defined(IA64)
-	if (upeek(pid, PT_R10, &r10) < 0)
+	if (upeek(tcp, PT_R10, &r10) < 0)
 		return -1;
-	if (upeek(pid, PT_R8, &r8) < 0)
+	if (upeek(tcp, PT_R8, &r8) < 0)
 		return -1;
 	if (ia32 && r8 != -ENOSYS && !(tcp->flags & TCB_INSYSCALL)) {
 		if (debug)
 			fprintf(stderr, "stray syscall exit: r8 = %ld\n", r8);
 		return 0;
 	}
+#elif defined(CRISV10) || defined(CRISV32)
+	if (upeek(tcp, 4*PT_R10, &r10) < 0)
+		return -1;
+	if (r10 != -ENOSYS && !(tcp->flags & TCB_INSYSCALL)) {
+		if (debug)
+			fprintf(stderr, "stray syscall exit: r10 = %ld\n", r10);
+		return 0;
+	}
+#elif defined(MICROBLAZE)
+	if (upeek(tcp, 3 * 4, &r3) < 0)
+		return -1;
+	if (r3 != -ENOSYS && !(tcp->flags & TCB_INSYSCALL)) {
+		if (debug)
+			fprintf(stderr, "stray syscall exit: r3 = %ld\n", r3);
+		return 0;
+	}
 #endif
 #endif /* LINUX */
 	return 1;
 }
 
+#ifdef LINUX
+/*
+ * Check the syscall return value register value for whether it is
+ * a negated errno code indicating an error, or a success return value.
+ */
+static inline int
+is_negated_errno(unsigned long int val)
+{
+	unsigned long int max = -(long int) nerrnos;
+	if (personality_wordsize[current_personality] < sizeof(val)) {
+		val = (unsigned int) val;
+		max = (unsigned int) max;
+	}
+	return val > max;
+}
+#endif
+
 static int
-get_error(tcp)
-struct tcb *tcp;
+get_error(struct tcb *tcp)
 {
 	int u_error = 0;
 #ifdef LINUX
-#if defined(S390) || defined(S390X)
-		if (gpr2 && (unsigned) -gpr2 < nerrnos) {
-			tcp->u_rval = -1;
-			u_error = -gpr2;
-		}
-		else {
-			tcp->u_rval = gpr2;
-			u_error = 0;
-		}
-#else /* !S390 && !S390X */
-#ifdef I386
-		if (eax < 0 && -eax < nerrnos) {
-			tcp->u_rval = -1;
-			u_error = -eax;
-		}
-		else {
-			tcp->u_rval = eax;
-			u_error = 0;
-		}
-#else /* !I386 */
-#ifdef X86_64
-		if (rax < 0 && -rax < nerrnos) {
-			tcp->u_rval = -1;
-			u_error = -rax;
-		}
-		else {
-			tcp->u_rval = rax;
-			u_error = 0;
-		}
-#else
-#ifdef IA64
-		if (ia32) {
-			int err;
+	int check_errno = 1;
+	if (tcp->scno >= 0 && tcp->scno < nsyscalls &&
+	    sysent[tcp->scno].sys_flags & SYSCALL_NEVER_FAILS) {
+		check_errno = 0;
+	}
+# if defined(S390) || defined(S390X)
+	if (check_errno && is_negated_errno(gpr2)) {
+		tcp->u_rval = -1;
+		u_error = -gpr2;
+	}
+	else {
+		tcp->u_rval = gpr2;
+		u_error = 0;
+	}
+# elif defined(I386)
+	if (check_errno && is_negated_errno(eax)) {
+		tcp->u_rval = -1;
+		u_error = -eax;
+	}
+	else {
+		tcp->u_rval = eax;
+		u_error = 0;
+	}
+# elif defined(X86_64)
+	if (check_errno && is_negated_errno(rax)) {
+		tcp->u_rval = -1;
+		u_error = -rax;
+	}
+	else {
+		tcp->u_rval = rax;
+		u_error = 0;
+	}
+# elif defined(IA64)
+	if (ia32) {
+		int err;
 
-			err = (int)r8;
-			if (err < 0 && -err < nerrnos) {
-				tcp->u_rval = -1;
-				u_error = -err;
-			}
-			else {
-				tcp->u_rval = err;
-				u_error = 0;
-			}
-		} else {
-			if (r10) {
-				tcp->u_rval = -1;
-				u_error = r8;
-			} else {
-				tcp->u_rval = r8;
-				u_error = 0;
-			}
+		err = (int)r8;
+		if (check_errno && is_negated_errno(err)) {
+			tcp->u_rval = -1;
+			u_error = -err;
 		}
-#else /* !IA64 */
-#ifdef MIPS
-		if (a3) {
-		  	tcp->u_rval = -1;
+		else {
+			tcp->u_rval = err;
+			u_error = 0;
+		}
+	} else {
+		if (check_errno && r10) {
+			tcp->u_rval = -1;
+			u_error = r8;
+		} else {
+			tcp->u_rval = r8;
+			u_error = 0;
+		}
+	}
+# elif defined(MIPS)
+		if (check_errno && a3) {
+			tcp->u_rval = -1;
 			u_error = r2;
 		} else {
-		  	tcp->u_rval = r2;
+			tcp->u_rval = r2;
 			u_error = 0;
 		}
-#else
-#ifdef POWERPC
-		if (result && (unsigned long) -result < nerrnos) {
+# elif defined(POWERPC)
+		if (check_errno && is_negated_errno(result)) {
 			tcp->u_rval = -1;
 			u_error = -result;
 		}
@@ -1520,9 +1604,8 @@
 			tcp->u_rval = result;
 			u_error = 0;
 		}
-#else /* !POWERPC */
-#ifdef M68K
-		if (d0 && (unsigned) -d0 < nerrnos) {
+# elif defined(M68K)
+		if (check_errno && is_negated_errno(d0)) {
 			tcp->u_rval = -1;
 			u_error = -d0;
 		}
@@ -1530,9 +1613,8 @@
 			tcp->u_rval = d0;
 			u_error = 0;
 		}
-#else /* !M68K */
-#ifdef ARM
-		if (regs.ARM_r0 && (unsigned) -regs.ARM_r0 < nerrnos) {
+# elif defined(ARM)
+		if (check_errno && is_negated_errno(regs.ARM_r0)) {
 			tcp->u_rval = -1;
 			u_error = -regs.ARM_r0;
 		}
@@ -1540,9 +1622,25 @@
 			tcp->u_rval = regs.ARM_r0;
 			u_error = 0;
 		}
-#else /* !ARM */
-#ifdef ALPHA
-		if (a3) {
+# elif defined(AVR32)
+		if (check_errno && regs.r12 && (unsigned) -regs.r12 < nerrnos) {
+			tcp->u_rval = -1;
+			u_error = -regs.r12;
+		}
+		else {
+			tcp->u_rval = regs.r12;
+			u_error = 0;
+		}
+# elif defined(BFIN)
+		if (check_errno && is_negated_errno(r0)) {
+			tcp->u_rval = -1;
+			u_error = -r0;
+		} else {
+			tcp->u_rval = r0;
+			u_error = 0;
+		}
+# elif defined(ALPHA)
+		if (check_errno && a3) {
 			tcp->u_rval = -1;
 			u_error = r0;
 		}
@@ -1550,29 +1648,26 @@
 			tcp->u_rval = r0;
 			u_error = 0;
 		}
-#else /* !ALPHA */
-#ifdef SPARC
-		if (regs.r_psr & PSR_C) {
+# elif defined(SPARC)
+		if (check_errno && regs.psr & PSR_C) {
 			tcp->u_rval = -1;
-			u_error = regs.r_o0;
+			u_error = regs.u_regs[U_REG_O0];
 		}
 		else {
-			tcp->u_rval = regs.r_o0;
+			tcp->u_rval = regs.u_regs[U_REG_O0];
 			u_error = 0;
 		}
-#else /* !SPARC */
-#ifdef SPARC64
-		if (regs.r_tstate & 0x1100000000UL) {
+# elif defined(SPARC64)
+		if (check_errno && regs.tstate & 0x1100000000UL) {
 			tcp->u_rval = -1;
-			u_error = regs.r_o0;
+			u_error = regs.u_regs[U_REG_O0];
 		}
 		else {
-			tcp->u_rval = regs.r_o0;
+			tcp->u_rval = regs.u_regs[U_REG_O0];
 			u_error = 0;
 		}
-#else /* !SPARC64 */
-#ifdef HPPA
-		if (r28 && (unsigned) -r28 < nerrnos) {
+# elif defined(HPPA)
+		if (check_errno && is_negated_errno(r28)) {
 			tcp->u_rval = -1;
 			u_error = -r28;
 		}
@@ -1580,51 +1675,68 @@
 			tcp->u_rval = r28;
 			u_error = 0;
 		}
-#else
-#ifdef SH
-               /* interpret R0 as return value or error number */
-               if (r0 && (unsigned) -r0 < nerrnos) {
-                       tcp->u_rval = -1;
-                       u_error = -r0;
-               }
-               else {
-                       tcp->u_rval = r0;
-                       u_error = 0;
-               }
-#else
-#ifdef SH64
-                /* interpret result as return value or error number */
-                if (r9 && (unsigned) -r9 < nerrnos) {
-	                tcp->u_rval = -1;
-	                u_error = -r9;
-                }
-                else {
-                        tcp->u_rval = r9;
-	                u_error = 0;
-                }
-#endif /* SH64 */
-#endif /* SH */
-#endif /* HPPA */
-#endif /* SPARC */
-#endif /* SPARC64 */
-#endif /* ALPHA */
-#endif /* ARM */
-#endif /* M68K */
-#endif /* POWERPC */
-#endif /* MIPS */
-#endif /* IA64 */
-#endif /* X86_64 */
-#endif /* I386 */
-#endif /* S390 || S390X */
+# elif defined(SH)
+		/* interpret R0 as return value or error number */
+		if (check_errno && is_negated_errno(r0)) {
+			tcp->u_rval = -1;
+			u_error = -r0;
+		}
+		else {
+			tcp->u_rval = r0;
+			u_error = 0;
+		}
+# elif defined(SH64)
+		/* interpret result as return value or error number */
+		if (check_errno && is_negated_errno(r9)) {
+			tcp->u_rval = -1;
+			u_error = -r9;
+		}
+		else {
+			tcp->u_rval = r9;
+			u_error = 0;
+		}
+# elif defined(CRISV10) || defined(CRISV32)
+		if (check_errno && r10 && (unsigned) -r10 < nerrnos) {
+			tcp->u_rval = -1;
+			u_error = -r10;
+		}
+		else {
+			tcp->u_rval = r10;
+			u_error = 0;
+		}
+# elif defined(TILE)
+		long rval;
+		/* interpret result as return value or error number */
+		if (upeek(tcp, PTREGS_OFFSET_REG(0), &rval) < 0)
+			return -1;
+		if (check_errno && rval < 0 && rval > -nerrnos) {
+			tcp->u_rval = -1;
+			u_error = -rval;
+		}
+		else {
+			tcp->u_rval = rval;
+			u_error = 0;
+		}
+# elif defined(MICROBLAZE)
+		/* interpret result as return value or error number */
+		if (check_errno && is_negated_errno(r3)) {
+			tcp->u_rval = -1;
+			u_error = -r3;
+		}
+		else {
+			tcp->u_rval = r3;
+			u_error = 0;
+		}
+# endif
 #endif /* LINUX */
 #ifdef SUNOS4
 		/* get error code from user struct */
-		if (upeek(pid, uoff(u_error), &u_error) < 0)
+		if (upeek(tcp, uoff(u_error), &u_error) < 0)
 			return -1;
 		u_error >>= 24; /* u_error is a char */
 
 		/* get system call return value */
-		if (upeek(pid, uoff(u_rval1), &tcp->u_rval) < 0)
+		if (upeek(tcp, uoff(u_rval1), &tcp->u_rval) < 0)
 			return -1;
 #endif /* SUNOS4 */
 #ifdef SVR4
@@ -1679,10 +1791,10 @@
 #endif /* SVR4 */
 #ifdef FREEBSD
 		if (regs.r_eflags & PSL_C) {
- 		        tcp->u_rval = -1;
+			tcp->u_rval = -1;
 		        u_error = regs.r_eax;
 		} else {
-		        tcp->u_rval = regs.r_eax;
+			tcp->u_rval = regs.r_eax;
 			tcp->u_lrval =
 			  ((unsigned long long) regs.r_edx << 32) +  regs.r_eax;
 		        u_error = 0;
@@ -1699,22 +1811,19 @@
 	long rval;
 {
 #ifdef LINUX
-#if defined(S390) || defined(S390X)
+# if defined(S390) || defined(S390X)
 	gpr2 = error ? -error : rval;
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)PT_GPR2, gpr2) < 0)
 		return -1;
-#else /* !S390 && !S390X */
-#ifdef I386
+# elif defined(I386)
 	eax = error ? -error : rval;
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(EAX * 4), eax) < 0)
 		return -1;
-#else /* !I386 */
-#ifdef X86_64
+# elif defined(X86_64)
 	rax = error ? -error : rval;
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(RAX * 8), rax) < 0)
 		return -1;
-#else
-#ifdef IA64
+# elif defined(IA64)
 	if (ia32) {
 		r8 = error ? -error : rval;
 		if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(PT_R8), r8) < 0)
@@ -1733,8 +1842,11 @@
 		    ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(PT_R10), r10) < 0)
 			return -1;
 	}
-#else /* !IA64 */
-#ifdef MIPS
+# elif defined(BFIN)
+	r0 = error ? -error : rval;
+	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)PT_R0, r0) < 0)
+		return -1;
+# elif defined(MIPS)
 	if (error) {
 		r2 = error;
 		a3 = -1;
@@ -1743,12 +1855,12 @@
 		r2 = rval;
 		a3 = 0;
 	}
+	/* PTRACE_POKEUSER is OK even for n32 since rval is only a long.  */
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_A3), a3) < 0 ||
 	    ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_V0), r2) < 0)
-	    	return -1;
-#else
-#ifdef POWERPC
-	if (upeek(tcp->pid, sizeof(unsigned long)*PT_CCR, &flags) < 0)
+		return -1;
+# elif defined(POWERPC)
+	if (upeek(tcp, sizeof(unsigned long)*PT_CCR, &flags) < 0)
 		return -1;
 	if (error) {
 		flags |= SO_MASK;
@@ -1761,18 +1873,19 @@
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(sizeof(unsigned long)*PT_CCR), flags) < 0 ||
 	    ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(sizeof(unsigned long)*PT_R3), result) < 0)
 		return -1;
-#else /* !POWERPC */
-#ifdef M68K
+# elif defined(M68K)
 	d0 = error ? -error : rval;
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*PT_D0), d0) < 0)
 		return -1;
-#else /* !M68K */
-#ifdef ARM
-       regs.ARM_r0 = error ? -error : rval;
-       if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*0), regs.ARM_r0) < 0)
+# elif defined(ARM)
+	regs.ARM_r0 = error ? -error : rval;
+	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*0), regs.ARM_r0) < 0)
 		return -1;
-#else /* !ARM */
-#ifdef ALPHA
+# elif defined(AVR32)
+	regs.r12 = error ? -error : rval;
+	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)REG_R12, regs.r12) < 0)
+		return -1;
+# elif defined(ALPHA)
 	if (error) {
 		a3 = -1;
 		r0 = error;
@@ -1784,79 +1897,64 @@
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_A3), a3) < 0 ||
 	    ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_R0), r0) < 0)
 		return -1;
-#else /* !ALPHA */
-#ifdef SPARC
+# elif defined(SPARC)
 	if (ptrace(PTRACE_GETREGS, tcp->pid, (char *)&regs, 0) < 0)
 		return -1;
 	if (error) {
-		regs.r_psr |= PSR_C;
-		regs.r_o0 = error;
+		regs.psr |= PSR_C;
+		regs.u_regs[U_REG_O0] = error;
 	}
 	else {
-		regs.r_psr &= ~PSR_C;
-		regs.r_o0 = rval;
+		regs.psr &= ~PSR_C;
+		regs.u_regs[U_REG_O0] = rval;
 	}
 	if (ptrace(PTRACE_SETREGS, tcp->pid, (char *)&regs, 0) < 0)
 		return -1;
-#else /* !SPARC */
-#ifdef SPARC64
+# elif defined(SPARC64)
 	if (ptrace(PTRACE_GETREGS, tcp->pid, (char *)&regs, 0) < 0)
 		return -1;
 	if (error) {
-		regs.r_tstate |= 0x1100000000UL;
-		regs.r_o0 = error;
+		regs.tstate |= 0x1100000000UL;
+		regs.u_regs[U_REG_O0] = error;
 	}
 	else {
-		regs.r_tstate &= ~0x1100000000UL;
-		regs.r_o0 = rval;
+		regs.tstate &= ~0x1100000000UL;
+		regs.u_regs[U_REG_O0] = rval;
 	}
 	if (ptrace(PTRACE_SETREGS, tcp->pid, (char *)&regs, 0) < 0)
 		return -1;
-#else /* !SPARC64 */
-#ifdef HPPA
+# elif defined(HPPA)
 	r28 = error ? -error : rval;
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(PT_GR28), r28) < 0)
 		return -1;
-#else
-#ifdef SH
+# elif defined(SH)
 	r0 = error ? -error : rval;
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*REG_REG0), r0) < 0)
 		return -1;
-#else
-#ifdef SH64
-        r9 = error ? -error : rval;
+# elif defined(SH64)
+	r9 = error ? -error : rval;
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)REG_GENERAL(9), r9) < 0)
 		return -1;
-#endif /* SH64 */
-#endif /* SH */
-#endif /* HPPA */
-#endif /* SPARC */
-#endif /* SPARC64 */
-#endif /* ALPHA */
-#endif /* ARM */
-#endif /* M68K */
-#endif /* POWERPC */
-#endif /* MIPS */
-#endif /* IA64 */
-#endif /* X86_64 */
-#endif /* I386 */
-#endif /* S390 || S390X */
+# endif
 #endif /* LINUX */
+
 #ifdef SUNOS4
 	if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)uoff(u_error),
 		   error << 24) < 0 ||
 	    ptrace(PTRACE_POKEUSER, tcp->pid, (char*)uoff(u_rval1), rval) < 0)
 		return -1;
 #endif /* SUNOS4 */
+
 #ifdef SVR4
 	/* XXX no clue */
 	return -1;
 #endif /* SVR4 */
+
 #ifdef FREEBSD
 	if (pread(tcp->pfd_reg, &regs, sizeof(regs), 0) < 0) {
-	        perror("pread");
-                return -1;
-        }
+		perror("pread");
+		return -1;
+	}
 	if (error) {
 		regs.r_eflags |= PSL_C;
 		regs.r_eax = error;
@@ -1866,9 +1964,9 @@
 		regs.r_eax = rval;
 	}
 	if (pwrite(tcp->pfd_reg, &regs, sizeof(regs), 0) < 0) {
-	        perror("pwrite");
-                return -1;
-        }
+		perror("pwrite");
+		return -1;
+	}
 #endif /* FREEBSD */
 
 	/* All branches reach here on success (only).  */
@@ -1878,12 +1976,8 @@
 }
 
 static int
-syscall_enter(tcp)
-struct tcb *tcp;
+syscall_enter(struct tcb *tcp)
 {
-#ifndef USE_PROCFS
-	int pid = tcp->pid;
-#endif /* !USE_PROCFS */
 #ifdef LINUX
 #if defined(S390) || defined(S390X)
 	{
@@ -1891,9 +1985,9 @@
 		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
 			tcp->u_nargs = sysent[tcp->scno].nargs;
 		else
-     	        	tcp->u_nargs = MAX_ARGS;
+			tcp->u_nargs = MAX_ARGS;
 		for (i = 0; i < tcp->u_nargs; i++) {
-			if (upeek(pid,i==0 ? PT_ORIGGPR2:PT_GPR2+i*sizeof(long), &tcp->u_arg[i]) < 0)
+			if (upeek(tcp,i==0 ? PT_ORIGGPR2:PT_GPR2+i*sizeof(long), &tcp->u_arg[i]) < 0)
 				return -1;
 		}
 	}
@@ -1903,32 +1997,33 @@
 		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
 			tcp->u_nargs = sysent[tcp->scno].nargs;
 		else
-     	        	tcp->u_nargs = MAX_ARGS;
+			tcp->u_nargs = MAX_ARGS;
 		for (i = 0; i < tcp->u_nargs; i++) {
 			/* WTA: if scno is out-of-bounds this will bomb. Add range-check
 			 * for scno somewhere above here!
 			 */
-			if (upeek(pid, REG_A0+i, &tcp->u_arg[i]) < 0)
+			if (upeek(tcp, REG_A0+i, &tcp->u_arg[i]) < 0)
 				return -1;
 		}
 	}
 #elif defined (IA64)
 	{
 		if (!ia32) {
-			unsigned long *out0, *rbs_end, cfm, sof, sol, i;
+			unsigned long *out0, cfm, sof, sol, i;
+			long rbs_end;
 			/* be backwards compatible with kernel < 2.4.4... */
 #			ifndef PT_RBS_END
 #			  define PT_RBS_END	PT_AR_BSP
 #			endif
 
-			if (upeek(pid, PT_RBS_END, (long *) &rbs_end) < 0)
+			if (upeek(tcp, PT_RBS_END, &rbs_end) < 0)
 				return -1;
-			if (upeek(pid, PT_CFM, (long *) &cfm) < 0)
+			if (upeek(tcp, PT_CFM, (long *) &cfm) < 0)
 				return -1;
 
 			sof = (cfm >> 0) & 0x7f;
 			sol = (cfm >> 7) & 0x7f;
-			out0 = ia64_rse_skip_regs(rbs_end, -sof + sol);
+			out0 = ia64_rse_skip_regs((unsigned long *) rbs_end, -sof + sol);
 
 			if (tcp->scno >= 0 && tcp->scno < nsyscalls
 			    && sysent[tcp->scno].nargs != -1)
@@ -1944,17 +2039,17 @@
 			int i;
 
 			if (/* EBX = out0 */
-			    upeek(pid, PT_R11, (long *) &tcp->u_arg[0]) < 0
+			    upeek(tcp, PT_R11, (long *) &tcp->u_arg[0]) < 0
 			    /* ECX = out1 */
-			    || upeek(pid, PT_R9,  (long *) &tcp->u_arg[1]) < 0
+			    || upeek(tcp, PT_R9,  (long *) &tcp->u_arg[1]) < 0
 			    /* EDX = out2 */
-			    || upeek(pid, PT_R10, (long *) &tcp->u_arg[2]) < 0
+			    || upeek(tcp, PT_R10, (long *) &tcp->u_arg[2]) < 0
 			    /* ESI = out3 */
-			    || upeek(pid, PT_R14, (long *) &tcp->u_arg[3]) < 0
+			    || upeek(tcp, PT_R14, (long *) &tcp->u_arg[3]) < 0
 			    /* EDI = out4 */
-			    || upeek(pid, PT_R15, (long *) &tcp->u_arg[4]) < 0
+			    || upeek(tcp, PT_R15, (long *) &tcp->u_arg[4]) < 0
 			    /* EBP = out5 */
-			    || upeek(pid, PT_R13, (long *) &tcp->u_arg[5]) < 0)
+			    || upeek(tcp, PT_R13, (long *) &tcp->u_arg[5]) < 0)
 				return -1;
 
 			for (i = 0; i < 6; ++i)
@@ -1968,43 +2063,64 @@
 				tcp->u_nargs = 5;
 		}
 	}
-#elif defined (MIPS)
+#elif defined (LINUX_MIPSN32) || defined (LINUX_MIPSN64)
+	/* N32 and N64 both use up to six registers.  */
 	{
-	  	long sp;
-	  	int i, nargs;
+		unsigned long long regs[38];
+		int i, nargs;
 
 		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
 			nargs = tcp->u_nargs = sysent[tcp->scno].nargs;
 		else
-     	        	nargs = tcp->u_nargs = MAX_ARGS;
+			nargs = tcp->u_nargs = MAX_ARGS;
+
+		if (ptrace (PTRACE_GETREGS, tcp->pid, NULL, (long) &regs) < 0)
+			return -1;
+
+		for(i = 0; i < nargs; i++) {
+			tcp->u_arg[i] = regs[REG_A0 + i];
+# if defined (LINUX_MIPSN32)
+			tcp->ext_arg[i] = regs[REG_A0 + i];
+# endif
+		}
+	}
+#elif defined (MIPS)
+	{
+		long sp;
+		int i, nargs;
+
+		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
+			nargs = tcp->u_nargs = sysent[tcp->scno].nargs;
+		else
+			nargs = tcp->u_nargs = MAX_ARGS;
 		if(nargs > 4) {
-		  	if(upeek(pid, REG_SP, &sp) < 0)
-			  	return -1;
+			if(upeek(tcp, REG_SP, &sp) < 0)
+				return -1;
 			for(i = 0; i < 4; i++) {
-			  	if (upeek(pid, REG_A0 + i, &tcp->u_arg[i])<0)
-				  	return -1;
+				if (upeek(tcp, REG_A0 + i, &tcp->u_arg[i])<0)
+					return -1;
 			}
 			umoven(tcp, sp+16, (nargs-4) * sizeof(tcp->u_arg[0]),
 			       (char *)(tcp->u_arg + 4));
 		} else {
-		  	for(i = 0; i < nargs; i++) {
-			  	if (upeek(pid, REG_A0 + i, &tcp->u_arg[i]) < 0)
-				  	return -1;
+			for(i = 0; i < nargs; i++) {
+				if (upeek(tcp, REG_A0 + i, &tcp->u_arg[i]) < 0)
+					return -1;
 			}
 		}
 	}
 #elif defined (POWERPC)
-#ifndef PT_ORIG_R3
-#define PT_ORIG_R3 34
-#endif
+# ifndef PT_ORIG_R3
+#  define PT_ORIG_R3 34
+# endif
 	{
 		int i;
 		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
 			tcp->u_nargs = sysent[tcp->scno].nargs;
 		else
-     	        	tcp->u_nargs = MAX_ARGS;
+			tcp->u_nargs = MAX_ARGS;
 		for (i = 0; i < tcp->u_nargs; i++) {
-			if (upeek(pid, (i==0) ?
+			if (upeek(tcp, (i==0) ?
 				(sizeof(unsigned long)*PT_ORIG_R3) :
 				((i+PT_R3)*sizeof(unsigned long)),
 					&tcp->u_arg[i]) < 0)
@@ -2018,9 +2134,9 @@
 		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
 			tcp->u_nargs = sysent[tcp->scno].nargs;
 		else
-     	        	tcp->u_nargs = MAX_ARGS;
+			tcp->u_nargs = MAX_ARGS;
 		for (i = 0; i < tcp->u_nargs; i++)
-			tcp->u_arg[i] = *((&regs.r_o0) + i);
+			tcp->u_arg[i] = regs.u_regs[U_REG_O0 + i];
 	}
 #elif defined (HPPA)
 	{
@@ -2029,9 +2145,9 @@
 		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
 			tcp->u_nargs = sysent[tcp->scno].nargs;
 		else
-     	        	tcp->u_nargs = MAX_ARGS;
+			tcp->u_nargs = MAX_ARGS;
 		for (i = 0; i < tcp->u_nargs; i++) {
-			if (upeek(pid, PT_GR26-4*i, &tcp->u_arg[i]) < 0)
+			if (upeek(tcp, PT_GR26-4*i, &tcp->u_arg[i]) < 0)
 				return -1;
 		}
 	}
@@ -2045,25 +2161,47 @@
 			tcp->u_nargs = MAX_ARGS;
 		for (i = 0; i < tcp->u_nargs; i++)
 			tcp->u_arg[i] = regs.uregs[i];
- 	}
-#elif defined(SH)
-       {
-               int i;
-               static int syscall_regs[] = {
-                   REG_REG0+4, REG_REG0+5, REG_REG0+6, REG_REG0+7,
-                   REG_REG0, REG_REG0+1, REG_REG0+2
-                   };
+	}
+#elif defined(AVR32)
+	tcp->u_nargs = sysent[tcp->scno].nargs;
+	tcp->u_arg[0] = regs.r12;
+	tcp->u_arg[1] = regs.r11;
+	tcp->u_arg[2] = regs.r10;
+	tcp->u_arg[3] = regs.r9;
+	tcp->u_arg[4] = regs.r5;
+	tcp->u_arg[5] = regs.r3;
+#elif defined(BFIN)
+	{
+		int i;
+		int argreg[] = {PT_R0, PT_R1, PT_R2, PT_R3, PT_R4, PT_R5};
 
-               tcp->u_nargs = sysent[tcp->scno].nargs;
-               for (i = 0; i < tcp->u_nargs; i++) {
-                       if (upeek(pid, 4*syscall_regs[i], &tcp->u_arg[i]) < 0)
-                               return -1;
-               }
-        }
+		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
+			tcp->u_nargs = sysent[tcp->scno].nargs;
+		else
+			tcp->u_nargs = sizeof(argreg) / sizeof(argreg[0]);
+
+		for (i = 0; i < tcp->u_nargs; ++i)
+			if (upeek(tcp, argreg[i], &tcp->u_arg[i]) < 0)
+				return -1;
+	}
+#elif defined(SH)
+	{
+		int i;
+		static int syscall_regs[] = {
+			REG_REG0+4, REG_REG0+5, REG_REG0+6, REG_REG0+7,
+			REG_REG0, REG_REG0+1, REG_REG0+2
+		};
+
+		tcp->u_nargs = sysent[tcp->scno].nargs;
+		for (i = 0; i < tcp->u_nargs; i++) {
+			if (upeek(tcp, 4*syscall_regs[i], &tcp->u_arg[i]) < 0)
+				return -1;
+		}
+	}
 #elif defined(SH64)
 	{
 		int i;
-                /* Registers used by SH5 Linux system calls for parameters */
+		/* Registers used by SH5 Linux system calls for parameters */
 		static int syscall_regs[] = { 2, 3, 4, 5, 6, 7 };
 
 		/*
@@ -2071,13 +2209,13 @@
 		 *       in the trap number matches the number strace expects.
 		 */
 		/*
-		    assert(sysent[tcp->scno].nargs <
-		    	sizeof(syscall_regs)/sizeof(syscall_regs[0]));
+		assert(sysent[tcp->scno].nargs <
+		       sizeof(syscall_regs)/sizeof(syscall_regs[0]));
 		 */
 
 		tcp->u_nargs = sysent[tcp->scno].nargs;
 		for (i = 0; i < tcp->u_nargs; i++) {
-			if (upeek(pid, REG_GENERAL(syscall_regs[i]), &tcp->u_arg[i]) < 0)
+			if (upeek(tcp, REG_GENERAL(syscall_regs[i]), &tcp->u_arg[i]) < 0)
 				return -1;
 		}
 	}
@@ -2093,9 +2231,62 @@
 		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
 			tcp->u_nargs = sysent[tcp->scno].nargs;
 		else
-     	        	tcp->u_nargs = MAX_ARGS;
+			tcp->u_nargs = MAX_ARGS;
 		for (i = 0; i < tcp->u_nargs; i++) {
-			if (upeek(pid, argreg[current_personality][i]*8, &tcp->u_arg[i]) < 0)
+			if (upeek(tcp, argreg[current_personality][i]*8, &tcp->u_arg[i]) < 0)
+				return -1;
+		}
+	}
+#elif defined(MICROBLAZE)
+	{
+		int i;
+		if (tcp->scno >= 0 && tcp->scno < nsyscalls)
+			tcp->u_nargs = sysent[tcp->scno].nargs;
+		else
+			tcp->u_nargs = 0;
+		for (i = 0; i < tcp->u_nargs; i++) {
+			if (upeek(tcp, (5 + i) * 4, &tcp->u_arg[i]) < 0)
+				return -1;
+		}
+	}
+#elif defined(CRISV10) || defined(CRISV32)
+	{
+		int i;
+		static const int crisregs[] = {
+			4*PT_ORIG_R10, 4*PT_R11, 4*PT_R12,
+			4*PT_R13, 4*PT_MOF, 4*PT_SRP
+		};
+
+		if (tcp->scno >= 0 && tcp->scno < nsyscalls)
+			tcp->u_nargs = sysent[tcp->scno].nargs;
+		else
+			tcp->u_nargs = 0;
+		for (i = 0; i < tcp->u_nargs; i++) {
+			if (upeek(tcp, crisregs[i], &tcp->u_arg[i]) < 0)
+				return -1;
+		}
+	}
+#elif defined(TILE)
+	{
+		int i;
+		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
+			tcp->u_nargs = sysent[tcp->scno].nargs;
+		else
+			tcp->u_nargs = MAX_ARGS;
+		for (i = 0; i < tcp->u_nargs; ++i) {
+			if (upeek(tcp, PTREGS_OFFSET_REG(i), &tcp->u_arg[i]) < 0)
+				return -1;
+		}
+	}
+#elif defined (M68K)
+	{
+		int i;
+		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
+			tcp->u_nargs = sysent[tcp->scno].nargs;
+		else
+			tcp->u_nargs = MAX_ARGS;
+		for (i = 0; i < tcp->u_nargs; i++) {
+			if (upeek(tcp, (i < 5 ? i : i + 2)*4, &tcp->u_arg[i]) < 0)
 				return -1;
 		}
 	}
@@ -2105,9 +2296,9 @@
 		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
 			tcp->u_nargs = sysent[tcp->scno].nargs;
 		else
-     	        	tcp->u_nargs = MAX_ARGS;
+			tcp->u_nargs = MAX_ARGS;
 		for (i = 0; i < tcp->u_nargs; i++) {
-			if (upeek(pid, i*4, &tcp->u_arg[i]) < 0)
+			if (upeek(tcp, i*4, &tcp->u_arg[i]) < 0)
 				return -1;
 		}
 	}
@@ -2119,11 +2310,11 @@
 		if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
 			tcp->u_nargs = sysent[tcp->scno].nargs;
 		else
-     	        	tcp->u_nargs = MAX_ARGS;
+			tcp->u_nargs = MAX_ARGS;
 		for (i = 0; i < tcp->u_nargs; i++) {
 			struct user *u;
 
-			if (upeek(pid, uoff(u_arg[0]) +
+			if (upeek(tcp, uoff(u_arg[0]) +
 			    (i*sizeof(u->u_arg[0])), &tcp->u_arg[i]) < 0)
 				return -1;
 		}
@@ -2185,7 +2376,7 @@
 	    sysent[tcp->scno].nargs > tcp->status.val)
 		tcp->u_nargs = sysent[tcp->scno].nargs;
 	else
-	  	tcp->u_nargs = tcp->status.val;
+		tcp->u_nargs = tcp->status.val;
 	if (tcp->u_nargs < 0)
 		tcp->u_nargs = 0;
 	if (tcp->u_nargs > MAX_ARGS)
@@ -2194,234 +2385,241 @@
 	case SYS___syscall:
 		pread(tcp->pfd, &tcp->u_arg, tcp->u_nargs * sizeof(unsigned long),
 		      regs.r_esp + sizeof(int) + sizeof(quad_t));
-	  break;
-        case SYS_syscall:
+		break;
+	case SYS_syscall:
 		pread(tcp->pfd, &tcp->u_arg, tcp->u_nargs * sizeof(unsigned long),
 		      regs.r_esp + 2 * sizeof(int));
-	  break;
-        default:
+		break;
+	default:
 		pread(tcp->pfd, &tcp->u_arg, tcp->u_nargs * sizeof(unsigned long),
 		      regs.r_esp + sizeof(int));
-	  break;
+		break;
 	}
 #endif /* FREEBSD */
 	return 1;
 }
 
-int
-trace_syscall(tcp)
-struct tcb *tcp;
+static int
+trace_syscall_exiting(struct tcb *tcp)
 {
 	int sys_res;
 	struct timeval tv;
-	int res;
+	int res, scno_good;
+	long u_error;
 
 	/* Measure the exit time as early as possible to avoid errors. */
-	if (dtime && (tcp->flags & TCB_INSYSCALL))
+	if (dtime || cflag)
 		gettimeofday(&tv, NULL);
 
-	res = get_scno(tcp);
-	if (res != 1)
+	/* BTW, why we don't just memorize syscall no. on entry
+	 * in tcp->something?
+	 */
+	scno_good = res = get_scno(tcp);
+	if (res == 0)
 		return res;
-
-	res = syscall_fixup(tcp);
-	if (res != 1)
+	if (res == 1)
+		res = syscall_fixup(tcp);
+	if (res == 0)
 		return res;
-
-	if (tcp->flags & TCB_INSYSCALL) {
-		long u_error;
+	if (res == 1)
 		res = get_error(tcp);
-		if (res != 1)
-			return res;
-
+	if (res == 0)
+		return res;
+	if (res == 1)
 		internal_syscall(tcp);
-		if (tcp->scno >= 0 && tcp->scno < nsyscalls &&
-		    !(qual_flags[tcp->scno] & QUAL_TRACE)) {
-			tcp->flags &= ~TCB_INSYSCALL;
-			return 0;
-		}
 
-		if (tcp->flags & TCB_REPRINT) {
-			printleader(tcp);
-			tprintf("<... ");
-			if (tcp->scno >= nsyscalls || tcp->scno < 0)
-				tprintf("syscall_%lu", tcp->scno);
-			else
-				tprintf("%s", sysent[tcp->scno].sys_name);
-			tprintf(" resumed> ");
-		}
-
-		if (cflag && tcp->scno < nsyscalls && tcp->scno >= 0) {
-			if (counts == NULL) {
-				counts = calloc(sizeof *counts, nsyscalls);
-				if (counts == NULL) {
-					fprintf(stderr, "\
-strace: out of memory for call counts\n");
-					exit(1);
-				}
-			}
-
-			counts[tcp->scno].calls++;
-			if (tcp->u_error)
-				counts[tcp->scno].errors++;
-			tv_sub(&tv, &tv, &tcp->etime);
-#ifndef HAVE_ANDROID_OS
-#ifdef LINUX
-			if (tv_cmp(&tv, &tcp->dtime) > 0) {
-				static struct timeval one_tick;
-				if (one_tick.tv_usec == 0) {
-					/* Initialize it.  */
-					struct itimerval it;
-					memset(&it, 0, sizeof it);
-					it.it_interval.tv_usec = 1;
-					setitimer(ITIMER_REAL, &it, NULL);
-					getitimer(ITIMER_REAL, &it);
-					one_tick = it.it_interval;
-				}
-
-				if (tv_nz(&tcp->dtime))
-					tv = tcp->dtime;
-				else if (tv_cmp(&tv, &one_tick) > 0) {
-					if (tv_cmp(&shortest, &one_tick) < 0)
-						tv = shortest;
-					else
-						tv = one_tick;
-				}
-			}
-#endif /* LINUX */
-#endif
-			if (tv_cmp(&tv, &shortest) < 0)
-				shortest = tv;
-			tv_add(&counts[tcp->scno].time,
-				&counts[tcp->scno].time, &tv);
-			tcp->flags &= ~TCB_INSYSCALL;
-			return 0;
-		}
-
-		if (tcp->scno >= nsyscalls || tcp->scno < 0
-		    || (qual_flags[tcp->scno] & QUAL_RAW))
-			sys_res = printargs(tcp);
-		else {
-			if (not_failing_only && tcp->u_error)
-				return 0;	/* ignore failed syscalls */
-			sys_res = (*sysent[tcp->scno].sys_func)(tcp);
-		}
-		u_error = tcp->u_error;
-		tprintf(") ");
-		tabto(acolumn);
-		if (tcp->scno >= nsyscalls || tcp->scno < 0 ||
-		    qual_flags[tcp->scno] & QUAL_RAW) {
-			if (u_error)
-				tprintf("= -1 (errno %ld)", u_error);
-			else
-				tprintf("= %#lx", tcp->u_rval);
-		}
-		else if (!(sys_res & RVAL_NONE) && u_error) {
-			switch (u_error) {
-#ifdef LINUX
-			case ERESTARTSYS:
-				tprintf("= ? ERESTARTSYS (To be restarted)");
-				break;
-			case ERESTARTNOINTR:
-				tprintf("= ? ERESTARTNOINTR (To be restarted)");
-				break;
-			case ERESTARTNOHAND:
-				tprintf("= ? ERESTARTNOHAND (To be restarted)");
-				break;
-			case ERESTART_RESTARTBLOCK:
-				tprintf("= ? ERESTART_RESTARTBLOCK (To be restarted)");
-				break;
-#endif /* LINUX */
-			default:
-				tprintf("= -1 ");
-				if (u_error < 0)
-					tprintf("E??? (errno %ld)", u_error);
-				else if (u_error < nerrnos)
-					tprintf("%s (%s)", errnoent[u_error],
-						strerror(u_error));
-				else
-					tprintf("ERRNO_%ld (%s)", u_error,
-						strerror(u_error));
-				break;
-			}
-		}
-		else {
-			if (sys_res & RVAL_NONE)
-				tprintf("= ?");
-			else {
-				switch (sys_res & RVAL_MASK) {
-				case RVAL_HEX:
-					tprintf("= %#lx", tcp->u_rval);
-					break;
-				case RVAL_OCTAL:
-					tprintf("= %#lo", tcp->u_rval);
-					break;
-				case RVAL_UDECIMAL:
-					tprintf("= %lu", tcp->u_rval);
-					break;
-				case RVAL_DECIMAL:
-					tprintf("= %ld", tcp->u_rval);
-					break;
-#ifdef HAVE_LONG_LONG
-				case RVAL_LHEX:
-					tprintf("= %#llx", tcp->u_lrval);
-					break;
-				case RVAL_LOCTAL:
-					tprintf("= %#llo", tcp->u_lrval);
-					break;
-				case RVAL_LUDECIMAL:
-					tprintf("= %llu", tcp->u_lrval);
-					break;
-				case RVAL_LDECIMAL:
-					tprintf("= %lld", tcp->u_lrval);
-					break;
-#endif
-				default:
-					fprintf(stderr,
-						"invalid rval format\n");
-					break;
-				}
-			}
-			if ((sys_res & RVAL_STR) && tcp->auxstr)
-				tprintf(" (%s)", tcp->auxstr);
-		}
-		if (dtime) {
-			tv_sub(&tv, &tv, &tcp->etime);
-			tprintf(" <%ld.%06ld>",
-				(long) tv.tv_sec, (long) tv.tv_usec);
-		}
-		printtrailer(tcp);
-
-		dumpio(tcp);
-		if (fflush(tcp->outf) == EOF)
-			return -1;
+	if (res == 1 && tcp->scno >= 0 && tcp->scno < nsyscalls &&
+	    !(qual_flags[tcp->scno] & QUAL_TRACE)) {
 		tcp->flags &= ~TCB_INSYSCALL;
 		return 0;
 	}
 
-	/* Entering system call */
-	res = syscall_enter(tcp);
-	if (res != 1)
+	if (tcp->flags & TCB_REPRINT) {
+		printleader(tcp);
+		tprintf("<... ");
+		if (scno_good != 1)
+			tprintf("????");
+		else if (tcp->scno >= nsyscalls || tcp->scno < 0)
+			tprintf("syscall_%lu", tcp->scno);
+		else
+			tprintf("%s", sysent[tcp->scno].sys_name);
+		tprintf(" resumed> ");
+	}
+
+	if (cflag) {
+		struct timeval t = tv;
+		int rc = count_syscall(tcp, &t);
+		if (cflag == CFLAG_ONLY_STATS)
+		{
+			tcp->flags &= ~TCB_INSYSCALL;
+			return rc;
+		}
+	}
+
+	if (res != 1) {
+		tprintf(") ");
+		tabto(acolumn);
+		tprintf("= ? <unavailable>");
+		printtrailer();
+		tcp->flags &= ~TCB_INSYSCALL;
+		return res;
+	}
+
+	if (tcp->scno >= nsyscalls || tcp->scno < 0
+	    || (qual_flags[tcp->scno] & QUAL_RAW))
+		sys_res = printargs(tcp);
+	else {
+		if (not_failing_only && tcp->u_error)
+			return 0;	/* ignore failed syscalls */
+		sys_res = (*sysent[tcp->scno].sys_func)(tcp);
+	}
+
+	u_error = tcp->u_error;
+	tprintf(") ");
+	tabto(acolumn);
+	if (tcp->scno >= nsyscalls || tcp->scno < 0 ||
+	    qual_flags[tcp->scno] & QUAL_RAW) {
+		if (u_error)
+			tprintf("= -1 (errno %ld)", u_error);
+		else
+			tprintf("= %#lx", tcp->u_rval);
+	}
+	else if (!(sys_res & RVAL_NONE) && u_error) {
+		switch (u_error) {
+#ifdef LINUX
+		case ERESTARTSYS:
+			tprintf("= ? ERESTARTSYS (To be restarted)");
+			break;
+		case ERESTARTNOINTR:
+			tprintf("= ? ERESTARTNOINTR (To be restarted)");
+			break;
+		case ERESTARTNOHAND:
+			tprintf("= ? ERESTARTNOHAND (To be restarted)");
+			break;
+		case ERESTART_RESTARTBLOCK:
+			tprintf("= ? ERESTART_RESTARTBLOCK (To be restarted)");
+			break;
+#endif /* LINUX */
+		default:
+			tprintf("= -1 ");
+			if (u_error < 0)
+				tprintf("E??? (errno %ld)", u_error);
+			else if (u_error < nerrnos)
+				tprintf("%s (%s)", errnoent[u_error],
+					strerror(u_error));
+			else
+				tprintf("ERRNO_%ld (%s)", u_error,
+					strerror(u_error));
+			break;
+		}
+		if ((sys_res & RVAL_STR) && tcp->auxstr)
+			tprintf(" (%s)", tcp->auxstr);
+	}
+	else {
+		if (sys_res & RVAL_NONE)
+			tprintf("= ?");
+		else {
+			switch (sys_res & RVAL_MASK) {
+			case RVAL_HEX:
+				tprintf("= %#lx", tcp->u_rval);
+				break;
+			case RVAL_OCTAL:
+				tprintf("= %#lo", tcp->u_rval);
+				break;
+			case RVAL_UDECIMAL:
+				tprintf("= %lu", tcp->u_rval);
+				break;
+			case RVAL_DECIMAL:
+				tprintf("= %ld", tcp->u_rval);
+				break;
+#ifdef HAVE_LONG_LONG
+			case RVAL_LHEX:
+				tprintf("= %#llx", tcp->u_lrval);
+				break;
+			case RVAL_LOCTAL:
+				tprintf("= %#llo", tcp->u_lrval);
+				break;
+			case RVAL_LUDECIMAL:
+				tprintf("= %llu", tcp->u_lrval);
+				break;
+			case RVAL_LDECIMAL:
+				tprintf("= %lld", tcp->u_lrval);
+				break;
+#endif
+			default:
+				fprintf(stderr,
+					"invalid rval format\n");
+				break;
+			}
+		}
+		if ((sys_res & RVAL_STR) && tcp->auxstr)
+			tprintf(" (%s)", tcp->auxstr);
+	}
+	if (dtime) {
+		tv_sub(&tv, &tv, &tcp->etime);
+		tprintf(" <%ld.%06ld>",
+			(long) tv.tv_sec, (long) tv.tv_usec);
+	}
+	printtrailer();
+
+	dumpio(tcp);
+	if (fflush(tcp->outf) == EOF)
+		return -1;
+	tcp->flags &= ~TCB_INSYSCALL;
+	return 0;
+}
+
+static int
+trace_syscall_entering(struct tcb *tcp)
+{
+	int sys_res;
+	int res, scno_good;
+
+	scno_good = res = get_scno(tcp);
+	if (res == 0)
+		return res;
+	if (res == 1)
+		res = syscall_fixup(tcp);
+	if (res == 0)
+		return res;
+	if (res == 1)
+		res = syscall_enter(tcp);
+	if (res == 0)
 		return res;
 
+	if (res != 1) {
+		printleader(tcp);
+		tcp->flags &= ~TCB_REPRINT;
+		tcp_last = tcp;
+		if (scno_good != 1)
+			tprintf("????" /* anti-trigraph gap */ "(");
+		else if (tcp->scno >= nsyscalls || tcp->scno < 0)
+			tprintf("syscall_%lu(", tcp->scno);
+		else
+			tprintf("%s(", sysent[tcp->scno].sys_name);
+		/*
+		 * " <unavailable>" will be added later by the code which
+		 * detects ptrace errors.
+		 */
+		tcp->flags |= TCB_INSYSCALL;
+		return res;
+	}
+
 	switch (known_scno(tcp)) {
-#ifdef LINUX
-#if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA) && !defined(__ARM_EABI__) //ANDROID
+#ifndef __ARM_EABI__
+#ifdef SYS_socket_subcall
 	case SYS_socketcall:
 		decode_subcall(tcp, SYS_socket_subcall,
 			SYS_socket_nsubcalls, deref_style);
 		break;
+#endif
+#ifdef SYS_ipc_subcall
 	case SYS_ipc:
 		decode_subcall(tcp, SYS_ipc_subcall,
 			SYS_ipc_nsubcalls, shift_style);
 		break;
-#endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */
-#if defined (SPARC) || defined (SPARC64)
-	case SYS_socketcall:
-		sparc_socket_decode (tcp);
-		break;
 #endif
-#endif /* LINUX */
+#endif
 #ifdef SVR4
 #ifdef SYS_pgrpsys_subcall
 	case SYS_pgrpsys:
@@ -2447,12 +2645,6 @@
 		decode_subcall(tcp, SYS_semsys_subcall,
 			SYS_semsys_nsubcalls, shift_style);
 		break;
-#if 0 /* broken */
-	case SYS_utssys:
-		decode_subcall(tcp, SYS_utssys_subcall,
-			SYS_utssys_nsubcalls, shift_style);
-		break;
-#endif
 	case SYS_sysfs:
 		decode_subcall(tcp, SYS_sysfs_subcall,
 			SYS_sysfs_nsubcalls, shift_style);
@@ -2509,9 +2701,9 @@
 		return 0;
 	}
 
-	if (cflag) {
-		gettimeofday(&tcp->etime, NULL);
+	if (cflag == CFLAG_ONLY_STATS) {
 		tcp->flags |= TCB_INSYSCALL;
+		gettimeofday(&tcp->etime, NULL);
 		return 0;
 	}
 
@@ -2523,7 +2715,8 @@
 	else
 		tprintf("%s(", sysent[tcp->scno].sys_name);
 	if (tcp->scno >= nsyscalls || tcp->scno < 0 ||
-	    ((qual_flags[tcp->scno] & QUAL_RAW) && tcp->scno != SYS_exit))
+	    ((qual_flags[tcp->scno] & QUAL_RAW) &&
+	     sysent[tcp->scno].sys_func != sys_exit))
 		sys_res = printargs(tcp);
 	else
 		sys_res = (*sysent[tcp->scno].sys_func)(tcp);
@@ -2531,12 +2724,19 @@
 		return -1;
 	tcp->flags |= TCB_INSYSCALL;
 	/* Measure the entrance time as late as possible to avoid errors. */
-	if (dtime)
+	if (dtime || cflag)
 		gettimeofday(&tcp->etime, NULL);
 	return sys_res;
 }
 
 int
+trace_syscall(struct tcb *tcp)
+{
+	return exiting(tcp) ?
+		trace_syscall_exiting(tcp) : trace_syscall_entering(tcp);
+}
+
+int
 printargs(tcp)
 struct tcb *tcp;
 {
@@ -2557,21 +2757,21 @@
 
 #ifdef LINUX
 #if defined (SPARC) || defined (SPARC64)
-	struct regs regs;
+	struct pt_regs regs;
 	if (ptrace(PTRACE_GETREGS,tcp->pid,(char *)&regs,0) < 0)
 		return -1;
-	val = regs.r_o1;
+	val = regs.u_regs[U_REG_O1];
 #elif defined(SH)
-	if (upeek(tcp->pid, 4*(REG_REG0+1), &val) < 0)
+	if (upeek(tcp, 4*(REG_REG0+1), &val) < 0)
 		return -1;
 #elif defined(IA64)
-	if (upeek(tcp->pid, PT_R9, &val) < 0)
+	if (upeek(tcp, PT_R9, &val) < 0)
 		return -1;
-#endif /* SPARC || SPARC64 */
+#endif
 #endif /* LINUX */
 
 #ifdef SUNOS4
-	if (upeek(tcp->pid, uoff(u_rval2), &val) < 0)
+	if (upeek(tcp, uoff(u_rval2), &val) < 0)
 		return -1;
 #endif /* SUNOS4 */
 
@@ -2589,6 +2789,7 @@
 	val = tcp->status.PR_REG[CTX_V1];
 #endif /* MIPS */
 #endif /* SVR4 */
+
 #ifdef FREEBSD
 	struct reg regs;
 	pread(tcp->pfd_reg, &regs, sizeof(regs), 0);
@@ -2597,6 +2798,7 @@
 	return val;
 }
 
+#ifdef SUNOS4
 /*
  * Apparently, indirect system calls have already be converted by ptrace(2),
  * so if you see "indir" this program has gone astray.
@@ -2619,127 +2821,23 @@
 	}
 	return 0;
 }
+#endif /* SUNOS4 */
 
-static int
-time_cmp(a, b)
-void *a;
-void *b;
+int
+is_restart_error(struct tcb *tcp)
 {
-	return -tv_cmp(&counts[*((int *) a)].time, &counts[*((int *) b)].time);
-}
-
-static int
-syscall_cmp(a, b)
-void *a;
-void *b;
-{
-	return strcmp(sysent[*((int *) a)].sys_name,
-		sysent[*((int *) b)].sys_name);
-}
-
-static int
-count_cmp(a, b)
-void *a;
-void *b;
-{
-	int m = counts[*((int *) a)].calls, n = counts[*((int *) b)].calls;
-
-	return (m < n) ? 1 : (m > n) ? -1 : 0;
-}
-
-static int (*sortfun)();
-static struct timeval overhead = { -1, -1 };
-
-void
-set_sortby(sortby)
-char *sortby;
-{
-	if (strcmp(sortby, "time") == 0)
-		sortfun = time_cmp;
-	else if (strcmp(sortby, "calls") == 0)
-		sortfun = count_cmp;
-	else if (strcmp(sortby, "name") == 0)
-		sortfun = syscall_cmp;
-	else if (strcmp(sortby, "nothing") == 0)
-		sortfun = NULL;
-	else {
-		fprintf(stderr, "invalid sortby: `%s'\n", sortby);
-		exit(1);
+#ifdef LINUX
+	if (!syserror(tcp))
+		return 0;
+	switch (tcp->u_error) {
+		case ERESTARTSYS:
+		case ERESTARTNOINTR:
+		case ERESTARTNOHAND:
+		case ERESTART_RESTARTBLOCK:
+			return 1;
+		default:
+			break;
 	}
-}
-
-void set_overhead(n)
-int n;
-{
-	overhead.tv_sec = n / 1000000;
-	overhead.tv_usec = n % 1000000;
-}
-
-void
-call_summary(outf)
-FILE *outf;
-{
-	int i, j;
-	int call_cum, error_cum;
-	struct timeval tv_cum, dtv;
-	double percent;
-	char *dashes = "-------------------------";
-	char error_str[16];
-
-	int *sorted_count = malloc(nsyscalls * sizeof(int));
-
-	call_cum = error_cum = tv_cum.tv_sec = tv_cum.tv_usec = 0;
-	if (overhead.tv_sec == -1) {
-		tv_mul(&overhead, &shortest, 8);
-		tv_div(&overhead, &overhead, 10);
-	}
-	for (i = 0; i < nsyscalls; i++) {
-		sorted_count[i] = i;
-		if (counts == NULL || counts[i].calls == 0)
-			continue;
-		tv_mul(&dtv, &overhead, counts[i].calls);
-		tv_sub(&counts[i].time, &counts[i].time, &dtv);
-		call_cum += counts[i].calls;
-		error_cum += counts[i].errors;
-		tv_add(&tv_cum, &tv_cum, &counts[i].time);
-	}
-	if (counts && sortfun)
-		qsort((void *) sorted_count, nsyscalls, sizeof(int), sortfun);
-	fprintf(outf, "%6.6s %11.11s %11.11s %9.9s %9.9s %s\n",
-		"% time", "seconds", "usecs/call",
-		"calls", "errors", "syscall");
-	fprintf(outf, "%6.6s %11.11s %11.11s %9.9s %9.9s %-16.16s\n",
-		dashes, dashes, dashes, dashes, dashes, dashes);
-	if (counts) {
-		for (i = 0; i < nsyscalls; i++) {
-			j = sorted_count[i];
-			if (counts[j].calls == 0)
-				continue;
-			tv_div(&dtv, &counts[j].time, counts[j].calls);
-			if (counts[j].errors)
-				sprintf(error_str, "%d", counts[j].errors);
-			else
-				error_str[0] = '\0';
-			percent = (100.0 * tv_float(&counts[j].time)
-				   / tv_float(&tv_cum));
-			fprintf(outf, "%6.2f %4ld.%06ld %11ld %9d %9.9s %s\n",
-				percent, (long) counts[j].time.tv_sec,
-				(long) counts[j].time.tv_usec,
-				(long) 1000000 * dtv.tv_sec + dtv.tv_usec,
-				counts[j].calls,
-				error_str, sysent[j].sys_name);
-		}
-	}
-	free(sorted_count);
-
-	fprintf(outf, "%6.6s %11.11s %11.11s %9.9s %9.9s %-16.16s\n",
-		dashes, dashes, dashes, dashes, dashes, dashes);
-	if (error_cum)
-		sprintf(error_str, "%d", error_cum);
-	else
-		error_str[0] = '\0';
-	fprintf(outf, "%6.6s %4ld.%06ld %11.11s %9d %9.9s %s\n",
-		"100.00", (long) tv_cum.tv_sec, (long) tv_cum.tv_usec, "",
-		call_cum, error_str, "total");
-
+#endif /* LINUX */
+	return 0;
 }
diff --git a/syscallent.sh b/syscallent.sh
deleted file mode 100644
index 2f08701..0000000
--- a/syscallent.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-# Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#	$Id: syscallent.sh,v 1.3 2003/03/31 01:03:34 roland Exp $
-
-cat ${1+"$@"} |
-	sed -n 's/^#[ 	]*define[ 	][ 	]*SYS_\([^ 	]*\)[ 	]*[^0-9]*\([0-9]*\).*$/\1 \2/p
-s/^#[ 	]*define[ 	][ 	]*__NR_\([^ 	]*\)[ 	]*[^0-9]*\([0-9]*\).*$/\1 \2/p
-s/^#[ ]*define[ ][ ]*__NR_\([^ ]*\)[ ]*[^0-9()]*(__NR_Linux + \([0-9]*\))$/\1 \2/p' |
-	sort +1n | uniq |
-	awk '
-	BEGIN {
-		tabs = "\t\t\t\t\t\t\t\t"
-		call = -1;
-	}
-	{
-		while (++call < $2) {
-			f = "printargs"
-			n = "SYS_" call
-			s = "\t{ -1,\t0,\t"
-			s = s f ","
-			s = s substr(tabs, 1, 24/8 - int((length(f) + 1)/8))
-			s = s "\"" n "\""
-			s = s substr(tabs, 1, 16/8 - int((length(n) + 2)/8))
-			s = s "}, /* " call " */"
-			print s
-		}
-		f = "sys_" $1
-		n = $1
-		s = "\t{ -1,\t0,\t"
-		s = s f ","
-		s = s substr(tabs, 1, 24/8 - int((length(f) + 1)/8))
-		s = s "\"" n "\""
-		s = s substr(tabs, 1, 16/8 - int((length(n) + 2)/8))
-		s = s "}, /* " call " */"
-		print s
-	}
-	END {
-		limit = call + 100
-		while (++call < limit) {
-			f = "printargs"
-			n = "SYS_" call
-			s = "\t{ -1,\t0,\t"
-			s = s f ","
-			s = s substr(tabs, 1, 24/8 - int((length(f) + 1)/8))
-			s = s "\"" n "\""
-			s = s substr(tabs, 1, 16/8 - int((length(n) + 2)/8))
-			s = s "}, /* " call " */"
-			print s
-		}
-	}
-	'
diff --git a/system.c b/system.c
index e8eb5be..01bd995 100644
--- a/system.c
+++ b/system.c
@@ -27,20 +27,17 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: system.c,v 1.37 2005/06/01 19:22:06 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
 
-#ifdef LINUX
-
 #ifdef HAVE_ANDROID_OS
 #undef __unused
-#include <linux/sysctl.h>
-#include <sys/mount.h>
-#define CTL_PROC 4
+#include <linux/socket.h>
+#endif
 
-#else
+#ifdef LINUX
 #define _LINUX_SOCKET_H
 #define _LINUX_FS_H
 
@@ -57,11 +54,21 @@
 #define MS_BIND		4096
 #define MS_MOVE		8192
 #define MS_REC		16384
-#define MS_VERBOSE	32768
+#define MS_SILENT	32768
 #define MS_POSIXACL	(1<<16)	/* VFS does not apply the umask */
+#define MS_UNBINDABLE	(1<<17)	/* change to unbindable */
+#define MS_PRIVATE	(1<<18)	/* change to private */
+#define MS_SLAVE	(1<<19)	/* change to slave */
+#define MS_SHARED	(1<<20)	/* change to shared */
+#define MS_RELATIME	(1<<21)
+#define MS_KERNMOUNT	(1<<22)
+#define MS_I_VERSION	(1<<23)
+#define MS_STRICTATIME	(1<<24)
+#define MS_BORN		(1<<29)
 #define MS_ACTIVE	(1<<30)
 #define MS_NOUSER	(1<<31)
-#endif /* HAVE_ANDROID_OS */
+#define MS_MGC_VAL	0xc0ed0000	/* Magic flag number */
+#define MS_MGC_MSK	0xffff0000	/* Magic flag mask */
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -69,11 +76,11 @@
 
 #include <sys/syscall.h>
 
-#ifdef SYS_capget
+#ifdef HAVE_LINUX_CAPABILITY_H
 #include <linux/capability.h>
 #endif
 
-#ifdef SYS_cacheflush
+#ifdef HAVE_ASM_CACHECTL_H
 #include <asm/cachectl.h>
 #endif
 
@@ -81,63 +88,99 @@
 #include <linux/utsname.h>
 #endif
 
-#ifdef MIPS
+#ifdef HAVE_ASM_SYSMIPS_H
 #include <asm/sysmips.h>
 #endif
 
 #include <linux/sysctl.h>
 
 static const struct xlat mount_flags[] = {
+	{ MS_MGC_VAL,	"MS_MGC_VAL"	},
 	{ MS_RDONLY,	"MS_RDONLY"	},
 	{ MS_NOSUID,	"MS_NOSUID"	},
 	{ MS_NODEV,	"MS_NODEV"	},
 	{ MS_NOEXEC,	"MS_NOEXEC"	},
 	{ MS_SYNCHRONOUS,"MS_SYNCHRONOUS"},
 	{ MS_REMOUNT,	"MS_REMOUNT"	},
+	{ MS_RELATIME,	"MS_RELATIME"	},
+	{ MS_KERNMOUNT,	"MS_KERNMOUNT"	},
+	{ MS_I_VERSION,	"MS_I_VERSION"	},
+	{ MS_STRICTATIME,"MS_STRICTATIME"},
+	{ MS_BORN,	"MS_BORN"	},
 	{ MS_MANDLOCK,	"MS_MANDLOCK"	},
 	{ MS_NOATIME,	"MS_NOATIME"	},
 	{ MS_NODIRATIME,"MS_NODIRATIME"	},
 	{ MS_BIND,	"MS_BIND"	},
 	{ MS_MOVE,	"MS_MOVE"	},
 	{ MS_REC,	"MS_REC"	},
-	{ MS_VERBOSE,	"MS_VERBOSE"	},
+	{ MS_SILENT,	"MS_SILENT"	},
 	{ MS_POSIXACL,	"MS_POSIXACL"	},
+	{ MS_UNBINDABLE,"MS_UNBINDABLE"	},
+	{ MS_PRIVATE,	"MS_PRIVATE"	},
+	{ MS_SLAVE,	"MS_SLAVE"	},
+	{ MS_SHARED,	"MS_SHARED"	},
 	{ MS_ACTIVE,	"MS_ACTIVE"	},
 	{ MS_NOUSER,	"MS_NOUSER"	},
 	{ 0,		NULL		},
 };
 
 int
-sys_mount(tcp)
-struct tcb *tcp;
+sys_mount(struct tcb *tcp)
 {
 	if (entering(tcp)) {
+		int ignore_type = 0, ignore_data = 0;
+		unsigned long flags = tcp->u_arg[3];
+
+		/* Discard magic */
+		if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
+			flags &= ~MS_MGC_MSK;
+
+		if (flags & MS_REMOUNT)
+			ignore_type = 1;
+		else if (flags & (MS_BIND | MS_MOVE))
+			ignore_type = ignore_data = 1;
+
 		printpath(tcp, tcp->u_arg[0]);
 		tprintf(", ");
+
 		printpath(tcp, tcp->u_arg[1]);
 		tprintf(", ");
-		if ((tcp->u_arg[3] & (MS_BIND|MS_MOVE|MS_REMOUNT)) == 0)
-			printpath(tcp, tcp->u_arg[2]);
-		else
+
+		if (ignore_type && tcp->u_arg[2])
 			tprintf("%#lx", tcp->u_arg[2]);
+		else
+			printstr(tcp, tcp->u_arg[2], -1);
 		tprintf(", ");
+
 		printflags(mount_flags, tcp->u_arg[3], "MS_???");
-		tprintf(", %#lx", tcp->u_arg[4]);
+		tprintf(", ");
+
+		if (ignore_data && tcp->u_arg[4])
+			tprintf("%#lx", tcp->u_arg[4]);
+		else
+			printstr(tcp, tcp->u_arg[4], -1);
 	}
 	return 0;
 }
 
+#define MNT_FORCE	0x00000001	/* Attempt to forcibily umount */
+#define MNT_DETACH	0x00000002	/* Just detach from the tree */
+#define MNT_EXPIRE	0x00000004	/* Mark for expiry */
+
+static const struct xlat umount_flags[] = {
+	{ MNT_FORCE,	"MNT_FORCE"	},
+	{ MNT_DETACH,	"MNT_DETACH"	},
+	{ MNT_EXPIRE,	"MNT_EXPIRE"	},
+	{ 0,		NULL		},
+};
+
 int
-sys_umount2(tcp)
-struct tcb *tcp;
+sys_umount2(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printstr(tcp, tcp->u_arg[0], -1);
 		tprintf(", ");
-		if (tcp->u_arg[1] & 1)
-			tprintf("MNT_FORCE");
-		else
-			tprintf("0");
+		printflags(umount_flags, tcp->u_arg[1], "MNT_???");
 	}
 	return 0;
 }
@@ -265,6 +308,88 @@
 }
 #endif /* M68K */
 
+#ifdef BFIN
+
+#include <bfin_sram.h>
+
+static const struct xlat sram_alloc_flags[] = {
+	{ L1_INST_SRAM,		"L1_INST_SRAM" },
+	{ L1_DATA_A_SRAM,	"L1_DATA_A_SRAM" },
+	{ L1_DATA_B_SRAM,	"L1_DATA_B_SRAM" },
+	{ L1_DATA_SRAM,		"L1_DATA_SRAM" },
+	{ L2_SRAM,		"L2_SRAM" },
+	{ 0,			NULL },
+};
+
+int
+sys_sram_alloc(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		/* size */
+		tprintf("%lu, ", tcp->u_arg[0]);
+		/* flags */
+		printxval(sram_alloc_flags, tcp->u_arg[1], "???_SRAM");
+	}
+	return 1;
+}
+
+#include <asm/cachectl.h>
+
+static const struct xlat cacheflush_flags[] = {
+	{ ICACHE,	"ICACHE" },
+	{ DCACHE,	"DCACHE" },
+	{ BCACHE,	"BCACHE" },
+	{ 0,		NULL },
+};
+
+int
+sys_cacheflush(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		/* start addr */
+		tprintf("%#lx, ", tcp->u_arg[0]);
+		/* length */
+		tprintf("%ld, ", tcp->u_arg[1]);
+		/* flags */
+		printxval(cacheflush_flags, tcp->u_arg[1], "?CACHE");
+	}
+	return 0;
+}
+
+#endif
+
+#ifdef SH
+static const struct xlat cacheflush_flags[] = {
+#ifdef CACHEFLUSH_D_INVAL
+	{ CACHEFLUSH_D_INVAL,	"CACHEFLUSH_D_INVAL" },
+#endif
+#ifdef CACHEFLUSH_D_WB
+	{ CACHEFLUSH_D_WB,	"CACHEFLUSH_D_WB" },
+#endif
+#ifdef CACHEFLUSH_D_PURGE
+	{ CACHEFLUSH_D_PURGE,	"CACHEFLUSH_D_PURGE" },
+#endif
+#ifdef CACHEFLUSH_I
+	{ CACHEFLUSH_I,		"CACHEFLUSH_I" },
+#endif
+	{ 0,			NULL },
+};
+
+int
+sys_cacheflush(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		/* addr */
+		tprintf("%#lx, ", tcp->u_arg[0]);
+		/* len */
+		tprintf("%lu, ", tcp->u_arg[1]);
+		/* flags */
+		printflags(cacheflush_flags, tcp->u_arg[2], "CACHEFLUSH_???");
+	}
+	return 0;
+}
+#endif /* SH */
+
 #endif /* LINUX */
 
 #ifdef SUNOS4
@@ -1452,6 +1577,21 @@
 	{ 1<<CAP_SYS_RESOURCE,	"CAP_SYS_RESOURCE"},
 	{ 1<<CAP_SYS_TIME,	"CAP_SYS_TIME"	},
 	{ 1<<CAP_SYS_TTY_CONFIG,"CAP_SYS_TTY_CONFIG"},
+#ifdef CAP_MKNOD
+	{ 1<<CAP_MKNOD,		"CAP_MKNOD"	},
+#endif
+#ifdef CAP_LEASE
+	{ 1<<CAP_LEASE,		"CAP_LEASE"	},
+#endif
+#ifdef CAP_AUDIT_WRITE
+	{ 1<<CAP_AUDIT_WRITE,	"CAP_AUDIT_WRITE"},
+#endif
+#ifdef CAP_AUDIT_CONTROL
+	{ 1<<CAP_AUDIT_CONTROL,	"CAP_AUDIT_CONTROL"},
+#endif
+#ifdef CAP_SETFCAP
+	{ 1<<CAP_SETFCAP,	"CAP_SETFCAP"	},
+#endif
 	{ 0,                    NULL            },
 };
 
@@ -1577,6 +1717,9 @@
 #endif
 
 #ifdef LINUX
+/* Linux 2.6.18+ headers removed CTL_PROC enum.  */
+# define CTL_PROC 4
+# define CTL_CPU 10		/* older headers lack */
 static const struct xlat sysctl_root[] = {
 	{ CTL_KERN, "CTL_KERN" },
 	{ CTL_VM, "CTL_VM" },
@@ -1585,6 +1728,9 @@
 	{ CTL_FS, "CTL_FS" },
 	{ CTL_DEBUG, "CTL_DEBUG" },
 	{ CTL_DEV, "CTL_DEV" },
+	{ CTL_BUS, "CTL_BUS" },
+	{ CTL_ABI, "CTL_ABI" },
+	{ CTL_CPU, "CTL_CPU" },
 	{ 0, NULL }
 };
 
@@ -1930,7 +2076,9 @@
 			goto out;
 		}
 	out:
-		max_cnt = abbrev(tcp) ? max_strlen : info.nlen;
+		max_cnt = info.nlen;
+		if (abbrev(tcp) && max_cnt > max_strlen)
+			max_cnt = max_strlen;
 		while (cnt < max_cnt)
 			tprintf(", %x", name[cnt++]);
 		if (cnt < info.nlen)
diff --git a/term.c b/term.c
index 2a68af8..23d2317 100644
--- a/term.c
+++ b/term.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: term.c,v 1.8 2005/06/01 19:02:38 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -178,10 +178,7 @@
 };
 
 
-int
-term_ioctl(tcp, code, arg)
-struct tcb *tcp;
-long code, arg;
+int term_ioctl(struct tcb *tcp, long code, long arg)
 {
 	struct termios tios;
 #ifndef FREEBSD
@@ -337,10 +334,10 @@
 	case TIOCMBIS:
 	case TIOCMBIC:
 	case TIOCMSET:
-		if (umove(tcp, arg, &arg) < 0)
+		if (umove(tcp, arg, &i) < 0)
 			return 0;
 		tprintf(", [");
-		printflags(modem_flags, arg, "TIOCM_???");
+		printflags(modem_flags, i, "TIOCM_???");
 		tprintf("]");
 		return 1;
 #endif /* TIOCMGET */
@@ -414,17 +411,9 @@
 	case TIOCGPTN:
 #endif
 		tprintf(", ");
-		printnum(tcp, arg, "%d");
+		printnum_int(tcp, arg, "%d");
 		return 1;
 
-#if 0
-	/* ioctls with an indirect parameter displayed in hex */
-
-		tprintf(", ");
-		printnum(tcp, arg, "%#x");
-		return 1;
-#endif
-
 	/* ioctls with an indirect parameter displayed as a char */
 
 #ifdef TIOCSTI
diff --git a/time.c b/time.c
index 15ec7c0..b4bb97c 100644
--- a/time.c
+++ b/time.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: time.c,v 1.12 2005/06/01 19:02:38 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
@@ -40,50 +40,175 @@
 #endif
 #include <linux/ioctl.h>
 #include <linux/rtc.h>
+
+#ifndef UTIME_NOW
+#define UTIME_NOW ((1l << 30) - 1l)
+#endif
+#ifndef UTIME_OMIT
+#define UTIME_OMIT ((1l << 30) - 2l)
+#endif
 #endif /* LINUX */
 
-void
-printtv(tcp, addr)
-struct tcb *tcp;
-long addr;
+struct timeval32
 {
-	struct timeval tv;
+	u_int32_t tv_sec, tv_usec;
+};
 
+static void
+tprint_timeval32(struct tcb *tcp, const struct timeval32 *tv)
+{
+	tprintf("{%u, %u}", tv->tv_sec, tv->tv_usec);
+}
+
+static void
+tprint_timeval(struct tcb *tcp, const struct timeval *tv)
+{
+	tprintf("{%lu, %lu}",
+		(unsigned long) tv->tv_sec, (unsigned long) tv->tv_usec);
+}
+
+void
+printtv_bitness(struct tcb *tcp, long addr, enum bitness_t bitness, int special)
+{
 	if (addr == 0)
 		tprintf("NULL");
 	else if (!verbose(tcp))
 		tprintf("%#lx", addr);
-	else if (umove(tcp, addr, &tv) < 0)
-		tprintf("{...}");
-	else
-		tprintf("{%lu, %lu}", (long) tv.tv_sec, (long) tv.tv_usec);
-}
+	else {
+		int rc;
 
-#ifdef ALPHA
-struct timeval32
-{
-    unsigned tv_sec;
-    unsigned tv_usec;
-};
+		if (bitness == BITNESS_32
+#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
+		    || personality_wordsize[current_personality] == 4
+#endif
+			)
+		{
+			struct timeval32 tv;
+
+			if ((rc = umove(tcp, addr, &tv)) >= 0) {
+				if (special && tv.tv_sec == 0 &&
+				    tv.tv_usec == UTIME_NOW)
+					tprintf("UTIME_NOW");
+				else if (special && tv.tv_sec == 0 &&
+					 tv.tv_usec == UTIME_OMIT)
+					tprintf("UTIME_OMIT");
+				else
+					tprint_timeval32(tcp, &tv);
+			}
+		} else {
+			struct timeval tv;
+
+			if ((rc = umove(tcp, addr, &tv)) >= 0) {
+				if (special && tv.tv_sec == 0 &&
+				    tv.tv_usec == UTIME_NOW)
+					tprintf("UTIME_NOW");
+				else if (special && tv.tv_sec == 0 &&
+					 tv.tv_usec == UTIME_OMIT)
+					tprintf("UTIME_OMIT");
+				else
+					tprint_timeval(tcp, &tv);
+			}
+		}
+		if (rc < 0)
+			tprintf("{...}");
+	}
+}
 
 void
-printtv32(tcp, addr)
-struct tcb *tcp;
-long addr;
+sprinttv(struct tcb *tcp, long addr, enum bitness_t bitness, char *buf)
 {
-    struct timeval32  tv;
+	if (addr == 0)
+		strcpy(buf, "NULL");
+	else if (!verbose(tcp))
+		sprintf(buf, "%#lx", addr);
+	else {
+		int rc;
 
-    if (addr == 0)
-	tprintf("NULL");
-    else if (!verbose(tcp))
-	tprintf("%#lx", addr);
-    else if (umove(tcp, addr, &tv) < 0)
-	tprintf("{...}");
-    else
-	tprintf("{%u, %u}", tv.tv_sec, tv.tv_usec);
-}
+		if (bitness == BITNESS_32
+#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
+		    || personality_wordsize[current_personality] == 4
 #endif
+			)
+		{
+			struct timeval32 tv;
 
+			if ((rc = umove(tcp, addr, &tv)) >= 0)
+				sprintf(buf, "{%u, %u}",
+					tv.tv_sec, tv.tv_usec);
+		} else {
+			struct timeval tv;
+
+			if ((rc = umove(tcp, addr, &tv)) >= 0)
+				sprintf(buf, "{%lu, %lu}",
+					(unsigned long) tv.tv_sec,
+					(unsigned long) tv.tv_usec);
+		}
+		if (rc < 0)
+			strcpy(buf, "{...}");
+	}
+}
+
+void print_timespec(struct tcb *tcp, long addr)
+{
+	if (addr == 0)
+		tprintf("NULL");
+	else if (!verbose(tcp))
+		tprintf("%#lx", addr);
+	else {
+		int rc;
+
+#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
+		if (personality_wordsize[current_personality] == 4) {
+			struct timeval32 tv;
+
+			if ((rc = umove(tcp, addr, &tv)) >= 0)
+				tprintf("{%u, %u}",
+					tv.tv_sec, tv.tv_usec);
+		} else
+#endif
+		{
+			struct timespec ts;
+
+			if ((rc = umove(tcp, addr, &ts)) >= 0)
+				tprintf("{%lu, %lu}",
+					(unsigned long) ts.tv_sec,
+					(unsigned long) ts.tv_nsec);
+		}
+		if (rc < 0)
+			tprintf("{...}");
+	}
+}
+
+void sprint_timespec(char *buf, struct tcb *tcp, long addr)
+{
+	if (addr == 0)
+		strcpy(buf, "NULL");
+	else if (!verbose(tcp))
+		sprintf(buf, "%#lx", addr);
+	else {
+		int rc;
+
+#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
+		if (personality_wordsize[current_personality] == 4) {
+			struct timeval32 tv;
+
+			if ((rc = umove(tcp, addr, &tv)) >= 0)
+				sprintf(buf, "{%u, %u}",
+					tv.tv_sec, tv.tv_usec);
+		} else
+#endif
+		{
+			struct timespec ts;
+
+			if ((rc = umove(tcp, addr, &ts)) >= 0)
+				sprintf(buf, "{%lu, %lu}",
+					(unsigned long) ts.tv_sec,
+					(unsigned long) ts.tv_nsec);
+		}
+		if (rc < 0)
+			strcpy(buf, "{...}");
+	}
+}
 
 int
 sys_time(tcp)
@@ -132,19 +257,18 @@
 sys_osf_gettimeofday(tcp)
 struct tcb *tcp;
 {
-    if (exiting(tcp)) {
-	if (syserror(tcp)) {
-	    tprintf("%#lx, %#lx",
-		    tcp->u_arg[0], tcp->u_arg[1]);
-	    return 0;
-	}
-	printtv32(tcp, tcp->u_arg[0]);
+	if (exiting(tcp)) {
+		if (syserror(tcp)) {
+			tprintf("%#lx, %#lx", tcp->u_arg[0], tcp->u_arg[1]);
+			return 0;
+		}
+		printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
 #ifndef SVR4
-	tprintf(", ");
-	printtv32(tcp, tcp->u_arg[1]);
+		tprintf(", ");
+		printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
 #endif /* !SVR4 */
-    }
-    return 0;
+	}
+	return 0;
 }
 #endif
 
@@ -167,14 +291,14 @@
 sys_osf_settimeofday(tcp)
 struct tcb *tcp;
 {
-    if (entering(tcp)) {
-	printtv32(tcp, tcp->u_arg[0]);
+	if (entering(tcp)) {
+		printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
 #ifndef SVR4
-	tprintf(", ");
-	printtv32(tcp, tcp->u_arg[1]);
+		tprintf(", ");
+		printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
 #endif /* !SVR4 */
-    }
-    return 0;
+	}
+	return 0;
 }
 #endif
 
@@ -194,6 +318,21 @@
 	return 0;
 }
 
+int
+sys_nanosleep(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		print_timespec(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+	} else {
+		if (!tcp->u_arg[1] || is_restart_error(tcp))
+			print_timespec(tcp, tcp->u_arg[1]);
+		else
+			tprintf("%#lx", tcp->u_arg[1]);
+	}
+	return 0;
+}
+
 static const struct xlat which[] = {
 	{ ITIMER_REAL,	"ITIMER_REAL"	},
 	{ ITIMER_VIRTUAL,"ITIMER_VIRTUAL"},
@@ -202,51 +341,50 @@
 };
 
 static void
-printitv(tcp, addr)
-struct tcb *tcp;
-long addr;
+printitv_bitness(struct tcb *tcp, long addr, enum bitness_t bitness)
 {
-	struct itimerval itv;
-
 	if (addr == 0)
 		tprintf("NULL");
 	else if (!verbose(tcp))
 		tprintf("%#lx", addr);
-	else if (umove(tcp, addr, &itv) < 0)
-		tprintf("{...}");
 	else {
-		tprintf("{it_interval={%lu, %lu}, it_value={%lu, %lu}}",
-		(long) itv.it_interval.tv_sec, (long) itv.it_interval.tv_usec,
-		(long) itv.it_value.tv_sec, (long) itv.it_value.tv_usec);
+		int rc;
+
+		if (bitness == BITNESS_32
+#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
+		    || personality_wordsize[current_personality] == 4
+#endif
+			)
+		{
+			struct {
+				struct timeval32 it_interval, it_value;
+			} itv;
+
+			if ((rc = umove(tcp, addr, &itv)) >= 0) {
+				tprintf("{it_interval=");
+				tprint_timeval32(tcp, &itv.it_interval);
+				tprintf(", it_value=");
+				tprint_timeval32(tcp, &itv.it_value);
+				tprintf("}");
+			}
+		} else {
+			struct itimerval itv;
+
+			if ((rc = umove(tcp, addr, &itv)) >= 0)	{
+				tprintf("{it_interval=");
+				tprint_timeval(tcp, &itv.it_interval);
+				tprintf(", it_value=");
+				tprint_timeval(tcp, &itv.it_value);
+				tprintf("}");
+			}
+		}
+		if (rc < 0)
+			tprintf("{...}");
 	}
 }
 
-
-#ifdef ALPHA
-static void
-printitv32(tcp, addr)
-struct tcb *tcp;
-long addr;
-{
-    struct itimerval32
-    {
-	struct timeval32 it_interval;
-	struct timeval32 it_value;
-    } itv;
-
-    if (addr == 0)
-	tprintf("NULL");
-    else if (!verbose(tcp))
-	tprintf("%#lx", addr);
-    else if (umove(tcp, addr, &itv) < 0)
-	tprintf("{...}");
-    else {
-	tprintf("{it_interval={%u, %u}, it_value={%u, %u}}",
-		itv.it_interval.tv_sec, itv.it_interval.tv_usec,
-		itv.it_value.tv_sec, itv.it_value.tv_usec);
-    }
-}
-#endif
+#define printitv(tcp, addr)	\
+	printitv_bitness((tcp), (addr), BITNESS_CURRENT)
 
 int
 sys_getitimer(tcp)
@@ -270,16 +408,16 @@
 sys_osf_getitimer(tcp)
 struct tcb *tcp;
 {
-    if (entering(tcp)) {
-	printxval(which, tcp->u_arg[0], "ITIMER_???");
-	tprintf(", ");
-    } else {
-	if (syserror(tcp))
-	    tprintf("%#lx", tcp->u_arg[1]);
-	else
-	    printitv32(tcp, tcp->u_arg[1]);
-    }
-    return 0;
+	if (entering(tcp)) {
+		printxval(which, tcp->u_arg[0], "ITIMER_???");
+		tprintf(", ");
+	} else {
+		if (syserror(tcp))
+			tprintf("%#lx", tcp->u_arg[1]);
+		else
+			printitv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
+	}
+	return 0;
 }
 #endif
 
@@ -306,61 +444,225 @@
 sys_osf_setitimer(tcp)
 struct tcb *tcp;
 {
-    if (entering(tcp)) {
-	printxval(which, tcp->u_arg[0], "ITIMER_???");
-	tprintf(", ");
-	printitv32(tcp, tcp->u_arg[1]);
-	tprintf(", ");
-    } else {
-	if (syserror(tcp))
-	    tprintf("%#lx", tcp->u_arg[2]);
-	else
-	    printitv32(tcp, tcp->u_arg[2]);
-    }
-    return 0;
+	if (entering(tcp)) {
+		printxval(which, tcp->u_arg[0], "ITIMER_???");
+		tprintf(", ");
+		printitv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
+		tprintf(", ");
+	} else {
+		if (syserror(tcp))
+			tprintf("%#lx", tcp->u_arg[2]);
+		else
+			printitv_bitness(tcp, tcp->u_arg[2], BITNESS_32);
+	}
+	return 0;
 }
 #endif
 
 #ifdef LINUX
 
-int
-sys_adjtimex(tcp)
-struct tcb *tcp;
-{
-	struct timex txc;
+static const struct xlat adjtimex_modes[] = {
+  { 0, "0" },
+#ifdef ADJ_OFFSET
+  { ADJ_OFFSET, "ADJ_OFFSET" },
+#endif
+#ifdef ADJ_FREQUENCY
+  { ADJ_FREQUENCY, "ADJ_FREQUENCY" },
+#endif
+#ifdef ADJ_MAXERROR
+  { ADJ_MAXERROR, "ADJ_MAXERROR" },
+#endif
+#ifdef ADJ_ESTERROR
+  { ADJ_ESTERROR, "ADJ_ESTERROR" },
+#endif
+#ifdef ADJ_STATUS
+  { ADJ_STATUS, "ADJ_STATUS" },
+#endif
+#ifdef ADJ_TIMECONST
+  { ADJ_TIMECONST, "ADJ_TIMECONST" },
+#endif
+#ifdef ADJ_TICK
+  { ADJ_TICK, "ADJ_TICK" },
+#endif
+#ifdef ADJ_OFFSET_SINGLESHOT
+  { ADJ_OFFSET_SINGLESHOT, "ADJ_OFFSET_SINGLESHOT" },
+#endif
+  { 0,             NULL }
+};
 
+static const struct xlat adjtimex_status[] = {
+#ifdef STA_PLL
+  { STA_PLL, "STA_PLL" },
+#endif
+#ifdef STA_PPSFREQ
+  { STA_PPSFREQ, "STA_PPSFREQ" },
+#endif
+#ifdef STA_PPSTIME
+  { STA_PPSTIME, "STA_PPSTIME" },
+#endif
+#ifdef STA_FLL
+  { STA_FLL, "STA_FLL" },
+#endif
+#ifdef STA_INS
+  { STA_INS, "STA_INS" },
+#endif
+#ifdef STA_DEL
+  { STA_DEL, "STA_DEL" },
+#endif
+#ifdef STA_UNSYNC
+  { STA_UNSYNC, "STA_UNSYNC" },
+#endif
+#ifdef STA_FREQHOLD
+  { STA_FREQHOLD, "STA_FREQHOLD" },
+#endif
+#ifdef STA_PPSSIGNAL
+  { STA_PPSSIGNAL, "STA_PPSSIGNAL" },
+#endif
+#ifdef STA_PPSJITTER
+  { STA_PPSJITTER, "STA_PPSJITTER" },
+#endif
+#ifdef STA_PPSWANDER
+  { STA_PPSWANDER, "STA_PPSWANDER" },
+#endif
+#ifdef STA_PPSERROR
+  { STA_PPSERROR, "STA_PPSERROR" },
+#endif
+#ifdef STA_CLOCKERR
+  { STA_CLOCKERR, "STA_CLOCKERR" },
+#endif
+  { 0,             NULL }
+};
+
+static const struct xlat adjtimex_state[] = {
+#ifdef TIME_OK
+  { TIME_OK, "TIME_OK" },
+#endif
+#ifdef TIME_INS
+  { TIME_INS, "TIME_INS" },
+#endif
+#ifdef TIME_DEL
+  { TIME_DEL, "TIME_DEL" },
+#endif
+#ifdef TIME_OOP
+  { TIME_OOP, "TIME_OOP" },
+#endif
+#ifdef TIME_WAIT
+  { TIME_WAIT, "TIME_WAIT" },
+#endif
+#ifdef TIME_ERROR
+  { TIME_ERROR, "TIME_ERROR" },
+#endif
+  { 0,             NULL }
+};
+
+#if SUPPORTED_PERSONALITIES > 1
+static int
+tprint_timex32(struct tcb *tcp, long addr)
+{
+	struct {
+		unsigned int modes;
+		int     offset;
+		int     freq;
+		int     maxerror;
+		int     esterror;
+		int     status;
+		int     constant;
+		int     precision;
+		int     tolerance;
+		struct timeval32 time;
+		int     tick;
+		int     ppsfreq;
+		int     jitter;
+		int     shift;
+		int     stabil;
+		int     jitcnt;
+		int     calcnt;
+		int     errcnt;
+		int     stbcnt;
+	} tx;
+
+	if (umove(tcp, addr, &tx) < 0)
+		return -1;
+
+	tprintf("{modes=");
+	printflags(adjtimex_modes, tx.modes, "ADJ_???");
+	tprintf(", offset=%d, freq=%d, maxerror=%d, ",
+		tx.offset, tx.freq, tx.maxerror);
+	tprintf("esterror=%u, status=", tx.esterror);
+	printflags(adjtimex_status, tx.status, "STA_???");
+	tprintf(", constant=%d, precision=%u, ",
+		tx.constant, tx.precision);
+	tprintf("tolerance=%d, time=", tx.tolerance);
+	tprint_timeval32(tcp, &tx.time);
+	tprintf(", tick=%d, ppsfreq=%d, jitter=%d",
+		tx.tick, tx.ppsfreq, tx.jitter);
+	tprintf(", shift=%d, stabil=%d, jitcnt=%d",
+		tx.shift, tx.stabil, tx.jitcnt);
+	tprintf(", calcnt=%d, errcnt=%d, stbcnt=%d",
+		tx.calcnt, tx.errcnt, tx.stbcnt);
+	tprintf("}");
+	return 0;
+}
+#endif /* SUPPORTED_PERSONALITIES > 1 */
+
+static int
+tprint_timex(struct tcb *tcp, long addr)
+{
+	struct timex tx;
+
+#if SUPPORTED_PERSONALITIES > 1
+	if (personality_wordsize[current_personality] == 4)
+		return tprint_timex32(tcp, addr);
+#endif
+	if (umove(tcp, addr, &tx) < 0)
+		return -1;
+
+#if LINUX_VERSION_CODE < 66332
+	tprintf("{mode=%d, offset=%ld, frequency=%ld, ",
+		tx.mode, tx.offset, tx.frequency);
+	tprintf("maxerror=%ld, esterror=%lu, status=%u, ",
+		tx.maxerror, tx.esterror, tx.status);
+	tprintf("time_constant=%ld, precision=%lu, ",
+		tx.time_constant, tx.precision);
+	tprintf("tolerance=%ld, time=", tx.tolerance);
+	tprint_timeval(tcp, &tx.time);
+#else
+	tprintf("{modes=");
+	printflags(adjtimex_modes, tx.modes, "ADJ_???");
+	tprintf(", offset=%ld, freq=%ld, maxerror=%ld, ",
+		tx.offset, tx.freq, tx.maxerror);
+	tprintf("esterror=%lu, status=", tx.esterror);
+	printflags(adjtimex_status, tx.status, "STA_???");
+	tprintf(", constant=%ld, precision=%lu, ",
+		tx.constant, tx.precision);
+	tprintf("tolerance=%ld, time=", tx.tolerance);
+	tprint_timeval(tcp, &tx.time);
+	tprintf(", tick=%ld, ppsfreq=%ld, jitter=%ld",
+		tx.tick, tx.ppsfreq, tx.jitter);
+	tprintf(", shift=%d, stabil=%ld, jitcnt=%ld",
+		tx.shift, tx.stabil, tx.jitcnt);
+	tprintf(", calcnt=%ld, errcnt=%ld, stbcnt=%ld",
+		tx.calcnt, tx.errcnt, tx.stbcnt);
+#endif
+	tprintf("}");
+	return 0;
+}
+
+int
+sys_adjtimex(struct tcb *tcp)
+{
 	if (exiting(tcp)) {
 		if (tcp->u_arg[0] == 0)
 			tprintf("NULL");
 		else if (syserror(tcp) || !verbose(tcp))
 			tprintf("%#lx", tcp->u_arg[0]);
-		else if (umove(tcp, tcp->u_arg[0], &txc) < 0)
+		else if (tprint_timex(tcp, tcp->u_arg[0]) < 0)
 			tprintf("{...}");
-		else {
-#if LINUX_VERSION_CODE < 66332
-			tprintf("{mode=%d, offset=%ld, frequency=%ld, ",
-				txc.mode, txc.offset, txc.frequency);
-			tprintf("maxerror=%ld, esterror=%lu, status=%u, ",
-				txc.maxerror, txc.esterror, txc.status);
-			tprintf("time_constant=%ld, precision=%lu, ",
-				txc.time_constant, txc.precision);
-			tprintf("tolerance=%ld, time={%lu, %lu}}",
-				txc.tolerance, (long) txc.time.tv_sec,
-				(long) txc.time.tv_usec);
-#else
-			tprintf("{modes=%d, offset=%ld, freq=%ld, ",
-				txc.modes, txc.offset, txc.freq);
-			tprintf("maxerror=%ld, esterror=%lu, status=%u, ",
-				txc.maxerror, txc.esterror, txc.status);
-			tprintf("constant=%ld, precision=%lu, ",
-				txc.constant, txc.precision);
-			tprintf("tolerance=%ld, time={%lu, %lu}}",
-				txc.tolerance, (long) txc.time.tv_sec,
-				(long) txc.time.tv_usec);
-			/* there's a bunch of other stuff, but it's not
-			 * worth the time or the trouble to include */
-#endif
-		}
+		if (syserror(tcp))
+			return 0;
+		tcp->auxstr = xlookup(adjtimex_state, tcp->u_rval);
+		if (tcp->auxstr)
+			return RVAL_STR;
 	}
 	return 0;
 }
@@ -377,7 +679,22 @@
 #ifdef CLOCK_MONOTONIC
   { CLOCK_MONOTONIC, "CLOCK_MONOTONIC" },
 #endif
-  { 0,             NULL }
+#ifdef CLOCK_PROCESS_CPUTIME_ID
+  { CLOCK_PROCESS_CPUTIME_ID, "CLOCK_PROCESS_CPUTIME_ID" },
+#endif
+#ifdef CLOCK_THREAD_CPUTIME_ID
+  { CLOCK_THREAD_CPUTIME_ID, "CLOCK_THREAD_CPUTIME_ID" },
+#endif
+#ifdef CLOCK_MONOTONIC_RAW
+  { CLOCK_MONOTONIC_RAW, "CLOCK_MONOTONIC_RAW" },
+#endif
+#ifdef CLOCK_REALTIME_COARSE
+  { CLOCK_REALTIME_COARSE, "CLOCK_REALTIME_COARSE" },
+#endif
+#ifdef CLOCK_MONOTONIC_COARSE
+  { CLOCK_MONOTONIC_COARSE, "CLOCK_MONOTONIC_COARSE" },
+#endif
+  { 0, NULL }
 };
 
 int
@@ -439,12 +756,58 @@
 	{ 0, NULL }
 };
 
+#if SUPPORTED_PERSONALITIES > 1
+static void
+printsigevent32(struct tcb *tcp, long arg)
+{
+	struct {
+		int     sigev_value;
+		int     sigev_signo;
+		int     sigev_notify;
+
+		union {
+			int     tid;
+			struct {
+				int     function, attribute;
+			} thread;
+		} un;
+	} sev;
+
+	if (umove(tcp, arg, &sev) < 0)
+		tprintf("{...}");
+	else {
+		tprintf("{%#x, ", sev.sigev_value);
+		if (sev.sigev_notify == SIGEV_SIGNAL)
+			tprintf("%s, ", signame(sev.sigev_signo));
+		else
+			tprintf("%u, ", sev.sigev_signo);
+		printxval(sigev_value, sev.sigev_notify + 1, "SIGEV_???");
+		tprintf(", ");
+		if (sev.sigev_notify == SIGEV_THREAD_ID)
+			tprintf("{%d}", sev.un.tid);
+		else if (sev.sigev_notify == SIGEV_THREAD)
+			tprintf("{%#x, %#x}",
+				sev.un.thread.function,
+				sev.un.thread.attribute);
+		else
+			tprintf("{...}");
+		tprintf("}");
+	}
+}
+#endif
+
 void
-printsigevent(tcp, arg)
-struct tcb *tcp;
-long arg;
+printsigevent(struct tcb *tcp, long arg)
 {
 	struct sigevent sev;
+
+#if SUPPORTED_PERSONALITIES > 1
+	if (personality_wordsize[current_personality] == 4)
+	{
+		printsigevent32(tcp, arg);
+		return;
+	}
+#endif
 	if (umove (tcp, arg, &sev) < 0)
 		tprintf("{...}");
 	else {
@@ -479,13 +842,12 @@
 		printsigevent(tcp, tcp->u_arg[1]);
 		tprintf(", ");
 	} else {
-		if (syserror(tcp))
+		void *p;
+
+		if (syserror(tcp) || umove(tcp, tcp->u_arg[2], &p) < 0)
 			tprintf("%#lx", tcp->u_arg[2]);
-		else {
-			void *p;
-			umove(tcp, tcp->u_arg[2], &p);
+		else
 			tprintf("{%p}", p);
-		}
 	}
 	return 0;
 }
@@ -614,4 +976,67 @@
 	}
 	return 1;
 }
+
+#ifndef TFD_TIMER_ABSTIME
+#define TFD_TIMER_ABSTIME (1 << 0)
+#endif
+
+static const struct xlat timerfdflags[] = {
+	{ TFD_TIMER_ABSTIME,	"TFD_TIMER_ABSTIME"	},
+	{ 0,			NULL			}
+};
+
+int
+sys_timerfd(tcp)
+struct tcb *tcp;
+{
+	if (entering(tcp)) {
+		/* It does not matter that the kernel uses itimerspec.  */
+		tprintf("%ld, ", tcp->u_arg[0]);
+		printxval(clocknames, tcp->u_arg[1], "CLOCK_???");
+		tprintf(", ");
+		printflags(timerfdflags, tcp->u_arg[2], "TFD_???");
+		tprintf(", ");
+		printitv(tcp, tcp->u_arg[3]);
+	}
+	return 0;
+}
+
+int
+sys_timerfd_create(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
+		tprintf(", ");
+		printflags(timerfdflags, tcp->u_arg[1], "TFD_???");
+	}
+	return 0;
+}
+
+int
+sys_timerfd_settime(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printflags(timerfdflags, tcp->u_arg[1], "TFD_???");
+		tprintf(", ");
+		printitv(tcp, tcp->u_arg[2]);
+		tprintf(", ");
+		printitv(tcp, tcp->u_arg[3]);
+	}
+	return 0;
+}
+
+int
+sys_timerfd_gettime(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprintf(", ");
+		printitv(tcp, tcp->u_arg[1]);
+	}
+	return 0;
+}
+
 #endif /* LINUX */
diff --git a/util.c b/util.c
index 8dfc0a4..81f6801 100644
--- a/util.c
+++ b/util.c
@@ -30,11 +30,10 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: util.c,v 1.62 2005/06/08 20:45:28 roland Exp $
+ *	$Id$
  */
 
 #include "defs.h"
-#include "../syscall-android.h"
 
 #include <signal.h>
 #include <sys/syscall.h>
@@ -52,6 +51,10 @@
 #include <link.h>
 #endif /* SUNOS4 */
 
+#ifdef HAVE_ANDROID_OS
+#include "syscall-android.h"
+#endif
+
 #if defined(linux) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1))
 #include <linux/ptrace.h>
 #endif
@@ -81,66 +84,11 @@
 #include <sys/utsname.h>
 #endif /* SUNOS4_KERNEL_ARCH_KLUDGE */
 
-#if defined(LINUXSPARC)
-
-# define fpq kernel_fpq
-# define fq kernel_fq
-# define fpu kernel_fpu
-# include <asm/reg.h>
-# undef fpq
-# undef fq
-# undef fpu
-
-#if defined (SPARC64)
-# define r_pc r_tpc
+#if defined(LINUXSPARC) && defined (SPARC64)
 # undef PTRACE_GETREGS
 # define PTRACE_GETREGS PTRACE_GETREGS64
 # undef PTRACE_SETREGS
 # define PTRACE_SETREGS PTRACE_SETREGS64
-#endif /* SPARC64 */
-
-#if !defined(__GLIBC__)
-
-#include <linux/unistd.h>
-
-#define _hack_syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,\
-          type5,arg5,syscall) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-      long __res; \
-\
-__asm__ volatile ("or %%g0, %1, %%o0\n\t" \
-                  "or %%g0, %2, %%o1\n\t" \
-                  "or %%g0, %3, %%o2\n\t" \
-                  "or %%g0, %4, %%o3\n\t" \
-                  "or %%g0, %5, %%o4\n\t" \
-                  "or %%g0, %6, %%g1\n\t" \
-#if defined (SPARC64)
-                  "t 0x6d\n\t" \
-#else
-                  "t 0x10\n\t" \
-#endif
-                  "bcc 1f\n\t" \
-                  "or %%g0, %%o0, %0\n\t" \
-                  "sub %%g0, %%o0, %0\n\t" \
-                  "1:\n\t" \
-                  : "=r" (__res) \
-                  : "0" ((long)(arg1)),"1" ((long)(arg2)), \
-                    "2" ((long)(arg3)),"3" ((long)(arg4)),"4" ((long)(arg5)), \
-                    "i" (__NR_##syscall)  \
-                  : "g1", "o0", "o1", "o2", "o3", "o4"); \
-if (__res>=0) \
-        return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-static _hack_syscall5(int,_ptrace,int,__request,int,__pid,int,__addr,int,__data,int,__addr2,ptrace)
-
-#define _ptrace
-
-#endif
-
 #endif
 
 /* macros */
@@ -151,18 +99,6 @@
 #define MIN(a,b)		(((a) < (b)) ? (a) : (b))
 #endif
 
-#if 0
-void
-tv_tv(tv, a, b)
-struct timeval *tv;
-int a;
-int b;
-{
-	tv->tv_sec = a;
-	tv->tv_usec = b;
-}
-#endif
-
 int
 tv_nz(a)
 struct timeval *a;
@@ -196,7 +132,7 @@
 {
 	tv->tv_sec = a->tv_sec + b->tv_sec;
 	tv->tv_usec = a->tv_usec + b->tv_usec;
-	if (tv->tv_usec > 1000000) {
+	if (tv->tv_usec >= 1000000) {
 		tv->tv_sec++;
 		tv->tv_usec -= 1000000;
 	}
@@ -230,14 +166,12 @@
 int n;
 {
 	tv->tv_usec = a->tv_usec * n;
-	tv->tv_sec = a->tv_sec * n + a->tv_usec / 1000000;
+	tv->tv_sec = a->tv_sec * n + tv->tv_usec / 1000000;
 	tv->tv_usec %= 1000000;
 }
 
-char *
-xlookup(xlat, val)
-const struct xlat *xlat;
-int val;
+const char *
+xlookup(const struct xlat *xlat, int val)
 {
 	for (; xlat->str != NULL; xlat++)
 		if (xlat->val == val)
@@ -246,15 +180,67 @@
 }
 
 /*
+ * Generic ptrace wrapper which tracks ESRCH errors
+ * by setting tcp->ptrace_errno to ESRCH.
+ *
+ * We assume that ESRCH indicates likely process death (SIGKILL?),
+ * modulo bugs where process somehow ended up not stopped.
+ * Unfortunately kernel uses ESRCH for that case too. Oh well.
+ *
+ * Currently used by upeek() only.
+ * TODO: use this in all other ptrace() calls while decoding.
+ */
+long
+do_ptrace(int request, struct tcb *tcp, void *addr, void *data)
+{
+	long l;
+
+	errno = 0;
+	l = ptrace(request, tcp->pid, addr, (long) data);
+	/* Non-ESRCH errors might be our invalid reg/mem accesses,
+	 * we do not record them. */
+	if (errno == ESRCH)
+		tcp->ptrace_errno = ESRCH;
+	return l;
+}
+
+/*
+ * Used when we want to unblock stopped traced process.
+ * Should be only used with PTRACE_CONT, PTRACE_DETACH and PTRACE_SYSCALL.
+ * Returns 0 on success or if error was ESRCH
+ * (presumably process was killed while we talk to it).
+ * Otherwise prints error message and returns -1.
+ */
+int
+ptrace_restart(int op, struct tcb *tcp, int sig)
+{
+	int err;
+	const char *msg;
+
+	errno = 0;
+	ptrace(op, tcp->pid, (void *) 1, (long) sig);
+	err = errno;
+	if (!err || err == ESRCH)
+		return 0;
+
+	tcp->ptrace_errno = err;
+	msg = "SYSCALL";
+	if (op == PTRACE_CONT)
+		msg = "CONT";
+	if (op == PTRACE_DETACH)
+		msg = "DETACH";
+	fprintf(stderr, "strace: ptrace(PTRACE_%s,1,%d): %s\n",
+			msg, sig, strerror(err));
+	return -1;
+}
+
+/*
  * Print entry in struct xlat table, if there.
  */
 void
-printxval(xlat, val, dflt)
-const struct xlat *xlat;
-int val;
-const char *dflt;
+printxval(const struct xlat *xlat, int val, const char *dflt)
 {
-	char *str = xlookup(xlat, val);
+	const char *str = xlookup(xlat, val);
 
 	if (str)
 		tprintf("%s", str);
@@ -262,6 +248,46 @@
 		tprintf("%#x /* %s */", val, dflt);
 }
 
+#if HAVE_LONG_LONG
+/*
+ * Print 64bit argument at position llarg and return the index of the next
+ * argument.
+ */
+int
+printllval(struct tcb *tcp, const char *format, int llarg)
+{
+# if defined(FREEBSD) \
+     || (defined(LINUX) && defined(POWERPC) && !defined(POWERPC64)) \
+     || defined (LINUX_MIPSO32)
+	/* Align 64bit argument to 64bit boundary.  */
+	if (llarg % 2) llarg++;
+# endif
+# if defined LINUX && (defined X86_64 || defined POWERPC64)
+	if (current_personality == 0) {
+		tprintf(format, tcp->u_arg[llarg]);
+		llarg++;
+	} else {
+#  ifdef POWERPC64
+		/* Align 64bit argument to 64bit boundary.  */
+		if (llarg % 2) llarg++;
+#  endif
+		tprintf(format, LONG_LONG(tcp->u_arg[llarg], tcp->u_arg[llarg + 1]));
+		llarg += 2;
+	}
+# elif defined IA64 || defined ALPHA
+	tprintf(format, tcp->u_arg[llarg]);
+	llarg++;
+# elif defined LINUX_MIPSN32
+	tprintf(format, tcp->ext_arg[llarg]);
+	llarg++;
+# else
+	tprintf(format, LONG_LONG(tcp->u_arg[llarg], tcp->u_arg[llarg + 1]));
+	llarg += 2;
+# endif
+	return llarg;
+}
+#endif
+
 /*
  * Interpret `xlat' as an array of flags
  * print the entries whose bits are on in `flags'
@@ -288,14 +314,42 @@
 	return n;
 }
 
+/*
+ * Interpret `xlat' as an array of flags/
+ * Print to static string the entries whose bits are on in `flags'
+ * Return static string.
+ */
+const char *
+sprintflags(const char *prefix, const struct xlat *xlat, int flags)
+{
+	static char outstr[1024];
+	int found = 0;
+
+	strcpy(outstr, prefix);
+
+	for (; xlat->str; xlat++) {
+		if ((flags & xlat->val) == xlat->val) {
+			if (found)
+				strcat(outstr, "|");
+			strcat(outstr, xlat->str);
+			flags &= ~xlat->val;
+			found = 1;
+		}
+	}
+	if (flags) {
+		if (found)
+			strcat(outstr, "|");
+		sprintf(outstr + strlen(outstr), "%#x", flags);
+	}
+
+	return outstr;
+}
+
 int
-printflags(xlat, flags, dflt)
-const struct xlat *xlat;
-int flags;
-const char *dflt;
+printflags(const struct xlat *xlat, int flags, const char *dflt)
 {
 	int n;
-	char *sep;
+	const char *sep;
 
 	if (flags == 0 && xlat->val == 0) {
 		tprintf("%s", xlat->str);
@@ -332,10 +386,7 @@
 }
 
 void
-printnum(tcp, addr, fmt)
-struct tcb *tcp;
-long addr;
-char *fmt;
+printnum(struct tcb *tcp, long addr, const char *fmt)
 {
 	long num;
 
@@ -353,6 +404,30 @@
 }
 
 void
+printnum_int(struct tcb *tcp, long addr, const char *fmt)
+{
+	int num;
+
+	if (!addr) {
+		tprintf("NULL");
+		return;
+	}
+	if (umove(tcp, addr, &num) < 0) {
+		tprintf("%#lx", addr);
+		return;
+	}
+	tprintf("[");
+	tprintf(fmt, num);
+	tprintf("]");
+}
+
+void
+printfd(struct tcb *tcp, int fd)
+{
+	tprintf("%d", fd);
+}
+
+void
 printuid(text, uid)
 const char *text;
 unsigned long uid;
@@ -363,106 +438,34 @@
 
 static char path[MAXPATHLEN + 1];
 
-static void
-string_quote(str)
-const char *str;
+/*
+ * Quote string `instr' of length `size'
+ * Write up to (3 + `size' * 4) bytes to `outstr' buffer.
+ * If `len' < 0, treat `instr' as a NUL-terminated string
+ * and quote at most (`size' - 1) bytes.
+ */
+static int
+string_quote(const char *instr, char *outstr, int len, int size)
 {
-	char buf[2 * MAXPATHLEN + 1];
-	char *s;
+	const unsigned char *ustr = (const unsigned char *) instr;
+	char *s = outstr;
+	int usehex = 0, c, i;
 
-	if (!strpbrk(str, "\"\'\\")) {
-		tprintf("\"%s\"", str);
-		return;
-	}
-	for (s = buf; *str; str++) {
-		switch (*str) {
-		case '\"': case '\'': case '\\':
-			*s++ = '\\'; *s++ = *str; break;
-		default:
-			*s++ = *str; break;
-		}
-	}
-	*s = '\0';
-	tprintf("\"%s\"", buf);
-}
-
-void
-printpath(tcp, addr)
-struct tcb *tcp;
-long addr;
-{
-	if (addr == 0)
-		tprintf("NULL");
-	else if (umovestr(tcp, addr, MAXPATHLEN, path) < 0)
-		tprintf("%#lx", addr);
-	else
-		string_quote(path);
-	return;
-}
-
-void
-printpathn(tcp, addr, n)
-struct tcb *tcp;
-long addr;
-int n;
-{
-	if (addr == 0)
-		tprintf("NULL");
-	else 	if (umovestr(tcp, addr, n, path) < 0)
-		tprintf("%#lx", addr);
-	else {
-		path[n] = '\0';
-		string_quote(path);
-	}
-}
-
-void
-printstr(tcp, addr, len)
-struct tcb *tcp;
-long addr;
-int len;
-{
-	static unsigned char *str = NULL;
-	static char *outstr;
-	int i, n, c, usehex;
-	char *s, *outend;
-
-	if (!addr) {
-		tprintf("NULL");
-		return;
-	}
-	if (!str) {
-		if ((str = malloc(max_strlen)) == NULL
-		    || (outstr = malloc(2*max_strlen)) == NULL) {
-			fprintf(stderr, "out of memory\n");
-			tprintf("%#lx", addr);
-			return;
-		}
-	}
-	outend = outstr + max_strlen * 2 - 10;
-	if (len < 0) {
-		n = max_strlen;
-		if (umovestr(tcp, addr, n, (char *) str) < 0) {
-			tprintf("%#lx", addr);
-			return;
-		}
-	}
-	else {
-		n = MIN(len, max_strlen);
-		if (umoven(tcp, addr, n, (char *) str) < 0) {
-			tprintf("%#lx", addr);
-			return;
-		}
-	}
-
-	usehex = 0;
 	if (xflag > 1)
 		usehex = 1;
 	else if (xflag) {
-		for (i = 0; i < n; i++) {
-			c = str[i];
-			if (len < 0 && c == '\0')
-				break;
+		/* Check for presence of symbol which require
+		   to hex-quote the whole string. */
+		for (i = 0; i < size; ++i) {
+			c = ustr[i];
+			/* Check for NUL-terminated string. */
+			if (len < 0) {
+				if (c == '\0')
+					break;
+				/* Quote at most size - 1 bytes. */
+				if (i == size - 1)
+					continue;
+			}
 			if (!isprint(c) && !isspace(c)) {
 				usehex = 1;
 				break;
@@ -470,61 +473,173 @@
 		}
 	}
 
-	s = outstr;
 	*s++ = '\"';
 
 	if (usehex) {
-		for (i = 0; i < n; i++) {
-			c = str[i];
-			if (len < 0 && c == '\0')
-				break;
+		/* Hex-quote the whole string. */
+		for (i = 0; i < size; ++i) {
+			c = ustr[i];
+			/* Check for NUL-terminated string. */
+			if (len < 0) {
+				if (c == '\0')
+					break;
+				/* Quote at most size - 1 bytes. */
+				if (i == size - 1)
+					continue;
+			}
 			sprintf(s, "\\x%02x", c);
 			s += 4;
-			if (s > outend)
-				break;
 		}
-	}
-	else {
-		for (i = 0; i < n; i++) {
-			c = str[i];
-			if (len < 0 && c == '\0')
-				break;
-			switch (c) {
-			case '\"': case '\'': case '\\':
-				*s++ = '\\'; *s++ = c; break;
-			case '\f':
-				*s++ = '\\'; *s++ = 'f'; break;
-			case '\n':
-				*s++ = '\\'; *s++ = 'n'; break;
-			case '\r':
-				*s++ = '\\'; *s++ = 'r'; break;
-			case '\t':
-				*s++ = '\\'; *s++ = 't'; break;
-			case '\v':
-				*s++ = '\\'; *s++ = 'v'; break;
-			default:
-				if (isprint(c))
-					*s++ = c;
-				else if (i < n - 1 && isdigit(str[i + 1])) {
-					sprintf(s, "\\%03o", c);
-					s += 4;
-				}
-				else {
-					sprintf(s, "\\%o", c);
-					s += strlen(s);
-				}
-				break;
+	} else {
+		for (i = 0; i < size; ++i) {
+			c = ustr[i];
+			/* Check for NUL-terminated string. */
+			if (len < 0) {
+				if (c == '\0')
+					break;
+				/* Quote at most size - 1 bytes. */
+				if (i == size - 1)
+					continue;
 			}
-			if (s > outend)
-				break;
+			switch (c) {
+				case '\"': case '\\':
+					*s++ = '\\';
+					*s++ = c;
+					break;
+				case '\f':
+					*s++ = '\\';
+					*s++ = 'f';
+					break;
+				case '\n':
+					*s++ = '\\';
+					*s++ = 'n';
+					break;
+				case '\r':
+					*s++ = '\\';
+					*s++ = 'r';
+					break;
+				case '\t':
+					*s++ = '\\';
+					*s++ = 't';
+					break;
+				case '\v':
+					*s++ = '\\';
+					*s++ = 'v';
+					break;
+				default:
+					if (isprint(c))
+						*s++ = c;
+					else if (i + 1 < size
+						 && isdigit(ustr[i + 1])) {
+						sprintf(s, "\\%03o", c);
+						s += 4;
+					} else {
+						sprintf(s, "\\%o", c);
+						s += strlen(s);
+					}
+					break;
+			}
 		}
 	}
 
 	*s++ = '\"';
-	if (i < len || (len < 0 && (i == n || s > outend))) {
-		*s++ = '.'; *s++ = '.'; *s++ = '.';
-	}
 	*s = '\0';
+
+	/* Return nonzero if the string was unterminated.  */
+	return i == size;
+}
+
+/*
+ * Print path string specified by address `addr' and length `n'.
+ * If path length exceeds `n', append `...' to the output.
+ */
+void
+printpathn(struct tcb *tcp, long addr, int n)
+{
+	if (!addr) {
+		tprintf("NULL");
+		return;
+	}
+
+	/* Cap path length to the path buffer size,
+	   and NUL-terminate the buffer. */
+	if (n > sizeof path - 1)
+		n = sizeof path - 1;
+	path[n] = '\0';
+
+	/* Fetch one byte more to find out whether path length > n. */
+	if (umovestr(tcp, addr, n + 1, path) < 0)
+		tprintf("%#lx", addr);
+	else {
+		static char outstr[4*(sizeof path - 1) + sizeof "\"...\""];
+		int trunc = (path[n] != '\0');
+
+		if (trunc)
+			path[n] = '\0';
+		(void) string_quote(path, outstr, -1, n + 1);
+		if (trunc)
+			strcat(outstr, "...");
+		tprintf("%s", outstr);
+	}
+}
+
+void
+printpath(struct tcb *tcp, long addr)
+{
+	printpathn(tcp, addr, sizeof path - 1);
+}
+
+/*
+ * Print string specified by address `addr' and length `len'.
+ * If `len' < 0, treat the string as a NUL-terminated string.
+ * If string length exceeds `max_strlen', append `...' to the output.
+ */
+void
+printstr(struct tcb *tcp, long addr, int len)
+{
+	static char *str = NULL;
+	static char *outstr;
+	int size;
+
+	if (!addr) {
+		tprintf("NULL");
+		return;
+	}
+	/* Allocate static buffers if they are not allocated yet. */
+	if (!str)
+		str = malloc(max_strlen + 1);
+	if (!outstr)
+		outstr = malloc(4 * max_strlen + sizeof "\"...\"");
+	if (!str || !outstr) {
+		fprintf(stderr, "out of memory\n");
+		tprintf("%#lx", addr);
+		return;
+	}
+
+	if (len < 0) {
+		/*
+		 * Treat as a NUL-terminated string: fetch one byte more
+		 * because string_quote() quotes one byte less.
+		 */
+		size = max_strlen + 1;
+		str[max_strlen] = '\0';
+		if (umovestr(tcp, addr, size, str) < 0) {
+			tprintf("%#lx", addr);
+			return;
+		}
+	}
+	else {
+		size = MIN(len, max_strlen);
+		if (umoven(tcp, addr, size, str) < 0) {
+			tprintf("%#lx", addr);
+			return;
+		}
+	}
+
+	if (string_quote(str, outstr, len, size) &&
+	    (len < 0 || len > max_strlen))
+		strcat(outstr, "...");
+
 	tprintf("%s", outstr);
 }
 
@@ -535,28 +650,51 @@
 int len;
 long addr;
 {
+#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
+	union {
+		struct { u_int32_t base; u_int32_t len; } *iov32;
+		struct { u_int64_t base; u_int64_t len; } *iov64;
+	} iovu;
+#define iov iovu.iov64
+#define sizeof_iov \
+  (personality_wordsize[current_personality] == 4 \
+   ? sizeof(*iovu.iov32) : sizeof(*iovu.iov64))
+#define iov_iov_base(i) \
+  (personality_wordsize[current_personality] == 4 \
+   ? (u_int64_t) iovu.iov32[i].base : iovu.iov64[i].base)
+#define iov_iov_len(i) \
+  (personality_wordsize[current_personality] == 4 \
+   ? (u_int64_t) iovu.iov32[i].len : iovu.iov64[i].len)
+#else
 	struct iovec *iov;
+#define sizeof_iov sizeof(*iov)
+#define iov_iov_base(i) iov[i].iov_base
+#define iov_iov_len(i) iov[i].iov_len
+#endif
 	int i;
 	unsigned long size;
 
-	size = sizeof(*iov) * (unsigned long) len;
-	if (size / sizeof(*iov) != len
-	    || (iov = (struct iovec *) malloc(size)) == NULL) {
+	size = sizeof_iov * (unsigned long) len;
+	if (size / sizeof_iov != len
+	    || (iov = malloc(size)) == NULL) {
 		fprintf(stderr, "out of memory\n");
 		return;
 	}
 	if (umoven(tcp, addr, size, (char *) iov) >= 0) {
 		for (i = 0; i < len; i++) {
-                        /* include the buffer number to make it easy to
-                         * match up the trace with the source */
-                        tprintf(" * %lu bytes in buffer %d\n",
-                                (unsigned long)iov[i].iov_len, i);
-                        dumpstr(tcp, (long) iov[i].iov_base,
-                                iov[i].iov_len);
-                }
+			/* include the buffer number to make it easy to
+			 * match up the trace with the source */
+			tprintf(" * %lu bytes in buffer %d\n",
+				(unsigned long)iov_iov_len(i), i);
+			dumpstr(tcp, (long) iov_iov_base(i),
+				iov_iov_len(i));
+		}
 	}
 	free((char *) iov);
-
+#undef sizeof_iov
+#undef iov_iov_base
+#undef iov_iov_len
+#undef iov
 }
 #endif
 
@@ -623,13 +761,8 @@
  * at address `addr' to our space at `laddr'
  */
 int
-umoven(tcp, addr, len, laddr)
-struct tcb *tcp;
-long addr;
-int len;
-char *laddr;
+umoven(struct tcb *tcp, long addr, int len, char *laddr)
 {
-
 #ifdef LINUX
 	int pid = tcp->pid;
 	int n, m;
@@ -651,7 +784,8 @@
 				return 0;
 			}
 			/* But if not started, we had a bogus address. */
-			perror("ptrace: umoven");
+			if (addr != 0 && errno != EIO && errno != ESRCH)
+				perror("ptrace: umoven");
 			return -1;
 		}
 		started = 1;
@@ -666,7 +800,7 @@
 				/* Ran into 'end of memory' - stupid "printpath" */
 				return 0;
 			}
-			if (addr != 0)
+			if (addr != 0 && errno != EIO && errno != ESRCH)
 				perror("ptrace: umoven");
 			return -1;
 		}
@@ -678,37 +812,6 @@
 
 #ifdef SUNOS4
 	int pid = tcp->pid;
-#if 0
-	int n, m;
-	union {
-		long val;
-		char x[sizeof(long)];
-	} u;
-
-	if (addr & (sizeof(long) - 1)) {
-		/* addr not a multiple of sizeof(long) */
-		n = addr - (addr & -sizeof(long)); /* residue */
-		addr &= -sizeof(long); /* residue */
-		errno = 0;
-		u.val = ptrace(PTRACE_PEEKDATA, pid, (char *) addr, 0);
-		if (errno) {
-			perror("umoven");
-			return -1;
-		}
-		memcpy(laddr, &u.x[n], m = MIN(sizeof(long) - n, len));
-		addr += sizeof(long), laddr += m, len -= m;
-	}
-	while (len) {
-		errno = 0;
-		u.val = ptrace(PTRACE_PEEKDATA, pid, (char *) addr, 0);
-		if (errno) {
-			perror("umoven");
-			return -1;
-		}
-		memcpy(laddr, u.x, m = MIN(sizeof(long), len));
-		addr += sizeof(long), laddr += m, len -= m;
-	}
-#else /* !oldway */
 	int n;
 
 	while (len) {
@@ -716,15 +819,16 @@
 		n = MIN(n, ((addr + PAGSIZ) & PAGMASK) - addr);
 		if (ptrace(PTRACE_READDATA, pid,
 			   (char *) addr, len, laddr) < 0) {
-			perror("umoven: ptrace(PTRACE_READDATA, ...)");
-			abort();
+			if (errno != ESRCH) {
+				perror("umoven: ptrace(PTRACE_READDATA, ...)");
+				abort();
+			}
 			return -1;
 		}
 		len -= n;
 		addr += n;
 		laddr += n;
 	}
-#endif /* !oldway */
 #endif /* SUNOS4 */
 
 #ifdef USE_PROCFS
@@ -746,11 +850,7 @@
  * for a terminating zero byte.
  */
 int
-umovestr(tcp, addr, len, laddr)
-struct tcb *tcp;
-long addr;
-int len;
-char *laddr;
+umovestr(struct tcb *tcp, long addr, int len, char *laddr)
 {
 #ifdef USE_PROCFS
 #ifdef HAVE_MP_PROCFS
@@ -801,7 +901,8 @@
 				/* Ran into 'end of memory' - stupid "printpath" */
 				return 0;
 			}
-			perror("umovestr");
+			if (addr != 0 && errno != EIO && errno != ESRCH)
+				perror("umovestr");
 			return -1;
 		}
 		started = 1;
@@ -819,7 +920,8 @@
 				/* Ran into 'end of memory' - stupid "printpath" */
 				return 0;
 			}
-			perror("umovestr");
+			if (addr != 0 && errno != EIO && errno != ESRCH)
+				perror("umovestr");
 			return -1;
 		}
 		started = 1;
@@ -835,10 +937,10 @@
 }
 
 #ifdef LINUX
-#if !defined (SPARC) && !defined(SPARC64)
-#define PTRACE_WRITETEXT	101
-#define PTRACE_WRITEDATA	102
-#endif /* !SPARC && !SPARC64 */
+# if !defined (SPARC) && !defined(SPARC64)
+#  define PTRACE_WRITETEXT	101
+#  define PTRACE_WRITEDATA	102
+# endif /* !SPARC && !SPARC64 */
 #endif /* LINUX */
 
 #ifdef SUNOS4
@@ -851,21 +953,6 @@
 int len;
 char *laddr;
 {
-#if 0
-	int n;
-
-	while (len) {
-		n = MIN(len, PAGSIZ);
-		n = MIN(n, ((addr + PAGSIZ) & PAGMASK) - addr);
-		if (ptrace(cmd, pid, (char *)addr, n, laddr) < 0) {
-			perror("uload: ptrace(PTRACE_WRITE, ...)");
-			return -1;
-		}
-		len -= n;
-		addr += n;
-		laddr += n;
-	}
-#else
 	int peek, poke;
 	int n, m;
 	union {
@@ -908,7 +995,6 @@
 		}
 		addr += sizeof(long), laddr += m, len -= m;
 	}
-#endif
 	return 0;
 }
 
@@ -936,14 +1022,14 @@
 #ifndef USE_PROCFS
 
 int
-upeek(pid, off, res)
-int pid;
+upeek(tcp, off, res)
+struct tcb *tcp;
 long off;
 long *res;
 {
 	long val;
 
-#ifdef SUNOS4_KERNEL_ARCH_KLUDGE
+# ifdef SUNOS4_KERNEL_ARCH_KLUDGE
 	{
 		static int is_sun4m = -1;
 		struct utsname name;
@@ -956,7 +1042,6 @@
 			}
 			is_sun4m = strcmp(name.machine, "sun4m") == 0;
 			if (is_sun4m) {
-				extern const struct xlat struct_user_offsets[];
 				const struct xlat *x;
 
 				for (x = struct_user_offsets; x->str; x++)
@@ -966,13 +1051,15 @@
 		if (is_sun4m)
 			off += 1024;
 	}
-#endif /* SUNOS4_KERNEL_ARCH_KLUDGE */
+# endif /* SUNOS4_KERNEL_ARCH_KLUDGE */
 	errno = 0;
-	val = ptrace(PTRACE_PEEKUSER, pid, (char *) off, 0);
+	val = do_ptrace(PTRACE_PEEKUSER, tcp, (char *) off, 0);
 	if (val == -1 && errno) {
-		char buf[60];
-		sprintf(buf,"upeek: ptrace(PTRACE_PEEKUSER,%d,%lu,0)",pid,off);
-		perror(buf);
+		if (errno != ESRCH) {
+			char buf[60];
+			sprintf(buf,"upeek: ptrace(PTRACE_PEEKUSER,%d,%lu,0)", tcp->pid, off);
+			perror(buf);
+		}
 		return -1;
 	}
 	*res = val;
@@ -981,204 +1068,163 @@
 
 #endif /* !USE_PROCFS */
 
-#if 0
-long
-getpc(tcp)
-struct tcb *tcp;
-{
-
-#ifdef LINUX
-	long pc;
-#if defined(I386)
-	if (upeek(tcp->pid, 4*EIP, &pc) < 0)
-		return -1;
-#elif defined(X86_64)
-	if (upeek(tcp->pid, 8*RIP, &pc) < 0)
-		return -1;
-#elif defined(IA64)
-	if (upeek(tcp->pid, PT_B0, &pc) < 0)
-		return -1;
-#elif defined(ARM)
-	if (upeek(tcp->pid, 4*15, &pc) < 0)
-		return -1;
-#elif defined(POWERPC)
-	if (upeek(tcp->pid, sizeof(unsigned long)*PT_NIP, &pc) < 0)
-		return -1;
-#elif defined(M68K)
-	if (upeek(tcp->pid, 4*PT_PC, &pc) < 0)
-		return -1;
-#elif defined(ALPHA)
-	if (upeek(tcp->pid, REG_PC, &pc) < 0)
-		return -1;
-#elif defined(MIPS)
- 	if (upeek(tcp->pid, REG_EPC, &pc) < 0)
- 		return -1;
-#elif defined(SPARC) || defined(SPARC64)
-	struct regs regs;
-	if (ptrace(PTRACE_GETREGS,tcp->pid,(char *)&regs,0) < 0)
-		return -1;
-	pc = regs.r_pc;
-#elif defined(S390) || defined(S390X)
-	if(upeek(tcp->pid,PT_PSWADDR,&pc) < 0)
-		return -1;
-#elif defined(HPPA)
-	if(upeek(tcp->pid,PT_IAOQ0,&pc) < 0)
-		return -1;
-#elif defined(SH)
-       if (upeek(tcp->pid, 4*REG_PC ,&pc) < 0)
-               return -1;
-#elif defined(SH64)
-       if (upeek(tcp->pid, REG_PC ,&pc) < 0)
-               return -1;
-#endif
-	return pc;
-#endif /* LINUX */
-
-#ifdef SUNOS4
-	/*
-	 * Return current program counter for `pid'
-	 * Assumes PC is never 0xffffffff
-	 */
-	struct regs regs;
-
-	if (ptrace(PTRACE_GETREGS, tcp->pid, (char *) &regs, 0) < 0) {
-		perror("getpc: ptrace(PTRACE_GETREGS, ...)");
-		return -1;
-	}
-	return regs.r_pc;
-#endif /* SUNOS4 */
-
-#ifdef SVR4
-	/* XXX */
-	return 0;
-#endif /* SVR4 */
-
-#ifdef FREEBSD
-	struct reg regs;
-	pread(tcp->pfd_reg, &regs, sizeof(regs), 0);
-	return regs.r_eip;
-#endif /* FREEBSD */
-}
-#endif
-
 void
-printcall(tcp)
-struct tcb *tcp;
+printcall(struct tcb *tcp)
 {
 #define PRINTBADPC tprintf(sizeof(long) == 4 ? "[????????] " : \
 			   sizeof(long) == 8 ? "[????????????????] " : \
 			   NULL /* crash */)
 
 #ifdef LINUX
-#ifdef I386
+# ifdef I386
 	long eip;
 
-	if (upeek(tcp->pid, 4*EIP, &eip) < 0) {
+	if (upeek(tcp, 4*EIP, &eip) < 0) {
 		PRINTBADPC;
 		return;
 	}
 	tprintf("[%08lx] ", eip);
 
-#elif defined(S390) || defined(S390X)
-         long psw;
-         if(upeek(tcp->pid,PT_PSWADDR,&psw) < 0) {
-                 PRINTBADPC;
-                 return;
-         }
-#ifdef S390
-         tprintf("[%08lx] ", psw);
-#elif S390X
-       tprintf("[%16lx] ", psw);
-#endif
+# elif defined(S390) || defined(S390X)
+	long psw;
+	if(upeek(tcp,PT_PSWADDR,&psw) < 0) {
+		PRINTBADPC;
+		return;
+	}
+#  ifdef S390
+	tprintf("[%08lx] ", psw);
+#  elif S390X
+	tprintf("[%16lx] ", psw);
+#  endif
 
-#elif defined(X86_64)
+# elif defined(X86_64)
 	long rip;
 
-	if (upeek(tcp->pid, 8*RIP, &rip) < 0) {
+	if (upeek(tcp, 8*RIP, &rip) < 0) {
 		PRINTBADPC;
 		return;
 	}
 	tprintf("[%16lx] ", rip);
-#elif defined(IA64)
+# elif defined(IA64)
 	long ip;
 
-	if (upeek(tcp->pid, PT_B0, &ip) < 0) {
+	if (upeek(tcp, PT_B0, &ip) < 0) {
 		PRINTBADPC;
 		return;
 	}
 	tprintf("[%08lx] ", ip);
-#elif defined(POWERPC)
+# elif defined(POWERPC)
 	long pc;
 
-	if (upeek(tcp->pid, sizeof(unsigned long)*PT_NIP, &pc) < 0) {
+	if (upeek(tcp, sizeof(unsigned long)*PT_NIP, &pc) < 0) {
+		PRINTBADPC;
+		return;
+	}
+#  ifdef POWERPC64
+	tprintf("[%016lx] ", pc);
+#  else
+	tprintf("[%08lx] ", pc);
+#  endif
+# elif defined(M68K)
+	long pc;
+
+	if (upeek(tcp, 4*PT_PC, &pc) < 0) {
 		tprintf ("[????????] ");
 		return;
 	}
 	tprintf("[%08lx] ", pc);
-#elif defined(M68K)
+# elif defined(ALPHA)
 	long pc;
 
-	if (upeek(tcp->pid, 4*PT_PC, &pc) < 0) {
-		tprintf ("[????????] ");
-		return;
-	}
-	tprintf("[%08lx] ", pc);
-#elif defined(ALPHA)
-	long pc;
-
-	if (upeek(tcp->pid, REG_PC, &pc) < 0) {
+	if (upeek(tcp, REG_PC, &pc) < 0) {
 		tprintf ("[????????????????] ");
 		return;
 	}
 	tprintf("[%08lx] ", pc);
-#elif defined(SPARC) || defined(SPARC64)
-	struct regs regs;
+# elif defined(SPARC) || defined(SPARC64)
+	struct pt_regs regs;
 	if (ptrace(PTRACE_GETREGS,tcp->pid,(char *)&regs,0) < 0) {
 		PRINTBADPC;
 		return;
 	}
-	tprintf("[%08lx] ", regs.r_pc);
-#elif defined(HPPA)
+#  if defined(SPARC64)
+	tprintf("[%08lx] ", regs.tpc);
+#  else
+	tprintf("[%08lx] ", regs.pc);
+#  endif
+# elif defined(HPPA)
 	long pc;
 
-	if(upeek(tcp->pid,PT_IAOQ0,&pc) < 0) {
+	if(upeek(tcp,PT_IAOQ0,&pc) < 0) {
 		tprintf ("[????????] ");
 		return;
 	}
 	tprintf("[%08lx] ", pc);
-#elif defined(MIPS)
+# elif defined(MIPS)
 	long pc;
 
-	if (upeek(tcp->pid, REG_EPC, &pc) < 0) {
+	if (upeek(tcp, REG_EPC, &pc) < 0) {
 		tprintf ("[????????] ");
 		return;
 	}
 	tprintf("[%08lx] ", pc);
-#elif defined(SH)
-       long pc;
-
-       if (upeek(tcp->pid, 4*REG_PC, &pc) < 0) {
-               tprintf ("[????????] ");
-               return;
-       }
-       tprintf("[%08lx] ", pc);
-#elif defined(SH64)
+# elif defined(SH)
 	long pc;
 
-	if (upeek(tcp->pid, REG_PC, &pc) < 0) {
+	if (upeek(tcp, 4*REG_PC, &pc) < 0) {
+		tprintf ("[????????] ");
+		return;
+	}
+	tprintf("[%08lx] ", pc);
+# elif defined(SH64)
+	long pc;
+
+	if (upeek(tcp, REG_PC, &pc) < 0) {
 		tprintf ("[????????????????] ");
 		return;
 	}
 	tprintf("[%08lx] ", pc);
-#elif defined(ARM)
+# elif defined(ARM)
 	long pc;
 
-	if (upeek(tcp->pid, 4*15, &pc) < 0) {
+	if (upeek(tcp, 4*15, &pc) < 0) {
 		PRINTBADPC;
 		return;
 	}
 	tprintf("[%08lx] ", pc);
-#endif /* !architecture */
+# elif defined(AVR32)
+	long pc;
+
+	if (upeek(tcp, REG_PC, &pc) < 0) {
+		tprintf("[????????] ");
+		return;
+	}
+	tprintf("[%08lx] ", pc);
+# elif defined(BFIN)
+	long pc;
+
+	if (upeek(tcp, PT_PC, &pc) < 0) {
+		PRINTBADPC;
+		return;
+	}
+	tprintf("[%08lx] ", pc);
+#elif defined(CRISV10)
+	long pc;
+
+	if (upeek(tcp, 4*PT_IRP, &pc) < 0) {
+		PRINTBADPC;
+		return;
+	}
+	tprintf("[%08lx] ", pc);
+#elif defined(CRISV32)
+	long pc;
+
+	if (upeek(tcp, 4*PT_ERP, &pc) < 0) {
+		PRINTBADPC;
+		return;
+	}
+	tprintf("[%08lx] ", pc);
+# endif /* architecture */
 #endif /* LINUX */
 
 #ifdef SUNOS4
@@ -1204,58 +1250,75 @@
 #endif /* FREEBSD */
 }
 
+
+/*
+ * These #if's are huge, please indent them correctly.
+ * It's easy to get confused otherwise.
+ */
 #ifndef USE_PROCFS
 
-#if defined LINUX
+#ifdef LINUX
 
-#include <sys/syscall.h>
-#ifndef CLONE_PTRACE
-# define CLONE_PTRACE    0x00002000
-#endif
-#ifndef CLONE_STOPPED
-# define CLONE_STOPPED   0x02000000
-#endif
+#  include "syscall.h"
 
-#ifdef IA64
+#  include <sys/syscall.h>
+#  ifndef CLONE_PTRACE
+#   define CLONE_PTRACE    0x00002000
+#  endif
+#  ifndef CLONE_VFORK
+#   define CLONE_VFORK     0x00004000
+#  endif
+#  ifndef CLONE_VM
+#   define CLONE_VM        0x00000100
+#  endif
+#  ifndef CLONE_STOPPED
+#   define CLONE_STOPPED   0x02000000
+#  endif
+
+#  ifdef IA64
 
 /* We don't have fork()/vfork() syscalls on ia64 itself, but the ia32
    subsystem has them for x86... */
-#define SYS_fork	2
-#define SYS_vfork	190
+#   define SYS_fork	2
+#   define SYS_vfork	190
 
 typedef unsigned long *arg_setup_state;
 
 static int
 arg_setup(struct tcb *tcp, arg_setup_state *state)
 {
-	unsigned long *bsp, cfm, sof, sol;
+	unsigned long cfm, sof, sol;
+	long bsp;
 
-	if (ia32)
+	if (ia32) {
+		/* Satisfy a false GCC warning.  */
+		*state = NULL;
 		return 0;
+	}
 
-	if (upeek(tcp->pid, PT_AR_BSP, (long *) &bsp) < 0)
+	if (upeek(tcp, PT_AR_BSP, &bsp) < 0)
 		return -1;
-	if (upeek(tcp->pid, PT_CFM, (long *) &cfm) < 0)
+	if (upeek(tcp, PT_CFM, (long *) &cfm) < 0)
 		return -1;
 
 	sof = (cfm >> 0) & 0x7f;
 	sol = (cfm >> 7) & 0x7f;
-	bsp = ia64_rse_skip_regs(bsp, -sof + sol);
+	bsp = (long) ia64_rse_skip_regs((unsigned long *) bsp, -sof + sol);
 
-	*state = bsp;
+	*state = (unsigned long *) bsp;
 	return 0;
 }
 
-# define arg_finish_change(tcp, state)	0
+#   define arg_finish_change(tcp, state)	0
 
-#ifdef SYS_fork
+#   ifdef SYS_fork
 static int
 get_arg0 (struct tcb *tcp, arg_setup_state *state, long *valp)
 {
 	int ret;
 
 	if (ia32)
-		ret = upeek (tcp->pid, PT_R11, valp);
+		ret = upeek (tcp, PT_R11, valp);
 	else
 		ret = umoven (tcp,
 			      (unsigned long) ia64_rse_skip_regs(*state, 0),
@@ -1269,14 +1332,14 @@
 	int ret;
 
 	if (ia32)
-		ret = upeek (tcp->pid, PT_R9, valp);
+		ret = upeek (tcp, PT_R9, valp);
 	else
 		ret = umoven (tcp,
 			      (unsigned long) ia64_rse_skip_regs(*state, 1),
 			      sizeof(long), (void *) valp);
 	return ret;
 }
-#endif
+#   endif
 
 static int
 set_arg0 (struct tcb *tcp, arg_setup_state *state, long val)
@@ -1310,71 +1373,87 @@
 	return errno ? -1 : 0;
 }
 
-#elif defined (SPARC) || defined (SPARC64)
+/* ia64 does not return the input arguments from functions (and syscalls)
+   according to ia64 RSE (Register Stack Engine) behavior.  */
 
-typedef struct regs arg_setup_state;
+#   define restore_arg0(tcp, state, val) ((void) (state), 0)
+#   define restore_arg1(tcp, state, val) ((void) (state), 0)
 
-# define arg_setup(tcp, state) \
-  (ptrace (PTRACE_GETREGS, tcp->pid, (char *) (state), 0))
-# define arg_finish_change(tcp, state) \
-  (ptrace (PTRACE_SETREGS, tcp->pid, (char *) (state), 0))
+#  elif defined (SPARC) || defined (SPARC64)
 
-# define get_arg0(tcp, state, valp) (*(valp) = (state)->r_o0, 0)
-# define get_arg1(tcp, state, valp) (*(valp) = (state)->r_o1, 0)
-# define set_arg0(tcp, state, val) ((state)->r_o0 = (val), 0)
-# define set_arg1(tcp, state, val) ((state)->r_o1 = (val), 0)
-# define restore_arg0(tcp, state, val) 0
+typedef struct pt_regs arg_setup_state;
 
-#else
+#   define arg_setup(tcp, state) \
+    (ptrace (PTRACE_GETREGS, tcp->pid, (char *) (state), 0))
+#   define arg_finish_change(tcp, state) \
+    (ptrace (PTRACE_SETREGS, tcp->pid, (char *) (state), 0))
 
-# if defined S390 || defined S390X
+#   define get_arg0(tcp, state, valp) (*(valp) = (state)->u_regs[U_REG_O0], 0)
+#   define get_arg1(tcp, state, valp) (*(valp) = (state)->u_regs[U_REG_O1], 0)
+#   define set_arg0(tcp, state, val) ((state)->u_regs[U_REG_O0] = (val), 0)
+#   define set_arg1(tcp, state, val) ((state)->u_regs[U_REG_O1] = (val), 0)
+#   define restore_arg0(tcp, state, val) 0
+
+#  else /* other architectures */
+
+#   if defined S390 || defined S390X
 /* Note: this is only true for the `clone' system call, which handles
    arguments specially.  We could as well say that its first two arguments
    are swapped relative to other architectures, but that would just be
    another #ifdef in the calls.  */
-#  define arg0_offset	PT_GPR3
-#  define arg1_offset	PT_ORIGGPR2
-#  define restore_arg0(tcp, state, val) ((void) (state), 0)
-#  define restore_arg1(tcp, state, val) ((void) (state), 0)
-#  define arg0_index	1
-#  define arg1_index	0
-# elif defined (ALPHA) || defined (MIPS)
-#  define arg0_offset	REG_A0
-#  define arg1_offset	(REG_A0+1)
-# elif defined (POWERPC)
-#  define arg0_offset	(sizeof(unsigned long)*PT_R3)
-#  define arg1_offset	(sizeof(unsigned long)*PT_R4)
-#  define restore_arg0(tcp, state, val) ((void) (state), 0)
-# elif defined (HPPA)
-#  define arg0_offset	 PT_GR26
-#  define arg1_offset	 (PT_GR26-4)
-# elif defined (X86_64)
-#  define arg0_offset	((long)(8*(current_personality ? RBX : RDI)))
-#  define arg1_offset	((long)(8*(current_personality ? RCX : RSI)))
-# elif defined (SH)
-#  define arg0_offset	(4*(REG_REG0+4))
-#  define arg1_offset	(4*(REG_REG0+5))
-# elif defined (SH64)
-   /* ABI defines arg0 & 1 in r2 & r3 */
-#  define arg0_offset   (REG_OFFSET+16)
-#  define arg1_offset   (REG_OFFSET+24)
-#  define restore_arg0(tcp, state, val) 0
-# else
-#  define arg0_offset	0
-#  define arg1_offset	4
-#  if defined ARM
-#   define restore_arg0(tcp, state, val) 0
-#  endif
-# endif
+#    define arg0_offset	PT_GPR3
+#    define arg1_offset	PT_ORIGGPR2
+#    define restore_arg0(tcp, state, val) ((void) (state), 0)
+#    define restore_arg1(tcp, state, val) ((void) (state), 0)
+#    define arg0_index	1
+#    define arg1_index	0
+#   elif defined (ALPHA) || defined (MIPS)
+#    define arg0_offset	REG_A0
+#    define arg1_offset	(REG_A0+1)
+#   elif defined (AVR32)
+#    define arg0_offset	(REG_R12)
+#    define arg1_offset	(REG_R11)
+#   elif defined (POWERPC)
+#    define arg0_offset	(sizeof(unsigned long)*PT_R3)
+#    define arg1_offset	(sizeof(unsigned long)*PT_R4)
+#    define restore_arg0(tcp, state, val) ((void) (state), 0)
+#   elif defined (HPPA)
+#    define arg0_offset	 PT_GR26
+#    define arg1_offset	 (PT_GR26-4)
+#   elif defined (X86_64)
+#    define arg0_offset	((long)(8*(current_personality ? RBX : RDI)))
+#    define arg1_offset	((long)(8*(current_personality ? RCX : RSI)))
+#   elif defined (SH)
+#    define arg0_offset	(4*(REG_REG0+4))
+#    define arg1_offset	(4*(REG_REG0+5))
+#   elif defined (SH64)
+    /* ABI defines arg0 & 1 in r2 & r3 */
+#    define arg0_offset   (REG_OFFSET+16)
+#    define arg1_offset   (REG_OFFSET+24)
+#    define restore_arg0(tcp, state, val) 0
+#   elif defined CRISV10 || defined CRISV32
+#    define arg0_offset   (4*PT_R11)
+#    define arg1_offset   (4*PT_ORIG_R10)
+#    define restore_arg0(tcp, state, val) 0
+#    define restore_arg1(tcp, state, val) 0
+#    define arg0_index   1
+#    define arg1_index   0
+#   else
+#    define arg0_offset	0
+#    define arg1_offset	4
+#    if defined ARM
+#     define restore_arg0(tcp, state, val) 0
+#    endif
+#   endif
 
 typedef int arg_setup_state;
 
-# define arg_setup(tcp, state) (0)
-# define arg_finish_change(tcp, state)	0
-# define get_arg0(tcp, cookie, valp) \
-  (upeek ((tcp)->pid, arg0_offset, (valp)))
-# define get_arg1(tcp, cookie, valp) \
-  (upeek ((tcp)->pid, arg1_offset, (valp)))
+#   define arg_setup(tcp, state) (0)
+#   define arg_finish_change(tcp, state)	0
+#   define get_arg0(tcp, cookie, valp) \
+    (upeek ((tcp), arg0_offset, (valp)))
+#   define get_arg1(tcp, cookie, valp) \
+    (upeek ((tcp), arg1_offset, (valp)))
 
 static int
 set_arg0 (struct tcb *tcp, void *cookie, long val)
@@ -1388,25 +1467,24 @@
 	return ptrace (PTRACE_POKEUSER, tcp->pid, (char*)arg1_offset, val);
 }
 
-#endif
+#  endif /* architectures */
 
-#ifndef restore_arg0
-# define restore_arg0(tcp, state, val) set_arg0((tcp), (state), (val))
-#endif
-#ifndef restore_arg1
-# define restore_arg1(tcp, state, val) set_arg1((tcp), (state), (val))
-#endif
+#  ifndef restore_arg0
+#   define restore_arg0(tcp, state, val) set_arg0((tcp), (state), (val))
+#  endif
+#  ifndef restore_arg1
+#   define restore_arg1(tcp, state, val) set_arg1((tcp), (state), (val))
+#  endif
 
-#ifndef arg0_index
-# define arg0_index 0
-# define arg1_index 1
-#endif
+#  ifndef arg0_index
+#   define arg0_index 0
+#   define arg1_index 1
+#  endif
 
 int
-setbpt(tcp)
-struct tcb *tcp;
+setbpt(struct tcb *tcp)
 {
-	extern int change_syscall(struct tcb *, int);
+	static int clone_scno[SUPPORTED_PERSONALITIES] = { SYS_clone };
 	arg_setup_state state;
 
 	if (tcp->flags & TCB_BPTSET) {
@@ -1414,18 +1492,32 @@
 		return -1;
 	}
 
+	/*
+	 * It's a silly kludge to initialize this with a search at runtime.
+	 * But it's better than maintaining another magic thing in the
+	 * godforsaken tables.
+	 */
+	if (clone_scno[current_personality] == 0) {
+		int i;
+		for (i = 0; i < nsyscalls; ++i)
+			if (sysent[i].sys_func == sys_clone) {
+				clone_scno[current_personality] = i;
+				break;
+			}
+	}
+
 	switch (known_scno(tcp)) {
-#ifdef SYS_vfork
+#  ifdef SYS_vfork
 	case SYS_vfork:
-#endif
-#ifdef SYS_fork
+#  endif
+#  ifdef SYS_fork
 	case SYS_fork:
-#endif
-#if defined SYS_fork || defined SYS_vfork
+#  endif
+#  if defined SYS_fork || defined SYS_vfork
 		if (arg_setup (tcp, &state) < 0
 		    || get_arg0 (tcp, &state, &tcp->inst[0]) < 0
 		    || get_arg1 (tcp, &state, &tcp->inst[1]) < 0
-		    || change_syscall(tcp, SYS_clone) < 0
+		    || change_syscall(tcp, clone_scno[current_personality]) < 0
 		    || set_arg0 (tcp, &state, CLONE_PTRACE|SIGCHLD) < 0
 		    || set_arg1 (tcp, &state, 0) < 0
 		    || arg_finish_change (tcp, &state) < 0)
@@ -1434,17 +1526,26 @@
 		tcp->u_arg[arg1_index] = 0;
 		tcp->flags |= TCB_BPTSET;
 		return 0;
-#endif
+#  endif
 
 	case SYS_clone:
-#ifdef SYS_clone2
+#  ifdef SYS_clone2
 	case SYS_clone2:
-#endif
-		if ((tcp->u_arg[arg0_index] & CLONE_PTRACE) == 0
-		    && (arg_setup (tcp, &state) < 0
-			|| set_arg0 (tcp, &state,
-				     tcp->u_arg[arg0_index] | CLONE_PTRACE) < 0
-			|| arg_finish_change (tcp, &state) < 0))
+#  endif
+		/* ia64 calls directly `clone (CLONE_VFORK | CLONE_VM)'
+		   contrary to x86 SYS_vfork above.  Even on x86 we turn the
+		   vfork semantics into plain fork - each application must not
+		   depend on the vfork specifics according to POSIX.  We would
+		   hang waiting for the parent resume otherwise.  We need to
+		   clear also CLONE_VM but only in the CLONE_VFORK case as
+		   otherwise we would break pthread_create.  */
+
+		if ((arg_setup (tcp, &state) < 0
+		    || set_arg0 (tcp, &state,
+				 (tcp->u_arg[arg0_index] | CLONE_PTRACE)
+				 & ~(tcp->u_arg[arg0_index] & CLONE_VFORK
+				     ? CLONE_VFORK | CLONE_VM : 0)) < 0
+		    || arg_finish_change (tcp, &state) < 0))
 			return -1;
 		tcp->flags |= TCB_BPTSET;
 		tcp->inst[0] = tcp->u_arg[arg0_index];
@@ -1469,230 +1570,30 @@
 	    || restore_arg0 (tcp, &state, tcp->inst[0]) < 0
 	    || restore_arg1 (tcp, &state, tcp->inst[1]) < 0
 	    || arg_finish_change (tcp, &state))
-		return -1;
+		if (errno != ESRCH) return -1;
 	tcp->flags &= ~TCB_BPTSET;
 	return 0;
 }
 
-#else
+# else /* !defined LINUX */
 
 int
 setbpt(tcp)
 struct tcb *tcp;
 {
-
-#ifdef LINUX
-#if defined (SPARC) || defined (SPARC64)
-	/* We simply use the SunOS breakpoint code. */
+#  ifdef SUNOS4
+#   ifdef SPARC	/* This code is slightly sparc specific */
 
 	struct regs regs;
-	unsigned long inst;
-#define LOOPA	0x30800000	/* ba,a	0 */
-
-	if (tcp->flags & TCB_BPTSET) {
-		fprintf(stderr, "PANIC: TCB already set in pid %u\n", tcp->pid);
-		return -1;
-	}
-	if (ptrace(PTRACE_GETREGS, tcp->pid, (char *)&regs, 0) < 0) {
-		perror("setbpt: ptrace(PTRACE_GETREGS, ...)");
-		return -1;
-	}
-	tcp->baddr = regs.r_o7 + 8;
-	errno = 0;
-	tcp->inst[0] = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)tcp->baddr, 0);
-	if(errno) {
-		perror("setbpt: ptrace(PTRACE_PEEKTEXT, ...)");
-		return -1;
-	}
-
-	/*
-	 * XXX - BRUTAL MODE ON
-	 * We cannot set a real BPT in the child, since it will not be
-	 * traced at the moment it will reach the trap and would probably
-	 * die with a core dump.
-	 * Thus, we are force our way in by taking out two instructions
-	 * and insert an eternal loop instead, in expectance of the SIGSTOP
-	 * generated by out PTRACE_ATTACH.
-	 * Of cause, if we evaporate ourselves in the middle of all this...
-	 */
-	errno = 0;
-	inst = LOOPA;
-#if defined (SPARC64)
-	inst <<= 32;
-	inst |= (tcp->inst[0] & 0xffffffffUL);
-#endif
-	ptrace(PTRACE_POKETEXT, tcp->pid, (char *) tcp->baddr, inst);
-	if(errno) {
-		perror("setbpt: ptrace(PTRACE_POKETEXT, ...)");
-		return -1;
-	}
-	tcp->flags |= TCB_BPTSET;
-
-#else /* !SPARC && !SPARC64 */
-#ifdef IA64
-	if (ia32) {
-#		define LOOP	0x0000feeb
-		if (tcp->flags & TCB_BPTSET) {
-			fprintf(stderr, "PANIC: bpt already set in pid %u\n",
-				tcp->pid);
-			return -1;
-		}
-		if (upeek(tcp->pid, PT_CR_IIP, &tcp->baddr) < 0)
-			return -1;
-		if (debug)
-			fprintf(stderr, "[%d] setting bpt at %lx\n",
-				tcp->pid, tcp->baddr);
-		tcp->inst[0] = ptrace(PTRACE_PEEKTEXT, tcp->pid,
-				      (char *) tcp->baddr, 0);
-		if (errno) {
-			perror("setbpt: ptrace(PTRACE_PEEKTEXT, ...)");
-			return -1;
-		}
-		ptrace(PTRACE_POKETEXT, tcp->pid, (char *) tcp->baddr, LOOP);
-		if (errno) {
-			perror("setbpt: ptrace(PTRACE_POKETEXT, ...)");
-			return -1;
-		}
-		tcp->flags |= TCB_BPTSET;
-	} else {
-		/*
-		 * Our strategy here is to replace the bundle that
-		 * contained the clone() syscall with a bundle of the
-		 * form:
-		 *
-		 *	{ 1: br 1b; br 1b; br 1b }
-		 *
-		 * This ensures that the newly forked child will loop
-		 * endlessly until we've got a chance to attach to it.
-		 */
-#		define LOOP0	0x0000100000000017
-#		define LOOP1	0x4000000000200000
-		unsigned long addr, ipsr;
-		pid_t pid;
-
-		pid = tcp->pid;
-		if (upeek(pid, PT_CR_IPSR, &ipsr) < 0)
-			return -1;
-		if (upeek(pid, PT_CR_IIP, &addr) < 0)
-			return -1;
-		/* store "ri" in low two bits */
-		tcp->baddr = addr | ((ipsr >> 41) & 0x3);
-
-		errno = 0;
-		tcp->inst[0] = ptrace(PTRACE_PEEKTEXT, pid, (char *) addr + 0,
-				      0);
-		tcp->inst[1] = ptrace(PTRACE_PEEKTEXT, pid, (char *) addr + 8,
-				      0);
-		if (errno) {
-			perror("setbpt: ptrace(PTRACE_PEEKTEXT, ...)");
-			return -1;
-		}
-
-		errno = 0;
-		ptrace(PTRACE_POKETEXT, pid, (char *) addr + 0, LOOP0);
-		ptrace(PTRACE_POKETEXT, pid, (char *) addr + 8, LOOP1);
-		if (errno) {
-			perror("setbpt: ptrace(PTRACE_POKETEXT, ...)");
-			return -1;
-		}
-		tcp->flags |= TCB_BPTSET;
-	}
-#else /* !IA64 */
-
-#if defined (I386) || defined(X86_64)
-#define LOOP	0x0000feeb
-#elif defined (M68K)
-#define LOOP	0x60fe0000
-#elif defined (ALPHA)
-#define LOOP	0xc3ffffff
-#elif defined (POWERPC)
-#define LOOP	0x48000000
-#elif defined(ARM)
-#define LOOP	0xEAFFFFFE
-#elif defined(MIPS)
-#define LOOP	0x1000ffff
-#elif defined(S390)
-#define LOOP	0xa7f40000	/* BRC 15,0 */
-#elif defined(S390X)
-#define LOOP   0xa7f4000000000000UL /* BRC 15,0 */
-#elif defined(HPPA)
-#define LOOP	0xe81f1ff7	/* b,l,n <loc>,r0 */
-#elif defined(SH)
-#ifdef __LITTLE_ENDIAN__
-#define LOOP   0x0000affe
-#else
-#define LOOP   0xfeaf0000
-#endif
-#else
-#error unknown architecture
-#endif
-
-	if (tcp->flags & TCB_BPTSET) {
-		fprintf(stderr, "PANIC: bpt already set in pid %u\n", tcp->pid);
-		return -1;
-	}
-#if defined (I386)
-	if (upeek(tcp->pid, 4*EIP, &tcp->baddr) < 0)
-		return -1;
-#elif defined (X86_64)
-	if (upeek(tcp->pid, 8*RIP, &tcp->baddr) < 0)
-		return -1;
-#elif defined (M68K)
-	if (upeek(tcp->pid, 4*PT_PC, &tcp->baddr) < 0)
-	  return -1;
-#elif defined (ALPHA)
-	return -1;
-#elif defined (ARM)
-	return -1;
-#elif defined (MIPS)
-	return -1;		/* FIXME: I do not know what i do - Flo */
-#elif defined (POWERPC)
-	if (upeek(tcp->pid, sizeof(unsigned long)*PT_NIP, &tcp->baddr) < 0)
-		return -1;
-#elif defined(S390) || defined(S390X)
-	if (upeek(tcp->pid,PT_PSWADDR, &tcp->baddr) < 0)
-		return -1;
-#elif defined(HPPA)
-	if (upeek(tcp->pid, PT_IAOQ0, &tcp->baddr) < 0)
-		return -1;
-	tcp->baddr &= ~0x03;
-#elif defined(SH)
-       if (upeek(tcp->pid, 4*REG_PC, &tcp->baddr) < 0)
-               return -1;
-#else
-#error unknown architecture
-#endif
-	if (debug)
-		fprintf(stderr, "[%d] setting bpt at %lx\n", tcp->pid, tcp->baddr);
-	tcp->inst[0] = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *) tcp->baddr, 0);
-	if (errno) {
-		perror("setbpt: ptrace(PTRACE_PEEKTEXT, ...)");
-		return -1;
-	}
-	ptrace(PTRACE_POKETEXT, tcp->pid, (char *) tcp->baddr, LOOP);
-	if (errno) {
-		perror("setbpt: ptrace(PTRACE_POKETEXT, ...)");
-		return -1;
-	}
-	tcp->flags |= TCB_BPTSET;
-
-#endif /* !IA64 */
-#endif /* SPARC || SPARC64 */
-#endif /* LINUX */
-
-#ifdef SUNOS4
-#ifdef SPARC	/* This code is slightly sparc specific */
-
-	struct regs regs;
-#define BPT	0x91d02001	/* ta	1 */
-#define LOOP	0x10800000	/* ba	0 */
-#define LOOPA	0x30800000	/* ba,a	0 */
-#define NOP	0x01000000
-#if LOOPA
+#    define BPT	0x91d02001	/* ta	1 */
+#    define LOOP	0x10800000	/* ba	0 */
+#    define LOOPA	0x30800000	/* ba,a	0 */
+#    define NOP	0x01000000
+#    if LOOPA
 	static int loopdeloop[1] = {LOOPA};
-#else
+#    else
 	static int loopdeloop[2] = {LOOP, NOP};
-#endif
+#    endif
 
 	if (tcp->flags & TCB_BPTSET) {
 		fprintf(stderr, "PANIC: TCB already set in pid %u\n", tcp->pid);
@@ -1726,8 +1627,8 @@
 	}
 	tcp->flags |= TCB_BPTSET;
 
-#endif /* SPARC */
-#endif /* SUNOS4 */
+#   endif /* SPARC */
+#  endif /* SUNOS4 */
 
 	return 0;
 }
@@ -1736,209 +1637,12 @@
 clearbpt(tcp)
 struct tcb *tcp;
 {
+#  ifdef SUNOS4
+#   ifdef SPARC
 
-#ifdef LINUX
-#if defined(I386) || defined(X86_64)
-	long eip;
-#elif defined(POWERPC)
-	long pc;
-#elif defined(M68K)
-	long pc;
-#elif defined(ALPHA)
-	long pc;
-#elif defined(HPPA)
-	long iaoq;
-#elif defined(SH)
-       long pc;
-#endif /* architecture */
-
-#if defined (SPARC) || defined (SPARC64)
-	/* Again, we borrow the SunOS breakpoint code. */
-	if (!(tcp->flags & TCB_BPTSET)) {
-		fprintf(stderr, "PANIC: TCB not set in pid %u\n", tcp->pid);
-		return -1;
-	}
-	errno = 0;
-	ptrace(PTRACE_POKETEXT, tcp->pid, (char *) tcp->baddr, tcp->inst[0]);
-	if(errno) {
-		perror("clearbtp: ptrace(PTRACE_POKETEXT, ...)");
-		return -1;
-	}
-	tcp->flags &= ~TCB_BPTSET;
-#elif defined(IA64)
-	if (ia32) {
-		unsigned long addr;
-
-		if (debug)
-			fprintf(stderr, "[%d] clearing bpt\n", tcp->pid);
-		if (!(tcp->flags & TCB_BPTSET)) {
-			fprintf(stderr, "PANIC: TCB not set in pid %u\n", tcp->pid);
-			return -1;
-		}
-		errno = 0;
-		ptrace(PTRACE_POKETEXT, tcp->pid, (char *) tcp->baddr, tcp->inst[0]);
-		if (errno) {
-			perror("clearbtp: ptrace(PTRACE_POKETEXT, ...)");
-			return -1;
-		}
-		tcp->flags &= ~TCB_BPTSET;
-
-		if (upeek(tcp->pid, PT_CR_IIP, &addr) < 0)
-			return -1;
-		if (addr != tcp->baddr) {
-			/* The breakpoint has not been reached yet.  */
-			if (debug)
-				fprintf(stderr,
-					"NOTE: PC not at bpt (pc %#lx baddr %#lx)\n",
-						addr, tcp->baddr);
-			return 0;
-		}
-	} else {
-		unsigned long addr, ipsr;
-		pid_t pid;
-
-		pid = tcp->pid;
-
-		if (upeek(pid, PT_CR_IPSR, &ipsr) < 0)
-			return -1;
-		if (upeek(pid, PT_CR_IIP, &addr) < 0)
-			return -1;
-
-		/* restore original bundle: */
-		errno = 0;
-		ptrace(PTRACE_POKETEXT, pid, (char *) addr + 0, tcp->inst[0]);
-		ptrace(PTRACE_POKETEXT, pid, (char *) addr + 8, tcp->inst[1]);
-		if (errno) {
-			perror("clearbpt: ptrace(PTRACE_POKETEXT, ...)");
-			return -1;
-		}
-
-		/* restore original "ri" in ipsr: */
-		ipsr = (ipsr & ~(0x3ul << 41)) | ((tcp->baddr & 0x3) << 41);
-		errno = 0;
-		ptrace(PTRACE_POKEUSER, pid, (char *) PT_CR_IPSR, ipsr);
-		if (errno) {
-			perror("clrbpt: ptrace(PTRACE_POKEUSER, ...)");
-			return -1;
-		}
-
-		tcp->flags &= ~TCB_BPTSET;
-
-		if (addr != (tcp->baddr & ~0x3)) {
-			/* the breakpoint has not been reached yet.  */
-			if (debug)
-				fprintf(stderr, "NOTE: PC not at bpt (pc %#lx baddr %#lx)\n",
-					addr, tcp->baddr);
-			return 0;
-		}
-	}
-#else /* !IA64  && !SPARC && !SPARC64 */
-
-	if (debug)
-		fprintf(stderr, "[%d] clearing bpt\n", tcp->pid);
-	if (!(tcp->flags & TCB_BPTSET)) {
-		fprintf(stderr, "PANIC: TCB not set in pid %u\n", tcp->pid);
-		return -1;
-	}
-	errno = 0;
-	ptrace(PTRACE_POKETEXT, tcp->pid, (char *) tcp->baddr, tcp->inst[0]);
-	if (errno) {
-		perror("clearbtp: ptrace(PTRACE_POKETEXT, ...)");
-		return -1;
-	}
-	tcp->flags &= ~TCB_BPTSET;
-
-#ifdef I386
-	if (upeek(tcp->pid, 4*EIP, &eip) < 0)
-		return -1;
-	if (eip != tcp->baddr) {
-		/* The breakpoint has not been reached yet.  */
-		if (debug)
-			fprintf(stderr,
-				"NOTE: PC not at bpt (pc %#lx baddr %#lx)\n",
-					eip, tcp->baddr);
-		return 0;
-	}
-#elif defined(X86_64)
-	if (upeek(tcp->pid, 8*RIP, &eip) < 0)
-		return -1;
-	if (eip != tcp->baddr) {
-		/* The breakpoint has not been reached yet.  */
-		if (debug)
-			fprintf(stderr,
-				"NOTE: PC not at bpt (pc %#lx baddr %#lx)\n",
-					eip, tcp->baddr);
-		return 0;
-	}
-#elif defined(POWERPC)
-	if (upeek(tcp->pid, sizeof(unsigned long)*PT_NIP, &pc) < 0)
-		return -1;
-	if (pc != tcp->baddr) {
-		/* The breakpoint has not been reached yet.  */
-		if (debug)
-			fprintf(stderr, "NOTE: PC not at bpt (pc %#lx baddr %#lx)\n",
-				pc, tcp->baddr);
-		return 0;
-	}
-#elif defined(M68K)
-	if (upeek(tcp->pid, 4*PT_PC, &pc) < 0)
-		return -1;
-	if (pc != tcp->baddr) {
-		/* The breakpoint has not been reached yet.  */
-		if (debug)
-			fprintf(stderr, "NOTE: PC not at bpt (pc %#lx baddr %#lx)\n",
-				pc, tcp->baddr);
-		return 0;
-	}
-#elif defined(ALPHA)
-	if (upeek(tcp->pid, REG_PC, &pc) < 0)
-		return -1;
-	if (pc != tcp->baddr) {
-		/* The breakpoint has not been reached yet.  */
-		if (debug)
-			fprintf(stderr, "NOTE: PC not at bpt (pc %#lx baddr %#lx)\n",
-				pc, tcp->baddr);
-		return 0;
-	}
-#elif defined(HPPA)
-	if (upeek(tcp->pid, PT_IAOQ0, &iaoq) < 0)
-		return -1;
-	iaoq &= ~0x03;
-	if (iaoq != tcp->baddr && iaoq != tcp->baddr + 4) {
-		/* The breakpoint has not been reached yet.  */
-		if (debug)
-			fprintf(stderr, "NOTE: PC not at bpt (iaoq %#lx baddr %#lx)\n",
-				iaoq, tcp->baddr);
-		return 0;
-	}
-	iaoq = tcp->baddr | 3;
-	/* We should be pointing at a 'ldi -1000,r1' in glibc, so it is
-	 * safe to set both IAOQ0 and IAOQ1 to that so the PSW N bit
-	 * has no significant effect.
-	 */
-	ptrace(PTRACE_POKEUSER, tcp->pid, (void *)PT_IAOQ0, iaoq);
-	ptrace(PTRACE_POKEUSER, tcp->pid, (void *)PT_IAOQ1, iaoq);
-#elif defined(SH)
-       if (upeek(tcp->pid, 4*REG_PC, &pc) < 0)
-               return -1;
-        if (pc != tcp->baddr) {
-                /* The breakpoint has not been reached yet.  */
-                if (debug)
-                        fprintf(stderr, "NOTE: PC not at bpt (pc %#lx baddr %#lx)\n",
-                                pc, tcp->baddr);
-                return 0;
-        }
-
-#endif /* arch */
-#endif /* !SPARC && !SPARC64 && !IA64 */
-#endif /* LINUX */
-
-#ifdef SUNOS4
-#ifdef SPARC
-
-#if !LOOPA
+#    if !LOOPA
 	struct regs regs;
-#endif
+#    endif
 
 	if (!(tcp->flags & TCB_BPTSET)) {
 		fprintf(stderr, "PANIC: TCB not set in pid %u\n", tcp->pid);
@@ -1951,10 +1655,10 @@
 	}
 	tcp->flags &= ~TCB_BPTSET;
 
-#if !LOOPA
+#    if !LOOPA
 	/*
 	 * Since we don't have a single instruction breakpoint, we may have
-	 * to adjust the program counter after removing the our `breakpoint'.
+	 * to adjust the program counter after removing our `breakpoint'.
 	 */
 	if (ptrace(PTRACE_GETREGS, tcp->pid, (char *)&regs, 0) < 0) {
 		perror("clearbpt: ptrace(PTRACE_GETREGS, ...)");
@@ -1966,7 +1670,7 @@
 		if (debug)
 			fprintf(stderr,
 				"NOTE: PC not at bpt (pc %#x baddr %#x)\n",
-					regs.r_pc, tcp->parent->baddr);
+					regs.r_pc, tcp->baddr);
 		return 0;
 	}
 	if (regs.r_pc != tcp->baddr)
@@ -1979,29 +1683,30 @@
 		perror("clearbpt: ptrace(PTRACE_SETREGS, ...)");
 		return -1;
 	}
-#endif /* LOOPA */
-#endif /* SPARC */
-#endif /* SUNOS4 */
+#    endif /* LOOPA */
+#   endif /* SPARC */
+#  endif /* SUNOS4 */
 
 	return 0;
 }
 
-#endif
+# endif /* !defined LINUX */
 
 #endif /* !USE_PROCFS */
 
+
 #ifdef SUNOS4
 
 static int
-getex(pid, hdr)
-int pid;
+getex(tcp, hdr)
+struct tcb *tcp;
 struct exec *hdr;
 {
 	int n;
 
 	for (n = 0; n < sizeof *hdr; n += 4) {
 		long res;
-		if (upeek(pid, uoff(u_exdata) + n, &res) < 0)
+		if (upeek(tcp, uoff(u_exdata) + n, &res) < 0)
 			return -1;
 		memcpy(((char *) hdr) + n, &res, 4);
 	}
@@ -2029,7 +1734,7 @@
 	struct link_dynamic_2 ld;
 	char *strtab, *cp;
 
-	if (getex(pid, &hdr) < 0)
+	if (getex(tcp, &hdr) < 0)
 		return -1;
 	if (!hdr.a_dynamic)
 		return -1;
@@ -2050,13 +1755,6 @@
 					(int)ld.ld_symb_size, strtab) < 0)
 		goto err;
 
-#if 0
-	for (cp = strtab; cp < strtab + ld.ld_symb_size; ) {
-		fprintf(stderr, "[symbol: %s]\n", cp);
-		cp += strlen(cp)+1;
-	}
-	return 0;
-#endif
 	for (cp = strtab; cp < strtab + ld.ld_symb_size; ) {
 		if (strcmp(cp, "_vfork") == 0) {
 			if (debug)