summaryrefslogtreecommitdiff
path: root/packages/strace
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/strace
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/strace')
-rw-r--r--packages/strace/strace-4.5.11/quota.patch10
-rw-r--r--packages/strace/strace-4.5.12/quota.patch10
-rw-r--r--packages/strace/strace-4.5.14/arm-eabi.patch65
-rw-r--r--packages/strace/strace-4.5.14/drop-ctl-proc.patch12
-rw-r--r--packages/strace/strace-4.5.14/glibc-2.5.patch11
-rw-r--r--packages/strace/strace-4.5.14/sh-arch-update.patch21
-rw-r--r--packages/strace/strace-4.5.14/sh-syscall-update.patch268
-rw-r--r--packages/strace/strace-4.5.14/strace-4.5.14-add-syscalls-up-to-sysvipc.patch75
-rw-r--r--packages/strace/strace-4.5.14/strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch75
-rw-r--r--packages/strace/strace-4.5.14/strace-4.5.14-avr32.patch2701
-rw-r--r--packages/strace/strace-4.5.14/strace-arm-no-cachectl.patch34
-rw-r--r--packages/strace/strace-4.5.15/strace-4.5.15.atmel.1.patch14842
-rw-r--r--packages/strace/strace/arm-compilation.patch10
-rw-r--r--packages/strace/strace/arm-syscall.patch16
-rw-r--r--packages/strace/strace/arm-syscallent.patch402
-rw-r--r--packages/strace/strace/mips-sigcontext.patch46
-rw-r--r--packages/strace/strace/strace-fix-arm-bad-syscall.patch18
-rw-r--r--packages/strace/strace/strace-undef-syscall.patch66
-rw-r--r--packages/strace/strace_4.5.11.bb13
-rw-r--r--packages/strace/strace_4.5.12.bb14
-rw-r--r--packages/strace/strace_4.5.14.bb45
-rw-r--r--packages/strace/strace_4.5.15.bb18
22 files changed, 0 insertions, 18772 deletions
diff --git a/packages/strace/strace-4.5.11/quota.patch b/packages/strace/strace-4.5.11/quota.patch
deleted file mode 100644
index 8d05da626a..0000000000
--- a/packages/strace/strace-4.5.11/quota.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- strace-4.5.11/resource.c.old 2005-06-28 14:44:27.000000000 +0100
-+++ strace-4.5.11/resource.c 2005-06-28 14:44:28.000000000 +0100
-@@ -36,6 +36,7 @@
- #ifdef LINUX
- #include <sys/times.h>
- #include <linux/kernel.h>
-+#define _LINUX_QUOTA_VERSION 1
- #include <sys/quota.h>
- #endif /* LINUX */
- #ifdef SUNOS4
diff --git a/packages/strace/strace-4.5.12/quota.patch b/packages/strace/strace-4.5.12/quota.patch
deleted file mode 100644
index 8d05da626a..0000000000
--- a/packages/strace/strace-4.5.12/quota.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- strace-4.5.11/resource.c.old 2005-06-28 14:44:27.000000000 +0100
-+++ strace-4.5.11/resource.c 2005-06-28 14:44:28.000000000 +0100
-@@ -36,6 +36,7 @@
- #ifdef LINUX
- #include <sys/times.h>
- #include <linux/kernel.h>
-+#define _LINUX_QUOTA_VERSION 1
- #include <sys/quota.h>
- #endif /* LINUX */
- #ifdef SUNOS4
diff --git a/packages/strace/strace-4.5.14/arm-eabi.patch b/packages/strace/strace-4.5.14/arm-eabi.patch
deleted file mode 100644
index 53e27f8ce8..0000000000
--- a/packages/strace/strace-4.5.14/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/packages/strace/strace-4.5.14/drop-ctl-proc.patch b/packages/strace/strace-4.5.14/drop-ctl-proc.patch
deleted file mode 100644
index 468913774a..0000000000
--- a/packages/strace/strace-4.5.14/drop-ctl-proc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: strace-4.5.14/system.c
-===================================================================
---- strace-4.5.14.orig/system.c 2006-10-01 13:02:08.000000000 +0200
-+++ strace-4.5.14/system.c 2006-10-01 13:02:27.000000000 +0200
-@@ -1578,7 +1578,6 @@
- { CTL_KERN, "CTL_KERN" },
- { CTL_VM, "CTL_VM" },
- { CTL_NET, "CTL_NET" },
-- { CTL_PROC, "CTL_PROC" },
- { CTL_FS, "CTL_FS" },
- { CTL_DEBUG, "CTL_DEBUG" },
- { CTL_DEV, "CTL_DEV" },
diff --git a/packages/strace/strace-4.5.14/glibc-2.5.patch b/packages/strace/strace-4.5.14/glibc-2.5.patch
deleted file mode 100644
index 3ee6b3de75..0000000000
--- a/packages/strace/strace-4.5.14/glibc-2.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- strace-4.5.14/strace.c~ 2006-10-14 14:54:54.000000000 +1000
-+++ strace-4.5.14/strace.c 2006-10-14 14:54:54.000000000 +1000
-@@ -2251,7 +2251,7 @@
- if (!cflag
- && (qual_flags[WSTOPSIG(status)] & QUAL_SIGNAL)) {
- unsigned long addr = 0, pc = 0;
--#ifdef PT_GETSIGINFO
-+#if defined(PT_GETSIGINFO) && defined(IA64)
- # define PSR_RI 41
- struct siginfo si;
- unsigned long psr;
diff --git a/packages/strace/strace-4.5.14/sh-arch-update.patch b/packages/strace/strace-4.5.14/sh-arch-update.patch
deleted file mode 100644
index e40673a616..0000000000
--- a/packages/strace/strace-4.5.14/sh-arch-update.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Strace doesn't know that sh3 and sh4 should be treated as sh and sh5 as
-sh64. Originally this was solved by ac_cv_host in the site files, however
-doing it in the site file breaks the glibc build, so teach strace about them
-instead.
-
---- strace-4.5.14/configure.ac 2006/05/11 07:12:05 1.1
-+++ strace-4.5.14/configure.ac 2006/05/11 07:15:42
-@@ -91,11 +91,11 @@
- arch=hppa
- AC_DEFINE([HPPA], 1, [Define for the HPPA architecture.])
- ;;
--sh)
-+sh|sh3*|sh4*)
- arch=sh
- AC_DEFINE([SH], 1, [Define for the SH architecture.])
- ;;
--sh64)
-+sh64|sh5*)
- arch=sh64
- AC_DEFINE([SH64], 1, [Define for the SH64 architecture.])
- ;;
diff --git a/packages/strace/strace-4.5.14/sh-syscall-update.patch b/packages/strace/strace-4.5.14/sh-syscall-update.patch
deleted file mode 100644
index 15102934e7..0000000000
--- a/packages/strace/strace-4.5.14/sh-syscall-update.patch
+++ /dev/null
@@ -1,268 +0,0 @@
---- strace/linux/sh/syscallent.h 2006/07/03 04:32:27 1.1
-+++ strace/linux/sh/syscallent.h 2006/07/03 05:29:55
-@@ -46,7 +46,7 @@
- { 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, TF, sys_chown, "lchown" }, /* 16 */
- { 0, 0, sys_break, "break" }, /* 17 */
- { 2, TF, sys_oldstat, "oldstat" }, /* 18 */
- { 3, TD, sys_lseek, "lseek" }, /* 19 */
-@@ -229,109 +229,157 @@
- { 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 */
-+ { 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, "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 */
-+ { 0, 0, sys_getgid, "getgid32" }, /* 200 */
-+ { 0, 0, sys_geteuid, "geteuid32" }, /* 201 */
-+ { 0, 0, sys_getegid, "getegid32" }, /* 202 */
-+ { 2, 0, sys_setreuid, "setreuid32" }, /* 203 */
-+ { 2, 0, sys_setregid, "setregid32" }, /* 204 */
-+ { 2, 0, sys_getgroups, "getgroups32" }, /* 205 */
-+ { 2, 0, sys_setgroups, "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, "getsetgid32" }, /* 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, printargs, "mincore" }, /* 218 */
-+ { 3, 0, sys_mincore, "mincore" }, /* 218 */
- { 3, 0, sys_madvise, "madvise" }, /* 219 */
-- { 4, 0, printargs, "getdents64" }, /* 220 */
-+ { 4, 0, 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, "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_223" }, /* 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, 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, printargs, "set_thread_area" }, /* 243 */
-+ { 1, 0, printargs, "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, 0, sys_fadvise64, "fadvise64" }, /* 250 */
-+ { 5, 0, printargs, "SYS_251" }, /* 251 */
-+ { 1, TP, sys_exit, "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, 0, sys_fstatfs64, "fstatfs64" }, /* 269 */
-+ { 3, TS, sys_tgkill, "tgkill" }, /* 270 */
-+ { 2, TF, sys_utimes, "utimes" }, /* 271 */
-+ { 6, 0, sys_fadvise64_64, "fadvise64_64" }, /* 272 */
-+ { 5, 0, printargs, "vserver" }, /* 273 */
-+ { 5, 0, printargs, "mbind" }, /* 274 */
-+ { 5, 0, printargs, "get_mempolicy" }, /* 275 */
-+ { 5, 0, printargs, "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" }, /* 284 */
-+ { 5, 0, printargs, "add_key" }, /* 285 */
-+ { 5, 0, printargs, "request_key" }, /* 286 */
-+ { 5, 0, printargs, "keyctl" }, /* 287 */
-+ { 5, 0, printargs, "ioprio_set" }, /* 288 */
-+ { 5, 0, printargs, "ioprio_get" }, /* 289 */
-+ { 5, 0, printargs, "inotify_init" }, /* 290 */
-+ { 5, 0, printargs, "inotify_add_watch" }, /* 291 */
-+ { 5, 0, printargs, "inotify_rm_watch" }, /* 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/packages/strace/strace-4.5.14/strace-4.5.14-add-syscalls-up-to-sysvipc.patch b/packages/strace/strace-4.5.14/strace-4.5.14-add-syscalls-up-to-sysvipc.patch
deleted file mode 100644
index 99b00ed689..0000000000
--- a/packages/strace/strace-4.5.14/strace-4.5.14-add-syscalls-up-to-sysvipc.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: strace-4.5.14/linux/avr32/syscallent.h
-===================================================================
---- strace-4.5.14.orig/linux/avr32/syscallent.h 2007-02-19 07:48:12.000000000 +0100
-+++ strace-4.5.14/linux/avr32/syscallent.h 2007-02-19 08:01:24.000000000 +0100
-@@ -251,4 +251,57 @@
- { 3, TS, sys_tgkill, "tgkill" }, /* 221 */
- { 5, 0, printargs, "SYS_222" }, /* 222 */
- { 2, TF, sys_utimes, "utimes" }, /* 223 */
-- { 6, 0, printargs, "fadvise64_64" }, /* 224 */
-+ { 6, 0, sys_fadvise64_64, "fadvise64_64" }, /* 224 */
-+ { 3, 0, printargs, "cacheflush" }, /* 225 */
-+ { 0, 0, printargs, "vserver" }, /* 226 */
-+ { 4, 0, sys_mq_open, "mq_open" }, /* 227 */
-+ { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 228 */
-+ { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 229 */
-+ { 5, 0, sys_mq_timedreceive, "mq_timedreceive" }, /* 230 */
-+ { 2, 0, sys_mq_notify, "mq_notify" }, /* 231 */
-+ { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 232 */
-+ { 4, 0, printargs, "kexec_load" }, /* 233 */
-+ { 1, 0, sys_waitid, "waitid" }, /* 234 */
-+ { 5, 0, printargs, "add_key" }, /* 235 */
-+ { 4, 0, printargs, "request_key" }, /* 236 */
-+ { 5, 0, printargs, "keyctl" }, /* 237 */
-+ { 3, 0, printargs, "ioprio_set" }, /* 238 */
-+ { 2, 0, printargs, "ioprio_get" }, /* 239 */
-+ { 1, 0, printargs, "inotify_init" }, /* 240 */
-+ { 3, 0, printargs, "inotify_add_watch" }, /* 241 */
-+ { 2, 0, printargs, "inotify_rm_watch" }, /* 242 */
-+ { 4, 0, printargs, "openat" }, /* 243 */
-+ { 3, 0, printargs, "mkdirat" }, /* 244 */
-+ { 4, 0, printargs, "mknodat" }, /* 245 */
-+ { 5, 0, printargs, "fchownat" }, /* 246 */
-+ { 3, 0, printargs, "futimesat" }, /* 247 */
-+ { 4, 0, sys_fstatfs64, "fstatat64" }, /* 248 */
-+ { 3, 0, printargs, "unlinkat" }, /* 249 */
-+ { 4, 0, printargs, "renameat" }, /* 250 */
-+ { 5, 0, printargs, "linkat" }, /* 251 */
-+ { 3, 0, printargs, "symlinkat" }, /* 252 */
-+ { 4, 0, printargs, "readlinkat" }, /* 253 */
-+ { 3, 0, printargs, "fchmodat" }, /* 254 */
-+ { 3, 0, printargs, "faccessat" }, /* 255 */
-+ { 6, 0, printargs, "pselect6" }, /* 256 */
-+ { 5, 0, printargs, "ppoll" }, /* 257 */
-+ { 1, 0, printargs, "unshare" }, /* 258 */
-+ { 2, 0, printargs, "set_robust_list" }, /* 259 */
-+ { 3, 0, printargs, "get_robust_list" }, /* 260 */
-+ { 6, 0, printargs, "splice" }, /* 261 */
-+ { 4, 0, printargs, "sync_file_range" }, /* 262 */
-+ { 4, 0, printargs, "tee" }, /* 263 */
-+ { 4, 0, printargs, "vmsplice" }, /* 264 */
-+ { 6 0, printargs, "sys_epoll_pwait" }, /* 265 */
-+ { 2, TI, sys_msgget, "msgget" }, /* 266 */
-+ { 4, TI, sys_msgsnd, "msgsnd" }, /* 267 */
-+ { 5, TI, sys_msgrcv, "msgrcv" }, /* 268 */
-+ { 3, TI, sys_msgctl, "msgctl" }, /* 269 */
-+ { 3, TI, sys_semget, "semget" }, /* 270 */
-+ { 3, TI, sys_semop, "semop" }, /* 271 */
-+ { 4, TI, sys_semctl, "semctl" }, /* 272 */
-+ { 4, TI, sys_semtimedop, "semtimedop" }, /* 273 */
-+ { 3, TI, sys_shmat, "shmat" }, /* 274 */
-+ { 3, TI, sys_shmget, "shmget" }, /* 275 */
-+ { 1, TI, sys_shmdt, "shmdt" }, /* 276 */
-+ { 3, TI, sys_shmctl, "shmctl" }, /* 277 */
-Index: strace-4.5.14/system.c
-===================================================================
---- strace-4.5.14.orig/system.c 2007-02-19 07:48:12.000000000 +0100
-+++ strace-4.5.14/system.c 2007-02-19 07:48:12.000000000 +0100
-@@ -1578,7 +1578,6 @@
- { CTL_KERN, "CTL_KERN" },
- { CTL_VM, "CTL_VM" },
- { CTL_NET, "CTL_NET" },
-- /* was CTL_PROC */
- { CTL_FS, "CTL_FS" },
- { CTL_DEBUG, "CTL_DEBUG" },
- { CTL_DEV, "CTL_DEV" },
diff --git a/packages/strace/strace-4.5.14/strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch b/packages/strace/strace-4.5.14/strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch
deleted file mode 100644
index 78317ac942..0000000000
--- a/packages/strace/strace-4.5.14/strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: strace-4.5.14/linux/avr32/syscallent.h
-===================================================================
---- strace-4.5.14.orig/linux/avr32/syscallent.h 2007-02-19 07:48:12.000000000 +0100
-+++ strace-4.5.14/linux/avr32/syscallent.h 2007-02-19 08:01:24.000000000 +0100
-@@ -251,4 +251,57 @@
- { 3, TS, sys_tgkill, "tgkill" }, /* 221 */
- { 5, 0, printargs, "SYS_222" }, /* 222 */
- { 2, TF, sys_utimes, "utimes" }, /* 223 */
-- { 6, 0, printargs, "fadvise64_64" }, /* 224 */
-+ { 6, 0, sys_fadvise64_64, "fadvise64_64" }, /* 224 */
-+ { 3, 0, printargs, "cacheflush" }, /* 225 */
-+ { 0, 0, printargs, "vserver" }, /* 226 */
-+ { 4, 0, sys_mq_open, "mq_open" }, /* 227 */
-+ { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 228 */
-+ { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 229 */
-+ { 5, 0, sys_mq_timedreceive, "mq_timedreceive" }, /* 230 */
-+ { 2, 0, sys_mq_notify, "mq_notify" }, /* 231 */
-+ { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 232 */
-+ { 4, 0, printargs, "kexec_load" }, /* 233 */
-+ { 1, 0, sys_waitid, "waitid" }, /* 234 */
-+ { 5, 0, printargs, "add_key" }, /* 235 */
-+ { 4, 0, printargs, "request_key" }, /* 236 */
-+ { 5, 0, printargs, "keyctl" }, /* 237 */
-+ { 3, 0, printargs, "ioprio_set" }, /* 238 */
-+ { 2, 0, printargs, "ioprio_get" }, /* 239 */
-+ { 1, 0, printargs, "inotify_init" }, /* 240 */
-+ { 3, 0, printargs, "inotify_add_watch" }, /* 241 */
-+ { 2, 0, printargs, "inotify_rm_watch" }, /* 242 */
-+ { 4, 0, printargs, "openat" }, /* 243 */
-+ { 3, 0, printargs, "mkdirat" }, /* 244 */
-+ { 4, 0, printargs, "mknodat" }, /* 245 */
-+ { 5, 0, printargs, "fchownat" }, /* 246 */
-+ { 3, 0, printargs, "futimesat" }, /* 247 */
-+ { 4, 0, sys_fstatfs64, "fstatat64" }, /* 248 */
-+ { 3, 0, printargs, "unlinkat" }, /* 249 */
-+ { 4, 0, printargs, "renameat" }, /* 250 */
-+ { 5, 0, printargs, "linkat" }, /* 251 */
-+ { 3, 0, printargs, "symlinkat" }, /* 252 */
-+ { 4, 0, printargs, "readlinkat" }, /* 253 */
-+ { 3, 0, printargs, "fchmodat" }, /* 254 */
-+ { 3, 0, printargs, "faccessat" }, /* 255 */
-+ { 6, 0, printargs, "pselect6" }, /* 256 */
-+ { 5, 0, printargs, "ppoll" }, /* 257 */
-+ { 1, 0, printargs, "unshare" }, /* 258 */
-+ { 2, 0, printargs, "set_robust_list" }, /* 259 */
-+ { 3, 0, printargs, "get_robust_list" }, /* 260 */
-+ { 6, 0, printargs, "splice" }, /* 261 */
-+ { 4, 0, printargs, "sync_file_range" }, /* 262 */
-+ { 4, 0, printargs, "tee" }, /* 263 */
-+ { 4, 0, printargs, "vmsplice" }, /* 264 */
-+ { 6, 0, printargs, "sys_epoll_pwait" }, /* 265 */
-+ { 2, TI, sys_msgget, "msgget" }, /* 266 */
-+ { 4, TI, sys_msgsnd, "msgsnd" }, /* 267 */
-+ { 5, TI, sys_msgrcv, "msgrcv" }, /* 268 */
-+ { 3, TI, sys_msgctl, "msgctl" }, /* 269 */
-+ { 3, TI, sys_semget, "semget" }, /* 270 */
-+ { 3, TI, sys_semop, "semop" }, /* 271 */
-+ { 4, TI, sys_semctl, "semctl" }, /* 272 */
-+ { 4, TI, sys_semtimedop, "semtimedop" }, /* 273 */
-+ { 3, TI, sys_shmat, "shmat" }, /* 274 */
-+ { 3, TI, sys_shmget, "shmget" }, /* 275 */
-+ { 1, TI, sys_shmdt, "shmdt" }, /* 276 */
-+ { 3, TI, sys_shmctl, "shmctl" }, /* 277 */
-Index: strace-4.5.14/system.c
-===================================================================
---- strace-4.5.14.orig/system.c 2007-02-19 07:48:12.000000000 +0100
-+++ strace-4.5.14/system.c 2007-02-19 07:48:12.000000000 +0100
-@@ -1578,7 +1578,6 @@
- { CTL_KERN, "CTL_KERN" },
- { CTL_VM, "CTL_VM" },
- { CTL_NET, "CTL_NET" },
-- /* was CTL_PROC */
- { CTL_FS, "CTL_FS" },
- { CTL_DEBUG, "CTL_DEBUG" },
- { CTL_DEV, "CTL_DEV" },
diff --git a/packages/strace/strace-4.5.14/strace-4.5.14-avr32.patch b/packages/strace/strace-4.5.14/strace-4.5.14-avr32.patch
deleted file mode 100644
index 1d4c4202e9..0000000000
--- a/packages/strace/strace-4.5.14/strace-4.5.14-avr32.patch
+++ /dev/null
@@ -1,2701 +0,0 @@
-Index: strace-4.5.14-avr32/linux/avr32/syscallent.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ strace-4.5.14-avr32/linux/avr32/syscallent.h 2006-05-02 13:36:39.000000000 +0200
-@@ -0,0 +1,254 @@
-+/*
-+ * Copyright (c) 2004-2006 Atmel Corporation
-+ * 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_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, sys_umask, "umask" }, /* 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, "chown" }, /* 16 */
-+ { 3, TF, sys_chown, "lchown" }, /* 17 */
-+ { 3, 0, sys_lseek, "lseek" }, /* 18 */
-+ { 5, 0, sys_llseek, "_llseek" }, /* 19 */
-+ { 0, 0, sys_getpid, "getpid" }, /* 20 */
-+ { 5, TF, sys_mount, "mount" }, /* 21 */
-+ { 2, TF, sys_umount, "umount" }, /* 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 */
-+ { 0, TS, sys_pause, "pause" }, /* 28 */
-+ { 2, TF, sys_utime, "utime" }, /* 29 */
-+ { 2, TF, sys_stat, "stat" }, /* 30 */
-+ { 2, 0, sys_fstat, "fstat" }, /* 31 */
-+ { 2, TF, sys_lstat, "lstat" }, /* 32 */
-+ { 2, TF, sys_access, "access" }, /* 33 */
-+ { 1, TF, sys_chroot, "chroot" }, /* 34 */
-+ { 0, 0, sys_sync, "sync" }, /* 35 */
-+ { 1, 0, sys_fsync, "fsync" }, /* 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 */
-+ { 5, TP, sys_clone, "clone" }, /* 44 */
-+ { 1, 0, sys_brk, "brk" }, /* 45 */
-+ { 1, 0, sys_setgid, "setgid" }, /* 46 */
-+ { 0, 0, sys_getgid, "getgid" }, /* 47 */
-+ { 2, TF, sys_getcwd, "getcwd" }, /* 48 */
-+ { 0, 0, sys_geteuid, "geteuid" }, /* 49 */
-+ { 0, 0, sys_getegid, "getegid" }, /* 50 */
-+ { 1, TF, sys_acct, "acct" }, /* 51 */
-+ { 1, 0, sys_setfsuid, "setfsuid" }, /* 52 */
-+ { 1, 0, sys_setfsgid, "setfsgid" }, /* 53 */
-+ { 3, 0, sys_ioctl, "ioctl" }, /* 54 */
-+ { 3, 0, sys_fcntl, "fcntl" }, /* 55 */
-+ { 2, 0, sys_setpgid, "setpgid" }, /* 56 */
-+ { 4, 0, sys_mremap, "mremap" }, /* 57 */
-+ { 3, 0, sys_setresuid, "setresuid" }, /* 58 */
-+ { 3, 0, sys_getresuid, "getresuid" }, /* 59 */
-+ { 2, 0, sys_setreuid, "setreuid" }, /* 60 */
-+ { 2, 0, sys_setregid, "setregid" }, /* 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 */
-+ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 67 */
-+ { 1, TS, printargs, "rt_sigreturn" }, /* 68 */
-+ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 69 */
-+ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 70 */
-+ { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait"}, /* 71 */
-+ { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo"}, /* 72 */
-+ { 2, TS, sys_rt_sigsuspend, "rt_sigsuspend" }, /* 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 */
-+ { 5, 0, sys_select, "select" }, /* 82 */
-+ { 2, TF, sys_symlink, "symlink" }, /* 83 */
-+ { 1, 0, sys_fchdir, "fchdir" }, /* 84 */
-+ { 3, TF, sys_readlink, "readlink" }, /* 85 */
-+ { 5, TF, sys_pread, "pread" }, /* 86 */
-+ { 5, TF, sys_pwrite, "pwrite" }, /* 87 */
-+ { 1, TF, sys_swapon, "swapon" }, /* 88 */
-+ { 3, 0, sys_reboot, "reboot" }, /* 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, TP, sys_wait4, "wait4" }, /* 98 */
-+ { 2, TF, sys_statfs, "statfs" }, /* 99 */
-+ { 2, 0, sys_fstatfs, "fstatfs" }, /* 100 */
-+ { 0, 0, sys_vhangup, "vhangup" }, /* 101 */
-+ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 102 */
-+ { 3, 0, sys_syslog, "syslog" }, /* 103 */
-+ { 3, 0, sys_setitimer, "setitimer" }, /* 104 */
-+ { 2, 0, sys_getitimer, "getitimer" }, /* 105 */
-+ { 1, 0, sys_swapoff, "swapoff" }, /* 106 */
-+ { 1, 0, sys_sysinfo, "sysinfo" }, /* 107 */
-+ { 6, 0, sys_ipc, "ipc" }, /* 108 */
-+ { 4, TF, sys_sendfile, "sendfile" }, /* 109 */
-+ { 2, 0, sys_setdomainname, "setdomainname" }, /* 110 */
-+ { 1, 0, sys_uname, "uname" }, /* 111 */
-+ { 1, 0, sys_adjtimex, "adjtimex" }, /* 112 */
-+ { 3, 0, sys_mprotect, "mprotect" }, /* 113 */
-+ { 0, TP, sys_vfork, "vfork" }, /* 114 */
-+ { 2, 0, sys_init_module, "init_module" }, /* 115 */
-+ { 1, 0, sys_delete_module, "delete_module" }, /* 116 */
-+ { 4, 0, sys_quotactl, "quotactl" }, /* 117 */
-+ { 1, 0, sys_getpgid, "getpgid" }, /* 118 */
-+ { 0, 0, sys_bdflush, "bdflush" }, /* 119 */
-+ { 3, 0, sys_sysfs, "sysfs" }, /* 120 */
-+ { 1, 0, sys_personality, "personality" }, /* 121 */
-+ { 5, 0, sys_afs_syscall, "afs_syscall" }, /* 122 */
-+ { 3, 0, sys_getdents, "getdents" }, /* 123 */
-+ { 2, 0, sys_flock, "flock" }, /* 124 */
-+ { 3, 0, sys_msync, "msync" }, /* 125 */
-+ { 3, 0, sys_readv, "readv" }, /* 126 */
-+ { 3, 0, sys_writev, "writev" }, /* 127 */
-+ { 1, 0, sys_getsid, "getsid" }, /* 128 */
-+ { 1, 0, sys_fdatasync, "fdatasync" }, /* 129 */
-+ { 1, 0, sys_sysctl, "_sysctl" }, /* 130 */
-+ { 2, 0, sys_mlock, "mlock" }, /* 131 */
-+ { 2, 0, sys_munlock, "munlock" }, /* 132 */
-+ { 2, 0, sys_mlockall, "mlockall" }, /* 133 */
-+ { 0, 0, sys_munlockall, "munlockall" }, /* 134 */
-+ { 0, 0, sys_sched_setparam, "sched_setparam"}, /* 135 */
-+ { 2, 0, sys_sched_getparam, "sched_getparam"}, /* 136 */
-+ { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 137 */
-+ { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 138 */
-+ { 0, 0, sys_sched_yield, "sched_yield"}, /* 139 */
-+ { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 140 */
-+ { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 141 */
-+ { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 142 */
-+ { 2, 0, sys_nanosleep, "nanosleep" }, /* 143 */
-+ { 3, 0, sys_poll, "poll" }, /* 144 */
-+ { 3, 0, printargs, "nfsservctl" }, /* 145 */
-+ { 3, 0, sys_setresgid, "setresgid" }, /* 146 */
-+ { 3, 0, sys_getresgid, "getresgid" }, /* 147 */
-+ { 5, 0, sys_prctl, "prctl" }, /* 148 */
-+ { 3, TN, sys_socket, "socket" }, /* 149 */
-+ { 3, TN, sys_bind, "bind" }, /* 150 */
-+ { 3, TN, sys_connect, "connect" }, /* 151 */
-+ { 2, TN, sys_listen, "listen" }, /* 152 */
-+ { 3, TN, sys_accept, "accept" }, /* 153 */
-+ { 3, TN, sys_getsockname, "getsockname" }, /* 154 */
-+ { 3, TN, sys_getpeername, "getpeername" }, /* 155 */
-+ { 4, TN, sys_socketpair, "socketpair" }, /* 156 */
-+ { 4, TN, sys_send, "send" }, /* 157 */
-+ { 4, TN, sys_recv, "recv" }, /* 158 */
-+ { 6, TN, sys_sendto, "sendto" }, /* 159 */
-+ { 6, TN, sys_recvfrom, "recvfrom" }, /* 160 */
-+ { 2, TN, sys_shutdown, "shutdown" }, /* 161 */
-+ { 5, TN, sys_setsockopt, "setsockopt" }, /* 162 */
-+ { 5, TN, sys_getsockopt, "getsockopt" }, /* 163 */
-+ { 3, TN, sys_sendmsg, "sendmsg" }, /* 164 */
-+ { 3, TN, sys_recvmsg, "recvmsg" }, /* 165 */
-+ { 3, TF, sys_truncate64, "truncate64" }, /* 166 */
-+ { 3, TF, sys_ftruncate64, "ftruncate64" }, /* 167 */
-+ { 2, TF, sys_stat64, "stat64" }, /* 168 */
-+ { 2, TF, sys_lstat64, "lstat64" }, /* 169 */
-+ { 2, TF, sys_fstat64, "fstat64" }, /* 170 */
-+ { 2, TF, sys_pivotroot, "pivot_root" }, /* 171 */
-+ { 3, 0, printargs, "mincore" }, /* 172 */
-+ { 3, 0, sys_madvise, "madvise" }, /* 173 */
-+ { 4, 0, sys_getdents64, "getdents64" }, /* 174 */
-+ { 3, 0, sys_fcntl, "fcntl64" }, /* 175 */
-+ { 0, 0, printargs, "gettid" }, /* 176 */
-+ { 4, 0, sys_readahead, "readahead" }, /* 177 */
-+ { 5, TF, sys_setxattr, "setxattr" }, /* 178 */
-+ { 5, TF, sys_setxattr, "lsetxattr" }, /* 179 */
-+ { 5, 0, sys_fsetxattr, "fsetxattr" }, /* 180 */
-+ { 4, TF, sys_getxattr, "getxattr" }, /* 181 */
-+ { 4, TF, sys_getxattr, "lgetxattr" }, /* 182 */
-+ { 4, 0, sys_fgetxattr, "fgetxattr" }, /* 183 */
-+ { 3, TF, sys_listxattr, "listxattr" }, /* 184 */
-+ { 3, TF, sys_listxattr, "llistxattr" }, /* 185 */
-+ { 3, 0, sys_flistxattr, "flistxattr" }, /* 186 */
-+ { 2, TF, sys_removexattr, "removexattr" }, /* 187 */
-+ { 2, TF, sys_removexattr, "lremovexattr" }, /* 188 */
-+ { 2, 0, sys_fremovexattr, "fremovexattr" }, /* 189 */
-+ { 2, TS, sys_kill, "tkill" }, /* 190 */
-+ { 4, TF, sys_sendfile64, "sendfile64" }, /* 191 */
-+ { 5, 0, sys_futex, "futex" }, /* 192 */
-+ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 193 */
-+ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 194 */
-+ { 2, 0, sys_capget, "capget" }, /* 195 */
-+ { 2, 0, sys_capset, "capset" }, /* 196 */
-+ { 2, 0, printargs, "io_setup" }, /* 197 */
-+ { 1, 0, printargs, "io_destroy" }, /* 198 */
-+ { 5, 0, printargs, "io_getevents" }, /* 199 */
-+ { 3, 0, printargs, "io_submit" }, /* 200 */
-+ { 3, 0, printargs, "io_cancel" }, /* 201 */
-+ { 6, 0, printargs, "fadvise64" }, /* 202 */
-+ { 1, TP, sys_exit, "exit_group" }, /* 203 */
-+ { 4, 0, printargs, "lookup_dcookie"}, /* 204 */
-+ { 1, 0, printargs, "epoll_create" }, /* 205 */
-+ { 4, 0, printargs, "epoll_ctl" }, /* 206 */
-+ { 4, 0, printargs, "epoll_wait" }, /* 207 */
-+ { 5, 0, sys_remap_file_pages, "remap_file_pages"}, /* 208 */
-+ { 1, 0, printargs, "set_tid_address"}, /* 209 */
-+ { 3, 0, sys_timer_create, "timer_create" }, /* 210 */
-+ { 4, 0, sys_timer_settime, "timer_settime" }, /* 211 */
-+ { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 212 */
-+ { 1, 0, sys_timer_getoverrun, "timer_getoverrun"}, /* 213 */
-+ { 1, 0, sys_timer_delete, "timer_delete" }, /* 214 */
-+ { 2, 0, sys_clock_settime, "clock_settime" }, /* 215 */
-+ { 2, 0, sys_clock_gettime, "clock_gettime" }, /* 216 */
-+ { 2, 0, sys_clock_getres, "clock_getres" }, /* 217 */
-+ { 4, 0, sys_clock_nanosleep, "clock_nanosleep"}, /* 218 */
-+ { 3, TF, sys_statfs64, "statfs64" }, /* 219 */
-+ { 3, 0, sys_fstatfs64, "fstatfs64" }, /* 220 */
-+ { 3, TS, sys_tgkill, "tgkill" }, /* 221 */
-+ { 5, 0, printargs, "SYS_222" }, /* 222 */
-+ { 2, TF, sys_utimes, "utimes" }, /* 223 */
-+ { 6, 0, printargs, "fadvise64_64" }, /* 224 */
-Index: strace-4.5.14-avr32/defs.h
-===================================================================
---- strace-4.5.14-avr32.orig/defs.h 2006-05-02 13:36:31.000000000 +0200
-+++ strace-4.5.14-avr32/defs.h 2006-05-02 13:36:39.000000000 +0200
-@@ -94,6 +94,9 @@
- # if defined(X86_64)
- # define LINUX_X86_64
- # endif
-+# if defined(AVR32)
-+# define LINUX_AVR32
-+# endif
- #endif
-
- #if defined(SVR4) || defined(FREEBSD)
-@@ -120,7 +123,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_AVR32)) && defined(__GLIBC__)
- #include <sys/ptrace.h>
- #else
- /* Work around awkward prototype in ptrace.h. */
-@@ -327,7 +330,7 @@ struct tcb {
- #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)
-+# if defined(ALPHA) || defined(SPARC) || defined(SPARC64) || defined(POWERPC) || defined(IA64) || defined(HPPA) || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) || defined(ARM) || defined(AVR32)
- # define TCB_WAITEXECVE 02000 /* ignore SIGTRAP after exceve */
- # endif
- # define TCB_CLONE_DETACHED 04000 /* CLONE_DETACHED set in creating syscall */
-Index: strace-4.5.14-avr32/process.c
-===================================================================
---- strace-4.5.14-avr32.orig/process.c 2006-05-02 13:36:31.000000000 +0200
-+++ strace-4.5.14-avr32/process.c 2006-05-02 13:36:39.000000000 +0200
-@@ -694,6 +694,10 @@ int new;
- 0x100000 | new) < 0)
- return -1;
- return 0;
-+#elif defined(AVR32)
-+ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_R8), new) < 0)
-+ return -1;
-+ return 0;
- #else
- #warning Do not know how to handle change_syscall for this architecture
- #endif /* architecture */
-@@ -774,6 +778,28 @@ setarg(tcp, argnum)
- if (errno)
- return -1;
- }
-+#elif defined(AVR32)
-+ {
-+ errno = 0;
-+ if (argnum == 0)
-+ ptrace(PTRACE_POKEUSER, tcp->pid,
-+ (char *)(REG_R12_ORIG),
-+ tcp->u_arg[argnum]);
-+ else if (argnum < 4)
-+ /* r11 .. r9 */
-+ ptrace(PTRACE_POKEUSER, tcp->pid,
-+ (char *)(REG_R12 - 4 * argnum),
-+ tcp->u_arg[argnum]);
-+ else if (argnum < 6)
-+ /* r6 .. r5 */
-+ ptrace(PTRACE_POKEUSER, tcp->pid,
-+ (char *)(REG_R10 - 4 * argnum),
-+ tcp->u_arg[argnum]);
-+ else
-+ return -E2BIG;
-+ if (errno)
-+ return -1;
-+ }
- #else
- # warning Sorry, setargs not implemented for this architecture.
- #endif
-@@ -2866,8 +2892,27 @@ const struct xlat struct_user_offsets[]
- { uoff(regs.ARM_pc), "pc" },
- { uoff(regs.ARM_cpsr), "cpsr" },
- #endif
--
--#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64)
-+#ifdef 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" },
-+#endif
-+#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) && !defined(AVR32)
- { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" },
- #endif
- #if defined(I386) || defined(X86_64)
-@@ -2883,20 +2928,20 @@ const struct xlat struct_user_offsets[]
- #if !defined(SPARC64)
- { uoff(start_code), "offsetof(struct user, start_code)" },
- #endif
--#ifdef SH64
-+#if defined(SH64) || defined(AVR32)
- { uoff(start_data), "offsetof(struct user, start_data)" },
- #endif
- #if !defined(SPARC64)
- { uoff(start_stack), "offsetof(struct user, start_stack)" },
- #endif
- { uoff(signal), "offsetof(struct user, signal)" },
--#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SH) && !defined(SH64) && !defined(SPARC64)
-+#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SH) && !defined(SH64) && !defined(SPARC64) && !defined(AVR32)
- { uoff(reserved), "offsetof(struct user, reserved)" },
- #endif
- #if !defined(SPARC64)
- { uoff(u_ar0), "offsetof(struct user, u_ar0)" },
- #endif
--#if !defined(ARM) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64)
-+#if !defined(ARM) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64) && !defined(AVR32)
- { uoff(u_fpstate), "offsetof(struct user, u_fpstate)" },
- #endif
- { uoff(magic), "offsetof(struct user, magic)" },
-Index: strace-4.5.14-avr32/syscall.c
-===================================================================
---- strace-4.5.14-avr32.orig/syscall.c 2006-05-02 13:36:30.000000000 +0200
-+++ strace-4.5.14-avr32/syscall.c 2006-05-02 13:36:39.000000000 +0200
-@@ -853,6 +853,8 @@ struct tcb *tcp;
- static long r9;
- #elif defined(X86_64)
- static long rax;
-+#elif defined(AVR32)
-+ static struct pt_regs regs;
- #endif
- #endif /* LINUX */
- #ifdef FREEBSD
-@@ -1299,7 +1301,26 @@ struct tcb *tcp;
- return 0;
- }
- }
--#endif /* SH64 */
-+#elif defined(AVR32)
-+ /*
-+ * Read complete register set in one go.
-+ */
-+ if (ptrace(PTRACE_GETREGS, pid, NULL, &regs) < 0)
-+ return -1;
-+
-+ /*
-+ * 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;
-+ }
-+ }
-+#endif /* AVR32 */
- #endif /* LINUX */
- #ifdef SUNOS4
- if (upeek(pid, uoff(u_arg[7]), &scno) < 0)
-@@ -1658,6 +1679,17 @@ struct tcb *tcp;
- tcp->u_rval = r9;
- u_error = 0;
- }
-+#else
-+#ifdef AVR32
-+ if (regs.r12 && (unsigned) -regs.r12 < nerrnos) {
-+ tcp->u_rval = -1;
-+ u_error = -regs.r12;
-+ }
-+ else {
-+ tcp->u_rval = regs.r12;
-+ u_error = 0;
-+ }
-+#endif /* AVR32 */
- #endif /* SH64 */
- #endif /* SH */
- #endif /* HPPA */
-@@ -1883,6 +1915,12 @@ force_result(tcp, error, rval)
- r9 = error ? -error : rval;
- if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)REG_GENERAL(9), r9) < 0)
- return -1;
-+#else
-+#ifdef AVR32
-+ regs.r12 = error ? -error : rval;
-+ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)REG_R12, regs.r12) < 0)
-+ return -1;
-+#endif /* AVR32 */
- #endif /* SH64 */
- #endif /* SH */
- #endif /* HPPA */
-@@ -2155,6 +2193,14 @@ struct tcb *tcp;
- return -1;
- }
- }
-+#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;
- #else /* Other architecture (like i386) (32bits specific) */
- {
- int i;
-@@ -2460,7 +2506,7 @@ strace: out of memory for call counts\n"
-
- switch (known_scno(tcp)) {
- #ifdef LINUX
--#if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA)
-+#if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA) && !defined(AVR32)
- case SYS_socketcall:
- decode_subcall(tcp, SYS_socket_subcall,
- SYS_socket_nsubcalls, deref_style);
-@@ -2469,7 +2515,7 @@ strace: out of memory for call counts\n"
- decode_subcall(tcp, SYS_ipc_subcall,
- SYS_ipc_nsubcalls, shift_style);
- break;
--#endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */
-+#endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA && !AVR32 */
- #if defined (SPARC) || defined (SPARC64)
- case SYS_socketcall:
- sparc_socket_decode (tcp);
-Index: strace-4.5.14-avr32/util.c
-===================================================================
---- strace-4.5.14-avr32.orig/util.c 2006-05-02 13:36:30.000000000 +0200
-+++ strace-4.5.14-avr32/util.c 2006-05-02 13:36:39.000000000 +0200
-@@ -1051,6 +1051,9 @@ struct tcb *tcp;
- #elif defined(SH64)
- if (upeek(tcp->pid, REG_PC ,&pc) < 0)
- return -1;
-+#elif defined(AVR32)
-+ if (upeek(tcp->pid, REG_PC, &pc) < 0)
-+ return -1;
- #endif
- return pc;
- #endif /* LINUX */
-@@ -1199,6 +1202,14 @@ struct tcb *tcp;
- return;
- }
- tprintf("[%08lx] ", pc);
-+#elif defined(AVR32)
-+ long pc;
-+
-+ if (upeek(tcp->pid, REG_PC, &pc) < 0) {
-+ tprintf("[????????] ");
-+ return;
-+ }
-+ tprintf("[%08lx] ", pc);
- #endif /* !architecture */
- #endif /* LINUX */
-
-@@ -1380,6 +1391,9 @@ typedef struct regs arg_setup_state;
- # define arg0_offset (REG_OFFSET+16)
- # define arg1_offset (REG_OFFSET+24)
- # define restore_arg0(tcp, state, val) 0
-+# elif defined (AVR32)
-+# define arg0_offset (REG_R12)
-+# define arg1_offset (REG_R11)
- # else
- # define arg0_offset 0
- # define arg1_offset 4
-Index: strace-4.5.14-avr32/configure.ac
-===================================================================
---- strace-4.5.14-avr32.orig/configure.ac 2006-05-02 13:36:30.000000000 +0200
-+++ strace-4.5.14-avr32/configure.ac 2006-05-02 13:36:39.000000000 +0200
-@@ -103,6 +103,10 @@ x86?64*)
- arch=x86_64
- AC_DEFINE([X86_64], 1, [Define for the AMD x86-64 architecture.])
- ;;
-+avr32*)
-+ arch=avr32
-+ AC_DEFINE([AVR32], 1, [Define for the AVR32 architecture.])
-+ ;;
- *)
- AC_MSG_RESULT([NO!])
- AC_MSG_ERROR([architecture $host_cpu is not supported by strace])
-Index: strace-4.5.14-avr32/config.h.in
-===================================================================
---- strace-4.5.14-avr32.orig/config.h.in 2006-05-02 13:36:30.000000000 +0200
-+++ strace-4.5.14-avr32/config.h.in 2006-05-02 13:36:39.000000000 +0200
-@@ -6,6 +6,9 @@
- /* Define for the ARM architecture. */
- #undef ARM
-
-+/* Define for the AVR32 architecture. */
-+#undef AVR32
-+
- /* Define for the FreeBSD operating system. */
- #undef FREEBSD
-
-Index: strace-4.5.14-avr32/config.sub
-===================================================================
---- strace-4.5.14-avr32.orig/config.sub 2006-05-02 13:36:30.000000000 +0200
-+++ strace-4.5.14-avr32/config.sub 2006-05-02 13:36:39.000000000 +0200
-@@ -231,6 +231,7 @@ case $basic_machine in
- | 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 \
-+ | avr32 \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
-@@ -297,7 +298,7 @@ case $basic_machine in
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-- | avr-* \
-+ | avr-* | avr32-* \
- | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | craynv-* | cydra-* \
-Index: strace-4.5.14-avr32/configure
-===================================================================
---- strace-4.5.14-avr32.orig/configure 2006-05-02 13:36:30.000000000 +0200
-+++ strace-4.5.14-avr32/configure 2006-05-02 13:36:39.000000000 +0200
-@@ -956,7 +956,7 @@ esac
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
-- cd $ac_popdir
-+ cd "$ac_popdir"
- done
- fi
-
-@@ -2017,6 +2017,14 @@ cat >>confdefs.h <<\_ACEOF
- _ACEOF
-
- ;;
-+avr32*)
-+ arch=avr32
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define AVR32 1
-+_ACEOF
-+
-+ ;;
- *)
- echo "$as_me:$LINENO: result: NO!" >&5
- echo "${ECHO_T}NO!" >&6
-@@ -2660,8 +2668,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -2719,8 +2726,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -2836,8 +2842,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -2891,8 +2896,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -2937,8 +2941,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -2982,8 +2985,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -3721,8 +3723,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -3786,8 +3787,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -3959,8 +3959,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4032,8 +4031,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- 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'
-+ { 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=$?
-@@ -4087,8 +4085,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- 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'
-+ { 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=$?
-@@ -4159,8 +4156,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- 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'
-+ { 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=$?
-@@ -4214,8 +4210,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- 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'
-+ { 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=$?
-@@ -4345,8 +4340,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4410,8 +4404,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4454,8 +4447,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4519,8 +4511,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4563,8 +4554,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4628,8 +4618,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4672,8 +4661,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4737,8 +4725,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4781,8 +4768,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4846,8 +4832,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4890,8 +4875,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4955,8 +4939,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -4999,8 +4982,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -5064,8 +5046,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -5108,8 +5089,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -5173,8 +5153,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -5217,8 +5196,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -5286,8 +5264,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -5360,8 +5337,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -5460,8 +5436,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -5610,8 +5585,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- 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'
-+ { 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=$?
-@@ -5668,8 +5642,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -5816,8 +5789,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -5968,8 +5940,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -6033,8 +6004,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -6100,8 +6070,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -6147,8 +6116,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -6214,8 +6182,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -6466,8 +6433,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -6532,8 +6498,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -6600,8 +6565,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- 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'
-+ { 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=$?
-@@ -6717,8 +6681,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- 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'
-+ { 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=$?
-@@ -6811,8 +6774,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -6958,8 +6920,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7019,8 +6980,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7081,8 +7041,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7355,8 +7314,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7400,8 +7358,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7470,8 +7427,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7538,8 +7494,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7584,8 +7539,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7651,8 +7605,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7697,8 +7650,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7766,8 +7718,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7833,8 +7784,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7898,8 +7848,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -7965,8 +7914,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -8031,8 +7979,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -8076,8 +8023,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -8144,8 +8090,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -8217,8 +8162,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -8288,8 +8232,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- 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'
-+ { 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=$?
-@@ -9292,11 +9235,6 @@ esac
- *) 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. */
-@@ -9335,6 +9273,12 @@ echo "$as_me: error: cannot find input f
- fi;;
- esac
- done` || { (exit 1); exit 1; }
-+
-+ 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
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
-Index: strace-4.5.14-avr32/system.c
-===================================================================
---- strace-4.5.14-avr32.orig/system.c 2006-09-14 17:03:55.000000000 +0200
-+++ strace-4.5.14-avr32/system.c 2006-09-14 17:04:44.000000000 +0200
-@@ -1578,7 +1578,7 @@ static const struct xlat sysctl_root[] =
- { CTL_KERN, "CTL_KERN" },
- { CTL_VM, "CTL_VM" },
- { CTL_NET, "CTL_NET" },
-- { CTL_PROC, "CTL_PROC" },
-+ /* was CTL_PROC */
- { CTL_FS, "CTL_FS" },
- { CTL_DEBUG, "CTL_DEBUG" },
- { CTL_DEV, "CTL_DEV" },
-Index: strace-4.5.14-avr32/linux/avr32/ioctlent.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ strace-4.5.14-avr32/linux/avr32/ioctlent.h 2006-09-21 14:34:24.000000000 +0200
-@@ -0,0 +1,1268 @@
-+{"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/wireless.h", "IW_POWER_ALL_R", 0x300},
-+{"linux/in6.h", "IPV6_PRIORITY_RESERVED1", 0x300},
-+{"linux/apm_bios.h", "APM_DEVICE_PARALLEL", 0x300},
-+{"linux/hdreg.h", "HDIO_GETGEO", 0x301},
-+{"linux/ps2esdi.h", "HDIO_GETGEO", 0x301},
-+{"linux/hdreg.h", "HDIO_GET_UNMASKINTR", 0x302},
-+{"linux/hdreg.h", "HDIO_GET_MULTCOUNT", 0x304},
-+{"linux/hdreg.h", "HDIO_GET_QDMA", 0x305},
-+{"linux/hdreg.h", "HDIO_SET_XFER", 0x306},
-+{"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_GET_WCACHE", 0x30e},
-+{"linux/hdreg.h", "HDIO_GET_ACOUSTIC", 0x30f},
-+{"linux/hdreg.h", "HDIO_GET_ADDRESS", 0x310},
-+{"linux/hdreg.h", "HDIO_GET_BUSSTATE", 0x31a},
-+{"linux/hdreg.h", "HDIO_TRISTATE_HWIF", 0x31b},
-+{"linux/hdreg.h", "HDIO_DRIVE_RESET", 0x31c},
-+{"linux/hdreg.h", "HDIO_DRIVE_TASKFILE", 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_SET_WCACHE", 0x32b},
-+{"linux/hdreg.h", "HDIO_SET_ACOUSTIC", 0x32c},
-+{"linux/hdreg.h", "HDIO_SET_BUSSTATE", 0x32d},
-+{"linux/hdreg.h", "HDIO_SET_QDMA", 0x32e},
-+{"linux/hdreg.h", "HDIO_SET_ADDRESS", 0x32f},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_CARDCO_1", 0x3ec},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_A_SQUARED", 0x3ed},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_COMSPEC_COMMUNICATIONS", 0x3ee},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_ANAKIN_RESEARCH", 0x3f1},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_MICROBOTICS", 0x3f2},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_ACCESS_ASSOCIATES_ALEGRA", 0x3f4},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_EXPANSION_TECHNOLOGIES", 0x3f6},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_ASDG", 0x3ff},
-+{"linux/apm_bios.h", "APM_DEVICE_PCMCIA", 0x600},
-+{"linux/ixjuser.h", "MIXER_PORT_CD_L", 0x600},
-+{"linux/in6.h", "IPV6_PRIORITY_INTERACTIVE", 0x600},
-+{"linux/lp.h", "LPCHAR", 0x601},
-+{"linux/lp.h", "LPTIME", 0x602},
-+{"linux/lp.h", "LPABORT", 0x604},
-+{"linux/lp.h", "LPSETIRQ", 0x605},
-+{"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/som.h", "SOM_LIB_RELOC", 0x619},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_GREAT_VALLEY_PRODUCTS_1", 0x6e1},
-+{"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", "BLKTRACESTART", 0x1274},
-+{"linux/fs.h", "BLKTRACESTOP", 0x1275},
-+{"linux/fs.h", "BLKTRACETEARDOWN", 0x1276},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_APOLLO_2", 0x2200},
-+{"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},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_APOLLO_3", 0x2222},
-+{"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/apm_bios.h", "APM_IOC_STANDBY", 0x4101},
-+{"linux/agpgart.h", "AGPIOC_ACQUIRE", 0x4101},
-+{"linux/apm_bios.h", "APM_IOC_SUSPEND", 0x4102},
-+{"linux/agpgart.h", "AGPIOC_RELEASE", 0x4102},
-+{"linux/pmu.h", "PMU_IOC_SLEEP", 0x4200},
-+{"linux/cciss_ioctl.h", "CCISS_REVALIDVOLS", 0x420a},
-+{"linux/cciss_ioctl.h", "CCISS_DEREGDISK", 0x420c},
-+{"linux/cciss_ioctl.h", "CCISS_REGNEWD", 0x420e},
-+{"linux/cciss_ioctl.h", "CCISS_RESCANDISK", 0x4210},
-+{"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_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/fb.h", "FBIOPUT_MODEINFO", 0x4617},
-+{"linux/fb.h", "FBIOGET_DISPINFO", 0x4618},
-+{"linux/arcfb.h", "FBIO_WAITEVENT", 0x4688},
-+{"linux/hiddev.h", "HIDIOCAPPLICATION", 0x4802},
-+{"linux/hiddev.h", "HIDIOCINITREPORT", 0x4805},
-+{"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/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/loop.h", "LOOP_SET_STATUS64", 0x4c04},
-+{"linux/loop.h", "LOOP_GET_STATUS64", 0x4c05},
-+{"linux/loop.h", "LOOP_CHANGE_FD", 0x4c06},
-+{"mtd/mtd-abi.h", "MTDFILEMODE", 0x4d13},
-+{"linux/random.h", "RNDZAPENTCNT", 0x5204},
-+{"linux/random.h", "RNDCLEARPOOL", 0x5206},
-+{"linux/cdrom.h", "CDROMPAUSE", 0x5301},
-+{"linux/n_r3964.h", "R3964_ENABLE_SIGNALS", 0x5301},
-+{"linux/n_r3964.h", "R3964_SETPRIORITY", 0x5302},
-+{"linux/cdrom.h", "CDROMRESUME", 0x5302},
-+{"linux/n_r3964.h", "R3964_USE_BCC", 0x5303},
-+{"linux/cdrom.h", "CDROMPLAYMSF", 0x5303},
-+{"linux/n_r3964.h", "R3964_READ_TELEGRAM", 0x5304},
-+{"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},
-+{"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", "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", "TIOCGHAYESESP", 0x545e},
-+{"asm/ioctls.h", "TIOCSHAYESESP", 0x545f},
-+{"asm/ioctls.h", "FIOQSIZE", 0x5460},
-+{"linux/uinput.h", "UI_DEV_CREATE", 0x5501},
-+{"linux/uinput.h", "UI_DEV_DESTROY", 0x5502},
-+{"linux/vt.h", "VT_OPENQRY", 0x5600},
-+{"linux/vt.h", "VT_GETMODE", 0x5601},
-+{"linux/videodev2.h", "VIDIOC_RESERVED", 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/vt.h", "VT_GETHIFONTMASK", 0x560d},
-+{"linux/videodev2.h", "VIDIOC_LOG_STATUS", 0x5646},
-+{"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/cm4000_cs.h", "CM_IOCSRDR", 0x6303},
-+{"linux/cm4000_cs.h", "CM_IOCARDOFF", 0x6304},
-+{"linux/chio.h", "CHIOINITELEM", 0x6311},
-+{"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/hpet.h", "HPET_IE_ON", 0x6801},
-+{"linux/hpet.h", "HPET_IE_OFF", 0x6802},
-+{"linux/hpet.h", "HPET_EPI", 0x6804},
-+{"linux/hpet.h", "HPET_DPI", 0x6805},
-+{"linux/mmtimer.h", "MMTIMER_GETOFFSET", 0x6d00},
-+{"linux/synclink.h", "MGSL_IOCSTXIDLE", 0x6d02},
-+{"linux/synclink.h", "MGSL_IOCGTXIDLE", 0x6d03},
-+{"linux/synclink.h", "MGSL_IOCTXENABLE", 0x6d04},
-+{"linux/mmtimer.h", "MMTIMER_GETBITS", 0x6d04},
-+{"linux/synclink.h", "MGSL_IOCRXENABLE", 0x6d05},
-+{"linux/mmtimer.h", "MMTIMER_MMAPAVAIL", 0x6d06},
-+{"linux/synclink.h", "MGSL_IOCTXABORT", 0x6d06},
-+{"linux/synclink.h", "MGSL_IOCGSTATS", 0x6d07},
-+{"linux/synclink.h", "MGSL_IOCLOOPTXDONE", 0x6d09},
-+{"linux/synclink.h", "MGSL_IOCSIF", 0x6d0a},
-+{"linux/synclink.h", "MGSL_IOCGIF", 0x6d0b},
-+{"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", "OLD_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_PLAY_CID", 0x71d7},
-+{"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/meye.h", "MEYEIOC_STILLCAPT", 0x76c4},
-+{"linux/videotext.h", "VTXIOCPUTPAGE", 0x8108},
-+{"linux/videotext.h", "VTXIOCSETDISP", 0x8109},
-+{"linux/videotext.h", "VTXIOCPUTSTAT", 0x810a},
-+{"linux/videotext.h", "VTXIOCCLRCACHE", 0x810b},
-+{"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", "SIOCBRADDBR", 0x89a0},
-+{"linux/sockios.h", "SIOCBRDELBR", 0x89a1},
-+{"linux/sockios.h", "SIOCBRADDIF", 0x89a2},
-+{"linux/sockios.h", "SIOCBRDELIF", 0x89a3},
-+{"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/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/videodev2.h", "VIDIOC_S_PRIORITY", 0x40015644},
-+{"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/sonypi.h", "SONYPI_IOCSBRT", 0x40017600},
-+{"linux/sonypi.h", "SONYPI_IOCSBLUE", 0x40017609},
-+{"linux/sonypi.h", "SONYPI_IOCSFAN", 0x4001760b},
-+{"linux/atmdev.h", "ATM_SETBACKEND", 0x400261f2},
-+{"linux/atmdev.h", "ATM_NEWBACKENDIF", 0x400261f3},
-+{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID", 0x40026e02},
-+{"linux/ppdev.h", "PPFCONTROL", 0x4002708e},
-+{"linux/telephony.h", "PHONE_RING_CADENCE", 0x40027186},
-+{"linux/fs.h", "BLKBSZSET", 0x40041271},
-+{"linux/radeonfb.h", "FBIO_RADEON_SET_MIRROR", 0x40044004},
-+{"linux/agpgart.h", "AGPIOC_SETUP", 0x40044103},
-+{"linux/agpgart.h", "AGPIOC_RESERVE", 0x40044104},
-+{"linux/agpgart.h", "AGPIOC_PROTECT", 0x40044105},
-+{"linux/agpgart.h", "AGPIOC_DEALLOCATE", 0x40044107},
-+{"linux/agpgart.h", "AGPIOC_BIND", 0x40044108},
-+{"linux/agpgart.h", "AGPIOC_UNBIND", 0x40044109},
-+{"linux/pmu.h", "PMU_IOC_SET_BACKLIGHT", 0x40044202},
-+{"linux/cciss_ioctl.h", "CCISS_REGNEWDISK", 0x4004420d},
-+{"linux/input.h", "EVIOCRMFF", 0x40044581},
-+{"linux/input.h", "EVIOCGRAB", 0x40044590},
-+{"linux/matroxfb.h", "FBIO_WAITFORVSYNC", 0x40044620},
-+{"linux/hiddev.h", "HIDIOCSFLAG", 0x4004480f},
-+{"mtd/mtd-abi.h", "OTPGETREGIONCOUNT", 0x40044d0e},
-+{"linux/ticable.h", "IOCTL_TIUSB_TIMEOUT", 0x40044e20},
-+{"linux/ticable.h", "IOCTL_TIUSB_RESET_DEVICE", 0x40044e21},
-+{"linux/ticable.h", "IOCTL_TIUSB_RESET_PIPES", 0x40044e22},
-+{"linux/random.h", "RNDADDTOENTCNT", 0x40045201},
-+{"asm/ioctls.h", "TIOCSPTLCK", 0x40045431},
-+{"linux/if_tun.h", "TUNSETNOCSUM", 0x400454c8},
-+{"linux/if_tun.h", "TUNSETDEBUG", 0x400454c9},
-+{"linux/if_tun.h", "TUNSETIFF", 0x400454ca},
-+{"linux/if_tun.h", "TUNSETPERSIST", 0x400454cb},
-+{"linux/if_tun.h", "TUNSETOWNER", 0x400454cc},
-+{"linux/if_tun.h", "TUNSETLINK", 0x400454cd},
-+{"linux/uinput.h", "UI_SET_EVBIT", 0x40045564},
-+{"linux/uinput.h", "UI_SET_KEYBIT", 0x40045565},
-+{"linux/uinput.h", "UI_SET_RELBIT", 0x40045566},
-+{"linux/uinput.h", "UI_SET_ABSBIT", 0x40045567},
-+{"linux/uinput.h", "UI_SET_MSCBIT", 0x40045568},
-+{"linux/uinput.h", "UI_SET_LEDBIT", 0x40045569},
-+{"linux/uinput.h", "UI_SET_SNDBIT", 0x4004556a},
-+{"linux/uinput.h", "UI_SET_FFBIT", 0x4004556b},
-+{"linux/uinput.h", "UI_SET_PHYS", 0x4004556c},
-+{"linux/uinput.h", "UI_SET_SWBIT", 0x4004556d},
-+{"linux/videodev2.h", "VIDIOC_OVERLAY", 0x4004560e},
-+{"linux/videodev2.h", "VIDIOC_STREAMON", 0x40045612},
-+{"linux/videodev2.h", "VIDIOC_STREAMOFF", 0x40045613},
-+{"linux/atmdev.h", "ATM_SETSC", 0x400461f1},
-+{"linux/atmdev.h", "ATM_DROPPARTY", 0x400461f5},
-+{"linux/cm4000_cs.h", "CM_IOCSPTS", 0x40046302},
-+{"linux/chio.h", "CHIOSPICKER", 0x40046305},
-+{"linux/cm4000_cs.h", "CM_IOSDBGLVL", 0x400463fa},
-+{"linux/video_decoder.h", "DECODER_SET_NORM", 0x40046403},
-+{"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_decoder.h", "DECODER_SET_GPIO", 0x40046408},
-+{"linux/video_decoder.h", "DECODER_SET_VBI_BYPASS", 0x4004640a},
-+{"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/ext3_fs.h", "EXT3_IOC_SETFLAGS", 0x40046602},
-+{"linux/ext2_fs.h", "EXT2_IOC_SETFLAGS", 0x40046602},
-+{"linux/iflags.h", "IFLAGS_SET_IOC", 0x40046602},
-+{"linux/ext3_fs.h", "EXT3_IOC_SETVERSION", 0x40046604},
-+{"linux/ext3_fs.h", "EXT3_IOC_SETRSVSZ", 0x40046606},
-+{"linux/ext3_fs.h", "EXT3_IOC_GROUP_EXTEND", 0x40046607},
-+{"linux/hpet.h", "HPET_IRQFREQ", 0x40046806},
-+{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID2", 0x40046e02},
-+{"linux/ncp_fs.h", "NCP_IOC_SET_SIGN_WANTED", 0x40046e06},
-+{"linux/ncp_fs.h", "NCP_IOC_GETDENTRYTTL", 0x40046e0c},
-+{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_CONNECTION", 0x40046ef8},
-+{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_MODE", 0x40046efa},
-+{"linux/rtc.h", "RTC_IRQP_SET", 0x4004700c},
-+{"linux/rtc.h", "RTC_EPOCH_SET", 0x4004700e},
-+{"linux/ppdev.h", "PPSETMODE", 0x40047080},
-+{"linux/ppdev.h", "PPDATADIR", 0x40047090},
-+{"linux/ppdev.h", "PPNEGOT", 0x40047091},
-+{"linux/ppdev.h", "PPSETPHASE", 0x40047094},
-+{"linux/ppdev.h", "PPSETFLAGS", 0x4004709b},
-+{"linux/ticable.h", "IOCTL_TISER_DELAY", 0x400470a0},
-+{"linux/ticable.h", "IOCTL_TISER_TIMEOUT", 0x400470a1},
-+{"linux/ticable.h", "IOCTL_TIPAR_DELAY", 0x400470a8},
-+{"linux/ticable.h", "IOCTL_TIPAR_TIMEOUT", 0x400470a9},
-+{"linux/serio.h", "SPIOCSTYPE", 0x40047101},
-+{"linux/telephony.h", "PHONE_CAPABILITIES_CHECK", 0x40047182},
-+{"linux/telephony.h", "PHONE_RING_START", 0x40047187},
-+{"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/telephony.h", "PHONE_VAD", 0x400471a9},
-+{"linux/telephony.h", "PHONE_WINK", 0x400471aa},
-+{"linux/ixjuser.h", "IXJCTL_SET_FILTER", 0x400471c7},
-+{"linux/ixjuser.h", "IXJCTL_GET_FILTER_HIST", 0x400471c8},
-+{"linux/ixjuser.h", "IXJCTL_INIT_TONE", 0x400471c9},
-+{"linux/ixjuser.h", "IXJCTL_TONE_CADENCE", 0x400471ca},
-+{"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_FILTER_CADENCE", 0x400471d6},
-+{"linux/ixjuser.h", "IXJCTL_CIDCW", 0x400471d9},
-+{"linux/telephony.h", "PHONE_REC_VOLUME_LINEAR", 0x400471db},
-+{"linux/telephony.h", "PHONE_PLAY_VOLUME_LINEAR", 0x400471dc},
-+{"linux/ixjuser.h", "IXJCTL_SET_FILTER_RAW", 0x400471dd},
-+{"linux/ixjuser.h", "IXJCTL_HZ", 0x400471e0},
-+{"linux/ixjuser.h", "IXJCTL_RATE", 0x400471e1},
-+{"linux/ixjuser.h", "IXJCTL_DTMF_PRESCALE", 0x400471e8},
-+{"linux/ixjuser.h", "IXJCTL_SIGCTL", 0x400471e9},
-+{"linux/ixjuser.h", "IXJCTL_SC_RXG", 0x400471ea},
-+{"linux/ixjuser.h", "IXJCTL_SC_TXG", 0x400471eb},
-+{"linux/ixjuser.h", "IXJCTL_INTERCOM_START", 0x400471fd},
-+{"linux/ixjuser.h", "IXJCTL_INTERCOM_STOP", 0x400471fe},
-+{"linux/msdos_fs.h", "FAT_IOCTL_SET_ATTRIBUTES", 0x40047211},
-+{"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/ext2_fs.h", "EXT2_IOC_SETVERSION", 0x40047602},
-+{"linux/ext3_fs.h", "EXT3_IOC_SETVERSION_OLD", 0x40047602},
-+{"linux/videodev.h", "VIDIOCCAPTURE", 0x40047608},
-+{"linux/videodev.h", "VIDIOCSFREQ", 0x4004760f},
-+{"linux/videodev.h", "VIDIOCSYNC", 0x40047612},
-+{"linux/videodev.h", "VIDIOCSWRITEMODE", 0x40047619},
-+{"linux/meye.h", "MEYEIOC_QBUF_CAPT", 0x400476c2},
-+{"linux/videotext.h", "VTXIOCSETVIRT", 0x4004810c},
-+{"linux/dn.h", "OSIOCSNETADDR", 0x400489e0},
-+{"linux/dn.h", "SIOCSNETADDR", 0x400489e0},
-+{"linux/auto_fs4.h", "AUTOFS_IOC_EXPIRE_MULTI", 0x40049366},
-+{"linux/if_pppox.h", "PPPOEIOCSFWD", 0x4004b100},
-+{"linux/gigaset_dev.h", "GIGASET_BRKCHARS", 0x40064702},
-+{"linux/meye.h", "MEYEIOC_S_PARAMS", 0x400676c1},
-+{"linux/cciss_ioctl.h", "CCISS_SETINTINFO", 0x40084203},
-+{"linux/input.h", "EVIOCSREP", 0x40084503},
-+{"linux/input.h", "EVIOCSKEYCODE", 0x40084504},
-+{"mtd/mtd-abi.h", "MEMERASE", 0x40084d02},
-+{"mtd/mtd-abi.h", "MEMLOCK", 0x40084d05},
-+{"mtd/mtd-abi.h", "MEMUNLOCK", 0x40084d06},
-+{"mtd/mtd-abi.h", "MEMGETBADBLOCK", 0x40084d0b},
-+{"mtd/mtd-abi.h", "MEMSETBADBLOCK", 0x40084d0c},
-+{"linux/random.h", "RNDADDENTROPY", 0x40085203},
-+{"linux/videodev2.h", "VIDIOC_S_STD", 0x40085618},
-+{"linux/videodev2.h", "VIDIOC_S_CTRL_OLD", 0x4008561c},
-+{"linux/atmdev.h", "ATM_GETNAMES", 0x40086183},
-+{"linux/atmdev.h", "ATM_ADDPARTY", 0x400861f4},
-+{"linux/chio.h", "CHIOGSTATUS", 0x40086308},
-+{"linux/video_decoder.h", "DECODER_INIT", 0x40086409},
-+{"linux/mtio.h", "MTIOCTOP", 0x40086d01},
-+{"linux/ppdev.h", "PPSETTIME", 0x40087096},
-+{"linux/if_ppp.h", "PPPIOCSACTIVE", 0x40087446},
-+{"linux/if_ppp.h", "PPPIOCSPASS", 0x40087447},
-+{"linux/if_ppp.h", "PPPIOCSNPMODE", 0x4008744b},
-+{"linux/fd.h", "FDFMTTRK", 0x400c0248},
-+{"linux/capi.h", "CAPI_REGISTER", 0x400c4301},
-+{"linux/hiddev.h", "HIDIOCGREPORT", 0x400c4807},
-+{"linux/hiddev.h", "HIDIOCSREPORT", 0x400c4808},
-+{"mtd/mtd-abi.h", "OTPGETREGIONINFO", 0x400c4d0f},
-+{"linux/uinput.h", "UI_END_FF_ERASE", 0x400c55cb},
-+{"linux/ite_gpio.h", "ITE_GPIO_OUT", 0x400c5a01},
-+{"linux/ite_gpio.h", "ITE_GPIO_INT_CTRL", 0x400c5a02},
-+{"linux/ite_gpio.h", "ITE_GPIO_IN_STATUS", 0x400c5a03},
-+{"linux/ite_gpio.h", "ITE_GPIO_OUT_STATUS", 0x400c5a04},
-+{"linux/ite_gpio.h", "ITE_GPIO_GEN_CTRL", 0x400c5a05},
-+{"linux/ite_gpio.h", "ITE_GPIO_INT_WAIT", 0x400c5a06},
-+{"linux/atm_idt77105.h", "IDT77105_GETSTAT", 0x400c6132},
-+{"linux/atm_idt77105.h", "IDT77105_GETSTATZ", 0x400c6133},
-+{"linux/atmdev.h", "ATM_GETSTAT", 0x400c6150},
-+{"linux/atmdev.h", "ATM_GETSTATZ", 0x400c6151},
-+{"linux/atmdev.h", "ATM_GETLOOP", 0x400c6152},
-+{"linux/atmdev.h", "ATM_SETLOOP", 0x400c6153},
-+{"linux/atmdev.h", "ATM_QUERYLOOP", 0x400c6154},
-+{"linux/atm_eni.h", "ENI_MEMDUMP", 0x400c6160},
-+{"linux/atm_he.h", "HE_GET_REG", 0x400c6160},
-+{"linux/atm_zatm.h", "ZATM_GETPOOL", 0x400c6161},
-+{"linux/atm_zatm.h", "ZATM_GETPOOLZ", 0x400c6162},
-+{"linux/atm_nicstar.h", "NS_SETBUFLEV", 0x400c6162},
-+{"linux/atm_zatm.h", "ZATM_SETPOOL", 0x400c6163},
-+{"linux/atm_eni.h", "ENI_SETMULT", 0x400c6167},
-+{"linux/atmdev.h", "ATM_GETLINKRATE", 0x400c6181},
-+{"linux/atmdev.h", "ATM_GETTYPE", 0x400c6184},
-+{"linux/atmdev.h", "ATM_GETESI", 0x400c6185},
-+{"linux/atmdev.h", "ATM_GETADDR", 0x400c6186},
-+{"linux/atmdev.h", "ATM_RSTADDR", 0x400c6187},
-+{"linux/atmdev.h", "ATM_ADDADDR", 0x400c6188},
-+{"linux/atmdev.h", "ATM_DELADDR", 0x400c6189},
-+{"linux/atmdev.h", "ATM_GETCIRANGE", 0x400c618a},
-+{"linux/atmdev.h", "ATM_SETCIRANGE", 0x400c618b},
-+{"linux/atmdev.h", "ATM_SETESI", 0x400c618c},
-+{"linux/atmdev.h", "ATM_SETESIF", 0x400c618d},
-+{"linux/atmdev.h", "ATM_ADDLECSADDR", 0x400c618e},
-+{"linux/atmdev.h", "ATM_DELLECSADDR", 0x400c618f},
-+{"linux/atmdev.h", "ATM_GETLECSADDR", 0x400c6190},
-+{"linux/chio.h", "CHIOPOSITION", 0x400c6303},
-+{"linux/i2o-dev.h", "I2OEVTREG", 0x400c690a},
-+{"linux/ncp_fs.h", "NCP_IOC_GETROOT", 0x400c6e08},
-+{"linux/if_ppp.h", "PPPIOCSCOMPRESS", 0x400c744d},
-+{"linux/videodev.h", "VIDIOCSPLAYMODE", 0x400c7618},
-+{"linux/video_decoder.h", "DECODER_SET_PICTURE", 0x400e6407},
-+{"linux/videodev.h", "VIDIOCSPICT", 0x400e7607},
-+{"linux/cciss_ioctl.h", "CCISS_SETNODENAME", 0x40104205},
-+{"linux/synclink.h", "MGSL_IOCSGPIO", 0x40106d10},
-+{"linux/videodev.h", "VIDIOCMCAPTURE", 0x40107613},
-+{"linux/fd.h", "FDSETMAXERRS", 0x4014024c},
-+{"linux/videodev2.h", "VIDIOC_S_CROP", 0x4014563c},
-+{"linux/chio.h", "CHIOMOVE", 0x40146301},
-+{"linux/videodev.h", "VIDIOCSFBUF", 0x4014760c},
-+{"linux/videodev.h", "VIDIOCSCAPTURE", 0x40147617},
-+{"linux/hiddev.h", "HIDIOCSUSAGE", 0x4018480c},
-+{"linux/hiddev.h", "HIDIOCGCOLLECTIONINDEX", 0x40184810},
-+{"linux/ext3_fs.h", "EXT3_IOC_GROUP_ADD", 0x40186608},
-+{"linux/videodev.h", "VIDIOCSMICROCODE", 0x4018761b},
-+{"linux/fd.h", "FDSETPRM", 0x401c0242},
-+{"linux/fd.h", "FDDEFPRM", 0x401c0243},
-+{"linux/atmbr2684.h", "BR2684_SETFILT", 0x401c6190},
-+{"linux/chio.h", "CHIOEXCHANGE", 0x401c6302},
-+{"linux/rtc.h", "RTC_PLL_SET", 0x401c7012},
-+{"linux/synclink.h", "MGSL_IOCSPARAMS", 0x40206d00},
-+{"linux/if_ppp.h", "PPPIOCSXASYNCMAP", 0x4020744f},
-+{"linux/videodev.h", "VIDIOCSWIN", 0x4020760a},
-+{"linux/videodev.h", "VIDIOCSVBIFMT", 0x4020761d},
-+{"linux/videotext.h", "VTXIOCCLRPAGE", 0x40208102},
-+{"linux/videotext.h", "VTXIOCCLRFOUND", 0x40208103},
-+{"linux/videotext.h", "VTXIOCPAGEREQ", 0x40208104},
-+{"linux/videotext.h", "VTXIOCGETSTAT", 0x40208105},
-+{"linux/videotext.h", "VTXIOCGETPAGE", 0x40208106},
-+{"linux/videotext.h", "VTXIOCSTOPDAU", 0x40208107},
-+{"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/smb_fs.h", "SMB_IOC_NEWCONN", 0x40287502},
-+{"linux/videodev.h", "VIDIOCSAUDIO", 0x40287611},
-+{"linux/videodev2.h", "VIDIOC_S_FBUF", 0x402c560b},
-+{"linux/videodev2.h", "VIDIOC_S_FREQUENCY", 0x402c5639},
-+{"linux/chio.h", "CHIOSVOLTAG", 0x40306312},
-+{"linux/videodev.h", "VIDIOCSCHAN", 0x40307603},
-+{"linux/uinput.h", "UI_END_FF_UPLOAD", 0x403455c9},
-+{"linux/videodev2.h", "VIDIOC_S_AUDIO", 0x40345622},
-+{"linux/videodev2.h", "VIDIOC_S_AUDOUT", 0x40345632},
-+{"linux/videodev.h", "VIDIOCSTUNER", 0x40347605},
-+{"linux/joystick.h", "JSIOCSAXMAP", 0x40406a31},
-+{"linux/videodev2.h", "VIDIOC_S_MODULATOR", 0x40445637},
-+{"linux/videodev2.h", "VIDIOC_S_TUNER", 0x4054561e},
-+{"linux/fd.h", "FDSETDRVPRM", 0x40580290},
-+{"linux/chio.h", "CHIOGELEM", 0x406c6310},
-+{"linux/videodev2.h", "VIDIOC_S_JPEGCOMP", 0x408c563e},
-+{"mtd/mtd-abi.h", "MEMSETOOBSEL", 0x40c84d09},
-+{"linux/videodev2.h", "VIDIOC_S_PARM_OLD", 0x40cc5616},
-+{"linux/joystick.h", "JSIOCSBTNMAP", 0x42006a33},
-+{"linux/hiddev.h", "HIDIOCSUSAGES", 0x501c4814},
-+{"linux/videodev2.h", "VIDIOC_G_PRIORITY", 0x80015643},
-+{"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/sonypi.h", "SONYPI_IOCGBRT", 0x80017600},
-+{"linux/sonypi.h", "SONYPI_IOCGBATFLAGS", 0x80017607},
-+{"linux/sonypi.h", "SONYPI_IOCGBLUE", 0x80017608},
-+{"linux/sonypi.h", "SONYPI_IOCGFAN", 0x8001760a},
-+{"linux/sonypi.h", "SONYPI_IOCGTEMP", 0x8001760c},
-+{"linux/capi.h", "CAPI_GET_ERRCODE", 0x80024321},
-+{"linux/capi.h", "CAPI_INSTALLED", 0x80024322},
-+{"linux/ipmi.h", "IPMICTL_REGISTER_FOR_CMD", 0x8002690e},
-+{"linux/ipmi.h", "IPMICTL_UNREGISTER_FOR_CMD", 0x8002690f},
-+{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID", 0x80027501},
-+{"linux/sonypi.h", "SONYPI_IOCGBAT1CAP", 0x80027602},
-+{"linux/sonypi.h", "SONYPI_IOCGBAT1REM", 0x80027603},
-+{"linux/sonypi.h", "SONYPI_IOCGBAT2CAP", 0x80027604},
-+{"linux/sonypi.h", "SONYPI_IOCGBAT2REM", 0x80027605},
-+{"linux/fs.h", "BLKBSZGET", 0x80041270},
-+{"linux/fs.h", "BLKGETSIZE64", 0x80041272},
-+{"linux/radeonfb.h", "FBIO_RADEON_GET_MIRROR", 0x80044003},
-+{"linux/agpgart.h", "AGPIOC_INFO", 0x80044100},
-+{"linux/pmu.h", "PMU_IOC_GET_BACKLIGHT", 0x80044201},
-+{"linux/pmu.h", "PMU_IOC_GET_MODEL", 0x80044203},
-+{"linux/pmu.h", "PMU_IOC_HAS_ADB", 0x80044204},
-+{"linux/pmu.h", "PMU_IOC_CAN_SLEEP", 0x80044205},
-+{"linux/pmu.h", "PMU_IOC_GRAB_BACKLIGHT", 0x80044206},
-+{"linux/cciss_ioctl.h", "CCISS_GETHEARTBEAT", 0x80044206},
-+{"linux/cciss_ioctl.h", "CCISS_GETBUSTYPES", 0x80044207},
-+{"linux/cciss_ioctl.h", "CCISS_GETFIRMVER", 0x80044208},
-+{"linux/cciss_ioctl.h", "CCISS_GETDRIVVER", 0x80044209},
-+{"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},
-+{"linux/input.h", "EVIOCGVERSION", 0x80044501},
-+{"linux/input.h", "EVIOCGEFFECTS", 0x80044584},
-+{"linux/arcfb.h", "FBIO_GETCONTROL2", 0x80044689},
-+{"linux/hiddev.h", "HIDIOCGVERSION", 0x80044801},
-+{"linux/hiddev.h", "HIDIOCGFLAG", 0x8004480e},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_VOLUME", 0x80044d00},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_BASS", 0x80044d01},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_TREBLE", 0x80044d02},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_SYNTH", 0x80044d03},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_PCM", 0x80044d04},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_SPEAKER", 0x80044d05},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_LINE", 0x80044d06},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_MIC", 0x80044d07},
-+{"mtd/mtd-abi.h", "MEMGETREGIONCOUNT", 0x80044d07},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_CD", 0x80044d08},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_IMIX", 0x80044d09},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_ALTPCM", 0x80044d0a},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_RECLEV", 0x80044d0b},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_IGAIN", 0x80044d0c},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_OGAIN", 0x80044d0d},
-+{"mtd/mtd-abi.h", "OTPSELECT", 0x80044d0d},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_LINE1", 0x80044d0e},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_LINE2", 0x80044d0f},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_LINE3", 0x80044d10},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_LOUD", 0x80044d1f},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_ENHANCE", 0x80044d1f},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_MUTE", 0x80044d1f},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_STEREODEVS", 0x80044dfb},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_CAPS", 0x80044dfc},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_RECMASK", 0x80044dfd},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_DEVMASK", 0x80044dfe},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_RECSRC", 0x80044dff},
-+{"linux/ticable.h", "IOCTL_TIUSB_GET_MAXPS", 0x80044e23},
-+{"linux/ticable.h", "IOCTL_TIUSB_GET_DEVID", 0x80044e24},
-+{"linux/random.h", "RNDGETENTCNT", 0x80045200},
-+{"asm/ioctls.h", "TIOCGPTN", 0x80045430},
-+{"linux/videodev2.h", "VIDIOC_G_INPUT", 0x80045626},
-+{"linux/videodev2.h", "VIDIOC_G_OUTPUT", 0x8004562e},
-+{"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/watchdog.h", "WDIOC_GETTIMEOUT", 0x80045707},
-+{"linux/watchdog.h", "WDIOC_GETPRETIMEOUT", 0x80045709},
-+{"linux/watchdog.h", "WDIOC_GETTIMELEFT", 0x8004570a},
-+{"linux/sonet.h", "SONET_GETDIAG", 0x80046114},
-+{"linux/sonet.h", "SONET_GETFRAMING", 0x80046116},
-+{"linux/cm4000_cs.h", "CM_IOCGSTATUS", 0x80046300},
-+{"linux/chio.h", "CHIOGPICKER", 0x80046304},
-+{"linux/video_decoder.h", "DECODER_GET_STATUS", 0x80046402},
-+{"linux/iflags.h", "IFLAGS_GET_IOC", 0x80046601},
-+{"linux/ext3_fs.h", "EXT3_IOC_GETFLAGS", 0x80046601},
-+{"linux/ext2_fs.h", "EXT2_IOC_GETFLAGS", 0x80046601},
-+{"linux/ext3_fs.h", "EXT3_IOC_GETVERSION", 0x80046603},
-+{"linux/ext3_fs.h", "EXT3_IOC_GETRSVSZ", 0x80046605},
-+{"linux/ext3_fs.h", "EXT3_IOC_WAIT_FOR_READONLY", 0x80046663},
-+{"linux/i2o-dev.h", "I2OVALIDATE", 0x80046908},
-+{"linux/ipmi.h", "IPMICTL_SET_GETS_EVENTS_CMD", 0x80046910},
-+{"linux/ipmi.h", "IPMICTL_SET_MY_ADDRESS_CMD", 0x80046911},
-+{"linux/ipmi.h", "IPMICTL_GET_MY_ADDRESS_CMD", 0x80046912},
-+{"linux/ipmi.h", "IPMICTL_SET_MY_LUN_CMD", 0x80046913},
-+{"linux/ipmi.h", "IPMICTL_GET_MY_LUN_CMD", 0x80046914},
-+{"linux/ipmi.h", "IPMICTL_SET_MY_CHANNEL_ADDRESS_CMD", 0x80046918},
-+{"linux/ipmi.h", "IPMICTL_GET_MY_CHANNEL_ADDRESS_CMD", 0x80046919},
-+{"linux/ipmi.h", "IPMICTL_SET_MY_CHANNEL_LUN_CMD", 0x8004691a},
-+{"linux/ipmi.h", "IPMICTL_GET_MY_CHANNEL_LUN_CMD", 0x8004691b},
-+{"linux/i8k.h", "I8K_BIOS_VERSION", 0x80046980},
-+{"linux/i8k.h", "I8K_MACHINE_ID", 0x80046981},
-+{"linux/i8k.h", "I8K_POWER_STATUS", 0x80046982},
-+{"linux/i8k.h", "I8K_FN_STATUS", 0x80046983},
-+{"linux/i8k.h", "I8K_GET_TEMP", 0x80046984},
-+{"linux/joystick.h", "JSIOCGVERSION", 0x80046a01},
-+{"linux/udf_fs_i.h", "UDF_GETEASIZE", 0x80046c40},
-+{"linux/udf_fs_i.h", "UDF_GETEABLOCK", 0x80046c41},
-+{"linux/udf_fs_i.h", "UDF_GETVOLIDENT", 0x80046c42},
-+{"linux/mmtimer.h", "MMTIMER_GETRES", 0x80046d01},
-+{"linux/mmtimer.h", "MMTIMER_GETFREQ", 0x80046d02},
-+{"linux/mtio.h", "MTIOCPOS", 0x80046d03},
-+{"linux/mmtimer.h", "MMTIMER_GETCOUNTER", 0x80046d09},
-+{"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/matroxfb.h", "MATROXFB_GET_OUTPUT_CONNECTION", 0x80046ef8},
-+{"linux/matroxfb.h", "MATROXFB_GET_AVAILABLE_OUTPUTS", 0x80046ef9},
-+{"linux/matroxfb.h", "MATROXFB_GET_ALL_OUTPUTS", 0x80046efb},
-+{"linux/rtc.h", "RTC_IRQP_READ", 0x8004700b},
-+{"linux/rtc.h", "RTC_EPOCH_READ", 0x8004700d},
-+{"linux/ppdev.h", "PPCLRIRQ", 0x80047093},
-+{"linux/ppdev.h", "PPGETMODES", 0x80047097},
-+{"linux/ppdev.h", "PPGETMODE", 0x80047098},
-+{"linux/ppdev.h", "PPGETPHASE", 0x80047099},
-+{"linux/ppdev.h", "PPGETFLAGS", 0x8004709a},
-+{"linux/telephony.h", "PHONE_CAPABILITIES_LIST", 0x80047181},
-+{"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/ixjuser.h", "IXJCTL_CID", 0x800471d4},
-+{"linux/ixjuser.h", "IXJCTL_VMWI", 0x800471d8},
-+{"linux/ixjuser.h", "IXJCTL_VERSION", 0x800471da},
-+{"linux/ixjuser.h", "IXJCTL_FRAMES_READ", 0x800471e2},
-+{"linux/ixjuser.h", "IXJCTL_FRAMES_WRITTEN", 0x800471e3},
-+{"linux/ixjuser.h", "IXJCTL_READ_WAIT", 0x800471e4},
-+{"linux/ixjuser.h", "IXJCTL_WRITE_WAIT", 0x800471e5},
-+{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_READ", 0x800471e6},
-+{"linux/msdos_fs.h", "FAT_IOCTL_GET_ATTRIBUTES", 0x80047210},
-+{"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_GETMOUNTUID32", 0x80047503},
-+{"linux/ext2_fs.h", "EXT2_IOC_GETVERSION", 0x80047601},
-+{"linux/ext3_fs.h", "EXT3_IOC_GETVERSION_OLD", 0x80047601},
-+{"linux/videodev.h", "VIDIOCGFREQ", 0x8004760e},
-+{"linux/meye.h", "MEYEIOC_STILLJCAPT", 0x800476c5},
-+{"linux/dn.h", "SIOCGNETADDR", 0x800489e1},
-+{"linux/dn.h", "OSIOCGNETADDR", 0x800489e1},
-+{"linux/auto_fs.h", "AUTOFS_IOC_PROTOVER", 0x80049363},
-+{"linux/auto_fs4.h", "AUTOFS_IOC_PROTOSUBVER", 0x80049367},
-+{"linux/auto_fs4.h", "AUTOFS_IOC_ASKREGHOST", 0x80049368},
-+{"linux/auto_fs4.h", "AUTOFS_IOC_TOGGLEREGHOST", 0x80049369},
-+{"linux/auto_fs4.h", "AUTOFS_IOC_ASKUMOUNT", 0x80049370},
-+{"linux/sonet.h", "SONET_GETFRSENSE", 0x80066117},
-+{"linux/meye.h", "MEYEIOC_G_PARAMS", 0x800676c0},
-+{"linux/cciss_ioctl.h", "CCISS_GETPCIINFO", 0x80084201},
-+{"linux/cciss_ioctl.h", "CCISS_GETINTINFO", 0x80084202},
-+{"linux/input.h", "EVIOCGID", 0x80084502},
-+{"linux/input.h", "EVIOCGREP", 0x80084503},
-+{"linux/input.h", "EVIOCGKEYCODE", 0x80084504},
-+{"linux/random.h", "RNDGETPOOL", 0x80085202},
-+{"linux/videodev2.h", "VIDIOC_G_STD", 0x80085617},
-+{"linux/videodev2.h", "VIDIOC_QUERYSTD", 0x8008563f},
-+{"linux/i2o-dev.h", "I2OPASSTHRU", 0x8008690c},
-+{"linux/i2o-dev.h", "I2OPASSTHRU32", 0x8008690c},
-+{"linux/ipmi.h", "IPMICTL_SET_TIMING_PARMS_CMD", 0x80086916},
-+{"linux/ipmi.h", "IPMICTL_GET_TIMING_PARMS_CMD", 0x80086917},
-+{"linux/mtio.h", "MTIOCGETSIZE", 0x80086d09},
-+{"linux/ncp_fs.h", "NCP_IOC_SETPRIVATEDATA", 0x80086e0a},
-+{"linux/ppdev.h", "PPGETTIME", 0x80087095},
-+{"linux/if_ppp.h", "PPPIOCGIDLE", 0x8008743f},
-+{"linux/cciss_ioctl.h", "CCISS_GETLUNINFO", 0x800c4211},
-+{"mtd/mtd-abi.h", "OTPLOCK", 0x800c4d10},
-+{"linux/video_decoder.h", "DECODER_GET_CAPABILITIES", 0x800c6401},
-+{"linux/video_encoder.h", "ENCODER_GET_CAPABILITIES", 0x800c6501},
-+{"linux/hpet.h", "HPET_INFO", 0x800c6803},
-+{"linux/ncp_fs.h", "NCP_IOC_NCPREQUEST", 0x800c6e01},
-+{"linux/ncp_fs.h", "NCP_IOC_SETROOT", 0x800c6e08},
-+{"linux/ncp_fs.h", "NCP_IOC_SETOBJECTNAME", 0x800c6e09},
-+{"linux/videodev.h", "VIDIOCKEY", 0x800c760d},
-+{"linux/videodev.h", "VIDIOCGPICT", 0x800e7606},
-+{"linux/fd.h", "FDGETDRVTYP", 0x8010020f},
-+{"linux/cciss_ioctl.h", "CCISS_GETNODENAME", 0x80104204},
-+{"mtd/mtd-abi.h", "ECCGETSTATS", 0x80104d12},
-+{"linux/synclink.h", "MGSL_IOCGGPIO", 0x80106d11},
-+{"linux/isdn_ppp.h", "PPPIOCGIFNAME", 0x80107488},
-+{"linux/videotext.h", "VTXIOCGETINFO", 0x80108101},
-+{"linux/fd.h", "FDGETMAXERRS", 0x8014020e},
-+{"linux/chio.h", "CHIOGPARAMS", 0x80146306},
-+{"linux/ipmi.h", "IPMICTL_SEND_COMMAND", 0x8014690d},
-+{"linux/mtio.h", "MTIOCVOLINFO", 0x80146d08},
-+{"linux/ncp_fs.h", "NCP_IOC_LOCKUNLOCK", 0x80146e07},
-+{"linux/videodev.h", "VIDIOCGFBUF", 0x8014760b},
-+{"linux/videodev.h", "VIDIOCGUNIT", 0x80147615},
-+{"linux/videodev.h", "VIDIOCGCAPTURE", 0x80147616},
-+{"linux/fd.h", "FDWERRORGET", 0x80180217},
-+{"linux/ncp_fs.h", "NCP_IOC_SIGN_INIT", 0x80186e05},
-+{"linux/fd.h", "FDGETPRM", 0x801c0204},
-+{"linux/hiddev.h", "HIDIOCGDEVINFO", 0x801c4803},
-+{"linux/ipmi.h", "IPMICTL_SEND_COMMAND_SETTIME", 0x801c6915},
-+{"linux/mtio.h", "MTIOCGET", 0x801c6d02},
-+{"linux/rtc.h", "RTC_PLL_GET", 0x801c7011},
-+{"linux/fd.h", "FDGETFDCSTAT", 0x80200215},
-+{"linux/fb.h", "FBIOGET_VBLANK", 0x80204612},
-+{"mtd/mtd-abi.h", "MEMGETINFO", 0x80204d01},
-+{"linux/i2o-dev.h", "I2OGETIOPS", 0x80206900},
-+{"linux/synclink.h", "MGSL_IOCGPARAMS", 0x80206d01},
-+{"linux/if_ppp.h", "PPPIOCGXASYNCMAP", 0x80207450},
-+{"linux/isdn_ppp.h", "PPPIOCGCOMPRESSORS", 0x80207486},
-+{"linux/videodev.h", "VIDIOCGWIN", 0x80207609},
-+{"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/watchdog.h", "WDIOC_GETSUPPORT", 0x80285700},
-+{"linux/rtc.h", "RTC_WKALM_RD", 0x80287010},
-+{"linux/videodev.h", "VIDIOCGAUDIO", 0x80287610},
-+{"linux/ncp_fs.h", "NCP_IOC_SETCHARSETS", 0x802a6e0b},
-+{"linux/videodev2.h", "VIDIOC_G_FBUF", 0x802c560a},
-+{"linux/videodev2.h", "VIDIOC_CROPCAP_OLD", 0x802c563a},
-+{"linux/fd.h", "FDGETDRVSTAT", 0x80340212},
-+{"linux/fd.h", "FDPOLLDRVSTAT", 0x80340213},
-+{"linux/videodev2.h", "VIDIOC_G_AUDIO", 0x80345621},
-+{"linux/videodev2.h", "VIDIOC_G_AUDOUT", 0x80345631},
-+{"linux/videodev.h", "VIDIOCGCAP", 0x803c7601},
-+{"linux/joystick.h", "JSIOCGAXMAP", 0x80406a32},
-+{"linux/fd.h", "FDGETDRVPRM", 0x80580211},
-+{"linux/videodev2.h", "VIDIOC_QUERYCAP", 0x80685600},
-+{"linux/i2o-dev.h", "I2OEVTGET", 0x8068690b},
-+{"linux/chio.h", "CHIOGVPARAMS", 0x80706313},
-+{"linux/videodev2.h", "VIDIOC_G_SLICED_VBI_CAP", 0x80745645},
-+{"linux/videodev.h", "VIDIOCGMBUF", 0x80887614},
-+{"linux/videodev2.h", "VIDIOC_G_JPEGCOMP", 0x808c563d},
-+{"mtd/mtd-abi.h", "MEMGETOOBSEL", 0x80c84d0a},
-+{"linux/hiddev.h", "HIDIOCGSTRING", 0x81044804},
-+{"linux/auto_fs.h", "AUTOFS_IOC_EXPIRE", 0x810c9365},
-+{"linux/videodev.h", "VIDIOCGPLAYINFO", 0x8118761a},
-+{"mtd/mtd-abi.h", "ECCGETLAYOUT", 0x81484d11},
-+{"linux/joystick.h", "JSIOCGBTNMAP", 0x82006a34},
-+{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_BOTH", 0x82187201},
-+{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_SHORT", 0x82187202},
-+{"linux/agpgart.h", "AGPIOC_ALLOCATE", 0xc0044106},
-+{"linux/capi.h", "CAPI_GET_MANUFACTURER", 0xc0044306},
-+{"linux/capi.h", "CAPI_GET_SERIAL", 0xc0044308},
-+{"linux/gigaset_dev.h", "GIGASET_REDIR", 0xc0044700},
-+{"linux/gigaset_dev.h", "GIGASET_CONFIG", 0xc0044701},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_VOLUME", 0xc0044d00},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_BASS", 0xc0044d01},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_TREBLE", 0xc0044d02},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_SYNTH", 0xc0044d03},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_PCM", 0xc0044d04},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_SPEAKER", 0xc0044d05},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE", 0xc0044d06},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_MIC", 0xc0044d07},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_CD", 0xc0044d08},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_IMIX", 0xc0044d09},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_ALTPCM", 0xc0044d0a},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECLEV", 0xc0044d0b},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_IGAIN", 0xc0044d0c},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_OGAIN", 0xc0044d0d},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE1", 0xc0044d0e},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE2", 0xc0044d0f},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE3", 0xc0044d10},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_ENHANCE", 0xc0044d1f},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_LOUD", 0xc0044d1f},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_MUTE", 0xc0044d1f},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECSRC", 0xc0044dff},
-+{"linux/videodev2.h", "VIDIOC_OVERLAY_OLD", 0xc004560e},
-+{"linux/videodev2.h", "VIDIOC_S_INPUT", 0xc0045627},
-+{"linux/videodev2.h", "VIDIOC_S_OUTPUT", 0xc004562f},
-+{"linux/watchdog.h", "WDIOC_SETTIMEOUT", 0xc0045706},
-+{"linux/watchdog.h", "WDIOC_SETPRETIMEOUT", 0xc0045708},
-+{"linux/sonet.h", "SONET_SETDIAG", 0xc0046112},
-+{"linux/sonet.h", "SONET_CLRDIAG", 0xc0046113},
-+{"linux/cm4000_cs.h", "CM_IOCGATR", 0xc0046301},
-+{"linux/coda.h", "CIOC_KERNEL_VERSION", 0xc004630a},
-+{"linux/i8k.h", "I8K_GET_SPEED", 0xc0046985},
-+{"linux/i8k.h", "I8K_GET_FAN", 0xc0046986},
-+{"linux/i8k.h", "I8K_SET_FAN", 0xc0046987},
-+{"linux/udf_fs_i.h", "UDF_RELOCATE_BLOCKS", 0xc0046c43},
-+{"linux/synclink.h", "MGSL_IOCWAITEVENT", 0xc0046d08},
-+{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_MODE", 0xc0046efa},
-+{"linux/telephony.h", "PHONE_QUERY_CODEC", 0xc00471a7},
-+{"linux/if_ppp.h", "PPPIOCNEWUNIT", 0xc004743e},
-+{"linux/toshiba.h", "TOSH_SMM", 0xc0047490},
-+{"linux/meye.h", "MEYEIOC_SYNC", 0xc00476c3},
-+{"linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", 0xc0049364},
-+{"linux/capi.h", "CAPI_MANUFACTURER_CMD", 0xc0084320},
-+{"linux/videodev2.h", "VIDIOC_G_CTRL", 0xc008561b},
-+{"linux/videodev2.h", "VIDIOC_S_CTRL", 0xc008561c},
-+{"linux/ncp_fs.h", "NCP_IOC_GETPRIVATEDATA", 0xc0086e0a},
-+{"linux/if_ppp.h", "PPPIOCGNPMODE", 0xc008744c},
-+{"linux/hiddev.h", "HIDIOCGREPORTINFO", 0xc00c4809},
-+{"mtd/mtd-abi.h", "MEMWRITEOOB", 0xc00c4d03},
-+{"mtd/mtd-abi.h", "MEMREADOOB", 0xc00c4d04},
-+{"linux/uinput.h", "UI_BEGIN_FF_ERASE", 0xc00c55ca},
-+{"linux/ite_gpio.h", "ITE_GPIO_IN", 0xc00c5a00},
-+{"linux/atm_nicstar.h", "NS_GETPSTAT", 0xc00c6161},
-+{"linux/i2o-dev.h", "I2OHRTGET", 0xc00c6901},
-+{"linux/i2o-dev.h", "I2OLCTGET", 0xc00c6902},
-+{"linux/mtio.h", "MTIOCFTFORMAT", 0xc00c6d0a},
-+{"linux/ncp_fs.h", "NCP_IOC_GETOBJECTNAME", 0xc00c6e09},
-+{"linux/capi.h", "CAPI_GET_VERSION", 0xc0104307},
-+{"linux/gigaset_dev.h", "GIGASET_VERSION", 0xc0104703},
-+{"linux/hiddev.h", "HIDIOCGCOLLECTIONINFO", 0xc0104811},
-+{"mtd/mtd-abi.h", "MEMGETREGIONINFO", 0xc0104d08},
-+{"linux/videodev2.h", "VIDIOC_REQBUFS", 0xc0105608},
-+{"linux/mtio.h", "MTIOCRDFTSEG", 0xc0106d06},
-+{"linux/mtio.h", "MTIOCWRFTSEG", 0xc0106d07},
-+{"linux/synclink.h", "MGSL_IOCWAITGPIO", 0xc0106d12},
-+{"linux/videodev2.h", "VIDIOC_G_CROP", 0xc014563b},
-+{"linux/hiddev.h", "HIDIOCGUSAGE", 0xc018480b},
-+{"linux/hiddev.h", "HIDIOCGUCODE", 0xc018480d},
-+{"linux/videodev2.h", "VIDIOC_G_EXT_CTRLS", 0xc0185647},
-+{"linux/videodev2.h", "VIDIOC_S_EXT_CTRLS", 0xc0185648},
-+{"linux/videodev2.h", "VIDIOC_TRY_EXT_CTRLS", 0xc0185649},
-+{"linux/pktcdvd.h", "PACKET_CTRL_CMD", 0xc0185801},
-+{"linux/i2o-dev.h", "I2OPARMSET", 0xc0186903},
-+{"linux/i2o-dev.h", "I2OPARMGET", 0xc0186904},
-+{"linux/ipmi.h", "IPMICTL_RECEIVE_MSG_TRUNC", 0xc018690b},
-+{"linux/ipmi.h", "IPMICTL_RECEIVE_MSG", 0xc018690c},
-+{"linux/i2o-dev.h", "I2OSWDL", 0xc01c6905},
-+{"linux/i2o-dev.h", "I2OSWUL", 0xc01c6906},
-+{"linux/i2o-dev.h", "I2OSWDEL", 0xc01c6907},
-+{"linux/i2o-dev.h", "I2OHTML", 0xc01c6909},
-+{"linux/mtio.h", "MTIOCFTCMD", 0xc0206d0b},
-+{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO_V2", 0xc0246e04},
-+{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO", 0xc0286e04},
-+{"linux/ncp_fs.h", "NCP_IOC_GETCHARSETS", 0xc02a6e0b},
-+{"linux/videodev2.h", "VIDIOC_QUERYMENU", 0xc02c5625},
-+{"linux/videodev2.h", "VIDIOC_G_FREQUENCY", 0xc02c5638},
-+{"linux/videodev2.h", "VIDIOC_CROPCAP", 0xc02c563a},
-+{"linux/videodev.h", "VIDIOCGCHAN", 0xc0307602},
-+{"linux/uinput.h", "UI_BEGIN_FF_UPLOAD", 0xc03455c8},
-+{"linux/videodev2.h", "VIDIOC_G_AUDIO_OLD", 0xc0345621},
-+{"linux/videodev2.h", "VIDIOC_G_AUDOUT_OLD", 0xc0345631},
-+{"linux/videodev2.h", "VIDIOC_ENUMAUDIO", 0xc0345641},
-+{"linux/videodev2.h", "VIDIOC_ENUMAUDOUT", 0xc0345642},
-+{"linux/videodev.h", "VIDIOCGTUNER", 0xc0347604},
-+{"linux/hiddev.h", "HIDIOCGFIELDINFO", 0xc038480a},
-+{"linux/capi.h", "CAPI_GET_PROFILE", 0xc0404309},
-+{"linux/videodev2.h", "VIDIOC_ENUM_FMT", 0xc0405602},
-+{"linux/videodev2.h", "VIDIOC_ENUMSTD", 0xc0405619},
-+{"linux/videodev2.h", "VIDIOC_QUERYBUF", 0xc0445609},
-+{"linux/videodev2.h", "VIDIOC_QBUF", 0xc044560f},
-+{"linux/videodev2.h", "VIDIOC_DQBUF", 0xc0445611},
-+{"linux/videodev2.h", "VIDIOC_QUERYCTRL", 0xc0445624},
-+{"linux/videodev2.h", "VIDIOC_G_MODULATOR", 0xc0445636},
-+{"linux/fb.h", "FBIO_CURSOR", 0xc0484608},
-+{"linux/videodev2.h", "VIDIOC_ENUMOUTPUT", 0xc0485630},
-+{"linux/videodev2.h", "VIDIOC_ENUMINPUT", 0xc04c561a},
-+{"linux/cciss_ioctl.h", "CCISS_PASSTHRU", 0xc054420b},
-+{"linux/videodev2.h", "VIDIOC_G_TUNER", 0xc054561d},
-+{"linux/cciss_ioctl.h", "CCISS_BIG_PASSTHRU", 0xc0584212},
-+{"linux/isdn_ppp.h", "PPPIOCGCALLINFO", 0xc0887480},
-+{"linux/videodev2.h", "VIDIOC_G_FMT", 0xc0cc5604},
-+{"linux/videodev2.h", "VIDIOC_S_FMT", 0xc0cc5605},
-+{"linux/videodev2.h", "VIDIOC_G_PARM", 0xc0cc5615},
-+{"linux/videodev2.h", "VIDIOC_S_PARM", 0xc0cc5616},
-+{"linux/videodev2.h", "VIDIOC_TRY_FMT", 0xc0cc5640},
-+{"linux/dm-ioctl.h", "DM_VERSION", 0xc134fd00},
-+{"linux/dm-ioctl.h", "DM_VERSION_32", 0xc134fd00},
-+{"linux/dm-ioctl.h", "DM_REMOVE_ALL_32", 0xc134fd01},
-+{"linux/dm-ioctl.h", "DM_REMOVE_ALL", 0xc134fd01},
-+{"linux/dm-ioctl.h", "DM_LIST_DEVICES_32", 0xc134fd02},
-+{"linux/dm-ioctl.h", "DM_LIST_DEVICES", 0xc134fd02},
-+{"linux/dm-ioctl.h", "DM_DEV_CREATE_32", 0xc134fd03},
-+{"linux/dm-ioctl.h", "DM_DEV_CREATE", 0xc134fd03},
-+{"linux/dm-ioctl.h", "DM_DEV_REMOVE", 0xc134fd04},
-+{"linux/dm-ioctl.h", "DM_DEV_REMOVE_32", 0xc134fd04},
-+{"linux/dm-ioctl.h", "DM_DEV_RENAME_32", 0xc134fd05},
-+{"linux/dm-ioctl.h", "DM_DEV_RENAME", 0xc134fd05},
-+{"linux/dm-ioctl.h", "DM_DEV_SUSPEND_32", 0xc134fd06},
-+{"linux/dm-ioctl.h", "DM_DEV_SUSPEND", 0xc134fd06},
-+{"linux/dm-ioctl.h", "DM_DEV_STATUS", 0xc134fd07},
-+{"linux/dm-ioctl.h", "DM_DEV_STATUS_32", 0xc134fd07},
-+{"linux/dm-ioctl.h", "DM_DEV_WAIT", 0xc134fd08},
-+{"linux/dm-ioctl.h", "DM_DEV_WAIT_32", 0xc134fd08},
-+{"linux/dm-ioctl.h", "DM_TABLE_LOAD", 0xc134fd09},
-+{"linux/dm-ioctl.h", "DM_TABLE_LOAD_32", 0xc134fd09},
-+{"linux/dm-ioctl.h", "DM_TABLE_CLEAR_32", 0xc134fd0a},
-+{"linux/dm-ioctl.h", "DM_TABLE_CLEAR", 0xc134fd0a},
-+{"linux/dm-ioctl.h", "DM_TABLE_DEPS_32", 0xc134fd0b},
-+{"linux/dm-ioctl.h", "DM_TABLE_DEPS", 0xc134fd0b},
-+{"linux/dm-ioctl.h", "DM_TABLE_STATUS", 0xc134fd0c},
-+{"linux/dm-ioctl.h", "DM_TABLE_STATUS_32", 0xc134fd0c},
-+{"linux/dm-ioctl.h", "DM_LIST_VERSIONS", 0xc134fd0d},
-+{"linux/dm-ioctl.h", "DM_LIST_VERSIONS_32", 0xc134fd0d},
-+{"linux/dm-ioctl.h", "DM_TARGET_MSG", 0xc134fd0e},
-+{"linux/dm-ioctl.h", "DM_TARGET_MSG_32", 0xc134fd0e},
-+{"linux/dm-ioctl.h", "DM_DEV_SET_GEOMETRY_32", 0xc134fd0f},
-+{"linux/dm-ioctl.h", "DM_DEV_SET_GEOMETRY", 0xc134fd0f},
-+{"linux/hiddev.h", "HIDIOCGUSAGES", 0xd01c4813},
-Index: strace-4.5.14-avr32/linux/avr32/ioctlent.sh
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ strace-4.5.14-avr32/linux/avr32/ioctlent.sh 2006-09-21 14:45:12.000000000 +0200
-@@ -0,0 +1,124 @@
-+#!/bin/sh
-+# Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
-+# All rights reserved.
-+#
-+# Copyright (c) 1995, 1996 Michael Elizabeth Chastain <mec@duracef.shout.net>
-+# 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.
-+
-+# Files to find.
-+file_find='asm/*.h linux/*.h scsi/*.h mtd/*.h'
-+
-+# Files to stop.
-+file_stop='asm/byteorder.h linux/config.h linux/elf-em.h linux/pci_ids.h linux/xd.h linux/reiserfs_fs.h linux/usbdevice_fs.h'
-+
-+# Defs to find.
-+# Work on the kernel source to convert all to df_iowr.
-+# Don't know how to find low-numbered ioctls in linux/mc146818rtc.h.
-+df_name='^[ ]*#[ ]*define[ ]+[A-Z_][A-Z0-9_]*[ ]+'
-+df_iowr='_IO|_IOR|_IOW|_IOWR'
-+df_NNNN='0[Xx](03|06|22|46|4B|4C|53|54|56|89|90)[0-9A-Fa-f][0-9A-Fa-f]'
-+df_4359='0[Xx]4359[0-9A-Fa-f][0-9A-Fa-f]' # linux/cyclades.h
-+df_470N='470[0-9]' # linux/fs.h (only in 1.2.13)
-+df_smix='MIXER_READ|MIXER_WRITE' # linux/soundcard.h
-+df_12NN='12[3-4][0-9]' # linux/umsdos_fs.h (only in 1.2.13)
-+df_tail='([() ]|$)'
-+def_find="$df_name($df_iowr|$df_NNNN|$df_4359|$df_470N|$df_smix|$df_12NN)$df_tail"
-+
-+# Defs to stop.
-+ds_tail='_MAGIC|_PATCH'
-+ds_fdmp='FD(DEF|GET|SET)MEDIAPRM' # linux/fd.h aliases (only in 1.2.13)
-+ds_mtio='MTIOC(GET|SET)CONFIG' # linux/mtio.h needs config (only in 1.2.13)
-+ds_soundcard='_SIO(RW?|W)?'
-+def_stop="$ds_tail|$ds_fdmp|$ds_mtio|$ds_soundcard"
-+
-+# Validate arg count.
-+if [ $# -ne 1 ]
-+then
-+ echo "usage: $0 include-directory" >&2
-+ exit 1
-+fi
-+
-+# Grep through the files.
-+(
-+ # Construct list: find files minus stop files.
-+ cd $1 || exit
-+ file_list=`(ls $file_find $file_stop $file_stop 2>/dev/null) | sort | uniq -u`
-+
-+ # Grep matching #define lines.
-+ # Transform to C structure form.
-+ # Filter out stop list.
-+ egrep "$def_find" $file_list |
-+ sed -n -e 's/^\(.*\):#[ ]*define[ ]*\([A-Z_][A-Z0-9_]*\).*$/ { "\1", "\2", \2 },/p' |
-+ egrep -v "$def_stop"
-+) > ioctlent.tmp
-+
-+# Generate the output file.
-+echo '/* This file is automatically generated by ioctlent.sh */'
-+echo
-+echo '#include <sys/types.h>'
-+echo '#include <sys/socket.h>'
-+echo '#include <stdint.h>'
-+echo
-+echo '/* Needed for <linux/baycom.h> */'
-+echo '#define BAYCOM_DEBUG'
-+echo
-+echo '/* Needed for <linux/dm-ioctl.h> */'
-+echo '#define CONFIG_COMPAT'
-+echo
-+echo '/* Needed for <linux/ext3_fs.h> */'
-+echo '#define CONFIG_JBD_DEBUG'
-+echo
-+echo '/* Needed for <linux/lp.h> */'
-+echo '#define LP_STATS'
-+echo
-+echo '/* Needed for <linux/videodev2.h> */'
-+echo '#define __OLD_VIDIOC_'
-+echo
-+echo '/* Needed for <linux/zftape.h> */'
-+echo '#define ZFT_OBSOLETE'
-+echo
-+echo '/* Needed for <linux/auto_fs.h> */'
-+echo '#include <linux/limits.h>'
-+echo
-+echo '/* Needed for <linux/cyclades.h> */'
-+echo '#include <linux/termios.h>'
-+#echo '#include <linux/tqueue.h>'
-+echo
-+echo '/* Needed for <linux/if_ppp.h> */'
-+echo '#include <linux/ppp_defs.h>'
-+echo '#include <linux/filter.h>'
-+echo
-+echo '/* Needed for <linux/msdos_fs.h> */'
-+echo '#include <linux/dirent.h>'
-+echo
-+awk '{ print "#include <" substr($2, 2, length($2) - 3) ">" }' ioctlent.tmp | sort -u
-+echo
-+echo 'struct ioctlent ioctlent [] ='
-+echo '{'
-+cat ioctlent.tmp
-+echo '};'
-+
-+# Clean up.
-+rm -f ioctlent.tmp
diff --git a/packages/strace/strace-4.5.14/strace-arm-no-cachectl.patch b/packages/strace/strace-4.5.14/strace-arm-no-cachectl.patch
deleted file mode 100644
index b71995dbdf..0000000000
--- a/packages/strace/strace-4.5.14/strace-arm-no-cachectl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-This patch is needed on newer uclibc becuase the uclibc header generation mechanism generates the sysnum.h properly NR_cacheflush is defined for ARM but there is no cachectl.h file which is exported to userspace. Strace assumes that if SYS_cacheflush is defined than it icludes asm/cachectl.h which breaks the build for ARM now.
-
-This patch adds a check for ARM architecture.
-
--Khem
-
-Here is error
-
-| if ccache arm-angstrom-linux-uclibcgnueabi-gcc -march=armv5te -mtune=arm926ej-s -DHAVE_CONFIG_H -I. -I. -I. -Ilinux/arm -I./linux/arm -Ilinux -I./linux -isystem/home/kraj/work/oe/build/uclibc/tmp-omap5912osk/staging/arm-angstrom-linux-uclibcgnueabi/usr/include -Wall -isystem/home/kraj/work/oe/build/uclibc/tmp-omap5912osk/staging/arm-angstrom-linux-uclibcgnueabi/usr/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -MT term.o -MD -MP -MF ".deps/term.Tpo" -c -o term.o term.c; \
-| then mv -f ".deps/term.Tpo" ".deps/term.Po"; else rm -f ".deps/term.Tpo"; exit 1; fi
-| system.c:69:26: error: asm/cachectl.h: No such file or directory
-| make[1]: *** [system.o] Error 1
-| make[1]: *** Waiting for unfinished jobs....
-| signal.c: In function 'sys_sigreturn':
-| signal.c:1221: warning: passing argument 4 of 'ptrace' makes integer from pointer without a cast
-| make[1]: Leaving directory `/home/kraj/work/oe/build/uclibc/tmp-omap5912osk/work/armv5te-angstrom-linux-uclibcgnueabi/strace-4.5.14-r5/strace-4.5.14'
-| make: *** [all] Error 2
-| FATAL: oe_runmake failed
-
-Index: strace-4.5.14/system.c
-===================================================================
---- strace-4.5.14.orig/system.c 2008-05-15 20:23:16.000000000 -0700
-+++ strace-4.5.14/system.c 2008-05-15 20:24:03.000000000 -0700
-@@ -65,7 +65,7 @@
- #include <linux/capability.h>
- #endif
-
--#ifdef SYS_cacheflush
-+#if defined SYS_cacheflush && !defined ARM
- #include <asm/cachectl.h>
- #endif
-
diff --git a/packages/strace/strace-4.5.15/strace-4.5.15.atmel.1.patch b/packages/strace/strace-4.5.15/strace-4.5.15.atmel.1.patch
deleted file mode 100644
index 57f836eaf7..0000000000
--- a/packages/strace/strace-4.5.15/strace-4.5.15.atmel.1.patch
+++ /dev/null
@@ -1,14842 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index a9972fe..8e4ecac 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -29,6 +29,7 @@ EXTRA_DIST = $(man_MANS) errnoent.sh signalent.sh syscallent.sh ioctlsort.c \
- linux/alpha/errnoent.h linux/alpha/ioctlent.h \
- linux/alpha/signalent.h linux/alpha/syscallent.h \
- linux/arm/syscallent.h \
-+ linux/avr32/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 \
-diff --git a/Makefile.in b/Makefile.in
-index bb0f8b1..d8e618b 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -121,6 +121,7 @@ EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FREEBSD_FALSE = @FREEBSD_FALSE@
- FREEBSD_TRUE = @FREEBSD_TRUE@
-+GREP = @GREP@
- I386_FALSE = @I386_FALSE@
- I386_TRUE = @I386_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -158,7 +159,6 @@ 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@
-@@ -174,24 +174,31 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- opsys = @opsys@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-@@ -222,6 +229,7 @@ EXTRA_DIST = $(man_MANS) errnoent.sh signalent.sh syscallent.sh ioctlsort.c \
- linux/alpha/errnoent.h linux/alpha/ioctlent.h \
- linux/alpha/signalent.h linux/alpha/syscallent.h \
- linux/arm/syscallent.h \
-+ linux/avr32/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 \
-@@ -522,7 +530,7 @@ distdir: $(DISTFILES)
- esac
- $(am__remove_distdir)
- mkdir $(distdir)
-- $(mkdir_p) $(distdir)/debian $(distdir)/freebsd $(distdir)/freebsd/i386 $(distdir)/linux $(distdir)/linux/alpha $(distdir)/linux/arm $(distdir)/linux/hppa $(distdir)/linux/ia64 $(distdir)/linux/m68k $(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
-+ $(mkdir_p) $(distdir)/debian $(distdir)/freebsd $(distdir)/freebsd/i386 $(distdir)/linux $(distdir)/linux/alpha $(distdir)/linux/arm $(distdir)/linux/avr32 $(distdir)/linux/hppa $(distdir)/linux/ia64 $(distdir)/linux/m68k $(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 \
-diff --git a/config.guess b/config.guess
-old mode 100755
-new mode 100644
-index 8229471..951383e
---- a/config.guess
-+++ b/config.guess
-@@ -1,9 +1,10 @@
- #! /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.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-
--timestamp='2004-11-12'
-+timestamp='2007-05-17'
-
- # 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
-@@ -17,13 +18,15 @@ timestamp='2004-11-12'
- #
- # 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.
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, 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.
-@@ -53,7 +56,7 @@ 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
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
-@@ -66,11 +69,11 @@ Try \`$me --help' for more information."
- while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
-- echo "$timestamp" ; exit 0 ;;
-+ echo "$timestamp" ; exit ;;
- --version | -v )
-- echo "$version" ; exit 0 ;;
-+ echo "$version" ; exit ;;
- --help | --h* | -h )
-- echo "$usage"; exit 0 ;;
-+ echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
-@@ -104,7 +107,7 @@ 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" ; } ||
-+ { tmp=`(umask 077 && mktemp -d "$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 ; } ;
-@@ -123,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
--esac ;'
-+esac ; set_cc_for_build= ;'
-
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
-+ sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
-@@ -196,55 +200,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- # 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 ;;
-+ exit ;;
- *:OpenBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+ exit ;;
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
-+ *:SolidBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+ exit ;;
- macppc:MirBSD:*:*)
-- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-- exit 0 ;;
-+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-+ exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- alpha:OSF1:*:*)
- case $UNAME_RELEASE in
- *4.0)
-@@ -297,40 +269,43 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- # 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 ;;
-+ exit ;;
- 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 ;;
-+ exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
-- exit 0 ;;
-+ exit ;;
- Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
-- exit 0;;
-+ exit ;;
- *:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
-- exit 0 ;;
-+ exit ;;
- *:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
-- exit 0 ;;
-+ exit ;;
- *:OS/390:*:*)
- echo i370-ibm-openedition
-- exit 0 ;;
-+ exit ;;
- *:z/VM:*:*)
- echo s390-ibm-zvmoe
-- exit 0 ;;
-+ exit ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
-- exit 0 ;;
-+ exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
-- exit 0;;
-+ exit ;;
-+ arm:riscos:*:*|arm:RISCOS:*:*)
-+ echo arm-unknown-riscos
-+ exit ;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- echo hppa1.1-hitachi-hiuxmpp
-- exit 0;;
-+ exit ;;
- 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
-@@ -338,32 +313,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- else
- echo pyramid-pyramid-bsd
- fi
-- exit 0 ;;
-+ exit ;;
- NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
-- exit 0 ;;
-+ exit ;;
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
-- exit 0 ;;
-+ exit ;;
- 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 ;;
-+ sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit 0 ;;
-+ exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit 0 ;;
-- i86pc:SunOS:5.*:*)
-+ exit ;;
-+ i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit 0 ;;
-+ exit ;;
- 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 ;;
-+ exit ;;
- sun4*:SunOS:*:*)
- case "`/usr/bin/arch -k`" in
- Series*|S4*)
-@@ -372,10 +347,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- 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 ;;
-+ exit ;;
- sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- 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
-@@ -387,10 +362,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- echo sparc-sun-sunos${UNAME_RELEASE}
- ;;
- esac
-- exit 0 ;;
-+ exit ;;
- aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- # 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
-@@ -401,40 +376,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- RISC*:Mach:*:*)
- echo mips-dec-mach_bsd4.3
-- exit 0 ;;
-+ exit ;;
- RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- 2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-@@ -458,32 +433,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- exit (-1);
- }
- EOF
-- $CC_FOR_BUILD -o $dummy $dummy.c \
-- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-- && exit 0
-+ $CC_FOR_BUILD -o $dummy $dummy.c &&
-+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+ SYSTEM_NAME=`$dummy $dummyarg` &&
-+ { echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- Motorola:PowerMAX_OS:*:*)
- echo powerpc-motorola-powermax
-- exit 0 ;;
-+ exit ;;
- Motorola:*:4.3:PL8-*)
- echo powerpc-harris-powermax
-- exit 0 ;;
-+ exit ;;
- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- echo powerpc-harris-powermax
-- exit 0 ;;
-+ exit ;;
- Night_Hawk:Power_UNIX:*:*)
- echo powerpc-harris-powerunix
-- exit 0 ;;
-+ exit ;;
- m88k:CX/UX:7*:*)
- echo m88k-harris-cxux7
-- exit 0 ;;
-+ exit ;;
- m88k:*:4*:R4*)
- echo m88k-motorola-sysv4
-- exit 0 ;;
-+ exit ;;
- m88k:*:3*:R3*)
- echo m88k-motorola-sysv3
-- exit 0 ;;
-+ exit ;;
- AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -499,29 +475,29 @@ EOF
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
-- exit 0 ;;
-+ exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
-- exit 0 ;;
-+ exit ;;
- M88*:*:R3*:*)
- # Delta 88k system running SVR3
- echo m88k-motorola-sysv3
-- exit 0 ;;
-+ exit ;;
- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- echo m88k-tektronix-sysv3
-- exit 0 ;;
-+ exit ;;
- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- echo m68k-tektronix-bsd
-- exit 0 ;;
-+ exit ;;
- *:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-- exit 0 ;;
-+ exit ;;
- ????????: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 '
-+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
-+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i*86:AIX:*:*)
- echo i386-ibm-aix
-- exit 0 ;;
-+ exit ;;
- ia64:AIX:*:*)
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
-@@ -529,7 +505,7 @@ EOF
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-- exit 0 ;;
-+ exit ;;
- *:AIX:2:3)
- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
-@@ -544,14 +520,18 @@ EOF
- exit(0);
- }
- EOF
-- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-- echo rs6000-ibm-aix3.2.5
-+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+ then
-+ echo "$SYSTEM_NAME"
-+ else
-+ echo rs6000-ibm-aix3.2.5
-+ fi
- 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 ;;
-+ exit ;;
- *: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
-@@ -565,28 +545,28 @@ EOF
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-- exit 0 ;;
-+ exit ;;
- *:AIX:*:*)
- echo rs6000-ibm-aix
-- exit 0 ;;
-+ exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- echo romp-ibm-bsd4.4
-- exit 0 ;;
-+ exit ;;
- 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
-+ exit ;; # report: romp-ibm BSD 4.3
- *:BOSX:*:*)
- echo rs6000-bull-bosx
-- exit 0 ;;
-+ exit ;;
- DPX/2?00:B.O.S.:*:*)
- echo m68k-bull-sysv3
-- exit 0 ;;
-+ exit ;;
- 9000/[34]??:4.3bsd:1.*:*)
- echo m68k-hp-bsd
-- exit 0 ;;
-+ exit ;;
- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- echo m68k-hp-bsd4.4
-- exit 0 ;;
-+ exit ;;
- 9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
-@@ -648,9 +628,19 @@ EOF
- 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
-+ eval $set_cc_for_build
-+
-+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
-+ # generating 64-bit code. GNU and HP use different nomenclature:
-+ #
-+ # $ CC_FOR_BUILD=cc ./config.guess
-+ # => hppa2.0w-hp-hpux11.23
-+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+ # => hppa64-hp-hpux11.23
-+
-+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+ grep __LP64__ >/dev/null
- then
- HP_ARCH="hppa2.0w"
- else
-@@ -658,11 +648,11 @@ EOF
- fi
- fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-- exit 0 ;;
-+ exit ;;
- ia64:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
-- exit 0 ;;
-+ exit ;;
- 3050*:HI-UX:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-@@ -690,158 +680,182 @@ EOF
- exit (0);
- }
- EOF
-- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+ { echo "$SYSTEM_NAME"; exit; }
- echo unknown-hitachi-hiuxwe2
-- exit 0 ;;
-+ exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- echo hppa1.1-hp-bsd
-- exit 0 ;;
-+ exit ;;
- 9000/8??:4.3bsd:*:*)
- echo hppa1.0-hp-bsd
-- exit 0 ;;
-+ exit ;;
- *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- echo hppa1.0-hp-mpeix
-- exit 0 ;;
-+ exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- echo hppa1.1-hp-osf
-- exit 0 ;;
-+ exit ;;
- hp8??:OSF1:*:*)
- echo hppa1.0-hp-osf
-- exit 0 ;;
-+ exit ;;
- i*86:OSF1:*:*)
- if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
- else
- echo ${UNAME_MACHINE}-unknown-osf1
- fi
-- exit 0 ;;
-+ exit ;;
- parisc*:Lites*:*:*)
- echo hppa1.1-hp-lites
-- exit 0 ;;
-+ exit ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
-- exit 0 ;;
-+ exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
-- exit 0 ;;
-+ exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
-- exit 0 ;;
-+ exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
-- exit 0 ;;
-+ exit ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
-- exit 0 ;;
-+ exit ;;
- CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-- exit 0 ;;
-+ exit ;;
- 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 ;;
-+ exit ;;
- CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-- exit 0 ;;
-+ exit ;;
- CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-- exit 0 ;;
-+ exit ;;
- CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-- exit 0 ;;
-+ exit ;;
- *:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-- exit 0 ;;
-+ exit ;;
- 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 ;;
-+ exit ;;
- 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 ;;
-+ exit ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- *:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- *:FreeBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-- exit 0 ;;
-+ case ${UNAME_MACHINE} in
-+ pc98)
-+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ amd64)
-+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ *)
-+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ esac
-+ exit ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
-- exit 0 ;;
-- i*:MINGW*:*)
-+ exit ;;
-+ *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
-- exit 0 ;;
-+ exit ;;
-+ i*:windows32*:*)
-+ # uname -m includes "-pc" on this system.
-+ echo ${UNAME_MACHINE}-mingw32
-+ exit ;;
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
-- exit 0 ;;
-- x86:Interix*:[34]*)
-- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-- exit 0 ;;
-+ exit ;;
-+ *:Interix*:[3456]*)
-+ case ${UNAME_MACHINE} in
-+ x86)
-+ echo i586-pc-interix${UNAME_RELEASE}
-+ exit ;;
-+ EM64T | authenticamd)
-+ echo x86_64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
-+ esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
-- exit 0 ;;
-+ exit ;;
- 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 ;;
-+ exit ;;
- i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
-- exit 0 ;;
-+ exit ;;
-+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+ echo x86_64-unknown-cygwin
-+ exit ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
-- exit 0 ;;
-+ exit ;;
- prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit 0 ;;
-+ exit ;;
- *:GNU:*:*)
- # the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-- exit 0 ;;
-+ exit ;;
- *: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 ;;
-+ exit ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
-- exit 0 ;;
-+ exit ;;
- arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
-+ avr32*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
-- exit 0 ;;
-+ exit ;;
- crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
-- exit 0 ;;
-+ exit ;;
- frv:Linux:*:*)
- echo frv-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
- m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
- mips:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-@@ -858,8 +872,12 @@ EOF
- #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
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^CPU/{
-+ s: ::g
-+ p
-+ }'`"
-+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
- eval $set_cc_for_build
-@@ -877,15 +895,22 @@ EOF
- #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
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^CPU/{
-+ s: ::g
-+ p
-+ }'`"
-+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
-+ or32:Linux:*:*)
-+ echo or32-unknown-linux-gnu
-+ exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
-@@ -899,7 +924,7 @@ EOF
- 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 ;;
-+ exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -907,25 +932,31 @@ EOF
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
- esac
-- exit 0 ;;
-+ exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
-- exit 0 ;;
-+ exit ;;
- sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
- sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
-+ vax:Linux:*:*)
-+ echo ${UNAME_MACHINE}-dec-linux-gnu
-+ exit ;;
- x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
-- exit 0 ;;
-+ exit ;;
-+ xtensa:Linux:*:*)
-+ echo xtensa-unknown-linux-gnu
-+ exit ;;
- 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
-@@ -943,15 +974,15 @@ EOF
- ;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-- exit 0 ;;
-+ exit ;;
- coff-i386)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-- exit 0 ;;
-+ exit ;;
- "")
- # 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 ;;
-+ exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
-@@ -968,7 +999,7 @@ EOF
- LIBC=gnulibc1
- # endif
- #else
-- #ifdef __INTEL_COMPILER
-+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
-@@ -978,16 +1009,23 @@ EOF
- 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
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^LIBC/{
-+ s: ::g
-+ p
-+ }'`"
-+ test x"${LIBC}" != x && {
-+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+ exit
-+ }
-+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- ;;
- 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 ;;
-+ exit ;;
- i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
-@@ -995,27 +1033,27 @@ EOF
- # I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-- exit 0 ;;
-+ exit ;;
- 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 ;;
-+ exit ;;
- i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
-- exit 0 ;;
-+ exit ;;
- i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
-- exit 0 ;;
-- i*86:syllable:*:*)
-+ exit ;;
-+ i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
-- exit 0 ;;
-+ exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
-- exit 0 ;;
-+ exit ;;
- 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
-@@ -1023,15 +1061,16 @@ EOF
- else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- fi
-- exit 0 ;;
-- i*86:*:5:[78]*)
-+ exit ;;
-+ i*86:*:5:[678]*)
-+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
- 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 ;;
-+ exit ;;
- i*86:*:3.2:*)
- if test -f /usr/options/cb.name; then
- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -1049,73 +1088,73 @@ EOF
- else
- echo ${UNAME_MACHINE}-pc-sysv32
- fi
-- exit 0 ;;
-+ exit ;;
- 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 ;;
-+ exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
-- exit 0 ;;
-+ exit ;;
- paragon:*:*:*)
- echo i860-intel-osf1
-- exit 0 ;;
-+ exit ;;
- 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 ;;
-+ exit ;;
- mini*:CTIX:SYS*5:*)
- # "miniframe"
- echo m68010-convergent-sysv
-- exit 0 ;;
-+ exit ;;
- mc68k:UNIX:SYSTEM5:3.51m)
- echo m68k-convergent-sysv
-- exit 0 ;;
-+ exit ;;
- M680?0:D-NIX:5.3:*)
- echo m68k-diab-dnix
-- exit 0 ;;
-+ exit ;;
- M68*:*:R3V[5678]*:*)
-- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
- 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
-+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-- && echo i486-ncr-sysv4 && exit 0 ;;
-+ && { echo i486-ncr-sysv4; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- mc68030:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
-- exit 0 ;;
-+ exit ;;
- TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- RM*:ReliantUNIX-*:*:*)
- echo mips-sni-sysv4
-- exit 0 ;;
-+ exit ;;
- RM*:SINIX-*:*:*)
- echo mips-sni-sysv4
-- exit 0 ;;
-+ exit ;;
- *:SINIX-*:*:*)
- if uname -p 2>/dev/null >/dev/null ; then
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1123,69 +1162,81 @@ EOF
- else
- echo ns32k-sni-sysv
- fi
-- exit 0 ;;
-+ exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>
- echo i586-unisys-sysv4
-- exit 0 ;;
-+ exit ;;
- *: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 ;;
-+ exit ;;
- *:*:*:FTX*)
- # From seanf@swdc.stratus.com.
- echo i860-stratus-sysv4
-- exit 0 ;;
-+ exit ;;
-+ i*86:VOS:*:*)
-+ # From Paul.Green@stratus.com.
-+ echo ${UNAME_MACHINE}-stratus-vos
-+ exit ;;
- *:VOS:*:*)
- # From Paul.Green@stratus.com.
- echo hppa1.1-stratus-vos
-- exit 0 ;;
-+ exit ;;
- mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- news*:NEWS-OS:6*:*)
- echo mips-sony-newsos6
-- exit 0 ;;
-+ exit ;;
- 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 ;;
-+ exit ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
-- exit 0 ;;
-+ exit ;;
- BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
- echo powerpc-apple-beos
-- exit 0 ;;
-+ exit ;;
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
-- exit 0 ;;
-+ exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
-+ SX-7:SUPER-UX:*:*)
-+ echo sx7-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8:SUPER-UX:*:*)
-+ echo sx8-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8R:SUPER-UX:*:*)
-+ echo sx8r-nec-superux${UNAME_RELEASE}
-+ exit ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- *:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- *: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 ;;
-+ exit ;;
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
- UNAME_PROCESSOR=`uname -p`
- if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1193,22 +1244,25 @@ EOF
- UNAME_MACHINE=pc
- fi
- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- *:QNX:*:4*)
- echo i386-pc-qnx
-- exit 0 ;;
-+ exit ;;
-+ NSE-?:NONSTOP_KERNEL:*:*)
-+ echo nse-tandem-nsk${UNAME_RELEASE}
-+ exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- *:NonStop-UX:*:*)
- echo mips-compaq-nonstopux
-- exit 0 ;;
-+ exit ;;
- BS2000:POSIX*:*:*)
- echo bs2000-siemens-sysv
-- exit 0 ;;
-+ exit ;;
- DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- *:Plan9:*:*)
- # "uname -m" is not consistent, so use $cputype instead. 386
- # is converted to i386 for consistency with other x86
-@@ -1219,41 +1273,47 @@ EOF
- UNAME_MACHINE="$cputype"
- fi
- echo ${UNAME_MACHINE}-unknown-plan9
-- exit 0 ;;
-+ exit ;;
- *:TOPS-10:*:*)
- echo pdp10-unknown-tops10
-- exit 0 ;;
-+ exit ;;
- *:TENEX:*:*)
- echo pdp10-unknown-tenex
-- exit 0 ;;
-+ exit ;;
- KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- echo pdp10-dec-tops20
-- exit 0 ;;
-+ exit ;;
- XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- echo pdp10-xkl-tops20
-- exit 0 ;;
-+ exit ;;
- *:TOPS-20:*:*)
- echo pdp10-unknown-tops20
-- exit 0 ;;
-+ exit ;;
- *:ITS:*:*)
- echo pdp10-unknown-its
-- exit 0 ;;
-+ exit ;;
- SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- *:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-- exit 0 ;;
-+ exit ;;
- *:*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 ;;
-+ A*) echo alpha-dec-vms ; exit ;;
-+ I*) echo ia64-dec-vms ; exit ;;
-+ V*) echo vax-dec-vms ; exit ;;
- esac ;;
- *:XENIX:*:SysV)
- echo i386-pc-xenix
-- exit 0 ;;
-+ exit ;;
-+ i*86:skyos:*:*)
-+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+ exit ;;
-+ i*86:rdos:*:*)
-+ echo ${UNAME_MACHINE}-pc-rdos
-+ exit ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1285,7 +1345,7 @@ main ()
- #endif
-
- #if defined (__arm) && defined (__acorn) && defined (__unix)
-- printf ("arm-acorn-riscix"); exit (0);
-+ printf ("arm-acorn-riscix\n"); exit (0);
- #endif
-
- #if defined (hp300) && !defined (hpux)
-@@ -1374,11 +1434,12 @@ main ()
- }
- EOF
-
--$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+ { echo "$SYSTEM_NAME"; exit; }
-
- # Apollos put the system type in the environment.
-
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
- # Convex versions that predate uname can use getsysinfo(1)
-
-@@ -1387,22 +1448,22 @@ then
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
-- exit 0 ;;
-+ exit ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
-- exit 0 ;;
-+ exit ;;
- c34*)
- echo c34-convex-bsd
-- exit 0 ;;
-+ exit ;;
- c38*)
- echo c38-convex-bsd
-- exit 0 ;;
-+ exit ;;
- c4*)
- echo c4-convex-bsd
-- exit 0 ;;
-+ exit ;;
- esac
- fi
-
-@@ -1413,7 +1474,9 @@ 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/
-+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+and
-+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
-diff --git a/config.h.in b/config.h.in
-index a2aeb2e..5778dc8 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -6,6 +6,9 @@
- /* Define for the ARM architecture. */
- #undef ARM
-
-+/* Define for the AVR32 architecture. */
-+#undef AVR32
-+
- /* Define for the FreeBSD operating system. */
- #undef FREEBSD
-
-diff --git a/config.sub b/config.sub
-old mode 100755
-new mode 100644
-index 987b17d..c060f44
---- a/config.sub
-+++ b/config.sub
-@@ -1,9 +1,10 @@
- #! /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.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-
--timestamp='2004-11-30'
-+timestamp='2007-04-29'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,14 +22,15 @@ timestamp='2004-11-30'
- #
- # 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.
--
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, 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.
- #
-@@ -70,7 +72,7 @@ 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
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
-@@ -83,11 +85,11 @@ Try \`$me --help' for more information."
- while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
-- echo "$timestamp" ; exit 0 ;;
-+ echo "$timestamp" ; exit ;;
- --version | -v )
-- echo "$version" ; exit 0 ;;
-+ echo "$version" ; exit ;;
- --help | --h* | -h )
-- echo "$usage"; exit 0 ;;
-+ echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
-@@ -99,7 +101,7 @@ while test $# -gt 0 ; do
- *local*)
- # First pass through any local machine types.
- echo $1
-- exit 0;;
-+ exit ;;
-
- * )
- break ;;
-@@ -118,8 +120,9 @@ esac
- # 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*)
-+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | 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/'`
- ;;
-@@ -170,6 +173,10 @@ case $os in
- -hiux*)
- os=-hiuxwe2
- ;;
-+ -sco6)
-+ os=-sco5v6
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
- -sco5)
- os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -186,6 +193,10 @@ case $os in
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-+ -sco5v6*)
-+ # 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/'`
-@@ -230,14 +241,16 @@ case $basic_machine in
- | 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 \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+ | bfin \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
-- | fr30 | frv \
-+ | fido | 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 \
-+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
-+ | maxq | mb | microblaze | mcore | mep \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -246,6 +259,7 @@ case $basic_machine in
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
-+ | mips64vr5900 | mips64vr5900el \
- | mipsisa32 | mipsisa32el \
- | mipsisa32r2 | mipsisa32r2el \
- | mipsisa64 | mipsisa64el \
-@@ -254,20 +268,24 @@ case $basic_machine in
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
-+ | mt \
- | msp430 \
-+ | nios | nios2 \
- | ns16k | ns32k \
-- | openrisc | or32 \
-+ | 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 \
-+ | score \
-+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
-- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-- | strongarm \
-+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+ | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
-- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
- basic_machine=$basic_machine-unknown
- ;;
-@@ -278,6 +296,9 @@ case $basic_machine in
- ;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- ;;
-+ ms1)
-+ basic_machine=mt-unknown
-+ ;;
-
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
-@@ -297,18 +318,18 @@ case $basic_machine in
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-- | avr-* \
-- | bs2000-* \
-+ | avr-* | avr32-* \
-+ | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
-- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-- | m32r-* | m32rle-* \
-+ | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-@@ -319,6 +340,7 @@ case $basic_machine in
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
-+ | mips64vr5900-* | mips64vr5900el-* \
- | mipsisa32-* | mipsisa32el-* \
- | mipsisa32r2-* | mipsisa32r2el-* \
- | mipsisa64-* | mipsisa64el-* \
-@@ -327,23 +349,26 @@ case $basic_machine in
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipstx39-* | mipstx39el-* \
- | mmix-* \
-+ | mt-* \
- | msp430-* \
-+ | nios-* | nios2-* \
- | 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-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-+ | sparclite-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
- | ymp-* \
- | z8k-*)
-@@ -658,6 +683,10 @@ case $basic_machine in
- basic_machine=i386-pc
- os=-mingw32
- ;;
-+ mingw32ce)
-+ basic_machine=arm-unknown
-+ os=-mingw32ce
-+ ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
-@@ -683,6 +712,9 @@ case $basic_machine in
- basic_machine=i386-pc
- os=-msdos
- ;;
-+ ms1-*)
-+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+ ;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
-@@ -758,9 +790,8 @@ case $basic_machine in
- basic_machine=hppa1.1-oki
- os=-proelf
- ;;
-- or32 | or32-*)
-+ openrisc | openrisc-*)
- basic_machine=or32-unknown
-- os=-coff
- ;;
- os400)
- basic_machine=powerpc-ibm
-@@ -791,6 +822,12 @@ case $basic_machine in
- pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
-+ pc98)
-+ basic_machine=i386-pc
-+ ;;
-+ pc98-*)
-+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
-@@ -847,6 +884,10 @@ case $basic_machine in
- basic_machine=i586-unknown
- os=-pw32
- ;;
-+ rdos)
-+ basic_machine=i386-pc
-+ os=-rdos
-+ ;;
- rom68k)
- basic_machine=m68k-rom68k
- os=-coff
-@@ -873,6 +914,10 @@ case $basic_machine in
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
-+ sde)
-+ basic_machine=mipsisa32-sde
-+ os=-elf
-+ ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
-@@ -884,6 +929,9 @@ case $basic_machine in
- basic_machine=sh-hitachi
- os=-hms
- ;;
-+ sh5el)
-+ basic_machine=sh5le-unknown
-+ ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
-@@ -1086,13 +1134,10 @@ case $basic_machine in
- we32k)
- basic_machine=we32k-att
- ;;
-- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
-- sh64)
-- basic_machine=sh64-unknown
-- ;;
-- sparc | sparcv8 | sparcv9 | sparcv9b)
-+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
- cydra)
-@@ -1165,20 +1210,23 @@ case $os in
- | -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+ | -openbsd* | -solidbsd* \
- | -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* \
-+ | -mingw32* | -linux-gnu* | -linux-newlib* | -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*)
-+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-@@ -1196,7 +1244,7 @@ case $os in
- os=`echo $os | sed -e 's|nto|nto-qnx|'`
- ;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- ;;
- -mac*)
-@@ -1330,6 +1378,12 @@ else
- # system, and we'll never get to this point.
-
- case $basic_machine in
-+ score-*)
-+ os=-elf
-+ ;;
-+ spu-*)
-+ os=-elf
-+ ;;
- *-acorn)
- os=-riscix1.2
- ;;
-@@ -1339,9 +1393,9 @@ case $basic_machine in
- arm*-semi)
- os=-aout
- ;;
-- c4x-* | tic4x-*)
-- os=-coff
-- ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
-@@ -1367,6 +1421,9 @@ case $basic_machine in
- m68*-cisco)
- os=-aout
- ;;
-+ mep-*)
-+ os=-elf
-+ ;;
- mips*-cisco)
- os=-elf
- ;;
-@@ -1385,6 +1442,9 @@ case $basic_machine in
- *-be)
- os=-beos
- ;;
-+ *-haiku)
-+ os=-haiku
-+ ;;
- *-ibm)
- os=-aix
- ;;
-@@ -1556,7 +1616,7 @@ case $basic_machine in
- esac
-
- echo $basic_machine$os
--exit 0
-+exit
-
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
-diff --git a/configure b/configure
-index e269669..37a9eff 100755
---- a/configure
-+++ b/configure
-@@ -1,25 +1,54 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59 for strace 4.5.15.
-+# Generated by GNU Autoconf 2.61 for strace 4.5.15.
- #
--# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 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
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- 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
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# 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
--DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@ else
- fi
-
-
-+# IFS
-+# We need space, tab and new line, in precisely that order. Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" "" $as_nl"
-+
-+# Find who we are. Look in the path if we contain no directory separator.
-+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
-+IFS=$as_save_IFS
-+
-+ ;;
-+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_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -44,18 +108,19 @@ 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
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -63,157 +128,388 @@ fi
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-
-+# CDPATH.
-+$as_unset CDPATH
-
--# 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
-+if test "x$CONFIG_SHELL" = x; then
-+ if (eval ":") 2>/dev/null; then
-+ as_have_required=yes
-+else
-+ as_have_required=no
- fi
-
-+ if test $as_have_required = yes && (eval ":
-+(as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-
-- 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
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-
-- ;;
-- 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
-- '')
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+ as_lineno_1=\$LINENO
-+ as_lineno_2=\$LINENO
-+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+ :
-+else
-+ as_candidate_shells=
- 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
-+ case $as_dir in
- /*)
-- if ("$as_dir/$as_base" -c '
-+ for as_base in sh bash ksh sh5; do
-+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+ done;;
-+ esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+ for as_shell in $as_candidate_shells $SHELL; do
-+ # Try only shells that exist, to save several forks.
-+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+ { ("$as_shell") 2> /dev/null <<\_ASEOF
-+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+"$@"}'='"$@"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+:
-+_ASEOF
-+}; then
-+ CONFIG_SHELL=$as_shell
-+ as_have_required=yes
-+ if { "$as_shell" 2> /dev/null <<\_ASEOF
-+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+"$@"}'='"$@"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+:
-+(as_func_return () {
-+ (exit $1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
- 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
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+ break
-+fi
-+
-+fi
-+
-+ done
-+
-+ if test "x$CONFIG_SHELL" != x; then
-+ for as_var in BASH_ENV ENV
-+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ done
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+ if test $as_have_required = no; then
-+ echo This script requires a shell more modern than all the
-+ echo shells that I found on your system. Please install a
-+ echo modern shell, or manually run the script under such a
-+ echo shell if you do have one.
-+ { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+ echo No shell found that supports shell functions.
-+ echo Please tell autoconf@gnu.org about your system,
-+ echo including any error possibly output before this
-+ echo message
-+}
-+
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # 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.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, 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 |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
-- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $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
-+ # original and so on. Autoconf is especially sensitive 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= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+ rm -f conf$$.dir/conf$$.file
-+else
-+ rm -f conf$$.dir
-+ mkdir conf$$.dir
-+fi
- 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='ln -s'
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- 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
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-@@ -222,7 +518,28 @@ else
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+if test -x / >/dev/null 2>&1; then
-+ as_test_x='test -x'
-+else
-+ if ls -dL / >/dev/null 2>&1; then
-+ as_ls_L_option=L
-+ else
-+ as_ls_L_option=
-+ fi
-+ as_test_x='
-+ eval sh -c '\''
-+ if test -d "$1"; then
-+ test -d "$1/.";
-+ else
-+ case $1 in
-+ -*)set "./$1";;
-+ esac;
-+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+ ???[sx]*):;;*)false;;esac;fi
-+ '\'' sh
-+ '
-+fi
-+as_executable_p=$as_test_x
-
- # 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'"
-@@ -231,39 +548,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
- 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 7<&0 </dev/null 6>&1
-
- # 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_clean_files=
- ac_config_libobj_dir=.
-+LIBOBJS=
- 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'
-@@ -275,42 +580,156 @@ ac_unique_file="strace.c"
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- # include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--# include <stdint.h>
--# endif
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef 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_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+CYGPATH_W
-+PACKAGE
-+VERSION
-+ACLOCAL
-+AUTOCONF
-+AUTOMAKE
-+AUTOHEADER
-+MAKEINFO
-+install_sh
-+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
-+GREP
-+EGREP
-+PERL
-+LIBOBJS
-+LTLIBOBJS'
- ac_subst_files=''
-+ ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+LIBS
-+CPPFLAGS
-+CPP'
-+
-
- # Initialize some variables set by options.
- ac_init_help=
-@@ -337,34 +756,48 @@ x_libraries=NONE
- # 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.
-+# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
- 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'
-+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
-
- ac_prev=
-+ac_dashdash=
- for ac_option
- do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
-- eval "$ac_prev=\$ac_option"
-+ eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
-- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+ case $ac_option in
-+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+ *) ac_optarg=yes ;;
-+ esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
-- case $ac_option in
-+ case $ac_dashdash$ac_option in
-+ --)
-+ ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
-@@ -386,33 +819,45 @@ do
- --config-cache | -C)
- cache_file=config.cache ;;
-
-- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+ -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
-- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-- | --da=*)
-+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
- datadir=$ac_optarg ;;
-
-+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+ | --dataroo | --dataro | --datar)
-+ ac_prev=datarootdir ;;
-+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+ datarootdir=$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 &&
-+ 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" ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=no ;;
-+
-+ -docdir | --docdir | --docdi | --doc | --do)
-+ ac_prev=docdir ;;
-+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+ docdir=$ac_optarg ;;
-+
-+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+ ac_prev=dvidir ;;
-+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+ dvidir=$ac_optarg ;;
-
- -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 &&
-+ 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'" ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -439,6 +884,12 @@ do
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
-+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+ ac_prev=htmldir ;;
-+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+ | --ht=*)
-+ htmldir=$ac_optarg ;;
-+
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
-@@ -463,13 +914,16 @@ do
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
-+ -localedir | --localedir | --localedi | --localed | --locale)
-+ ac_prev=localedir ;;
-+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+ localedir=$ac_optarg ;;
-+
- -localstatedir | --localstatedir | --localstatedi | --localstated \
-- | --localstate | --localstat | --localsta | --localst \
-- | --locals | --local | --loca | --loc | --lo)
-+ | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -534,6 +988,16 @@ do
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
-+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+ ac_prev=pdfdir ;;
-+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+ pdfdir=$ac_optarg ;;
-+
-+ -psdir | --psdir | --psdi | --psd | --ps)
-+ ac_prev=psdir ;;
-+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+ psdir=$ac_optarg ;;
-+
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-@@ -586,24 +1050,20 @@ do
- -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 &&
-+ 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'" ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ 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 &&
-+ 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" ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=no ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -634,8 +1094,7 @@ Try \`$0 --help' for more information." >&2
- 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'"
-+ eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
-@@ -655,27 +1114,19 @@ if test -n "$ac_prev"; then
- { (exit 1); exit 1; }; }
- fi
-
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
-+# Be sure to have absolute directory names.
-+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+ datadir sysconfdir sharedstatedir localstatedir includedir \
-+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+ libdir localedir mandir
- do
-- eval ac_val=$`echo $ac_var`
-+ eval ac_val=\$$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; }; };;
-+ [\\/$]* | ?:[\\/]* ) continue;;
-+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
-+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; }
- done
-
- # There might be people who depend on the old broken behavior: `$host'
-@@ -702,74 +1153,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
- test "$silent" = yes && exec 6>/dev/null
-
-
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+ { echo "$as_me: error: Working directory cannot be determined" >&2
-+ { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+ { echo "$as_me: error: pwd does not report name of working directory" >&2
-+ { (exit 1); exit 1; }; }
-+
-+
- # 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 ||
-+ # Try the directory containing this script, then the parent directory.
-+ ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ 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'`
-+ 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
-+ 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
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&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
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&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
-+ pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+ srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+ eval ac_env_${ac_var}_value=\$${ac_var}
-+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
-
- #
- # Report the --help message.
-@@ -798,9 +1251,6 @@ Configuration:
- -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]
-@@ -818,15 +1268,22 @@ 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]
-+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
-+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
-+ --infodir=DIR info documentation [DATAROOTDIR/info]
-+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
-+ --mandir=DIR man documentation [DATAROOTDIR/man]
-+ --docdir=DIR documentation root [DATAROOTDIR/doc/strace]
-+ --htmldir=DIR html documentation [DOCDIR]
-+ --dvidir=DIR dvi documentation [DOCDIR]
-+ --pdfdir=DIR pdf documentation [DOCDIR]
-+ --psdir=DIR ps documentation [DOCDIR]
- _ACEOF
-
- cat <<\_ACEOF
-@@ -861,128 +1318,95 @@ Some influential environment variables:
- 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>
-+ LIBS libraries to pass to the linker, e.g. -l<library>
-+ CPPFLAGS C/C++/Objective 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
-+ac_status=$?
- 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
-+ test -d "$ac_dir" || continue
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- 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
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-
- case $srcdir in
-- .) # No --srcdir option. We are building in place.
-+ .) # 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_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
- 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 ;;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$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
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+ cd "$ac_dir" || { ac_status=$?; continue; }
-+ # Check for guested 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
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi
-- cd $ac_popdir
-+ fi || ac_status=$?
-+ cd "$ac_pwd" || { ac_status=$?; break; }
- done
- fi
-
--test -n "$ac_init_help" && exit 0
-+test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
- strace configure 4.5.15
--generated by GNU Autoconf 2.59
-+generated by GNU Autoconf 2.61
-
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 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
-+ exit
- fi
--exec 5>config.log
--cat >&5 <<_ACEOF
-+cat >config.log <<_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.15, which was
--generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- $ $0 $@
-
- _ACEOF
-+exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1001,7 +1425,7 @@ uname -v = `(uname -v) 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`
-+/usr/bin/hostinfo = `(/usr/bin/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`
-@@ -1015,6 +1439,7 @@ do
- test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
- done
-+IFS=$as_save_IFS
-
- } >&5
-
-@@ -1036,7 +1461,6 @@ _ACEOF
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
--ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1047,7 +1471,7 @@ do
- -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
-@@ -1069,9 +1493,7 @@ do
- -* ) 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=" "
-+ ac_configure_args="$ac_configure_args '$ac_arg'"
- ;;
- esac
- done
-@@ -1082,8 +1504,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_
- # 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.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
- trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
-@@ -1096,20 +1518,34 @@ trap 'exit_status=$?
- _ASBOX
- echo
- # The following way of writing the cache mishandles newlines in values,
--{
-+(
-+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+ eval ac_val=\$$ac_var
-+ case $ac_val in #(
-+ *${as_nl}*)
-+ case $ac_var in #(
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
- (set) 2>&1 |
-- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+ *${as_nl}ac_space=\ *)
- sed -n \
-- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-- ;;
-+ "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"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--}
-+ esac |
-+ sort
-+)
- echo
-
- cat <<\_ASBOX
-@@ -1120,22 +1556,28 @@ _ASBOX
- echo
- for ac_var in $ac_subst_vars
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
--## ------------- ##
--## Output files. ##
--## ------------- ##
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
- echo
- for ac_var in $ac_subst_files
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-@@ -1147,26 +1589,24 @@ _ASBOX
- ## ----------- ##
- _ASBOX
- echo
-- sed "/^$/d" confdefs.h | sort
-+ cat confdefs.h
- 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 &&
-+ rm -f core *.core core.conftest.* &&
-+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-- ' 0
-+' 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
-+rm -f -r conftest* confdefs.h
-
- # Predefined preprocessor variables.
-
-@@ -1197,14 +1637,17 @@ _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
-+if test -n "$CONFIG_SITE"; then
-+ set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+ set x "$ac_default_prefix/share/config.site" \
-+ "$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in $CONFIG_SITE; do
-+shift
-+for ac_site_file
-+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;}
-@@ -1220,8 +1663,8 @@ if test -r "$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;;
-+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+ *) . "./$cache_file";;
- esac
- fi
- else
-@@ -1233,12 +1676,11 @@ 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
-+for ac_var in $ac_precious_vars; 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"
-+ 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
-@@ -1263,8 +1705,7 @@ echo "$as_me: current value: $ac_new_val" >&2;}
- # 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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
-@@ -1281,12 +1722,6 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov
- { (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
--
-
-
-
-@@ -1311,36 +1746,47 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-+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"
-+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
-+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
-+ 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
-+ 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;}
-+ { { 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.
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-+
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -1355,8 +1801,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
- # 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
-+{ 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
-@@ -1378,7 +1824,7 @@ case $as_dir/ in
- # 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 -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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.
-@@ -1397,21 +1843,22 @@ case $as_dir/ in
- ;;
- esac
- done
-+IFS=$as_save_IFS
-
-
- 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
-+ # As a last resort, use the slow shell script. Don't cache a
-+ # value 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.
-+ # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ 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.
-@@ -1421,8 +1868,8 @@ 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
-+{ 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
-@@ -1464,20 +1911,20 @@ 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
-+{ 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"
-+ 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"
-+ 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
-+rm -f conftest.sed
-
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1529,8 +1976,8 @@ 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
-+{ 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
-@@ -1543,54 +1990,57 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
-
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
-- echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
-+ { 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
-+ { 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 "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
- all:
-- @echo 'ac_maketemp="$(MAKE)"'
-+ @echo '@@@%%%=$(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
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+ *@@@%%%=?*=@@@%%%*)
-+ eval ac_cv_prog_make_${ac_make}_set=yes;;
-+ *)
-+ eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
- 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
-+if eval test \$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
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
-@@ -1661,8 +2111,8 @@ 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
-+{ 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
-@@ -1675,32 +2125,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
-
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
-- echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+ { 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
-+ { 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
-+{ 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
-@@ -1713,27 +2165,41 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
-
-- 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
-+ { 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
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- STRIP=$ac_ct_STRIP
-+ if test "x$ac_ct_STRIP" = x; then
-+ STRIP=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ STRIP=$ac_ct_STRIP
-+ fi
- else
- STRIP="$ac_cv_prog_STRIP"
- fi
-@@ -1753,17 +2219,17 @@ 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.
-+{ 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 was given.
- if test "${enable_maintainer_mode+set}" = set; then
-- enableval="$enable_maintainer_mode"
-- USE_MAINTAINER_MODE=$enableval
-+ 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
-+fi
-+
-+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
-
- if test $USE_MAINTAINER_MODE = yes; then
-@@ -1778,62 +2244,91 @@ fi
-
-
- # 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;}
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/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
-+{ 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" &&
-+ ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
- { { 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;}
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_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
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- 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
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-+
-+
-+{ 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;}
-+ if test "x$host_alias" = x; then
-+ ac_cv_host=$ac_cv_build
-+else
-+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-+fi
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- 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
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+
-+
-+
-+{ 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
-@@ -1884,18 +2379,18 @@ _ACEOF
-
- ;;
- *)
-- echo "$as_me:$LINENO: result: NO!" >&5
--echo "${ECHO_T}NO!" >&6
-+ { 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: 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
-+{ 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
-@@ -2017,16 +2512,24 @@ cat >>confdefs.h <<\_ACEOF
- _ACEOF
-
- ;;
-+avr32*)
-+ arch=avr32
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define AVR32 1
-+_ACEOF
-+
-+ ;;
- *)
-- echo "$as_me:$LINENO: result: NO!" >&5
--echo "${ECHO_T}NO!" >&6
-+ { 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
-+{ echo "$as_me:$LINENO: result: $arch" >&5
-+echo "${ECHO_T}$arch" >&6; }
-
-
-
-@@ -2100,8 +2603,8 @@ 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
-+{ 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
-@@ -2114,32 +2617,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { 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
-+ { 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
-+{ 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
-@@ -2152,36 +2657,51 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
-
- 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
-+ { 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
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- CC=$ac_ct_CC
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
- 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.
-+ 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
-+{ 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
-@@ -2194,74 +2714,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
-
- 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
-+ { 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
-+ { 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
- 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
-+{ 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
-@@ -2275,7 +2755,7 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-@@ -2286,6 +2766,7 @@ do
- fi
- done
- done
-+IFS=$as_save_IFS
-
- if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
-@@ -2303,22 +2784,23 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { 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
-+ { 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
-+ for ac_prog in cl.exe
- 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
-+{ 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
-@@ -2331,36 +2813,38 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { 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
-+ { 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
-+ for ac_prog in cl.exe
- 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
-+{ 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
-@@ -2373,29 +2857,45 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
-
- 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
-+ { 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
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$ac_ct_CC" && break
- done
-
-- CC=$ac_ct_CC
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
- fi
-
- fi
-@@ -2408,21 +2908,35 @@ 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
-+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_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler --version >&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_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -v >&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_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-@@ -2447,47 +2961,77 @@ 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
-+{ 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
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort. b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions. Remove them first so a
-+# subsequent execution test works.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+ esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { (ac_try="$ac_link_default"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile. We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
- 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.
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- ;;
- [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
-+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+ then :; else
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ fi
-+ # We set ac_cv_exeext here because the later test for it is not
-+ # safe: cross compilers may not add the suffix if given an `-o'
-+ # argument, so we may need to know it at that point already.
-+ # Even if this section looks crufty: it has the advantage of
-+ # actually working.
- break;;
- * )
- break;;
- esac
- done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
- else
-+ ac_file=''
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-@@ -2499,19 +3043,21 @@ See \`config.log' for more details." >&2;}
- 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
-+# Check that 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
-+{ 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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -2530,22 +3076,27 @@ See \`config.log' for more details." >&2;}
- fi
- fi
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ 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
-+# Check that 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
-+{ 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 { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -2556,9 +3107,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- 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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- export ac_cv_exeext
- break;;
- * ) break;;
- esac
-@@ -2572,14 +3122,14 @@ See \`config.log' for more details." >&2;}
- fi
-
- rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
-+{ 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
-+{ 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
-@@ -2599,14 +3149,20 @@ main ()
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ for ac_file in conftest.o conftest.obj conftest.*; do
-+ test -f "$ac_file" || continue;
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-@@ -2624,12 +3180,12 @@ 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
-+{ 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
-+{ 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
-@@ -2652,50 +3208,49 @@ main ()
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_compiler_gnu=no
-+ ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-+{ 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
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2711,38 +3266,118 @@ main ()
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ CFLAGS=""
-+ 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 { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ 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 { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core 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
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+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
-@@ -2758,12 +3393,12 @@ 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 "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_prog_cc_stdc=no
-+ ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -2797,12 +3432,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
- /* 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
-+ as 'x'. The following induces an error, until -std 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. */
-+ that's true only with -std. */
- int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -2817,205 +3457,57 @@ 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__"
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_c89=$ac_arg
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- 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 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&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" ;;
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- 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'
-@@ -3023,7 +3515,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- DEPDIR="${am__leading_dot}deps"
-
-- ac_config_commands="$ac_config_commands depfiles"
-+ac_config_commands="$ac_config_commands depfiles"
-
-
- am_make=${MAKE-make}
-@@ -3033,8 +3525,8 @@ am__doit:
- .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
-+{ 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
-@@ -3061,15 +3553,15 @@ if test "$am__include" = "#"; then
- fi
-
-
--echo "$as_me:$LINENO: result: $_am_result" >&5
--echo "${ECHO_T}$_am_result" >&6
-+{ 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.
-+# Check whether --enable-dependency-tracking was given.
- if test "${enable_dependency_tracking+set}" = set; then
-- enableval="$enable_dependency_tracking"
-+ enableval=$enable_dependency_tracking;
-+fi
-
--fi;
- if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-@@ -3089,8 +3581,8 @@ 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
-+{ 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
-@@ -3179,8 +3671,8 @@ else
- fi
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+{ 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
-
-
-@@ -3204,8 +3696,8 @@ _ACEOF
-
-
-
--echo "$as_me:$LINENO: checking for primary include directory" >&5
--echo $ECHO_N "checking for primary include directory... $ECHO_C" >&6
-+{ 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
-@@ -3222,28 +3714,28 @@ then
- includedir=$new_includedir
- fi
- fi
--echo "$as_me:$LINENO: result: $includedir" >&5
--echo "${ECHO_T}$includedir" >&6
-+{ 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
-+ { 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
-+ { 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
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- fi
-
-@@ -3271,8 +3763,8 @@ 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
-+{ 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=
-@@ -3306,24 +3798,22 @@ cat >>conftest.$ac_ext <<_ACEOF
- #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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -3332,9 +3822,10 @@ 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
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3344,24 +3835,22 @@ 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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -3372,6 +3861,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -3389,8 +3879,8 @@ fi
- else
- ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
-+{ 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
-@@ -3413,24 +3903,22 @@ cat >>conftest.$ac_ext <<_ACEOF
- #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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -3439,9 +3927,10 @@ 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
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3451,24 +3940,22 @@ 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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -3479,6 +3966,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -3502,24 +3990,171 @@ 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 "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+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'
-+ # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_path_GREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in grep ggrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+ # Check for GNU ac_path_GREP and select it if it is found.
-+ # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+ ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ echo 'GREP' >> "conftest.nl"
-+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+ ac_count=`expr $ac_count + 1`
-+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_GREP="$ac_path_GREP"
-+ ac_path_GREP_max=$ac_count
- fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+ $ac_path_GREP_found && break 3
-+ done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+ ac_cv_path_GREP=$GREP
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-+
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+
-+
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_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_path_EGREP="$GREP -E"
-+ else
-+ # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_path_EGREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in egrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+ # Check for GNU ac_path_EGREP and select it if it is found.
-+ # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+ ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ echo 'EGREP' >> "conftest.nl"
-+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+ ac_count=`expr $ac_count + 1`
-+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_EGREP="$ac_path_EGREP"
-+ ac_path_EGREP_max=$ac_count
-+ fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+ $ac_path_EGREP_found && break 3
-+ done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+ ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_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
-+ { 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
-@@ -3560,8 +4195,8 @@ 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
-+{ 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
-@@ -3580,8 +4215,8 @@ fi
- # 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
-+{ 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
-@@ -3603,7 +4238,7 @@ case $as_dir/ in
- # 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 -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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.
-@@ -3622,21 +4257,22 @@ case $as_dir/ in
- ;;
- esac
- done
-+IFS=$as_save_IFS
-
-
- 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
-+ # As a last resort, use the slow shell script. Don't cache a
-+ # value 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.
-+ # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ 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.
-@@ -3646,8 +4282,8 @@ 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
-+{ 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
-@@ -3665,10 +4301,10 @@ main ()
- #ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
-- const charset x;
-+ const charset cs;
- /* SunOS 4.1.1 cc rejects this. */
-- char const *const *ccp;
-- char **p;
-+ char const *const *pcpcc;
-+ char **ppc;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
-@@ -3677,16 +4313,17 @@ main ()
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
-- ccp = &g + (g ? g-g : 0);
-+ pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
-- ++ccp;
-- p = (char**) ccp;
-- ccp = (char const *const *) p;
-+ ++pcpcc;
-+ ppc = (char**) pcpcc;
-+ pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
-+ if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
-@@ -3705,7 +4342,9 @@ main ()
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
-+ if (!foo) return 0;
- }
-+ return !cs[0] && !zero.x;
- #endif
-
- ;
-@@ -3713,38 +4352,34 @@ main ()
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_c_const=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -3753,8 +4388,8 @@ _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
-+{ 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
-@@ -3778,35 +4413,31 @@ main ()
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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.
-@@ -3862,6 +4493,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <ctype.h>
-+#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -3881,18 +4513,27 @@ main ()
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
-- exit(2);
-- exit (0);
-+ return 2;
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3905,12 +4546,14 @@ 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
-+rm -f core *.core core.conftest.* 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
-+{ 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
-@@ -3927,9 +4570,9 @@ 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 "$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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -3951,38 +4594,35 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -3994,13 +4634,12 @@ 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
-+ { 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
-@@ -4008,126 +4647,83 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #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 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
-+for ac_lib in '' dir; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_opendir=$ac_res
- 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
-+ break
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- done
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ :
-+else
-+ ac_cv_search_opendir=no
- fi
-+rm conftest.$ac_ext
- 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"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
- else
-- echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+ { 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
-@@ -4135,122 +4731,80 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #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 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
-+for ac_lib in '' x; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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"
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_search_opendir=$ac_res
- 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
-+ break
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- done
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ :
-+else
-+ ac_cv_search_opendir=no
- fi
-+rm conftest.$ac_ext
- 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"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $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
-+{ 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
-@@ -4263,42 +4817,52 @@ cat >>conftest.$ac_ext <<_ACEOF
- #include <sys/types.h>
- #include <sys/stat.h>
-
--#if defined(S_ISBLK) && defined(S_IFDIR)
--# if S_ISBLK (S_IFDIR)
--You lose.
--# endif
-+#if defined S_ISBLK && defined S_IFDIR
-+extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
- #endif
-
--#if defined(S_ISBLK) && defined(S_IFCHR)
--# if S_ISBLK (S_IFCHR)
--You lose.
--# endif
-+#if defined S_ISBLK && defined S_IFCHR
-+extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
- #endif
-
--#if defined(S_ISLNK) && defined(S_IFREG)
--# if S_ISLNK (S_IFREG)
--You lose.
--# endif
-+#if defined S_ISLNK && defined S_IFREG
-+extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
- #endif
-
--#if defined(S_ISSOCK) && defined(S_IFREG)
--# if S_ISSOCK (S_IFREG)
--You lose.
--# endif
-+#if defined S_ISSOCK && defined S_IFREG
-+extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
- #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
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_stat_broken=no
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_header_stat_broken=yes
- fi
--rm -f conftest*
-
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
--echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
-+{ 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
-@@ -4321,9 +4885,9 @@ 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 "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -4337,38 +4901,35 @@ $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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -4379,8 +4940,8 @@ 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
-+{ 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
-@@ -4402,33 +4963,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4446,40 +5002,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_member_struct_stat_st_blksize=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -4488,8 +5041,8 @@ _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
-+{ 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
-@@ -4511,33 +5064,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4555,40 +5103,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_member_struct_stat_st_blocks=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -4597,8 +5142,8 @@ _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
-+{ 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
-@@ -4620,33 +5165,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4664,40 +5204,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_member_struct_stat_st_aclcnt=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -4706,8 +5243,8 @@ _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
-+{ 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
-@@ -4729,33 +5266,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4773,40 +5305,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_member_struct_stat_st_flags=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -4815,8 +5344,8 @@ _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
-+{ 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
-@@ -4838,33 +5367,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4882,40 +5406,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_member_struct_stat_st_fstype=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -4924,8 +5445,8 @@ _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
-+{ 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
-@@ -4947,33 +5468,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4991,40 +5507,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_member_struct_stat_st_gen=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -5033,8 +5546,8 @@ _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
-+{ 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
-@@ -5056,33 +5569,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5100,40 +5608,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_member_struct_stat_st_level=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -5142,8 +5647,8 @@ _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
-+{ 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
-@@ -5165,33 +5670,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5209,40 +5709,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_member_struct_stat_st_rdev=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -5252,8 +5749,8 @@ _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
-+{ 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
-@@ -5278,39 +5775,35 @@ struct stat64 st;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_type_stat64=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-
-@@ -5321,8 +5814,8 @@ _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
-+{ 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
-@@ -5334,64 +5827,52 @@ 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 *(signal (0, 0)) (0) == 1;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_type_signal=int
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_signal=int
-+ ac_cv_type_signal=void
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-+{ 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
-@@ -5413,8 +5894,8 @@ 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
-+{ 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
-@@ -5428,8 +5909,8 @@ _ACEOF
-
- fi
-
--echo "$as_me:$LINENO: checking for mode_t" >&5
--echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
-+{ 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
-@@ -5440,50 +5921,47 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef mode_t ac__type_new_;
- int
- main ()
- {
--if ((mode_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (mode_t))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_type_mode_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -5494,8 +5972,8 @@ _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
-+{ 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
-@@ -5509,7 +5987,7 @@ 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>
-+$ac_includes_default
- #define NGID 256
- #undef MAX
- #define MAX(x, y) ((x) > (y) ? (x) : (y))
-@@ -5519,7 +5997,7 @@ main ()
- {
- gid_t gidset[NGID];
- int i, n;
-- union { gid_t gval; long lval; } val;
-+ union { gid_t gval; long int lval; } val;
-
- val.lval = -1;
- for (i = 0; i < NGID; i++)
-@@ -5527,18 +6005,28 @@ main ()
- 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);
-+ happens when gid_t is short int but getgroups modifies an array
-+ of ints. */
-+ return n > 0 && gidset[n] != val.gval;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -5551,8 +6039,10 @@ 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
-+rm -f core *.core core.conftest.* 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. */
-@@ -5573,16 +6063,16 @@ rm -f conftest*
-
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
--echo "${ECHO_T}$ac_cv_type_getgroups" >&6
-+{ 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
-+{ 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
-@@ -5602,54 +6092,51 @@ return makedev(0, 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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; 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
-+ ac_cv_header_sys_types_h_makedev=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ 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
-+ { 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
-+{ 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
-+{ 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
-@@ -5660,41 +6147,37 @@ $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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ 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
-+
-+rm -f core 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
-+{ 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
-@@ -5703,24 +6186,22 @@ 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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5728,9 +6209,10 @@ 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
-+{ 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
-@@ -5754,25 +6236,18 @@ echo "$as_me: WARNING: sys/mkdev.h: section \"Present But Cannot Be Compiled
- 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
-+{ 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
-+{ 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
-@@ -5787,17 +6262,17 @@ 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
-+ { 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
-+{ 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
-+{ 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
-@@ -5808,41 +6283,37 @@ $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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ 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
-+
-+rm -f core 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
-+{ 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
-@@ -5851,24 +6322,22 @@ 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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5876,9 +6345,10 @@ 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
-+{ 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
-@@ -5902,25 +6372,18 @@ echo "$as_me: WARNING: sys/sysmacros.h: section \"Present But Cannot Be Comp
- 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
-+{ 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
-+{ 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
-@@ -5935,8 +6398,8 @@ fi
- fi
- fi
-
--echo "$as_me:$LINENO: checking for sig_atomic_t" >&5
--echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
-+{ 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
-@@ -5948,50 +6411,47 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <signal.h>
-
-+typedef sig_atomic_t ac__type_new_;
- int
- main ()
- {
--if ((sig_atomic_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (sig_atomic_t))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_type_sig_atomic_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -6000,8 +6460,8 @@ _ACEOF
-
-
- fi
--echo "$as_me:$LINENO: checking for siginfo_t" >&5
--echo $ECHO_N "checking for siginfo_t... $ECHO_C" >&6
-+{ 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
-@@ -6013,50 +6473,47 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <signal.h>
-
-+typedef siginfo_t ac__type_new_;
- int
- main ()
- {
--if ((siginfo_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (siginfo_t))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_type_siginfo_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -6066,8 +6523,8 @@ _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
-+{ 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
-@@ -6092,33 +6549,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6139,40 +6591,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_member_struct_sockaddr_in6_sin6_scope_id=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -6182,8 +6631,8 @@ _ACEOF
-
- fi
-
--echo "$as_me:$LINENO: checking for long long" >&5
--echo $ECHO_N "checking for long long... $ECHO_C" >&6
-+{ 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
-@@ -6194,50 +6643,47 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef long long ac__type_new_;
- int
- main ()
- {
--if ((long long *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (long long))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_type_long_long=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -6247,8 +6693,8 @@ _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
-+{ 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
-@@ -6277,13 +6723,22 @@ int main () {
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6296,12 +6751,14 @@ 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
-+rm -f core *.core core.conftest.* 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
-+{ 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
-
-@@ -6311,8 +6768,8 @@ _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
-+{ 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
-@@ -6337,13 +6794,22 @@ main () {
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6356,12 +6822,14 @@ 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
-+rm -f core *.core core.conftest.* 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
-+{ 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
-
-@@ -6371,8 +6839,8 @@ _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
-+{ 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
-@@ -6399,13 +6867,22 @@ main () {
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6418,12 +6895,14 @@ 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
-+rm -f core *.core core.conftest.* 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
-+{ 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
-
-@@ -6433,8 +6912,8 @@ _ACEOF
-
- fi
-
--echo "$as_me:$LINENO: checking for struct opthdr" >&5
--echo $ECHO_N "checking for struct opthdr... $ECHO_C" >&6
-+{ 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
-@@ -6446,50 +6925,47 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/socket.h>
-
-+typedef struct opthdr ac__type_new_;
- int
- main ()
- {
--if ((struct opthdr *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (struct opthdr))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_type_struct_opthdr=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -6499,8 +6975,8 @@ _ACEOF
-
- fi
-
--echo "$as_me:$LINENO: checking for struct t_opthdr" >&5
--echo $ECHO_N "checking for struct t_opthdr... $ECHO_C" >&6
-+{ 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
-@@ -6512,50 +6988,47 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/tiuser.h>
-
-+typedef struct t_opthdr ac__type_new_;
- int
- main ()
- {
--if ((struct t_opthdr *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (struct t_opthdr))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_type_struct_t_opthdr=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -6568,8 +7041,8 @@ 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
-+{ 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
-@@ -6586,46 +7059,43 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
--main ();
-+return 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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; 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
-+ ac_cv_lib_nsl_main=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ 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
-@@ -6652,9 +7122,9 @@ 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 "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6680,68 +7150,60 @@ cat >>conftest.$ac_ext <<_ACEOF
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #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)
-+#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 $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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; 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"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -6782,18 +7244,19 @@ 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 inttypes.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
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&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
-+{ 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
-@@ -6804,41 +7267,37 @@ $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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ 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
-+
-+rm -f core 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
-+{ 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
-@@ -6847,24 +7306,22 @@ 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
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6872,9 +7329,10 @@ 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
-+{ 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
-@@ -6898,25 +7356,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\
- 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 "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6935,9 +7387,9 @@ 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 "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6951,38 +7403,35 @@ cat >>conftest.$ac_ext <<_ACEOF
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -6996,9 +7445,9 @@ 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 "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7012,38 +7461,35 @@ cat >>conftest.$ac_ext <<_ACEOF
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -7058,9 +7504,9 @@ 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 "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7074,38 +7520,35 @@ cat >>conftest.$ac_ext <<_ACEOF
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -7116,8 +7559,8 @@ fi
- done
-
-
--echo "$as_me:$LINENO: checking for MP procfs" >&5
--echo $ECHO_N "checking for MP procfs... $ECHO_C" >&6
-+{ 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
-@@ -7178,13 +7621,22 @@ fail:
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7197,12 +7649,14 @@ 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
-+rm -f core *.core core.conftest.* 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
-+{ 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
-
-@@ -7212,8 +7666,8 @@ _ACEOF
-
- fi
-
--echo "$as_me:$LINENO: checking for pollable procfs" >&5
--echo $ECHO_N "checking for pollable procfs... $ECHO_C" >&6
-+{ 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
-@@ -7289,13 +7743,22 @@ fail:
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7308,12 +7771,14 @@ 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
-+rm -f core *.core core.conftest.* 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
-+{ 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
-
-@@ -7324,8 +7789,8 @@ _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
-+{ 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
-@@ -7348,33 +7813,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7393,40 +7853,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_member_struct_msghdr_msg_control=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -7436,8 +7893,8 @@ _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
-+{ 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
-@@ -7463,39 +7920,35 @@ s.pr_syscall
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_struct_pr_syscall=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-
-@@ -7506,8 +7959,8 @@ _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
-+{ 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
-@@ -7531,33 +7984,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7577,40 +8025,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_member_struct_T_conn_res_QUEUE_ptr=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -7619,8 +8064,8 @@ _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
-+{ 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
-@@ -7644,33 +8089,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7690,40 +8130,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_member_struct_T_conn_res_ACCEPTOR_id=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -7734,8 +8171,8 @@ _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
-+{ 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
-@@ -7747,50 +8184,47 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <asm/stat.h>
-
-+typedef struct __old_kernel_stat ac__type_new_;
- int
- main ()
- {
--if ((struct __old_kernel_stat *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (struct __old_kernel_stat))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_type_struct___old_kernel_stat=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -7801,8 +8235,8 @@ _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
-+{ 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
-@@ -7814,50 +8248,47 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/ptrace.h>
-
-+typedef struct pt_all_user_regs ac__type_new_;
- int
- main ()
- {
--if ((struct pt_all_user_regs *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (struct pt_all_user_regs))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_type_struct_pt_all_user_regs=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -7866,8 +8297,8 @@ _ACEOF
-
-
- fi
--echo "$as_me:$LINENO: checking for struct ia64_fpreg" >&5
--echo $ECHO_N "checking for struct ia64_fpreg... $ECHO_C" >&6
-+{ 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
-@@ -7879,50 +8310,47 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/ptrace.h>
-
-+typedef struct ia64_fpreg ac__type_new_;
- int
- main ()
- {
--if ((struct ia64_fpreg *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (struct ia64_fpreg))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_type_struct_ia64_fpreg=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -7933,8 +8361,8 @@ _ACEOF
- fi
-
-
--echo "$as_me:$LINENO: checking for struct user_desc" >&5
--echo $ECHO_N "checking for struct user_desc... $ECHO_C" >&6
-+{ 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
-@@ -7946,50 +8374,47 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <asm/ldt.h>
-
-+typedef struct user_desc ac__type_new_;
- int
- main ()
- {
--if ((struct user_desc *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (struct user_desc))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_type_struct_user_desc=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -8000,8 +8425,8 @@ _ACEOF
- fi
-
-
--echo "$as_me:$LINENO: checking for struct dqblk.dqb_curblocks" >&5
--echo $ECHO_N "checking for struct dqblk.dqb_curblocks... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for struct dqblk.dqb_curblocks" >&5
-+echo $ECHO_N "checking for struct dqblk.dqb_curblocks... $ECHO_C" >&6; }
- if test "${ac_cv_member_struct_dqblk_dqb_curblocks+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8024,33 +8449,28 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_dqblk_dqb_curblocks=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -8069,40 +8489,37 @@ return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_dqblk_dqb_curblocks=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_member_struct_dqblk_dqb_curblocks=no
-+ ac_cv_member_struct_dqblk_dqb_curblocks=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_member_struct_dqblk_dqb_curblocks" >&5
--echo "${ECHO_T}$ac_cv_member_struct_dqblk_dqb_curblocks" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_dqblk_dqb_curblocks" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_dqblk_dqb_curblocks" >&6; }
- if test $ac_cv_member_struct_dqblk_dqb_curblocks = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -8113,8 +8530,8 @@ _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
-+{ 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
-@@ -8129,7 +8546,7 @@ int
- main ()
- {
- #ifndef sys_errlist
-- char *p = (char *) sys_errlist;
-+ (void) sys_errlist;
- #endif
-
- ;
-@@ -8137,38 +8554,34 @@ main ()
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_have_decl_sys_errlist=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -8185,8 +8598,8 @@ _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
-+{ 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
-@@ -8202,7 +8615,7 @@ int
- main ()
- {
- #ifndef sys_siglist
-- char *p = (char *) sys_siglist;
-+ (void) sys_siglist;
- #endif
-
- ;
-@@ -8210,38 +8623,34 @@ main ()
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_have_decl_sys_siglist=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -8256,8 +8665,8 @@ _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
-+{ 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
-@@ -8273,7 +8682,7 @@ int
- main ()
- {
- #ifndef _sys_siglist
-- char *p = (char *) _sys_siglist;
-+ (void) _sys_siglist;
- #endif
-
- ;
-@@ -8281,38 +8690,34 @@ main ()
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; 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
-+ ac_cv_have_decl__sys_siglist=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+{ 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
-@@ -8332,8 +8737,8 @@ 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
-+{ 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
-@@ -8348,29 +8753,30 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
-
- ;;
- esac
- fi
- PERL=$ac_cv_path_PERL
--
- if test -n "$PERL"; then
-- echo "$as_me:$LINENO: result: $PERL" >&5
--echo "${ECHO_T}$PERL" >&6
-+ { 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
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-- ac_config_files="$ac_config_files Makefile"
-+
-+ac_config_files="$ac_config_files Makefile"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -8390,39 +8796,58 @@ _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.
-+# So, we kill variables containing newlines.
- # 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.
--{
-+(
-+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+ eval ac_val=\$$ac_var
-+ case $ac_val in #(
-+ *${as_nl}*)
-+ case $ac_var in #(
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
-+
- (set) 2>&1 |
-- case `(ac_space=' '; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+ *${as_nl}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"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--} |
-+ esac |
-+ sort
-+) |
- sed '
-+ /^ac_cv_env_/b end
- t clear
-- : 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"
-+ 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 "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
-- echo "not updating unwritable cache $cache_file"
-+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
- fi
- rm -f confcache
-@@ -8431,32 +8856,18 @@ 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'
-+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+ ac_i=`echo "$ac_i" | sed "$ac_script"`
-+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
-+ # will be set to the directory where LIBOBJS objects are built.
-+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
-
-@@ -8550,17 +8961,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
- ## M4sh Initialization. ##
- ## --------------------- ##
-
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- 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
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# 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
--DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -8570,8 +9009,43 @@ else
- fi
-
-
-+# IFS
-+# We need space, tab and new line, in precisely that order. Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" "" $as_nl"
-+
-+# Find who we are. Look in the path if we contain no directory separator.
-+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
-+IFS=$as_save_IFS
-+
-+ ;;
-+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_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -8585,18 +9059,19 @@ 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
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -8604,159 +9079,120 @@ fi
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ 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
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-
--# 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
-+# CDPATH.
-+$as_unset CDPATH
-
-
-- 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
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # 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.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, 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 |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
-- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\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;}
-+ 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
-+ # original and so on. Autoconf is especially sensitive 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= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+ rm -f conf$$.dir/conf$$.file
-+else
-+ rm -f conf$$.dir
-+ mkdir conf$$.dir
-+fi
- 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='ln -s'
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- 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
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-@@ -8765,7 +9201,28 @@ else
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+if test -x / >/dev/null 2>&1; then
-+ as_test_x='test -x'
-+else
-+ if ls -dL / >/dev/null 2>&1; then
-+ as_ls_L_option=L
-+ else
-+ as_ls_L_option=
-+ fi
-+ as_test_x='
-+ eval sh -c '\''
-+ if test -d "$1"; then
-+ test -d "$1/.";
-+ else
-+ case $1 in
-+ -*)set "./$1";;
-+ esac;
-+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+ ???[sx]*):;;*)false;;esac;fi
-+ '\'' sh
-+ '
-+fi
-+as_executable_p=$as_test_x
-
- # 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'"
-@@ -8774,31 +9231,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
- 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
-+# Save the log message, 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
--
-+# values after options handling.
-+ac_log="
- This file was extended by strace $as_me 4.5.15, which was
--generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -8806,30 +9246,20 @@ generated by GNU Autoconf 2.59. Invocation command line was
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
- _ACEOF
-
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
--if test -n "$ac_config_files"; then
-- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
-
--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
-+_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
--
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -8837,7 +9267,7 @@ current configuration.
- Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
-- -V, --version print version number, then exit
-+ -V, --version print version number and configuration settings, 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
-@@ -8856,19 +9286,21 @@ Configuration commands:
- $config_commands
-
- Report bugs to <bug-autoconf@gnu.org>."
--_ACEOF
-
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- strace config.status 4.5.15
--configured by $0, generated by GNU Autoconf 2.59,
-- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.61,
-+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2006 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"
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
- _ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -8879,39 +9311,24 @@ while test $# != 0
- do
- case $1 in
- --*=*)
-- ac_option=`expr "x$1" : 'x\([^=]*\)='`
-- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+ 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 )
-+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+ echo "$ac_cs_version"; exit ;;
-+ --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
-@@ -8921,18 +9338,24 @@ Try \`$0 --help' for more information." >&2;}
- $ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
-+ --he | --h)
-+ # Conflict between --help and --header
-+ { 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 ;;
- -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;}
-+ -*) { 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" ;;
-+ *) ac_config_targets="$ac_config_targets $1"
-+ ac_need_defaults=false ;;
-
- esac
- shift
-@@ -8948,37 +9371,49 @@ 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
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ CONFIG_SHELL=$SHELL
-+ export CONFIG_SHELL
-+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
-
- _ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+ echo "$ac_log"
-+} >&5
-
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- #
--# INIT-COMMANDS section.
-+# INIT-COMMANDS
- #
--
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
- _ACEOF
-
--
--
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
- 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" ;;
-+ case $ac_config_target in
-+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+
- *) { { 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
-@@ -8990,353 +9425,461 @@ if $ac_need_defaults; then
- 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,
-+# simply because there is no reason against having 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.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
-- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+ tmp=
-+ trap 'exit_status=$?
-+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$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` &&
-+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
- } ||
- {
-- tmp=./confstat$$-$RANDOM
-- (umask 077 && mkdir $tmp)
-+ tmp=./conf$$-$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.
-+# Set up the sed scripts for 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
-+if test -n "$CONFIG_FILES"; then
-+
-+_ACEOF
-+
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+CYGPATH_W!$CYGPATH_W$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+install_sh!$install_sh$ac_delim
-+STRIP!$STRIP$ac_delim
-+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-+mkdir_p!$mkdir_p$ac_delim
-+AWK!$AWK$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+am__leading_dot!$am__leading_dot$ac_delim
-+AMTAR!$AMTAR$ac_delim
-+am__tar!$am__tar$ac_delim
-+am__untar!$am__untar$ac_delim
-+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-+MAINT!$MAINT$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+opsys!$opsys$ac_delim
-+arch!$arch$ac_delim
-+LINUX_TRUE!$LINUX_TRUE$ac_delim
-+LINUX_FALSE!$LINUX_FALSE$ac_delim
-+I386_TRUE!$I386_TRUE$ac_delim
-+I386_FALSE!$I386_FALSE$ac_delim
-+X86_64_TRUE!$X86_64_TRUE$ac_delim
-+X86_64_FALSE!$X86_64_FALSE$ac_delim
-+SUNOS4_TRUE!$SUNOS4_TRUE$ac_delim
-+SUNOS4_FALSE!$SUNOS4_FALSE$ac_delim
-+SVR4_TRUE!$SVR4_TRUE$ac_delim
-+SVR4_FALSE!$SVR4_FALSE$ac_delim
-+FREEBSD_TRUE!$FREEBSD_TRUE$ac_delim
-+FREEBSD_FALSE!$FREEBSD_FALSE$ac_delim
-+CC!$CC$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+DEPDIR!$DEPDIR$ac_delim
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-+CCDEPMODE!$CCDEPMODE$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
--fi # test -n "$CONFIG_FILES"
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+WARNFLAGS!$WARNFLAGS$ac_delim
-+CPP!$CPP$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+PERL!$PERL$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+# 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
-+
- 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 ;;
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
-+do
-+ case $ac_tag in
-+ :[FHLC]) ac_mode=$ac_tag; continue;;
-+ esac
-+ case $ac_mode$ac_tag in
-+ :[FHL]*:*);;
-+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ :[FH]-) ac_tag=-:-;;
-+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+ esac
-+ ac_save_IFS=$IFS
-+ IFS=:
-+ set x $ac_tag
-+ IFS=$ac_save_IFS
-+ shift
-+ ac_file=$1
-+ shift
-+
-+ case $ac_mode in
-+ :L) ac_source=$1;;
-+ :[FH])
-+ ac_file_inputs=
-+ for ac_f
-+ do
-+ case $ac_f in
-+ -) ac_f="$tmp/stdin";;
-+ *) # Look for the file first in the build tree, then in the source tree
-+ # (if the path is not absolute). The absolute path cannot be DOS-style,
-+ # because $ac_f cannot contain `:'.
-+ test -f "$ac_f" ||
-+ case $ac_f in
-+ [\\/$]*) false;;
-+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+ esac ||
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+ ac_file_inputs="$ac_file_inputs $ac_f"
-+ done
-+
-+ # 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. */
-+ configure_input="Generated from "`IFS=:
-+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+ if test x"$ac_file" != x-; then
-+ configure_input="$ac_file. $configure_input"
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ fi
-+
-+ case $ac_tag in
-+ *:-:* | *:-) cat >"$tmp/stdin";;
-+ esac
-+ ;;
- esac
-
-- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+ ac_dir=`$as_dirname -- "$ac_file" ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ 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"
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ { as_dir="$ac_dir"
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+ *) as_qdir=$as_dir;;
-+ esac
-+ as_dirs="'$as_qdir' $as_dirs"
-+ as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ 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'`
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ test -d "$as_dir" && break
- 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;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- 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
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-
- case $srcdir in
-- .) # No --srcdir option. We are building in place.
-+ .) # 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_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
- 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 ;;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
--# 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 $ac_mode in
-+ :F)
-+ #
-+ # CONFIG_FILE
-+ #
-
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
-+_ACEOF
-
-- 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; }
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+
-+case `sed -n '/datarootdir/ {
-+ p
-+ q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ ac_datarootdir_hack='
-+ s&@datadir@&$datadir&g
-+ s&@docdir@&$docdir&g
-+ s&@infodir@&$infodir&g
-+ s&@localedir@&$localedir&g
-+ s&@mandir@&$mandir&g
-+ s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
- _ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
- $extrasub
-@@ -9344,248 +9887,130 @@ _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".
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;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&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-+
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&5
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&2;}
-+
-+ rm -f "$tmp/stdin"
- 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 ;;
-+ -) cat "$tmp/out"; rm -f "$tmp/out";;
-+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- 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
-+ ;;
-+ :H)
-+ #
-+ # CONFIG_HEADER
-+ #
-+_ACEOF
-+
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status. If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless. But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-+ac_dB='\\)[ (].*,\\1define\\2'
-+ac_dC=' '
-+ac_dD=' ,'
-+
-+uniq confdefs.h |
-+ sed -n '
-+ t rset
-+ :rset
-+ s/^[ ]*#[ ]*define[ ][ ]*//
-+ t ok
-+ d
-+ :ok
-+ s/[\\&,]/\\&/g
-+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-+ ' >>conftest.defines
-+
-+# Remove the space that was appended to ease matching.
-+# Then replace #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
-+# (The regexp can be short, since the line contains either #define or #undef.)
-+echo 's/ $//
-+s,^[ #]*u.*,/* & */,' >>conftest.defines
-+
-+# Break up conftest.defines:
-+ac_max_sed_lines=50
-+
-+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-+# et cetera.
-+ac_in='$ac_file_inputs'
-+ac_out='"$tmp/out1"'
-+ac_nxt='"$tmp/out2"'
-+
-+while :
- 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
-+ # Write a here document:
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ # First, check the format of the line:
-+ cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-+b
-+:def
-+_ACEOF
-+ sed ${ac_max_sed_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
-+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+ grep . conftest.tail >/dev/null || break
- 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
-+rm -f conftest.defines conftest.tail
-
-+echo "ac_result=$ac_in" >>$CONFIG_STATUS
- 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 "/* $configure_input */" >"$tmp/config.h"
-+ cat "$ac_result" >>"$tmp/config.h"
-+ 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
-+ mv "$tmp/config.h" $ac_file
- fi
- else
-- cat $tmp/config.h
-- rm -f $tmp/config.h
-+ echo "/* $configure_input */"
-+ cat "$ac_result"
- fi
-+ rm -f "$tmp/out12"
- # Compute $ac_file's index in $config_headers.
- _am_stamp_count=1
- for _am_header in $config_headers :; do
-@@ -9596,135 +10021,39 @@ for _am_header in $config_headers :; do
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
- done
--echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
- $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
-- X$ac_file : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ 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
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`/stamp-h$_am_stamp_count
-+ ;;
-
--# 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
-+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
-+ 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
-+ case $ac_file$ac_mode in
-+ "depfiles":C) 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.
-@@ -9734,18 +10063,29 @@ echo "$as_me: executing $ac_dest commands" >&6;}
- # 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 ||
-+ dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
-- X"$mf" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ 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'`
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
- else
- continue
- fi
-@@ -9767,53 +10107,79 @@ echo X"$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 ||
-+ fdir=`$as_dirname -- "$file" ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
-- X"$file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ 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
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ { as_dir=$dirpart/$fdir
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+ *) as_qdir=$as_dir;;
-+ esac
-+ as_dirs="'$as_qdir' $as_dirs"
-+ as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ 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'`
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ test -d "$as_dir" && break
- 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;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
- ;;
-+
- esac
--done
--_ACEOF
-+done # for ac_tag
-
--cat >>$CONFIG_STATUS <<\_ACEOF
-
- { (exit 0); exit 0; }
- _ACEOF
-diff --git a/configure.ac b/configure.ac
-index 49a9b20..87695b8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -103,6 +103,10 @@ x86?64*)
- arch=x86_64
- AC_DEFINE([X86_64], 1, [Define for the AMD x86-64 architecture.])
- ;;
-+avr32*)
-+ arch=avr32
-+ AC_DEFINE([AVR32], 1, [Define for the AVR32 architecture.])
-+ ;;
- *)
- AC_MSG_RESULT([NO!])
- AC_MSG_ERROR([architecture $host_cpu is not supported by strace])
-diff --git a/defs.h b/defs.h
-index 486fac5..1818e8c 100644
---- a/defs.h
-+++ b/defs.h
-@@ -94,6 +94,9 @@
- # if defined(X86_64)
- # define LINUX_X86_64
- # endif
-+# if defined(AVR32)
-+# define LINUX_AVR32
-+# endif
- #endif
-
- #if defined(SVR4) || defined(FREEBSD)
-@@ -120,7 +123,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_AVR32)) && defined(__GLIBC__)
- #include <sys/ptrace.h>
- #else
- /* Work around awkward prototype in ptrace.h. */
-@@ -327,7 +330,7 @@ struct tcb {
- #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)
-+# if defined(ALPHA) || defined(SPARC) || defined(SPARC64) || defined(POWERPC) || defined(IA64) || defined(HPPA) || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) || defined(ARM) || defined(AVR32)
- # define TCB_WAITEXECVE 02000 /* ignore SIGTRAP after exceve */
- # endif
- # define TCB_CLONE_DETACHED 04000 /* CLONE_DETACHED set in creating syscall */
-diff --git a/linux/avr32/ioctlent.h b/linux/avr32/ioctlent.h
-new file mode 100644
-index 0000000..0f0a63d
---- /dev/null
-+++ b/linux/avr32/ioctlent.h
-@@ -0,0 +1,1268 @@
-+{"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/wireless.h", "IW_POWER_ALL_R", 0x300},
-+{"linux/in6.h", "IPV6_PRIORITY_RESERVED1", 0x300},
-+{"linux/apm_bios.h", "APM_DEVICE_PARALLEL", 0x300},
-+{"linux/hdreg.h", "HDIO_GETGEO", 0x301},
-+{"linux/ps2esdi.h", "HDIO_GETGEO", 0x301},
-+{"linux/hdreg.h", "HDIO_GET_UNMASKINTR", 0x302},
-+{"linux/hdreg.h", "HDIO_GET_MULTCOUNT", 0x304},
-+{"linux/hdreg.h", "HDIO_GET_QDMA", 0x305},
-+{"linux/hdreg.h", "HDIO_SET_XFER", 0x306},
-+{"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_GET_WCACHE", 0x30e},
-+{"linux/hdreg.h", "HDIO_GET_ACOUSTIC", 0x30f},
-+{"linux/hdreg.h", "HDIO_GET_ADDRESS", 0x310},
-+{"linux/hdreg.h", "HDIO_GET_BUSSTATE", 0x31a},
-+{"linux/hdreg.h", "HDIO_TRISTATE_HWIF", 0x31b},
-+{"linux/hdreg.h", "HDIO_DRIVE_RESET", 0x31c},
-+{"linux/hdreg.h", "HDIO_DRIVE_TASKFILE", 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_SET_WCACHE", 0x32b},
-+{"linux/hdreg.h", "HDIO_SET_ACOUSTIC", 0x32c},
-+{"linux/hdreg.h", "HDIO_SET_BUSSTATE", 0x32d},
-+{"linux/hdreg.h", "HDIO_SET_QDMA", 0x32e},
-+{"linux/hdreg.h", "HDIO_SET_ADDRESS", 0x32f},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_CARDCO_1", 0x3ec},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_A_SQUARED", 0x3ed},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_COMSPEC_COMMUNICATIONS", 0x3ee},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_ANAKIN_RESEARCH", 0x3f1},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_MICROBOTICS", 0x3f2},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_ACCESS_ASSOCIATES_ALEGRA", 0x3f4},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_EXPANSION_TECHNOLOGIES", 0x3f6},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_ASDG", 0x3ff},
-+{"linux/apm_bios.h", "APM_DEVICE_PCMCIA", 0x600},
-+{"linux/ixjuser.h", "MIXER_PORT_CD_L", 0x600},
-+{"linux/in6.h", "IPV6_PRIORITY_INTERACTIVE", 0x600},
-+{"linux/lp.h", "LPCHAR", 0x601},
-+{"linux/lp.h", "LPTIME", 0x602},
-+{"linux/lp.h", "LPABORT", 0x604},
-+{"linux/lp.h", "LPSETIRQ", 0x605},
-+{"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/som.h", "SOM_LIB_RELOC", 0x619},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_GREAT_VALLEY_PRODUCTS_1", 0x6e1},
-+{"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", "BLKTRACESTART", 0x1274},
-+{"linux/fs.h", "BLKTRACESTOP", 0x1275},
-+{"linux/fs.h", "BLKTRACETEARDOWN", 0x1276},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_APOLLO_2", 0x2200},
-+{"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},
-+{"linux/zorro_ids.h", "ZORRO_MANUF_APOLLO_3", 0x2222},
-+{"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/apm_bios.h", "APM_IOC_STANDBY", 0x4101},
-+{"linux/agpgart.h", "AGPIOC_ACQUIRE", 0x4101},
-+{"linux/apm_bios.h", "APM_IOC_SUSPEND", 0x4102},
-+{"linux/agpgart.h", "AGPIOC_RELEASE", 0x4102},
-+{"linux/pmu.h", "PMU_IOC_SLEEP", 0x4200},
-+{"linux/cciss_ioctl.h", "CCISS_REVALIDVOLS", 0x420a},
-+{"linux/cciss_ioctl.h", "CCISS_DEREGDISK", 0x420c},
-+{"linux/cciss_ioctl.h", "CCISS_REGNEWD", 0x420e},
-+{"linux/cciss_ioctl.h", "CCISS_RESCANDISK", 0x4210},
-+{"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_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/fb.h", "FBIOPUT_MODEINFO", 0x4617},
-+{"linux/fb.h", "FBIOGET_DISPINFO", 0x4618},
-+{"linux/arcfb.h", "FBIO_WAITEVENT", 0x4688},
-+{"linux/hiddev.h", "HIDIOCAPPLICATION", 0x4802},
-+{"linux/hiddev.h", "HIDIOCINITREPORT", 0x4805},
-+{"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/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/loop.h", "LOOP_SET_STATUS64", 0x4c04},
-+{"linux/loop.h", "LOOP_GET_STATUS64", 0x4c05},
-+{"linux/loop.h", "LOOP_CHANGE_FD", 0x4c06},
-+{"mtd/mtd-abi.h", "MTDFILEMODE", 0x4d13},
-+{"linux/random.h", "RNDZAPENTCNT", 0x5204},
-+{"linux/random.h", "RNDCLEARPOOL", 0x5206},
-+{"linux/cdrom.h", "CDROMPAUSE", 0x5301},
-+{"linux/n_r3964.h", "R3964_ENABLE_SIGNALS", 0x5301},
-+{"linux/n_r3964.h", "R3964_SETPRIORITY", 0x5302},
-+{"linux/cdrom.h", "CDROMRESUME", 0x5302},
-+{"linux/n_r3964.h", "R3964_USE_BCC", 0x5303},
-+{"linux/cdrom.h", "CDROMPLAYMSF", 0x5303},
-+{"linux/n_r3964.h", "R3964_READ_TELEGRAM", 0x5304},
-+{"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},
-+{"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", "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", "TIOCGHAYESESP", 0x545e},
-+{"asm/ioctls.h", "TIOCSHAYESESP", 0x545f},
-+{"asm/ioctls.h", "FIOQSIZE", 0x5460},
-+{"linux/uinput.h", "UI_DEV_CREATE", 0x5501},
-+{"linux/uinput.h", "UI_DEV_DESTROY", 0x5502},
-+{"linux/vt.h", "VT_OPENQRY", 0x5600},
-+{"linux/vt.h", "VT_GETMODE", 0x5601},
-+{"linux/videodev2.h", "VIDIOC_RESERVED", 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/vt.h", "VT_GETHIFONTMASK", 0x560d},
-+{"linux/videodev2.h", "VIDIOC_LOG_STATUS", 0x5646},
-+{"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/cm4000_cs.h", "CM_IOCSRDR", 0x6303},
-+{"linux/cm4000_cs.h", "CM_IOCARDOFF", 0x6304},
-+{"linux/chio.h", "CHIOINITELEM", 0x6311},
-+{"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/hpet.h", "HPET_IE_ON", 0x6801},
-+{"linux/hpet.h", "HPET_IE_OFF", 0x6802},
-+{"linux/hpet.h", "HPET_EPI", 0x6804},
-+{"linux/hpet.h", "HPET_DPI", 0x6805},
-+{"linux/mmtimer.h", "MMTIMER_GETOFFSET", 0x6d00},
-+{"linux/synclink.h", "MGSL_IOCSTXIDLE", 0x6d02},
-+{"linux/synclink.h", "MGSL_IOCGTXIDLE", 0x6d03},
-+{"linux/synclink.h", "MGSL_IOCTXENABLE", 0x6d04},
-+{"linux/mmtimer.h", "MMTIMER_GETBITS", 0x6d04},
-+{"linux/synclink.h", "MGSL_IOCRXENABLE", 0x6d05},
-+{"linux/mmtimer.h", "MMTIMER_MMAPAVAIL", 0x6d06},
-+{"linux/synclink.h", "MGSL_IOCTXABORT", 0x6d06},
-+{"linux/synclink.h", "MGSL_IOCGSTATS", 0x6d07},
-+{"linux/synclink.h", "MGSL_IOCLOOPTXDONE", 0x6d09},
-+{"linux/synclink.h", "MGSL_IOCSIF", 0x6d0a},
-+{"linux/synclink.h", "MGSL_IOCGIF", 0x6d0b},
-+{"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", "OLD_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_PLAY_CID", 0x71d7},
-+{"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/meye.h", "MEYEIOC_STILLCAPT", 0x76c4},
-+{"linux/videotext.h", "VTXIOCPUTPAGE", 0x8108},
-+{"linux/videotext.h", "VTXIOCSETDISP", 0x8109},
-+{"linux/videotext.h", "VTXIOCPUTSTAT", 0x810a},
-+{"linux/videotext.h", "VTXIOCCLRCACHE", 0x810b},
-+{"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", "SIOCBRADDBR", 0x89a0},
-+{"linux/sockios.h", "SIOCBRDELBR", 0x89a1},
-+{"linux/sockios.h", "SIOCBRADDIF", 0x89a2},
-+{"linux/sockios.h", "SIOCBRDELIF", 0x89a3},
-+{"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/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/videodev2.h", "VIDIOC_S_PRIORITY", 0x40015644},
-+{"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/sonypi.h", "SONYPI_IOCSBRT", 0x40017600},
-+{"linux/sonypi.h", "SONYPI_IOCSBLUE", 0x40017609},
-+{"linux/sonypi.h", "SONYPI_IOCSFAN", 0x4001760b},
-+{"linux/atmdev.h", "ATM_SETBACKEND", 0x400261f2},
-+{"linux/atmdev.h", "ATM_NEWBACKENDIF", 0x400261f3},
-+{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID", 0x40026e02},
-+{"linux/ppdev.h", "PPFCONTROL", 0x4002708e},
-+{"linux/telephony.h", "PHONE_RING_CADENCE", 0x40027186},
-+{"linux/fs.h", "BLKBSZSET", 0x40041271},
-+{"linux/radeonfb.h", "FBIO_RADEON_SET_MIRROR", 0x40044004},
-+{"linux/agpgart.h", "AGPIOC_SETUP", 0x40044103},
-+{"linux/agpgart.h", "AGPIOC_RESERVE", 0x40044104},
-+{"linux/agpgart.h", "AGPIOC_PROTECT", 0x40044105},
-+{"linux/agpgart.h", "AGPIOC_DEALLOCATE", 0x40044107},
-+{"linux/agpgart.h", "AGPIOC_BIND", 0x40044108},
-+{"linux/agpgart.h", "AGPIOC_UNBIND", 0x40044109},
-+{"linux/pmu.h", "PMU_IOC_SET_BACKLIGHT", 0x40044202},
-+{"linux/cciss_ioctl.h", "CCISS_REGNEWDISK", 0x4004420d},
-+{"linux/input.h", "EVIOCRMFF", 0x40044581},
-+{"linux/input.h", "EVIOCGRAB", 0x40044590},
-+{"linux/matroxfb.h", "FBIO_WAITFORVSYNC", 0x40044620},
-+{"linux/hiddev.h", "HIDIOCSFLAG", 0x4004480f},
-+{"mtd/mtd-abi.h", "OTPGETREGIONCOUNT", 0x40044d0e},
-+{"linux/ticable.h", "IOCTL_TIUSB_TIMEOUT", 0x40044e20},
-+{"linux/ticable.h", "IOCTL_TIUSB_RESET_DEVICE", 0x40044e21},
-+{"linux/ticable.h", "IOCTL_TIUSB_RESET_PIPES", 0x40044e22},
-+{"linux/random.h", "RNDADDTOENTCNT", 0x40045201},
-+{"asm/ioctls.h", "TIOCSPTLCK", 0x40045431},
-+{"linux/if_tun.h", "TUNSETNOCSUM", 0x400454c8},
-+{"linux/if_tun.h", "TUNSETDEBUG", 0x400454c9},
-+{"linux/if_tun.h", "TUNSETIFF", 0x400454ca},
-+{"linux/if_tun.h", "TUNSETPERSIST", 0x400454cb},
-+{"linux/if_tun.h", "TUNSETOWNER", 0x400454cc},
-+{"linux/if_tun.h", "TUNSETLINK", 0x400454cd},
-+{"linux/uinput.h", "UI_SET_EVBIT", 0x40045564},
-+{"linux/uinput.h", "UI_SET_KEYBIT", 0x40045565},
-+{"linux/uinput.h", "UI_SET_RELBIT", 0x40045566},
-+{"linux/uinput.h", "UI_SET_ABSBIT", 0x40045567},
-+{"linux/uinput.h", "UI_SET_MSCBIT", 0x40045568},
-+{"linux/uinput.h", "UI_SET_LEDBIT", 0x40045569},
-+{"linux/uinput.h", "UI_SET_SNDBIT", 0x4004556a},
-+{"linux/uinput.h", "UI_SET_FFBIT", 0x4004556b},
-+{"linux/uinput.h", "UI_SET_PHYS", 0x4004556c},
-+{"linux/uinput.h", "UI_SET_SWBIT", 0x4004556d},
-+{"linux/videodev2.h", "VIDIOC_OVERLAY", 0x4004560e},
-+{"linux/videodev2.h", "VIDIOC_STREAMON", 0x40045612},
-+{"linux/videodev2.h", "VIDIOC_STREAMOFF", 0x40045613},
-+{"linux/atmdev.h", "ATM_SETSC", 0x400461f1},
-+{"linux/atmdev.h", "ATM_DROPPARTY", 0x400461f5},
-+{"linux/cm4000_cs.h", "CM_IOCSPTS", 0x40046302},
-+{"linux/chio.h", "CHIOSPICKER", 0x40046305},
-+{"linux/cm4000_cs.h", "CM_IOSDBGLVL", 0x400463fa},
-+{"linux/video_decoder.h", "DECODER_SET_NORM", 0x40046403},
-+{"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_decoder.h", "DECODER_SET_GPIO", 0x40046408},
-+{"linux/video_decoder.h", "DECODER_SET_VBI_BYPASS", 0x4004640a},
-+{"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/ext3_fs.h", "EXT3_IOC_SETFLAGS", 0x40046602},
-+{"linux/ext2_fs.h", "EXT2_IOC_SETFLAGS", 0x40046602},
-+{"linux/iflags.h", "IFLAGS_SET_IOC", 0x40046602},
-+{"linux/ext3_fs.h", "EXT3_IOC_SETVERSION", 0x40046604},
-+{"linux/ext3_fs.h", "EXT3_IOC_SETRSVSZ", 0x40046606},
-+{"linux/ext3_fs.h", "EXT3_IOC_GROUP_EXTEND", 0x40046607},
-+{"linux/hpet.h", "HPET_IRQFREQ", 0x40046806},
-+{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID2", 0x40046e02},
-+{"linux/ncp_fs.h", "NCP_IOC_SET_SIGN_WANTED", 0x40046e06},
-+{"linux/ncp_fs.h", "NCP_IOC_GETDENTRYTTL", 0x40046e0c},
-+{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_CONNECTION", 0x40046ef8},
-+{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_MODE", 0x40046efa},
-+{"linux/rtc.h", "RTC_IRQP_SET", 0x4004700c},
-+{"linux/rtc.h", "RTC_EPOCH_SET", 0x4004700e},
-+{"linux/ppdev.h", "PPSETMODE", 0x40047080},
-+{"linux/ppdev.h", "PPDATADIR", 0x40047090},
-+{"linux/ppdev.h", "PPNEGOT", 0x40047091},
-+{"linux/ppdev.h", "PPSETPHASE", 0x40047094},
-+{"linux/ppdev.h", "PPSETFLAGS", 0x4004709b},
-+{"linux/ticable.h", "IOCTL_TISER_DELAY", 0x400470a0},
-+{"linux/ticable.h", "IOCTL_TISER_TIMEOUT", 0x400470a1},
-+{"linux/ticable.h", "IOCTL_TIPAR_DELAY", 0x400470a8},
-+{"linux/ticable.h", "IOCTL_TIPAR_TIMEOUT", 0x400470a9},
-+{"linux/serio.h", "SPIOCSTYPE", 0x40047101},
-+{"linux/telephony.h", "PHONE_CAPABILITIES_CHECK", 0x40047182},
-+{"linux/telephony.h", "PHONE_RING_START", 0x40047187},
-+{"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/telephony.h", "PHONE_VAD", 0x400471a9},
-+{"linux/telephony.h", "PHONE_WINK", 0x400471aa},
-+{"linux/ixjuser.h", "IXJCTL_SET_FILTER", 0x400471c7},
-+{"linux/ixjuser.h", "IXJCTL_GET_FILTER_HIST", 0x400471c8},
-+{"linux/ixjuser.h", "IXJCTL_INIT_TONE", 0x400471c9},
-+{"linux/ixjuser.h", "IXJCTL_TONE_CADENCE", 0x400471ca},
-+{"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_FILTER_CADENCE", 0x400471d6},
-+{"linux/ixjuser.h", "IXJCTL_CIDCW", 0x400471d9},
-+{"linux/telephony.h", "PHONE_REC_VOLUME_LINEAR", 0x400471db},
-+{"linux/telephony.h", "PHONE_PLAY_VOLUME_LINEAR", 0x400471dc},
-+{"linux/ixjuser.h", "IXJCTL_SET_FILTER_RAW", 0x400471dd},
-+{"linux/ixjuser.h", "IXJCTL_HZ", 0x400471e0},
-+{"linux/ixjuser.h", "IXJCTL_RATE", 0x400471e1},
-+{"linux/ixjuser.h", "IXJCTL_DTMF_PRESCALE", 0x400471e8},
-+{"linux/ixjuser.h", "IXJCTL_SIGCTL", 0x400471e9},
-+{"linux/ixjuser.h", "IXJCTL_SC_RXG", 0x400471ea},
-+{"linux/ixjuser.h", "IXJCTL_SC_TXG", 0x400471eb},
-+{"linux/ixjuser.h", "IXJCTL_INTERCOM_START", 0x400471fd},
-+{"linux/ixjuser.h", "IXJCTL_INTERCOM_STOP", 0x400471fe},
-+{"linux/msdos_fs.h", "FAT_IOCTL_SET_ATTRIBUTES", 0x40047211},
-+{"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/ext2_fs.h", "EXT2_IOC_SETVERSION", 0x40047602},
-+{"linux/ext3_fs.h", "EXT3_IOC_SETVERSION_OLD", 0x40047602},
-+{"linux/videodev.h", "VIDIOCCAPTURE", 0x40047608},
-+{"linux/videodev.h", "VIDIOCSFREQ", 0x4004760f},
-+{"linux/videodev.h", "VIDIOCSYNC", 0x40047612},
-+{"linux/videodev.h", "VIDIOCSWRITEMODE", 0x40047619},
-+{"linux/meye.h", "MEYEIOC_QBUF_CAPT", 0x400476c2},
-+{"linux/videotext.h", "VTXIOCSETVIRT", 0x4004810c},
-+{"linux/dn.h", "OSIOCSNETADDR", 0x400489e0},
-+{"linux/dn.h", "SIOCSNETADDR", 0x400489e0},
-+{"linux/auto_fs4.h", "AUTOFS_IOC_EXPIRE_MULTI", 0x40049366},
-+{"linux/if_pppox.h", "PPPOEIOCSFWD", 0x4004b100},
-+{"linux/gigaset_dev.h", "GIGASET_BRKCHARS", 0x40064702},
-+{"linux/meye.h", "MEYEIOC_S_PARAMS", 0x400676c1},
-+{"linux/cciss_ioctl.h", "CCISS_SETINTINFO", 0x40084203},
-+{"linux/input.h", "EVIOCSREP", 0x40084503},
-+{"linux/input.h", "EVIOCSKEYCODE", 0x40084504},
-+{"mtd/mtd-abi.h", "MEMERASE", 0x40084d02},
-+{"mtd/mtd-abi.h", "MEMLOCK", 0x40084d05},
-+{"mtd/mtd-abi.h", "MEMUNLOCK", 0x40084d06},
-+{"mtd/mtd-abi.h", "MEMGETBADBLOCK", 0x40084d0b},
-+{"mtd/mtd-abi.h", "MEMSETBADBLOCK", 0x40084d0c},
-+{"linux/random.h", "RNDADDENTROPY", 0x40085203},
-+{"linux/videodev2.h", "VIDIOC_S_STD", 0x40085618},
-+{"linux/videodev2.h", "VIDIOC_S_CTRL_OLD", 0x4008561c},
-+{"linux/atmdev.h", "ATM_GETNAMES", 0x40086183},
-+{"linux/atmdev.h", "ATM_ADDPARTY", 0x400861f4},
-+{"linux/chio.h", "CHIOGSTATUS", 0x40086308},
-+{"linux/video_decoder.h", "DECODER_INIT", 0x40086409},
-+{"linux/mtio.h", "MTIOCTOP", 0x40086d01},
-+{"linux/ppdev.h", "PPSETTIME", 0x40087096},
-+{"linux/if_ppp.h", "PPPIOCSACTIVE", 0x40087446},
-+{"linux/if_ppp.h", "PPPIOCSPASS", 0x40087447},
-+{"linux/if_ppp.h", "PPPIOCSNPMODE", 0x4008744b},
-+{"linux/fd.h", "FDFMTTRK", 0x400c0248},
-+{"linux/capi.h", "CAPI_REGISTER", 0x400c4301},
-+{"linux/hiddev.h", "HIDIOCGREPORT", 0x400c4807},
-+{"linux/hiddev.h", "HIDIOCSREPORT", 0x400c4808},
-+{"mtd/mtd-abi.h", "OTPGETREGIONINFO", 0x400c4d0f},
-+{"linux/uinput.h", "UI_END_FF_ERASE", 0x400c55cb},
-+{"linux/ite_gpio.h", "ITE_GPIO_OUT", 0x400c5a01},
-+{"linux/ite_gpio.h", "ITE_GPIO_INT_CTRL", 0x400c5a02},
-+{"linux/ite_gpio.h", "ITE_GPIO_IN_STATUS", 0x400c5a03},
-+{"linux/ite_gpio.h", "ITE_GPIO_OUT_STATUS", 0x400c5a04},
-+{"linux/ite_gpio.h", "ITE_GPIO_GEN_CTRL", 0x400c5a05},
-+{"linux/ite_gpio.h", "ITE_GPIO_INT_WAIT", 0x400c5a06},
-+{"linux/atm_idt77105.h", "IDT77105_GETSTAT", 0x400c6132},
-+{"linux/atm_idt77105.h", "IDT77105_GETSTATZ", 0x400c6133},
-+{"linux/atmdev.h", "ATM_GETSTAT", 0x400c6150},
-+{"linux/atmdev.h", "ATM_GETSTATZ", 0x400c6151},
-+{"linux/atmdev.h", "ATM_GETLOOP", 0x400c6152},
-+{"linux/atmdev.h", "ATM_SETLOOP", 0x400c6153},
-+{"linux/atmdev.h", "ATM_QUERYLOOP", 0x400c6154},
-+{"linux/atm_eni.h", "ENI_MEMDUMP", 0x400c6160},
-+{"linux/atm_he.h", "HE_GET_REG", 0x400c6160},
-+{"linux/atm_zatm.h", "ZATM_GETPOOL", 0x400c6161},
-+{"linux/atm_zatm.h", "ZATM_GETPOOLZ", 0x400c6162},
-+{"linux/atm_nicstar.h", "NS_SETBUFLEV", 0x400c6162},
-+{"linux/atm_zatm.h", "ZATM_SETPOOL", 0x400c6163},
-+{"linux/atm_eni.h", "ENI_SETMULT", 0x400c6167},
-+{"linux/atmdev.h", "ATM_GETLINKRATE", 0x400c6181},
-+{"linux/atmdev.h", "ATM_GETTYPE", 0x400c6184},
-+{"linux/atmdev.h", "ATM_GETESI", 0x400c6185},
-+{"linux/atmdev.h", "ATM_GETADDR", 0x400c6186},
-+{"linux/atmdev.h", "ATM_RSTADDR", 0x400c6187},
-+{"linux/atmdev.h", "ATM_ADDADDR", 0x400c6188},
-+{"linux/atmdev.h", "ATM_DELADDR", 0x400c6189},
-+{"linux/atmdev.h", "ATM_GETCIRANGE", 0x400c618a},
-+{"linux/atmdev.h", "ATM_SETCIRANGE", 0x400c618b},
-+{"linux/atmdev.h", "ATM_SETESI", 0x400c618c},
-+{"linux/atmdev.h", "ATM_SETESIF", 0x400c618d},
-+{"linux/atmdev.h", "ATM_ADDLECSADDR", 0x400c618e},
-+{"linux/atmdev.h", "ATM_DELLECSADDR", 0x400c618f},
-+{"linux/atmdev.h", "ATM_GETLECSADDR", 0x400c6190},
-+{"linux/chio.h", "CHIOPOSITION", 0x400c6303},
-+{"linux/i2o-dev.h", "I2OEVTREG", 0x400c690a},
-+{"linux/ncp_fs.h", "NCP_IOC_GETROOT", 0x400c6e08},
-+{"linux/if_ppp.h", "PPPIOCSCOMPRESS", 0x400c744d},
-+{"linux/videodev.h", "VIDIOCSPLAYMODE", 0x400c7618},
-+{"linux/video_decoder.h", "DECODER_SET_PICTURE", 0x400e6407},
-+{"linux/videodev.h", "VIDIOCSPICT", 0x400e7607},
-+{"linux/cciss_ioctl.h", "CCISS_SETNODENAME", 0x40104205},
-+{"linux/synclink.h", "MGSL_IOCSGPIO", 0x40106d10},
-+{"linux/videodev.h", "VIDIOCMCAPTURE", 0x40107613},
-+{"linux/fd.h", "FDSETMAXERRS", 0x4014024c},
-+{"linux/videodev2.h", "VIDIOC_S_CROP", 0x4014563c},
-+{"linux/chio.h", "CHIOMOVE", 0x40146301},
-+{"linux/videodev.h", "VIDIOCSFBUF", 0x4014760c},
-+{"linux/videodev.h", "VIDIOCSCAPTURE", 0x40147617},
-+{"linux/hiddev.h", "HIDIOCSUSAGE", 0x4018480c},
-+{"linux/hiddev.h", "HIDIOCGCOLLECTIONINDEX", 0x40184810},
-+{"linux/ext3_fs.h", "EXT3_IOC_GROUP_ADD", 0x40186608},
-+{"linux/videodev.h", "VIDIOCSMICROCODE", 0x4018761b},
-+{"linux/fd.h", "FDSETPRM", 0x401c0242},
-+{"linux/fd.h", "FDDEFPRM", 0x401c0243},
-+{"linux/atmbr2684.h", "BR2684_SETFILT", 0x401c6190},
-+{"linux/chio.h", "CHIOEXCHANGE", 0x401c6302},
-+{"linux/rtc.h", "RTC_PLL_SET", 0x401c7012},
-+{"linux/synclink.h", "MGSL_IOCSPARAMS", 0x40206d00},
-+{"linux/if_ppp.h", "PPPIOCSXASYNCMAP", 0x4020744f},
-+{"linux/videodev.h", "VIDIOCSWIN", 0x4020760a},
-+{"linux/videodev.h", "VIDIOCSVBIFMT", 0x4020761d},
-+{"linux/videotext.h", "VTXIOCCLRPAGE", 0x40208102},
-+{"linux/videotext.h", "VTXIOCCLRFOUND", 0x40208103},
-+{"linux/videotext.h", "VTXIOCPAGEREQ", 0x40208104},
-+{"linux/videotext.h", "VTXIOCGETSTAT", 0x40208105},
-+{"linux/videotext.h", "VTXIOCGETPAGE", 0x40208106},
-+{"linux/videotext.h", "VTXIOCSTOPDAU", 0x40208107},
-+{"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/smb_fs.h", "SMB_IOC_NEWCONN", 0x40287502},
-+{"linux/videodev.h", "VIDIOCSAUDIO", 0x40287611},
-+{"linux/videodev2.h", "VIDIOC_S_FBUF", 0x402c560b},
-+{"linux/videodev2.h", "VIDIOC_S_FREQUENCY", 0x402c5639},
-+{"linux/chio.h", "CHIOSVOLTAG", 0x40306312},
-+{"linux/videodev.h", "VIDIOCSCHAN", 0x40307603},
-+{"linux/uinput.h", "UI_END_FF_UPLOAD", 0x403455c9},
-+{"linux/videodev2.h", "VIDIOC_S_AUDIO", 0x40345622},
-+{"linux/videodev2.h", "VIDIOC_S_AUDOUT", 0x40345632},
-+{"linux/videodev.h", "VIDIOCSTUNER", 0x40347605},
-+{"linux/joystick.h", "JSIOCSAXMAP", 0x40406a31},
-+{"linux/videodev2.h", "VIDIOC_S_MODULATOR", 0x40445637},
-+{"linux/videodev2.h", "VIDIOC_S_TUNER", 0x4054561e},
-+{"linux/fd.h", "FDSETDRVPRM", 0x40580290},
-+{"linux/chio.h", "CHIOGELEM", 0x406c6310},
-+{"linux/videodev2.h", "VIDIOC_S_JPEGCOMP", 0x408c563e},
-+{"mtd/mtd-abi.h", "MEMSETOOBSEL", 0x40c84d09},
-+{"linux/videodev2.h", "VIDIOC_S_PARM_OLD", 0x40cc5616},
-+{"linux/joystick.h", "JSIOCSBTNMAP", 0x42006a33},
-+{"linux/hiddev.h", "HIDIOCSUSAGES", 0x501c4814},
-+{"linux/videodev2.h", "VIDIOC_G_PRIORITY", 0x80015643},
-+{"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/sonypi.h", "SONYPI_IOCGBRT", 0x80017600},
-+{"linux/sonypi.h", "SONYPI_IOCGBATFLAGS", 0x80017607},
-+{"linux/sonypi.h", "SONYPI_IOCGBLUE", 0x80017608},
-+{"linux/sonypi.h", "SONYPI_IOCGFAN", 0x8001760a},
-+{"linux/sonypi.h", "SONYPI_IOCGTEMP", 0x8001760c},
-+{"linux/capi.h", "CAPI_GET_ERRCODE", 0x80024321},
-+{"linux/capi.h", "CAPI_INSTALLED", 0x80024322},
-+{"linux/ipmi.h", "IPMICTL_REGISTER_FOR_CMD", 0x8002690e},
-+{"linux/ipmi.h", "IPMICTL_UNREGISTER_FOR_CMD", 0x8002690f},
-+{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID", 0x80027501},
-+{"linux/sonypi.h", "SONYPI_IOCGBAT1CAP", 0x80027602},
-+{"linux/sonypi.h", "SONYPI_IOCGBAT1REM", 0x80027603},
-+{"linux/sonypi.h", "SONYPI_IOCGBAT2CAP", 0x80027604},
-+{"linux/sonypi.h", "SONYPI_IOCGBAT2REM", 0x80027605},
-+{"linux/fs.h", "BLKBSZGET", 0x80041270},
-+{"linux/fs.h", "BLKGETSIZE64", 0x80041272},
-+{"linux/radeonfb.h", "FBIO_RADEON_GET_MIRROR", 0x80044003},
-+{"linux/agpgart.h", "AGPIOC_INFO", 0x80044100},
-+{"linux/pmu.h", "PMU_IOC_GET_BACKLIGHT", 0x80044201},
-+{"linux/pmu.h", "PMU_IOC_GET_MODEL", 0x80044203},
-+{"linux/pmu.h", "PMU_IOC_HAS_ADB", 0x80044204},
-+{"linux/pmu.h", "PMU_IOC_CAN_SLEEP", 0x80044205},
-+{"linux/pmu.h", "PMU_IOC_GRAB_BACKLIGHT", 0x80044206},
-+{"linux/cciss_ioctl.h", "CCISS_GETHEARTBEAT", 0x80044206},
-+{"linux/cciss_ioctl.h", "CCISS_GETBUSTYPES", 0x80044207},
-+{"linux/cciss_ioctl.h", "CCISS_GETFIRMVER", 0x80044208},
-+{"linux/cciss_ioctl.h", "CCISS_GETDRIVVER", 0x80044209},
-+{"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},
-+{"linux/input.h", "EVIOCGVERSION", 0x80044501},
-+{"linux/input.h", "EVIOCGEFFECTS", 0x80044584},
-+{"linux/arcfb.h", "FBIO_GETCONTROL2", 0x80044689},
-+{"linux/hiddev.h", "HIDIOCGVERSION", 0x80044801},
-+{"linux/hiddev.h", "HIDIOCGFLAG", 0x8004480e},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_VOLUME", 0x80044d00},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_BASS", 0x80044d01},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_TREBLE", 0x80044d02},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_SYNTH", 0x80044d03},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_PCM", 0x80044d04},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_SPEAKER", 0x80044d05},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_LINE", 0x80044d06},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_MIC", 0x80044d07},
-+{"mtd/mtd-abi.h", "MEMGETREGIONCOUNT", 0x80044d07},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_CD", 0x80044d08},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_IMIX", 0x80044d09},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_ALTPCM", 0x80044d0a},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_RECLEV", 0x80044d0b},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_IGAIN", 0x80044d0c},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_OGAIN", 0x80044d0d},
-+{"mtd/mtd-abi.h", "OTPSELECT", 0x80044d0d},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_LINE1", 0x80044d0e},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_LINE2", 0x80044d0f},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_LINE3", 0x80044d10},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_LOUD", 0x80044d1f},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_ENHANCE", 0x80044d1f},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_MUTE", 0x80044d1f},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_STEREODEVS", 0x80044dfb},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_CAPS", 0x80044dfc},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_RECMASK", 0x80044dfd},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_DEVMASK", 0x80044dfe},
-+{"linux/soundcard.h", "SOUND_MIXER_READ_RECSRC", 0x80044dff},
-+{"linux/ticable.h", "IOCTL_TIUSB_GET_MAXPS", 0x80044e23},
-+{"linux/ticable.h", "IOCTL_TIUSB_GET_DEVID", 0x80044e24},
-+{"linux/random.h", "RNDGETENTCNT", 0x80045200},
-+{"asm/ioctls.h", "TIOCGPTN", 0x80045430},
-+{"linux/videodev2.h", "VIDIOC_G_INPUT", 0x80045626},
-+{"linux/videodev2.h", "VIDIOC_G_OUTPUT", 0x8004562e},
-+{"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/watchdog.h", "WDIOC_GETTIMEOUT", 0x80045707},
-+{"linux/watchdog.h", "WDIOC_GETPRETIMEOUT", 0x80045709},
-+{"linux/watchdog.h", "WDIOC_GETTIMELEFT", 0x8004570a},
-+{"linux/sonet.h", "SONET_GETDIAG", 0x80046114},
-+{"linux/sonet.h", "SONET_GETFRAMING", 0x80046116},
-+{"linux/cm4000_cs.h", "CM_IOCGSTATUS", 0x80046300},
-+{"linux/chio.h", "CHIOGPICKER", 0x80046304},
-+{"linux/video_decoder.h", "DECODER_GET_STATUS", 0x80046402},
-+{"linux/iflags.h", "IFLAGS_GET_IOC", 0x80046601},
-+{"linux/ext3_fs.h", "EXT3_IOC_GETFLAGS", 0x80046601},
-+{"linux/ext2_fs.h", "EXT2_IOC_GETFLAGS", 0x80046601},
-+{"linux/ext3_fs.h", "EXT3_IOC_GETVERSION", 0x80046603},
-+{"linux/ext3_fs.h", "EXT3_IOC_GETRSVSZ", 0x80046605},
-+{"linux/ext3_fs.h", "EXT3_IOC_WAIT_FOR_READONLY", 0x80046663},
-+{"linux/i2o-dev.h", "I2OVALIDATE", 0x80046908},
-+{"linux/ipmi.h", "IPMICTL_SET_GETS_EVENTS_CMD", 0x80046910},
-+{"linux/ipmi.h", "IPMICTL_SET_MY_ADDRESS_CMD", 0x80046911},
-+{"linux/ipmi.h", "IPMICTL_GET_MY_ADDRESS_CMD", 0x80046912},
-+{"linux/ipmi.h", "IPMICTL_SET_MY_LUN_CMD", 0x80046913},
-+{"linux/ipmi.h", "IPMICTL_GET_MY_LUN_CMD", 0x80046914},
-+{"linux/ipmi.h", "IPMICTL_SET_MY_CHANNEL_ADDRESS_CMD", 0x80046918},
-+{"linux/ipmi.h", "IPMICTL_GET_MY_CHANNEL_ADDRESS_CMD", 0x80046919},
-+{"linux/ipmi.h", "IPMICTL_SET_MY_CHANNEL_LUN_CMD", 0x8004691a},
-+{"linux/ipmi.h", "IPMICTL_GET_MY_CHANNEL_LUN_CMD", 0x8004691b},
-+{"linux/i8k.h", "I8K_BIOS_VERSION", 0x80046980},
-+{"linux/i8k.h", "I8K_MACHINE_ID", 0x80046981},
-+{"linux/i8k.h", "I8K_POWER_STATUS", 0x80046982},
-+{"linux/i8k.h", "I8K_FN_STATUS", 0x80046983},
-+{"linux/i8k.h", "I8K_GET_TEMP", 0x80046984},
-+{"linux/joystick.h", "JSIOCGVERSION", 0x80046a01},
-+{"linux/udf_fs_i.h", "UDF_GETEASIZE", 0x80046c40},
-+{"linux/udf_fs_i.h", "UDF_GETEABLOCK", 0x80046c41},
-+{"linux/udf_fs_i.h", "UDF_GETVOLIDENT", 0x80046c42},
-+{"linux/mmtimer.h", "MMTIMER_GETRES", 0x80046d01},
-+{"linux/mmtimer.h", "MMTIMER_GETFREQ", 0x80046d02},
-+{"linux/mtio.h", "MTIOCPOS", 0x80046d03},
-+{"linux/mmtimer.h", "MMTIMER_GETCOUNTER", 0x80046d09},
-+{"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/matroxfb.h", "MATROXFB_GET_OUTPUT_CONNECTION", 0x80046ef8},
-+{"linux/matroxfb.h", "MATROXFB_GET_AVAILABLE_OUTPUTS", 0x80046ef9},
-+{"linux/matroxfb.h", "MATROXFB_GET_ALL_OUTPUTS", 0x80046efb},
-+{"linux/rtc.h", "RTC_IRQP_READ", 0x8004700b},
-+{"linux/rtc.h", "RTC_EPOCH_READ", 0x8004700d},
-+{"linux/ppdev.h", "PPCLRIRQ", 0x80047093},
-+{"linux/ppdev.h", "PPGETMODES", 0x80047097},
-+{"linux/ppdev.h", "PPGETMODE", 0x80047098},
-+{"linux/ppdev.h", "PPGETPHASE", 0x80047099},
-+{"linux/ppdev.h", "PPGETFLAGS", 0x8004709a},
-+{"linux/telephony.h", "PHONE_CAPABILITIES_LIST", 0x80047181},
-+{"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/ixjuser.h", "IXJCTL_CID", 0x800471d4},
-+{"linux/ixjuser.h", "IXJCTL_VMWI", 0x800471d8},
-+{"linux/ixjuser.h", "IXJCTL_VERSION", 0x800471da},
-+{"linux/ixjuser.h", "IXJCTL_FRAMES_READ", 0x800471e2},
-+{"linux/ixjuser.h", "IXJCTL_FRAMES_WRITTEN", 0x800471e3},
-+{"linux/ixjuser.h", "IXJCTL_READ_WAIT", 0x800471e4},
-+{"linux/ixjuser.h", "IXJCTL_WRITE_WAIT", 0x800471e5},
-+{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_READ", 0x800471e6},
-+{"linux/msdos_fs.h", "FAT_IOCTL_GET_ATTRIBUTES", 0x80047210},
-+{"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_GETMOUNTUID32", 0x80047503},
-+{"linux/ext2_fs.h", "EXT2_IOC_GETVERSION", 0x80047601},
-+{"linux/ext3_fs.h", "EXT3_IOC_GETVERSION_OLD", 0x80047601},
-+{"linux/videodev.h", "VIDIOCGFREQ", 0x8004760e},
-+{"linux/meye.h", "MEYEIOC_STILLJCAPT", 0x800476c5},
-+{"linux/dn.h", "SIOCGNETADDR", 0x800489e1},
-+{"linux/dn.h", "OSIOCGNETADDR", 0x800489e1},
-+{"linux/auto_fs.h", "AUTOFS_IOC_PROTOVER", 0x80049363},
-+{"linux/auto_fs4.h", "AUTOFS_IOC_PROTOSUBVER", 0x80049367},
-+{"linux/auto_fs4.h", "AUTOFS_IOC_ASKREGHOST", 0x80049368},
-+{"linux/auto_fs4.h", "AUTOFS_IOC_TOGGLEREGHOST", 0x80049369},
-+{"linux/auto_fs4.h", "AUTOFS_IOC_ASKUMOUNT", 0x80049370},
-+{"linux/sonet.h", "SONET_GETFRSENSE", 0x80066117},
-+{"linux/meye.h", "MEYEIOC_G_PARAMS", 0x800676c0},
-+{"linux/cciss_ioctl.h", "CCISS_GETPCIINFO", 0x80084201},
-+{"linux/cciss_ioctl.h", "CCISS_GETINTINFO", 0x80084202},
-+{"linux/input.h", "EVIOCGID", 0x80084502},
-+{"linux/input.h", "EVIOCGREP", 0x80084503},
-+{"linux/input.h", "EVIOCGKEYCODE", 0x80084504},
-+{"linux/random.h", "RNDGETPOOL", 0x80085202},
-+{"linux/videodev2.h", "VIDIOC_G_STD", 0x80085617},
-+{"linux/videodev2.h", "VIDIOC_QUERYSTD", 0x8008563f},
-+{"linux/i2o-dev.h", "I2OPASSTHRU", 0x8008690c},
-+{"linux/i2o-dev.h", "I2OPASSTHRU32", 0x8008690c},
-+{"linux/ipmi.h", "IPMICTL_SET_TIMING_PARMS_CMD", 0x80086916},
-+{"linux/ipmi.h", "IPMICTL_GET_TIMING_PARMS_CMD", 0x80086917},
-+{"linux/mtio.h", "MTIOCGETSIZE", 0x80086d09},
-+{"linux/ncp_fs.h", "NCP_IOC_SETPRIVATEDATA", 0x80086e0a},
-+{"linux/ppdev.h", "PPGETTIME", 0x80087095},
-+{"linux/if_ppp.h", "PPPIOCGIDLE", 0x8008743f},
-+{"linux/cciss_ioctl.h", "CCISS_GETLUNINFO", 0x800c4211},
-+{"mtd/mtd-abi.h", "OTPLOCK", 0x800c4d10},
-+{"linux/video_decoder.h", "DECODER_GET_CAPABILITIES", 0x800c6401},
-+{"linux/video_encoder.h", "ENCODER_GET_CAPABILITIES", 0x800c6501},
-+{"linux/hpet.h", "HPET_INFO", 0x800c6803},
-+{"linux/ncp_fs.h", "NCP_IOC_NCPREQUEST", 0x800c6e01},
-+{"linux/ncp_fs.h", "NCP_IOC_SETROOT", 0x800c6e08},
-+{"linux/ncp_fs.h", "NCP_IOC_SETOBJECTNAME", 0x800c6e09},
-+{"linux/videodev.h", "VIDIOCKEY", 0x800c760d},
-+{"linux/videodev.h", "VIDIOCGPICT", 0x800e7606},
-+{"linux/fd.h", "FDGETDRVTYP", 0x8010020f},
-+{"linux/cciss_ioctl.h", "CCISS_GETNODENAME", 0x80104204},
-+{"mtd/mtd-abi.h", "ECCGETSTATS", 0x80104d12},
-+{"linux/synclink.h", "MGSL_IOCGGPIO", 0x80106d11},
-+{"linux/isdn_ppp.h", "PPPIOCGIFNAME", 0x80107488},
-+{"linux/videotext.h", "VTXIOCGETINFO", 0x80108101},
-+{"linux/fd.h", "FDGETMAXERRS", 0x8014020e},
-+{"linux/chio.h", "CHIOGPARAMS", 0x80146306},
-+{"linux/ipmi.h", "IPMICTL_SEND_COMMAND", 0x8014690d},
-+{"linux/mtio.h", "MTIOCVOLINFO", 0x80146d08},
-+{"linux/ncp_fs.h", "NCP_IOC_LOCKUNLOCK", 0x80146e07},
-+{"linux/videodev.h", "VIDIOCGFBUF", 0x8014760b},
-+{"linux/videodev.h", "VIDIOCGUNIT", 0x80147615},
-+{"linux/videodev.h", "VIDIOCGCAPTURE", 0x80147616},
-+{"linux/fd.h", "FDWERRORGET", 0x80180217},
-+{"linux/ncp_fs.h", "NCP_IOC_SIGN_INIT", 0x80186e05},
-+{"linux/fd.h", "FDGETPRM", 0x801c0204},
-+{"linux/hiddev.h", "HIDIOCGDEVINFO", 0x801c4803},
-+{"linux/ipmi.h", "IPMICTL_SEND_COMMAND_SETTIME", 0x801c6915},
-+{"linux/mtio.h", "MTIOCGET", 0x801c6d02},
-+{"linux/rtc.h", "RTC_PLL_GET", 0x801c7011},
-+{"linux/fd.h", "FDGETFDCSTAT", 0x80200215},
-+{"linux/fb.h", "FBIOGET_VBLANK", 0x80204612},
-+{"mtd/mtd-abi.h", "MEMGETINFO", 0x80204d01},
-+{"linux/i2o-dev.h", "I2OGETIOPS", 0x80206900},
-+{"linux/synclink.h", "MGSL_IOCGPARAMS", 0x80206d01},
-+{"linux/if_ppp.h", "PPPIOCGXASYNCMAP", 0x80207450},
-+{"linux/isdn_ppp.h", "PPPIOCGCOMPRESSORS", 0x80207486},
-+{"linux/videodev.h", "VIDIOCGWIN", 0x80207609},
-+{"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/watchdog.h", "WDIOC_GETSUPPORT", 0x80285700},
-+{"linux/rtc.h", "RTC_WKALM_RD", 0x80287010},
-+{"linux/videodev.h", "VIDIOCGAUDIO", 0x80287610},
-+{"linux/ncp_fs.h", "NCP_IOC_SETCHARSETS", 0x802a6e0b},
-+{"linux/videodev2.h", "VIDIOC_G_FBUF", 0x802c560a},
-+{"linux/videodev2.h", "VIDIOC_CROPCAP_OLD", 0x802c563a},
-+{"linux/fd.h", "FDGETDRVSTAT", 0x80340212},
-+{"linux/fd.h", "FDPOLLDRVSTAT", 0x80340213},
-+{"linux/videodev2.h", "VIDIOC_G_AUDIO", 0x80345621},
-+{"linux/videodev2.h", "VIDIOC_G_AUDOUT", 0x80345631},
-+{"linux/videodev.h", "VIDIOCGCAP", 0x803c7601},
-+{"linux/joystick.h", "JSIOCGAXMAP", 0x80406a32},
-+{"linux/fd.h", "FDGETDRVPRM", 0x80580211},
-+{"linux/videodev2.h", "VIDIOC_QUERYCAP", 0x80685600},
-+{"linux/i2o-dev.h", "I2OEVTGET", 0x8068690b},
-+{"linux/chio.h", "CHIOGVPARAMS", 0x80706313},
-+{"linux/videodev2.h", "VIDIOC_G_SLICED_VBI_CAP", 0x80745645},
-+{"linux/videodev.h", "VIDIOCGMBUF", 0x80887614},
-+{"linux/videodev2.h", "VIDIOC_G_JPEGCOMP", 0x808c563d},
-+{"mtd/mtd-abi.h", "MEMGETOOBSEL", 0x80c84d0a},
-+{"linux/hiddev.h", "HIDIOCGSTRING", 0x81044804},
-+{"linux/auto_fs.h", "AUTOFS_IOC_EXPIRE", 0x810c9365},
-+{"linux/videodev.h", "VIDIOCGPLAYINFO", 0x8118761a},
-+{"mtd/mtd-abi.h", "ECCGETLAYOUT", 0x81484d11},
-+{"linux/joystick.h", "JSIOCGBTNMAP", 0x82006a34},
-+{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_BOTH", 0x82187201},
-+{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_SHORT", 0x82187202},
-+{"linux/agpgart.h", "AGPIOC_ALLOCATE", 0xc0044106},
-+{"linux/capi.h", "CAPI_GET_MANUFACTURER", 0xc0044306},
-+{"linux/capi.h", "CAPI_GET_SERIAL", 0xc0044308},
-+{"linux/gigaset_dev.h", "GIGASET_REDIR", 0xc0044700},
-+{"linux/gigaset_dev.h", "GIGASET_CONFIG", 0xc0044701},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_VOLUME", 0xc0044d00},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_BASS", 0xc0044d01},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_TREBLE", 0xc0044d02},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_SYNTH", 0xc0044d03},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_PCM", 0xc0044d04},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_SPEAKER", 0xc0044d05},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE", 0xc0044d06},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_MIC", 0xc0044d07},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_CD", 0xc0044d08},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_IMIX", 0xc0044d09},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_ALTPCM", 0xc0044d0a},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECLEV", 0xc0044d0b},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_IGAIN", 0xc0044d0c},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_OGAIN", 0xc0044d0d},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE1", 0xc0044d0e},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE2", 0xc0044d0f},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE3", 0xc0044d10},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_ENHANCE", 0xc0044d1f},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_LOUD", 0xc0044d1f},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_MUTE", 0xc0044d1f},
-+{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECSRC", 0xc0044dff},
-+{"linux/videodev2.h", "VIDIOC_OVERLAY_OLD", 0xc004560e},
-+{"linux/videodev2.h", "VIDIOC_S_INPUT", 0xc0045627},
-+{"linux/videodev2.h", "VIDIOC_S_OUTPUT", 0xc004562f},
-+{"linux/watchdog.h", "WDIOC_SETTIMEOUT", 0xc0045706},
-+{"linux/watchdog.h", "WDIOC_SETPRETIMEOUT", 0xc0045708},
-+{"linux/sonet.h", "SONET_SETDIAG", 0xc0046112},
-+{"linux/sonet.h", "SONET_CLRDIAG", 0xc0046113},
-+{"linux/cm4000_cs.h", "CM_IOCGATR", 0xc0046301},
-+{"linux/coda.h", "CIOC_KERNEL_VERSION", 0xc004630a},
-+{"linux/i8k.h", "I8K_GET_SPEED", 0xc0046985},
-+{"linux/i8k.h", "I8K_GET_FAN", 0xc0046986},
-+{"linux/i8k.h", "I8K_SET_FAN", 0xc0046987},
-+{"linux/udf_fs_i.h", "UDF_RELOCATE_BLOCKS", 0xc0046c43},
-+{"linux/synclink.h", "MGSL_IOCWAITEVENT", 0xc0046d08},
-+{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_MODE", 0xc0046efa},
-+{"linux/telephony.h", "PHONE_QUERY_CODEC", 0xc00471a7},
-+{"linux/if_ppp.h", "PPPIOCNEWUNIT", 0xc004743e},
-+{"linux/toshiba.h", "TOSH_SMM", 0xc0047490},
-+{"linux/meye.h", "MEYEIOC_SYNC", 0xc00476c3},
-+{"linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", 0xc0049364},
-+{"linux/capi.h", "CAPI_MANUFACTURER_CMD", 0xc0084320},
-+{"linux/videodev2.h", "VIDIOC_G_CTRL", 0xc008561b},
-+{"linux/videodev2.h", "VIDIOC_S_CTRL", 0xc008561c},
-+{"linux/ncp_fs.h", "NCP_IOC_GETPRIVATEDATA", 0xc0086e0a},
-+{"linux/if_ppp.h", "PPPIOCGNPMODE", 0xc008744c},
-+{"linux/hiddev.h", "HIDIOCGREPORTINFO", 0xc00c4809},
-+{"mtd/mtd-abi.h", "MEMWRITEOOB", 0xc00c4d03},
-+{"mtd/mtd-abi.h", "MEMREADOOB", 0xc00c4d04},
-+{"linux/uinput.h", "UI_BEGIN_FF_ERASE", 0xc00c55ca},
-+{"linux/ite_gpio.h", "ITE_GPIO_IN", 0xc00c5a00},
-+{"linux/atm_nicstar.h", "NS_GETPSTAT", 0xc00c6161},
-+{"linux/i2o-dev.h", "I2OHRTGET", 0xc00c6901},
-+{"linux/i2o-dev.h", "I2OLCTGET", 0xc00c6902},
-+{"linux/mtio.h", "MTIOCFTFORMAT", 0xc00c6d0a},
-+{"linux/ncp_fs.h", "NCP_IOC_GETOBJECTNAME", 0xc00c6e09},
-+{"linux/capi.h", "CAPI_GET_VERSION", 0xc0104307},
-+{"linux/gigaset_dev.h", "GIGASET_VERSION", 0xc0104703},
-+{"linux/hiddev.h", "HIDIOCGCOLLECTIONINFO", 0xc0104811},
-+{"mtd/mtd-abi.h", "MEMGETREGIONINFO", 0xc0104d08},
-+{"linux/videodev2.h", "VIDIOC_REQBUFS", 0xc0105608},
-+{"linux/mtio.h", "MTIOCRDFTSEG", 0xc0106d06},
-+{"linux/mtio.h", "MTIOCWRFTSEG", 0xc0106d07},
-+{"linux/synclink.h", "MGSL_IOCWAITGPIO", 0xc0106d12},
-+{"linux/videodev2.h", "VIDIOC_G_CROP", 0xc014563b},
-+{"linux/hiddev.h", "HIDIOCGUSAGE", 0xc018480b},
-+{"linux/hiddev.h", "HIDIOCGUCODE", 0xc018480d},
-+{"linux/videodev2.h", "VIDIOC_G_EXT_CTRLS", 0xc0185647},
-+{"linux/videodev2.h", "VIDIOC_S_EXT_CTRLS", 0xc0185648},
-+{"linux/videodev2.h", "VIDIOC_TRY_EXT_CTRLS", 0xc0185649},
-+{"linux/pktcdvd.h", "PACKET_CTRL_CMD", 0xc0185801},
-+{"linux/i2o-dev.h", "I2OPARMSET", 0xc0186903},
-+{"linux/i2o-dev.h", "I2OPARMGET", 0xc0186904},
-+{"linux/ipmi.h", "IPMICTL_RECEIVE_MSG_TRUNC", 0xc018690b},
-+{"linux/ipmi.h", "IPMICTL_RECEIVE_MSG", 0xc018690c},
-+{"linux/i2o-dev.h", "I2OSWDL", 0xc01c6905},
-+{"linux/i2o-dev.h", "I2OSWUL", 0xc01c6906},
-+{"linux/i2o-dev.h", "I2OSWDEL", 0xc01c6907},
-+{"linux/i2o-dev.h", "I2OHTML", 0xc01c6909},
-+{"linux/mtio.h", "MTIOCFTCMD", 0xc0206d0b},
-+{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO_V2", 0xc0246e04},
-+{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO", 0xc0286e04},
-+{"linux/ncp_fs.h", "NCP_IOC_GETCHARSETS", 0xc02a6e0b},
-+{"linux/videodev2.h", "VIDIOC_QUERYMENU", 0xc02c5625},
-+{"linux/videodev2.h", "VIDIOC_G_FREQUENCY", 0xc02c5638},
-+{"linux/videodev2.h", "VIDIOC_CROPCAP", 0xc02c563a},
-+{"linux/videodev.h", "VIDIOCGCHAN", 0xc0307602},
-+{"linux/uinput.h", "UI_BEGIN_FF_UPLOAD", 0xc03455c8},
-+{"linux/videodev2.h", "VIDIOC_G_AUDIO_OLD", 0xc0345621},
-+{"linux/videodev2.h", "VIDIOC_G_AUDOUT_OLD", 0xc0345631},
-+{"linux/videodev2.h", "VIDIOC_ENUMAUDIO", 0xc0345641},
-+{"linux/videodev2.h", "VIDIOC_ENUMAUDOUT", 0xc0345642},
-+{"linux/videodev.h", "VIDIOCGTUNER", 0xc0347604},
-+{"linux/hiddev.h", "HIDIOCGFIELDINFO", 0xc038480a},
-+{"linux/capi.h", "CAPI_GET_PROFILE", 0xc0404309},
-+{"linux/videodev2.h", "VIDIOC_ENUM_FMT", 0xc0405602},
-+{"linux/videodev2.h", "VIDIOC_ENUMSTD", 0xc0405619},
-+{"linux/videodev2.h", "VIDIOC_QUERYBUF", 0xc0445609},
-+{"linux/videodev2.h", "VIDIOC_QBUF", 0xc044560f},
-+{"linux/videodev2.h", "VIDIOC_DQBUF", 0xc0445611},
-+{"linux/videodev2.h", "VIDIOC_QUERYCTRL", 0xc0445624},
-+{"linux/videodev2.h", "VIDIOC_G_MODULATOR", 0xc0445636},
-+{"linux/fb.h", "FBIO_CURSOR", 0xc0484608},
-+{"linux/videodev2.h", "VIDIOC_ENUMOUTPUT", 0xc0485630},
-+{"linux/videodev2.h", "VIDIOC_ENUMINPUT", 0xc04c561a},
-+{"linux/cciss_ioctl.h", "CCISS_PASSTHRU", 0xc054420b},
-+{"linux/videodev2.h", "VIDIOC_G_TUNER", 0xc054561d},
-+{"linux/cciss_ioctl.h", "CCISS_BIG_PASSTHRU", 0xc0584212},
-+{"linux/isdn_ppp.h", "PPPIOCGCALLINFO", 0xc0887480},
-+{"linux/videodev2.h", "VIDIOC_G_FMT", 0xc0cc5604},
-+{"linux/videodev2.h", "VIDIOC_S_FMT", 0xc0cc5605},
-+{"linux/videodev2.h", "VIDIOC_G_PARM", 0xc0cc5615},
-+{"linux/videodev2.h", "VIDIOC_S_PARM", 0xc0cc5616},
-+{"linux/videodev2.h", "VIDIOC_TRY_FMT", 0xc0cc5640},
-+{"linux/dm-ioctl.h", "DM_VERSION", 0xc134fd00},
-+{"linux/dm-ioctl.h", "DM_VERSION_32", 0xc134fd00},
-+{"linux/dm-ioctl.h", "DM_REMOVE_ALL_32", 0xc134fd01},
-+{"linux/dm-ioctl.h", "DM_REMOVE_ALL", 0xc134fd01},
-+{"linux/dm-ioctl.h", "DM_LIST_DEVICES_32", 0xc134fd02},
-+{"linux/dm-ioctl.h", "DM_LIST_DEVICES", 0xc134fd02},
-+{"linux/dm-ioctl.h", "DM_DEV_CREATE_32", 0xc134fd03},
-+{"linux/dm-ioctl.h", "DM_DEV_CREATE", 0xc134fd03},
-+{"linux/dm-ioctl.h", "DM_DEV_REMOVE", 0xc134fd04},
-+{"linux/dm-ioctl.h", "DM_DEV_REMOVE_32", 0xc134fd04},
-+{"linux/dm-ioctl.h", "DM_DEV_RENAME_32", 0xc134fd05},
-+{"linux/dm-ioctl.h", "DM_DEV_RENAME", 0xc134fd05},
-+{"linux/dm-ioctl.h", "DM_DEV_SUSPEND_32", 0xc134fd06},
-+{"linux/dm-ioctl.h", "DM_DEV_SUSPEND", 0xc134fd06},
-+{"linux/dm-ioctl.h", "DM_DEV_STATUS", 0xc134fd07},
-+{"linux/dm-ioctl.h", "DM_DEV_STATUS_32", 0xc134fd07},
-+{"linux/dm-ioctl.h", "DM_DEV_WAIT", 0xc134fd08},
-+{"linux/dm-ioctl.h", "DM_DEV_WAIT_32", 0xc134fd08},
-+{"linux/dm-ioctl.h", "DM_TABLE_LOAD", 0xc134fd09},
-+{"linux/dm-ioctl.h", "DM_TABLE_LOAD_32", 0xc134fd09},
-+{"linux/dm-ioctl.h", "DM_TABLE_CLEAR_32", 0xc134fd0a},
-+{"linux/dm-ioctl.h", "DM_TABLE_CLEAR", 0xc134fd0a},
-+{"linux/dm-ioctl.h", "DM_TABLE_DEPS_32", 0xc134fd0b},
-+{"linux/dm-ioctl.h", "DM_TABLE_DEPS", 0xc134fd0b},
-+{"linux/dm-ioctl.h", "DM_TABLE_STATUS", 0xc134fd0c},
-+{"linux/dm-ioctl.h", "DM_TABLE_STATUS_32", 0xc134fd0c},
-+{"linux/dm-ioctl.h", "DM_LIST_VERSIONS", 0xc134fd0d},
-+{"linux/dm-ioctl.h", "DM_LIST_VERSIONS_32", 0xc134fd0d},
-+{"linux/dm-ioctl.h", "DM_TARGET_MSG", 0xc134fd0e},
-+{"linux/dm-ioctl.h", "DM_TARGET_MSG_32", 0xc134fd0e},
-+{"linux/dm-ioctl.h", "DM_DEV_SET_GEOMETRY_32", 0xc134fd0f},
-+{"linux/dm-ioctl.h", "DM_DEV_SET_GEOMETRY", 0xc134fd0f},
-+{"linux/hiddev.h", "HIDIOCGUSAGES", 0xd01c4813},
-diff --git a/linux/avr32/ioctlent.sh b/linux/avr32/ioctlent.sh
-new file mode 100644
-index 0000000..8e1b448
---- /dev/null
-+++ b/linux/avr32/ioctlent.sh
-@@ -0,0 +1,124 @@
-+#!/bin/sh
-+# Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
-+# All rights reserved.
-+#
-+# Copyright (c) 1995, 1996 Michael Elizabeth Chastain <mec@duracef.shout.net>
-+# 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.
-+
-+# Files to find.
-+file_find='asm/*.h linux/*.h scsi/*.h mtd/*.h'
-+
-+# Files to stop.
-+file_stop='asm/byteorder.h linux/config.h linux/elf-em.h linux/pci_ids.h linux/xd.h linux/reiserfs_fs.h linux/usbdevice_fs.h'
-+
-+# Defs to find.
-+# Work on the kernel source to convert all to df_iowr.
-+# Don't know how to find low-numbered ioctls in linux/mc146818rtc.h.
-+df_name='^[ ]*#[ ]*define[ ]+[A-Z_][A-Z0-9_]*[ ]+'
-+df_iowr='_IO|_IOR|_IOW|_IOWR'
-+df_NNNN='0[Xx](03|06|22|46|4B|4C|53|54|56|89|90)[0-9A-Fa-f][0-9A-Fa-f]'
-+df_4359='0[Xx]4359[0-9A-Fa-f][0-9A-Fa-f]' # linux/cyclades.h
-+df_470N='470[0-9]' # linux/fs.h (only in 1.2.13)
-+df_smix='MIXER_READ|MIXER_WRITE' # linux/soundcard.h
-+df_12NN='12[3-4][0-9]' # linux/umsdos_fs.h (only in 1.2.13)
-+df_tail='([() ]|$)'
-+def_find="$df_name($df_iowr|$df_NNNN|$df_4359|$df_470N|$df_smix|$df_12NN)$df_tail"
-+
-+# Defs to stop.
-+ds_tail='_MAGIC|_PATCH'
-+ds_fdmp='FD(DEF|GET|SET)MEDIAPRM' # linux/fd.h aliases (only in 1.2.13)
-+ds_mtio='MTIOC(GET|SET)CONFIG' # linux/mtio.h needs config (only in 1.2.13)
-+ds_soundcard='_SIO(RW?|W)?'
-+def_stop="$ds_tail|$ds_fdmp|$ds_mtio|$ds_soundcard"
-+
-+# Validate arg count.
-+if [ $# -ne 1 ]
-+then
-+ echo "usage: $0 include-directory" >&2
-+ exit 1
-+fi
-+
-+# Grep through the files.
-+(
-+ # Construct list: find files minus stop files.
-+ cd $1 || exit
-+ file_list=`(ls $file_find $file_stop $file_stop 2>/dev/null) | sort | uniq -u`
-+
-+ # Grep matching #define lines.
-+ # Transform to C structure form.
-+ # Filter out stop list.
-+ egrep "$def_find" $file_list |
-+ sed -n -e 's/^\(.*\):#[ ]*define[ ]*\([A-Z_][A-Z0-9_]*\).*$/ { "\1", "\2", \2 },/p' |
-+ egrep -v "$def_stop"
-+) > ioctlent.tmp
-+
-+# Generate the output file.
-+echo '/* This file is automatically generated by ioctlent.sh */'
-+echo
-+echo '#include <sys/types.h>'
-+echo '#include <sys/socket.h>'
-+echo '#include <stdint.h>'
-+echo
-+echo '/* Needed for <linux/baycom.h> */'
-+echo '#define BAYCOM_DEBUG'
-+echo
-+echo '/* Needed for <linux/dm-ioctl.h> */'
-+echo '#define CONFIG_COMPAT'
-+echo
-+echo '/* Needed for <linux/ext3_fs.h> */'
-+echo '#define CONFIG_JBD_DEBUG'
-+echo
-+echo '/* Needed for <linux/lp.h> */'
-+echo '#define LP_STATS'
-+echo
-+echo '/* Needed for <linux/videodev2.h> */'
-+echo '#define __OLD_VIDIOC_'
-+echo
-+echo '/* Needed for <linux/zftape.h> */'
-+echo '#define ZFT_OBSOLETE'
-+echo
-+echo '/* Needed for <linux/auto_fs.h> */'
-+echo '#include <linux/limits.h>'
-+echo
-+echo '/* Needed for <linux/cyclades.h> */'
-+echo '#include <linux/termios.h>'
-+#echo '#include <linux/tqueue.h>'
-+echo
-+echo '/* Needed for <linux/if_ppp.h> */'
-+echo '#include <linux/ppp_defs.h>'
-+echo '#include <linux/filter.h>'
-+echo
-+echo '/* Needed for <linux/msdos_fs.h> */'
-+echo '#include <linux/dirent.h>'
-+echo
-+awk '{ print "#include <" substr($2, 2, length($2) - 3) ">" }' ioctlent.tmp | sort -u
-+echo
-+echo 'struct ioctlent ioctlent [] ='
-+echo '{'
-+cat ioctlent.tmp
-+echo '};'
-+
-+# Clean up.
-+rm -f ioctlent.tmp
-diff --git a/linux/avr32/syscallent.h b/linux/avr32/syscallent.h
-new file mode 100644
-index 0000000..702d28f
---- /dev/null
-+++ b/linux/avr32/syscallent.h
-@@ -0,0 +1,307 @@
-+/*
-+ * Copyright (c) 2004-2006 Atmel Corporation
-+ * 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_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, sys_umask, "umask" }, /* 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, "chown" }, /* 16 */
-+ { 3, TF, sys_chown, "lchown" }, /* 17 */
-+ { 3, 0, sys_lseek, "lseek" }, /* 18 */
-+ { 5, 0, sys_llseek, "_llseek" }, /* 19 */
-+ { 0, 0, sys_getpid, "getpid" }, /* 20 */
-+ { 5, TF, sys_mount, "mount" }, /* 21 */
-+ { 2, TF, sys_umount, "umount" }, /* 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 */
-+ { 0, TS, sys_pause, "pause" }, /* 28 */
-+ { 2, TF, sys_utime, "utime" }, /* 29 */
-+ { 2, TF, sys_stat, "stat" }, /* 30 */
-+ { 2, 0, sys_fstat, "fstat" }, /* 31 */
-+ { 2, TF, sys_lstat, "lstat" }, /* 32 */
-+ { 2, TF, sys_access, "access" }, /* 33 */
-+ { 1, TF, sys_chroot, "chroot" }, /* 34 */
-+ { 0, 0, sys_sync, "sync" }, /* 35 */
-+ { 1, 0, sys_fsync, "fsync" }, /* 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 */
-+ { 5, TP, sys_clone, "clone" }, /* 44 */
-+ { 1, 0, sys_brk, "brk" }, /* 45 */
-+ { 1, 0, sys_setgid, "setgid" }, /* 46 */
-+ { 0, 0, sys_getgid, "getgid" }, /* 47 */
-+ { 2, TF, sys_getcwd, "getcwd" }, /* 48 */
-+ { 0, 0, sys_geteuid, "geteuid" }, /* 49 */
-+ { 0, 0, sys_getegid, "getegid" }, /* 50 */
-+ { 1, TF, sys_acct, "acct" }, /* 51 */
-+ { 1, 0, sys_setfsuid, "setfsuid" }, /* 52 */
-+ { 1, 0, sys_setfsgid, "setfsgid" }, /* 53 */
-+ { 3, 0, sys_ioctl, "ioctl" }, /* 54 */
-+ { 3, 0, sys_fcntl, "fcntl" }, /* 55 */
-+ { 2, 0, sys_setpgid, "setpgid" }, /* 56 */
-+ { 4, 0, sys_mremap, "mremap" }, /* 57 */
-+ { 3, 0, sys_setresuid, "setresuid" }, /* 58 */
-+ { 3, 0, sys_getresuid, "getresuid" }, /* 59 */
-+ { 2, 0, sys_setreuid, "setreuid" }, /* 60 */
-+ { 2, 0, sys_setregid, "setregid" }, /* 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 */
-+ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 67 */
-+ { 1, TS, printargs, "rt_sigreturn" }, /* 68 */
-+ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 69 */
-+ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 70 */
-+ { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait"}, /* 71 */
-+ { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo"}, /* 72 */
-+ { 2, TS, sys_rt_sigsuspend, "rt_sigsuspend" }, /* 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 */
-+ { 5, 0, sys_select, "select" }, /* 82 */
-+ { 2, TF, sys_symlink, "symlink" }, /* 83 */
-+ { 1, 0, sys_fchdir, "fchdir" }, /* 84 */
-+ { 3, TF, sys_readlink, "readlink" }, /* 85 */
-+ { 5, TF, sys_pread, "pread" }, /* 86 */
-+ { 5, TF, sys_pwrite, "pwrite" }, /* 87 */
-+ { 1, TF, sys_swapon, "swapon" }, /* 88 */
-+ { 3, 0, sys_reboot, "reboot" }, /* 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, TP, sys_wait4, "wait4" }, /* 98 */
-+ { 2, TF, sys_statfs, "statfs" }, /* 99 */
-+ { 2, 0, sys_fstatfs, "fstatfs" }, /* 100 */
-+ { 0, 0, sys_vhangup, "vhangup" }, /* 101 */
-+ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 102 */
-+ { 3, 0, sys_syslog, "syslog" }, /* 103 */
-+ { 3, 0, sys_setitimer, "setitimer" }, /* 104 */
-+ { 2, 0, sys_getitimer, "getitimer" }, /* 105 */
-+ { 1, 0, sys_swapoff, "swapoff" }, /* 106 */
-+ { 1, 0, sys_sysinfo, "sysinfo" }, /* 107 */
-+ { 6, 0, sys_ipc, "ipc" }, /* 108 */
-+ { 4, TF, sys_sendfile, "sendfile" }, /* 109 */
-+ { 2, 0, sys_setdomainname, "setdomainname" }, /* 110 */
-+ { 1, 0, sys_uname, "uname" }, /* 111 */
-+ { 1, 0, sys_adjtimex, "adjtimex" }, /* 112 */
-+ { 3, 0, sys_mprotect, "mprotect" }, /* 113 */
-+ { 0, TP, sys_vfork, "vfork" }, /* 114 */
-+ { 2, 0, sys_init_module, "init_module" }, /* 115 */
-+ { 1, 0, sys_delete_module, "delete_module" }, /* 116 */
-+ { 4, 0, sys_quotactl, "quotactl" }, /* 117 */
-+ { 1, 0, sys_getpgid, "getpgid" }, /* 118 */
-+ { 0, 0, sys_bdflush, "bdflush" }, /* 119 */
-+ { 3, 0, sys_sysfs, "sysfs" }, /* 120 */
-+ { 1, 0, sys_personality, "personality" }, /* 121 */
-+ { 5, 0, sys_afs_syscall, "afs_syscall" }, /* 122 */
-+ { 3, 0, sys_getdents, "getdents" }, /* 123 */
-+ { 2, 0, sys_flock, "flock" }, /* 124 */
-+ { 3, 0, sys_msync, "msync" }, /* 125 */
-+ { 3, 0, sys_readv, "readv" }, /* 126 */
-+ { 3, 0, sys_writev, "writev" }, /* 127 */
-+ { 1, 0, sys_getsid, "getsid" }, /* 128 */
-+ { 1, 0, sys_fdatasync, "fdatasync" }, /* 129 */
-+ { 1, 0, sys_sysctl, "_sysctl" }, /* 130 */
-+ { 2, 0, sys_mlock, "mlock" }, /* 131 */
-+ { 2, 0, sys_munlock, "munlock" }, /* 132 */
-+ { 2, 0, sys_mlockall, "mlockall" }, /* 133 */
-+ { 0, 0, sys_munlockall, "munlockall" }, /* 134 */
-+ { 0, 0, sys_sched_setparam, "sched_setparam"}, /* 135 */
-+ { 2, 0, sys_sched_getparam, "sched_getparam"}, /* 136 */
-+ { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 137 */
-+ { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 138 */
-+ { 0, 0, sys_sched_yield, "sched_yield"}, /* 139 */
-+ { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 140 */
-+ { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 141 */
-+ { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 142 */
-+ { 2, 0, sys_nanosleep, "nanosleep" }, /* 143 */
-+ { 3, 0, sys_poll, "poll" }, /* 144 */
-+ { 3, 0, printargs, "nfsservctl" }, /* 145 */
-+ { 3, 0, sys_setresgid, "setresgid" }, /* 146 */
-+ { 3, 0, sys_getresgid, "getresgid" }, /* 147 */
-+ { 5, 0, sys_prctl, "prctl" }, /* 148 */
-+ { 3, TN, sys_socket, "socket" }, /* 149 */
-+ { 3, TN, sys_bind, "bind" }, /* 150 */
-+ { 3, TN, sys_connect, "connect" }, /* 151 */
-+ { 2, TN, sys_listen, "listen" }, /* 152 */
-+ { 3, TN, sys_accept, "accept" }, /* 153 */
-+ { 3, TN, sys_getsockname, "getsockname" }, /* 154 */
-+ { 3, TN, sys_getpeername, "getpeername" }, /* 155 */
-+ { 4, TN, sys_socketpair, "socketpair" }, /* 156 */
-+ { 4, TN, sys_send, "send" }, /* 157 */
-+ { 4, TN, sys_recv, "recv" }, /* 158 */
-+ { 6, TN, sys_sendto, "sendto" }, /* 159 */
-+ { 6, TN, sys_recvfrom, "recvfrom" }, /* 160 */
-+ { 2, TN, sys_shutdown, "shutdown" }, /* 161 */
-+ { 5, TN, sys_setsockopt, "setsockopt" }, /* 162 */
-+ { 5, TN, sys_getsockopt, "getsockopt" }, /* 163 */
-+ { 3, TN, sys_sendmsg, "sendmsg" }, /* 164 */
-+ { 3, TN, sys_recvmsg, "recvmsg" }, /* 165 */
-+ { 3, TF, sys_truncate64, "truncate64" }, /* 166 */
-+ { 3, TF, sys_ftruncate64, "ftruncate64" }, /* 167 */
-+ { 2, TF, sys_stat64, "stat64" }, /* 168 */
-+ { 2, TF, sys_lstat64, "lstat64" }, /* 169 */
-+ { 2, TF, sys_fstat64, "fstat64" }, /* 170 */
-+ { 2, TF, sys_pivotroot, "pivot_root" }, /* 171 */
-+ { 3, 0, printargs, "mincore" }, /* 172 */
-+ { 3, 0, sys_madvise, "madvise" }, /* 173 */
-+ { 4, 0, sys_getdents64, "getdents64" }, /* 174 */
-+ { 3, 0, sys_fcntl, "fcntl64" }, /* 175 */
-+ { 0, 0, printargs, "gettid" }, /* 176 */
-+ { 4, 0, sys_readahead, "readahead" }, /* 177 */
-+ { 5, TF, sys_setxattr, "setxattr" }, /* 178 */
-+ { 5, TF, sys_setxattr, "lsetxattr" }, /* 179 */
-+ { 5, 0, sys_fsetxattr, "fsetxattr" }, /* 180 */
-+ { 4, TF, sys_getxattr, "getxattr" }, /* 181 */
-+ { 4, TF, sys_getxattr, "lgetxattr" }, /* 182 */
-+ { 4, 0, sys_fgetxattr, "fgetxattr" }, /* 183 */
-+ { 3, TF, sys_listxattr, "listxattr" }, /* 184 */
-+ { 3, TF, sys_listxattr, "llistxattr" }, /* 185 */
-+ { 3, 0, sys_flistxattr, "flistxattr" }, /* 186 */
-+ { 2, TF, sys_removexattr, "removexattr" }, /* 187 */
-+ { 2, TF, sys_removexattr, "lremovexattr" }, /* 188 */
-+ { 2, 0, sys_fremovexattr, "fremovexattr" }, /* 189 */
-+ { 2, TS, sys_kill, "tkill" }, /* 190 */
-+ { 4, TF, sys_sendfile64, "sendfile64" }, /* 191 */
-+ { 5, 0, sys_futex, "futex" }, /* 192 */
-+ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 193 */
-+ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 194 */
-+ { 2, 0, sys_capget, "capget" }, /* 195 */
-+ { 2, 0, sys_capset, "capset" }, /* 196 */
-+ { 2, 0, sys_io_setup, "io_setup" }, /* 197 */
-+ { 1, 0, sys_io_destroy, "io_destroy" }, /* 198 */
-+ { 5, 0, sys_io_getevents, "io_getevents" }, /* 199 */
-+ { 3, 0, sys_io_submit, "io_submit" }, /* 200 */
-+ { 3, 0, sys_io_cancel, "io_cancel" }, /* 201 */
-+ { 6, 0, sys_fadvise64, "fadvise64" }, /* 202 */
-+ { 1, TP, sys_exit, "exit_group" }, /* 203 */
-+ { 4, 0, printargs, "lookup_dcookie"}, /* 204 */
-+ { 1, 0, sys_epoll_create, "epoll_create" }, /* 205 */
-+ { 4, 0, sys_epoll_ctl, "epoll_ctl" }, /* 206 */
-+ { 4, 0, sys_epoll_wait, "epoll_wait" }, /* 207 */
-+ { 5, 0, sys_remap_file_pages, "remap_file_pages"}, /* 208 */
-+ { 1, 0, printargs, "set_tid_address"}, /* 209 */
-+ { 3, 0, sys_timer_create, "timer_create" }, /* 210 */
-+ { 4, 0, sys_timer_settime, "timer_settime" }, /* 211 */
-+ { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 212 */
-+ { 1, 0, sys_timer_getoverrun, "timer_getoverrun"}, /* 213 */
-+ { 1, 0, sys_timer_delete, "timer_delete" }, /* 214 */
-+ { 2, 0, sys_clock_settime, "clock_settime" }, /* 215 */
-+ { 2, 0, sys_clock_gettime, "clock_gettime" }, /* 216 */
-+ { 2, 0, sys_clock_getres, "clock_getres" }, /* 217 */
-+ { 4, 0, sys_clock_nanosleep, "clock_nanosleep"}, /* 218 */
-+ { 3, TF, sys_statfs64, "statfs64" }, /* 219 */
-+ { 3, 0, sys_fstatfs64, "fstatfs64" }, /* 220 */
-+ { 3, TS, sys_tgkill, "tgkill" }, /* 221 */
-+ { 5, 0, printargs, "SYS_222" }, /* 222 */
-+ { 2, TF, sys_utimes, "utimes" }, /* 223 */
-+ { 6, 0, sys_fadvise64_64, "fadvise64_64" }, /* 224 */
-+ { 3, 0, printargs, "cacheflush" }, /* 225 */
-+ { 0, 0, printargs, "vserver" }, /* 226 */
-+ { 4, 0, sys_mq_open, "mq_open" }, /* 227 */
-+ { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 228 */
-+ { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 229 */
-+ { 5, 0, sys_mq_timedreceive, "mq_timedreceive" }, /* 230 */
-+ { 2, 0, sys_mq_notify, "mq_notify" }, /* 231 */
-+ { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 232 */
-+ { 4, 0, printargs, "kexec_load" }, /* 233 */
-+ { 1, 0, sys_waitid, "waitid" }, /* 234 */
-+ { 5, 0, printargs, "add_key" }, /* 235 */
-+ { 4, 0, printargs, "request_key" }, /* 236 */
-+ { 5, 0, printargs, "keyctl" }, /* 237 */
-+ { 3, 0, printargs, "ioprio_set" }, /* 238 */
-+ { 2, 0, printargs, "ioprio_get" }, /* 239 */
-+ { 1, 0, printargs, "inotify_init" }, /* 240 */
-+ { 3, 0, sys_inotify_add_watch, "inotify_add_watch" }, /* 241 */
-+ { 2, 0, sys_inotify_rm_watch, "inotify_rm_watch" }, /* 242 */
-+ { 4, 0, sys_openat, "openat" }, /* 243 */
-+ { 3, 0, sys_mkdirat, "mkdirat" }, /* 244 */
-+ { 4, 0, sys_mknodat, "mknodat" }, /* 245 */
-+ { 5, 0, sys_fchownat, "fchownat" }, /* 246 */
-+ { 3, 0, sys_futimesat, "futimesat" }, /* 247 */
-+ { 4, 0, printargs, "fstatat64" }, /* 248 */
-+ { 3, 0, sys_unlinkat, "unlinkat" }, /* 249 */
-+ { 4, 0, sys_renameat, "renameat" }, /* 250 */
-+ { 5, 0, sys_linkat, "linkat" }, /* 251 */
-+ { 3, 0, sys_symlinkat, "symlinkat" }, /* 252 */
-+ { 4, 0, sys_readlinkat, "readlinkat" }, /* 253 */
-+ { 3, 0, sys_fchmodat, "fchmodat" }, /* 254 */
-+ { 3, 0, sys_faccessat, "faccessat" }, /* 255 */
-+ { 6, 0, sys_pselect6, "pselect6" }, /* 256 */
-+ { 5, 0, sys_ppoll, "ppoll" }, /* 257 */
-+ { 1, 0, sys_unshare, "unshare" }, /* 258 */
-+ { 2, 0, printargs, "set_robust_list" }, /* 259 */
-+ { 3, 0, printargs, "get_robust_list" }, /* 260 */
-+ { 6, 0, printargs, "splice" }, /* 261 */
-+ { 4, 0, printargs, "sync_file_range" }, /* 262 */
-+ { 4, 0, printargs, "tee" }, /* 263 */
-+ { 4, 0, printargs, "vmsplice" }, /* 264 */
-+ { 6, 0, printargs, "sys_epoll_pwait" }, /* 265 */
-+ { 2, TI, sys_msgget, "msgget" }, /* 266 */
-+ { 4, TI, sys_msgsnd, "msgsnd" }, /* 267 */
-+ { 5, TI, sys_msgrcv, "msgrcv" }, /* 268 */
-+ { 3, TI, sys_msgctl, "msgctl" }, /* 269 */
-+ { 3, TI, sys_semget, "semget" }, /* 270 */
-+ { 3, TI, sys_semop, "semop" }, /* 271 */
-+ { 4, TI, sys_semctl, "semctl" }, /* 272 */
-+ { 4, TI, sys_semtimedop, "semtimedop" }, /* 273 */
-+ { 3, TI, sys_shmat, "shmat" }, /* 274 */
-+ { 3, TI, sys_shmget, "shmget" }, /* 275 */
-+ { 1, TI, sys_shmdt, "shmdt" }, /* 276 */
-+ { 3, TI, sys_shmctl, "shmctl" }, /* 277 */
-diff --git a/process.c b/process.c
-index 96e3676..dd11a0a 100644
---- a/process.c
-+++ b/process.c
-@@ -714,6 +714,10 @@ int new;
- return -1;
-
- return 0;
-+#elif defined(AVR32)
-+ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_R8), new) < 0)
-+ return -1;
-+ return 0;
- #else
- #warning Do not know how to handle change_syscall for this architecture
- #endif /* architecture */
-@@ -794,6 +798,28 @@ setarg(tcp, argnum)
- if (errno)
- return -1;
- }
-+#elif defined(AVR32)
-+ {
-+ errno = 0;
-+ if (argnum == 0)
-+ ptrace(PTRACE_POKEUSER, tcp->pid,
-+ (char *)(REG_R12_ORIG),
-+ tcp->u_arg[argnum]);
-+ else if (argnum < 4)
-+ /* r11 .. r9 */
-+ ptrace(PTRACE_POKEUSER, tcp->pid,
-+ (char *)(REG_R12 - 4 * argnum),
-+ tcp->u_arg[argnum]);
-+ else if (argnum < 6)
-+ /* r6 .. r5 */
-+ ptrace(PTRACE_POKEUSER, tcp->pid,
-+ (char *)(REG_R10 - 4 * argnum),
-+ tcp->u_arg[argnum]);
-+ else
-+ return -E2BIG;
-+ if (errno)
-+ return -1;
-+ }
- #else
- # warning Sorry, setargs not implemented for this architecture.
- #endif
-@@ -2882,8 +2908,27 @@ const struct xlat struct_user_offsets[] = {
- { uoff(regs.ARM_pc), "pc" },
- { uoff(regs.ARM_cpsr), "cpsr" },
- #endif
--
--#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64)
-+#ifdef 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" },
-+#endif
-+#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) && !defined(AVR32)
- { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" },
- #endif
- #if defined(I386) || defined(X86_64)
-@@ -2899,20 +2944,20 @@ const struct xlat struct_user_offsets[] = {
- #if !defined(SPARC64)
- { uoff(start_code), "offsetof(struct user, start_code)" },
- #endif
--#ifdef SH64
-+#if defined(SH64) || defined(AVR32)
- { uoff(start_data), "offsetof(struct user, start_data)" },
- #endif
- #if !defined(SPARC64)
- { uoff(start_stack), "offsetof(struct user, start_stack)" },
- #endif
- { uoff(signal), "offsetof(struct user, signal)" },
--#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SH) && !defined(SH64) && !defined(SPARC64)
-+#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SH) && !defined(SH64) && !defined(SPARC64) && !defined(AVR32)
- { uoff(reserved), "offsetof(struct user, reserved)" },
- #endif
- #if !defined(SPARC64)
- { uoff(u_ar0), "offsetof(struct user, u_ar0)" },
- #endif
--#if !defined(ARM) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64)
-+#if !defined(ARM) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64) && !defined(AVR32)
- { uoff(u_fpstate), "offsetof(struct user, u_fpstate)" },
- #endif
- { uoff(magic), "offsetof(struct user, magic)" },
-diff --git a/syscall.c b/syscall.c
-index ade4f0d..9c26ecb 100644
---- a/syscall.c
-+++ b/syscall.c
-@@ -809,6 +809,8 @@ internal_syscall(struct tcb *tcp)
- static long r9;
- #elif defined(X86_64)
- static long rax;
-+#elif defined(AVR32)
-+ static struct pt_regs regs;
- #endif
- #endif /* LINUX */
- #ifdef FREEBSD
-@@ -1264,7 +1266,26 @@ struct tcb *tcp;
- return 0;
- }
- }
--#endif /* SH64 */
-+#elif defined(AVR32)
-+ /*
-+ * Read complete register set in one go.
-+ */
-+ if (ptrace(PTRACE_GETREGS, pid, NULL, &regs) < 0)
-+ return -1;
-+
-+ /*
-+ * 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;
-+ }
-+ }
-+#endif /* AVR32 */
- #endif /* LINUX */
- #ifdef SUNOS4
- if (upeek(pid, uoff(u_arg[7]), &scno) < 0)
-@@ -1623,6 +1644,17 @@ struct tcb *tcp;
- tcp->u_rval = r9;
- u_error = 0;
- }
-+#else
-+#ifdef AVR32
-+ if (regs.r12 && (unsigned) -regs.r12 < nerrnos) {
-+ tcp->u_rval = -1;
-+ u_error = -regs.r12;
-+ }
-+ else {
-+ tcp->u_rval = regs.r12;
-+ u_error = 0;
-+ }
-+#endif /* AVR32 */
- #endif /* SH64 */
- #endif /* SH */
- #endif /* HPPA */
-@@ -1848,6 +1880,12 @@ force_result(tcp, error, rval)
- r9 = error ? -error : rval;
- if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)REG_GENERAL(9), r9) < 0)
- return -1;
-+#else
-+#ifdef AVR32
-+ regs.r12 = error ? -error : rval;
-+ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)REG_R12, regs.r12) < 0)
-+ return -1;
-+#endif /* AVR32 */
- #endif /* SH64 */
- #endif /* SH */
- #endif /* HPPA */
-@@ -2120,6 +2158,14 @@ struct tcb *tcp;
- return -1;
- }
- }
-+#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;
- #else /* Other architecture (like i386) (32bits specific) */
- {
- int i;
-@@ -2382,7 +2428,7 @@ trace_syscall(struct tcb *tcp)
-
- switch (known_scno(tcp)) {
- #ifdef LINUX
--#if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA)
-+#if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA) && !defined(AVR32)
- case SYS_socketcall:
- decode_subcall(tcp, SYS_socket_subcall,
- SYS_socket_nsubcalls, deref_style);
-@@ -2391,7 +2437,7 @@ trace_syscall(struct tcb *tcp)
- decode_subcall(tcp, SYS_ipc_subcall,
- SYS_ipc_nsubcalls, shift_style);
- break;
--#endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */
-+#endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA && !AVR32 */
- #if defined (SPARC) || defined (SPARC64)
- case SYS_socketcall:
- sparc_socket_decode (tcp);
-diff --git a/util.c b/util.c
-index 6359110..5cb1f50 100644
---- a/util.c
-+++ b/util.c
-@@ -1069,6 +1069,9 @@ struct tcb *tcp;
- #elif defined(SH64)
- if (upeek(tcp->pid, REG_PC ,&pc) < 0)
- return -1;
-+#elif defined(AVR32)
-+ if (upeek(tcp->pid, REG_PC, &pc) < 0)
-+ return -1;
- #endif
- return pc;
- #endif /* LINUX */
-@@ -1217,6 +1220,14 @@ struct tcb *tcp;
- return;
- }
- tprintf("[%08lx] ", pc);
-+#elif defined(AVR32)
-+ long pc;
-+
-+ if (upeek(tcp->pid, REG_PC, &pc) < 0) {
-+ tprintf("[????????] ");
-+ return;
-+ }
-+ tprintf("[%08lx] ", pc);
- #endif /* !architecture */
- #endif /* LINUX */
-
-@@ -1398,6 +1409,9 @@ typedef struct regs arg_setup_state;
- # define arg0_offset (REG_OFFSET+16)
- # define arg1_offset (REG_OFFSET+24)
- # define restore_arg0(tcp, state, val) 0
-+# elif defined (AVR32)
-+# define arg0_offset (REG_R12)
-+# define arg1_offset (REG_R11)
- # else
- # define arg0_offset 0
- # define arg1_offset 4
diff --git a/packages/strace/strace/arm-compilation.patch b/packages/strace/strace/arm-compilation.patch
deleted file mode 100644
index 9dd7133ce1..0000000000
--- a/packages/strace/strace/arm-compilation.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- strace-4.4.98/syscall.c~arm-compilation 2003-06-04 01:29:04.000000000 +0200
-+++ strace-4.4.98/syscall.c 2003-09-01 00:13:02.000000000 +0200
-@@ -696,6 +696,7 @@
- static int d0;
- #elif defined (ARM)
- static struct pt_regs regs;
-+ static long r0;
- #elif defined (ALPHA)
- static long r0;
- static long a3;
diff --git a/packages/strace/strace/arm-syscall.patch b/packages/strace/strace/arm-syscall.patch
deleted file mode 100644
index 952d09bb24..0000000000
--- a/packages/strace/strace/arm-syscall.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- /dev/null
-+++ strace-4.4.98/linux/arm/syscall.h
-@@ -0,0 +1,2 @@
-+#include "../syscall.h"
-+#include "dummy.h"
---- /dev/null
-+++ strace-4.4.98/linux/arm/dummy.h
-@@ -0,0 +1,3 @@
-+#include "../dummy.h"
-+#undef SYS_waitpid
-+#define sys_waitpid printargs
diff --git a/packages/strace/strace/arm-syscallent.patch b/packages/strace/strace/arm-syscallent.patch
deleted file mode 100644
index dd23ab762b..0000000000
--- a/packages/strace/strace/arm-syscallent.patch
+++ /dev/null
@@ -1,402 +0,0 @@
---- /dev/null Fri Apr 23 21:29:25 2004
-+++ strace-4.5.4/linux/arm/syscallent.h Thu Sep 2 13:42:52 2004
-@@ -0,0 +1,399 @@
-+/*
-+ * 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.26 2004/04/16 21:48:44 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 */
-+#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" }, /* 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 */
-+ { 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 */
-+#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" }, /* 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 */
-+#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, "pread" }, /* 180 */
-+ { 5, TF, sys_pwrite, "pwrite" }, /* 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" }, /* 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 */
-+ { 4, 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 */
-+ { 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, printargs, "io_setup" }, /* 245 */
-+ { 1, 0, printargs, "io_destroy" }, /* 246 */
-+ { 5, 0, printargs, "io_getevents" }, /* 247 */
-+ { 3, 0, printargs, "io_submit" }, /* 248 */
-+ { 3, 0, printargs, "io_cancel" }, /* 249 */
-+ { 5, 0, printargs, "SYS_250" }, /* 250 */
-+ { 5, 0, printargs, "SYS_251" }, /* 251 */
-+ { 1, TP, sys_exit, "exit_group" }, /* 252 */
-+ { 4, 0, printargs, "lookup_dcookie"}, /* 253 */
-+ { 1, 0, printargs, "epoll_create" }, /* 254 */
-+ { 4, 0, printargs, "epoll_ctl" }, /* 255 */
-+ { 4, 0, printargs, "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, 0, sys_fstatfs64, "fstatfs64" }, /* 269 */
-+ { 3, TS, sys_tgkill, "tgkill" }, /* 270 */
-+ { 2, TF, sys_utimes, "utimes" }, /* 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 */
-+ { 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_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 && !defined X86_64 /* pers1 broken on x86-64 */
-+ #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 && !defined X86_64 /* pers1 broken on x86-64 */
-+ #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/packages/strace/strace/mips-sigcontext.patch b/packages/strace/strace/mips-sigcontext.patch
deleted file mode 100644
index 15f5cc88e4..0000000000
--- a/packages/strace/strace/mips-sigcontext.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -urN strace-4.5.14/signal.c strace-4.5.14-mips/signal.c
---- strace-4.5.14/signal.c 2006-01-12 22:34:50.000000000 +0000
-+++ strace-4.5.14-mips/signal.c 2007-05-03 06:59:09.000000000 +0000
-@@ -66,7 +66,7 @@
-
-
- #ifdef LINUX
--
-+#include <linux/version.h>
- #ifdef IA64
- # include <asm/ptrace_offsets.h>
- #endif /* !IA64 */
-@@ -1420,7 +1420,11 @@
- if (umove(tcp, sp, &sc) < 0)
- return 0;
- tcp->u_arg[0] = 1;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- tcp->u_arg[1] = sc.sc_sigset;
-+#else
-+ tcp->u_arg[1] = sc.sc_hi2;
-+#endif
- } else {
- tcp->u_rval = tcp->u_error = 0;
- if(tcp->u_arg[0] == 0)
-diff -urN strace-4.5.14/system.c strace-4.5.14-mips/system.c
---- strace-4.5.14/system.c 2006-01-12 21:21:06.000000000 +0000
-+++ strace-4.5.14-mips/system.c 2007-05-03 06:59:09.000000000 +0000
-@@ -78,6 +78,7 @@
- #endif
-
- #include <linux/sysctl.h>
-+#include <linux/version.h>
-
- static const struct xlat mount_flags[] = {
- { MS_MGC_VAL, "MS_MGC_VAL" },
-@@ -1578,7 +1579,9 @@
- { CTL_KERN, "CTL_KERN" },
- { CTL_VM, "CTL_VM" },
- { CTL_NET, "CTL_NET" },
-- { CTL_PROC, "CTL_PROC" },
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-+ { CTL_PROC, "CTL_PROC" },
-+#endif
- { CTL_FS, "CTL_FS" },
- { CTL_DEBUG, "CTL_DEBUG" },
- { CTL_DEV, "CTL_DEV" },
diff --git a/packages/strace/strace/strace-fix-arm-bad-syscall.patch b/packages/strace/strace/strace-fix-arm-bad-syscall.patch
deleted file mode 100644
index d7d7426b74..0000000000
--- a/packages/strace/strace/strace-fix-arm-bad-syscall.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- strace-4.5.12-orig/syscall.c 2005-06-08 21:45:28.000000000 +0100
-+++ strace-4.5.12/syscall.c 2005-10-25 19:26:39.000000000 +0100
-@@ -1013,6 +1013,15 @@ struct tcb *tcp;
- /*
- * Note: we only deal with only 32-bit CPUs here.
- */
-+
-+ if (!(tcp->flags & TCB_INSYSCALL) &&
-+ (tcp->flags & TCB_WAITEXECVE)) {
-+ /* caught a fake syscall from the execve's exit */
-+ tcp->flags &= ~TCB_WAITEXECVE;
-+ return 0;
-+ }
-+
-+
- if (regs.ARM_cpsr & 0x20) {
- /*
- * Get the Thumb-mode system call number
diff --git a/packages/strace/strace/strace-undef-syscall.patch b/packages/strace/strace/strace-undef-syscall.patch
deleted file mode 100644
index 95166ea18a..0000000000
--- a/packages/strace/strace/strace-undef-syscall.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Origin is http://buildroot.uclibc.org/cgi-bin/viewcvs.cgi/*checkout*/trunk/buildroot/package/strace/strace-undef-syscall.patch?rev=17767
-
-This gets applied to fix build errors with uclibc on ARM EABI
-
---- strace-4.5.12/linux/syscallent.h.orig 2005-08-09 01:48:54.000000000 -0600
-+++ strace-4.5.12/linux/syscallent.h 2005-08-09 01:50:23.000000000 -0600
-@@ -298,7 +298,11 @@
- { 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 */
-+ { 1, TP, sys_exit, "exit_group"
-+#ifdef __NR_exit_group
-+ , __NR_exit_group
-+#endif
-+ }, /* 252 */
- { 4, 0, printargs, "lookup_dcookie"}, /* 253 */
- { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */
- { 4, 0, sys_epoll_ctl, "epoll_ctl" }, /* 255 */
---- strace-4.5.15.orig/linux/syscallent.h 2007-02-04 19:03:48.000000000 +0100
-+++ strace-4.5.15/linux/syscallent.h 2007-02-04 19:11:04.000000000 +0100
-@@ -130,7 +130,10 @@
- { 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 */
-+ { 2, TD, sys_socketcall, "socketcall",
-+#ifdef __NR_socketcall
-+ SYS_socketcall }, /* 102 */
-+#endif
- { 3, 0, sys_syslog, "syslog" }, /* 103 */
- { 3, 0, sys_setitimer, "setitimer" }, /* 104 */
- { 2, 0, sys_getitimer, "getitimer" }, /* 105 */
-@@ -145,7 +148,10 @@
- { 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 */
-+ { 6, 0, sys_ipc, "ipc",
-+#ifdef __NR_ipc
-+ SYS_ipc }, /* 117 */
-+#endif
- { 1, TD, sys_fsync, "fsync" }, /* 118 */
- { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */
- { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */
---- strace-4.5.15.orig/syscall.c 2007-02-04 19:03:48.000000000 +0100
-+++ strace-4.5.15/syscall.c 2007-02-04 19:07:26.000000000 +0100
-@@ -2404,14 +2404,18 @@
- switch (known_scno(tcp)) {
- #ifdef LINUX
- #if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA)
-+#ifdef __NR_socketcall
- case SYS_socketcall:
- decode_subcall(tcp, SYS_socket_subcall,
- SYS_socket_nsubcalls, deref_style);
- break;
-+#endif
-+#ifdef __NR_ipc
- case SYS_ipc:
- decode_subcall(tcp, SYS_ipc_subcall,
- SYS_ipc_nsubcalls, shift_style);
- break;
-+#endif
- #endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */
- #if defined (SPARC) || defined (SPARC64)
- case SYS_socketcall:
diff --git a/packages/strace/strace_4.5.11.bb b/packages/strace/strace_4.5.11.bb
deleted file mode 100644
index 8570172782..0000000000
--- a/packages/strace/strace_4.5.11.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-LICENSE = "GPL"
-SECTION = "console/utils"
-PR = "r2"
-
-DESCRIPTION = "strace is a system call tracing tool."
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
- file://arm-syscallent.patch;patch=1 \
- file://quota.patch;patch=1"
-
-inherit autotools
-
-export INCLUDES = "-I. -I./linux"
diff --git a/packages/strace/strace_4.5.12.bb b/packages/strace/strace_4.5.12.bb
deleted file mode 100644
index 3a15563100..0000000000
--- a/packages/strace/strace_4.5.12.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-SECTION = "console/utils"
-PR = "r1"
-
-DESCRIPTION = "strace is a system call tracing tool."
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
- file://arm-syscallent.patch;patch=1 \
- file://quota.patch;patch=1 \
- file://strace-fix-arm-bad-syscall.patch;patch=1"
-
-inherit autotools
-
-export INCLUDES = "-I. -I./linux"
diff --git a/packages/strace/strace_4.5.14.bb b/packages/strace/strace_4.5.14.bb
deleted file mode 100644
index cb697008b8..0000000000
--- a/packages/strace/strace_4.5.14.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "strace is a system call tracing tool."
-SECTION = "console/utils"
-LICENSE = "GPL"
-PR = "r7"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
- file://glibc-2.5.patch;patch=1 \
- file://arm-eabi.patch;patch=1 \
- file://drop-ctl-proc.patch;patch=1 \
- file://sh-arch-update.patch;patch=1 \
- file://sh-syscall-update.patch;patch=1 \
- file://strace-fix-arm-bad-syscall.patch;patch=1 \
- file://strace-undef-syscall.patch;patch=1 \
- file://strace-arm-no-cachectl.patch;patch=1 \
- "
-
-# The strace-4.5.14-avr32.patch conflicts with some other patches.
-# These patches are primarly for the ARM and SuperH, so we'll just
-# not use them when building for the AVR32.
-# The avr32 patch also includes the drop-ctl-proc.patch
-# The AVR32 patches are from http://avr32linux.org/twiki/bin/view/Main/STrace
-SRC_URI_avr32 = \
- "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
- file://strace-4.5.14-avr32.patch;patch=1 \
- file://strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch;patch=1 \
- "
-
-# Again, a different set of patches for MIPS. See http://bugs.openembedded.net/show_bug.cgi?id=2221
-MIPS = "\
- ${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
- file://glibc-2.5.patch;patch=1 \
- file://arm-eabi.patch;patch=1 \
- file://sh-arch-update.patch;patch=1 \
- file://sh-syscall-update.patch;patch=1 \
- file://strace-fix-arm-bad-syscall.patch;patch=1 \
- file://strace-undef-syscall.patch;patch=1 \
- file://strace-arm-no-cachectl.patch;patch=1 \
- file://mips-sigcontext.patch;patch=1 \
-"
-SRC_URI_mips = "${MIPS}"
-SRC_URI_mipsel = "${MIPS}"
-
-inherit autotools
-
-export INCLUDES = "-I. -I./linux"
diff --git a/packages/strace/strace_4.5.15.bb b/packages/strace/strace_4.5.15.bb
deleted file mode 100644
index e73fb0f732..0000000000
--- a/packages/strace/strace_4.5.15.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "strace is a system call tracing tool."
-SECTION = "console/utils"
-LICENSE = "GPL"
-
-# this recipe is missing patches for arm and sh
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_avr32 = "1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
- "
-
-SRC_URI_avr32 = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
- file://strace-4.5.15.atmel.1.patch;patch=1 \
- "
-
-inherit autotools
-
-export INCLUDES = "-I. -I./linux"