diff options
32 files changed, 72 insertions, 32 deletions
diff --git a/ldso/include/ldsodefs.h b/ldso/include/ldsodefs.h index bd3b02d47..d9fe5bbe3 100644 --- a/ldso/include/ldsodefs.h +++ b/ldso/include/ldsodefs.h @@ -1,7 +1,7 @@ #ifndef _LDSODEFS_H #define _LDSODEFS_H 1 -#include "kernel-features.h" +#include <bits/kernel-features.h> #include <features.h> #include <tls.h> diff --git a/libc/sysdeps/linux/common/getdents.c b/libc/sysdeps/linux/common/getdents.c index 0baf47eb4..e1aa2a51f 100644 --- a/libc/sysdeps/linux/common/getdents.c +++ b/libc/sysdeps/linux/common/getdents.c @@ -16,6 +16,7 @@ #include <sys/types.h> #include <sys/syscall.h> #include <bits/kernel_types.h> +#include <bits/kernel-features.h> /* With newer versions of linux, the getdents syscall returns d_type * information after the name field. diff --git a/libc/sysdeps/linux/common/sys/ptrace.h b/libc/sysdeps/linux/common/sys/ptrace.h index b4aec4f20..08658f976 100644 --- a/libc/sysdeps/linux/common/sys/ptrace.h +++ b/libc/sysdeps/linux/common/sys/ptrace.h @@ -1,5 +1,5 @@ /* `ptrace' debugger support interface. Linux version. - Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1996-1999,2000,2006,2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -109,8 +109,47 @@ enum __ptrace_request #define PT_SETFPXREGS PTRACE_SETFPXREGS /* Continue and stop at the next (return from) syscall. */ - PTRACE_SYSCALL = 24 + PTRACE_SYSCALL = 24, #define PT_SYSCALL PTRACE_SYSCALL + + /* Set ptrace filter options. */ + PTRACE_SETOPTIONS = 0x4200, +#define PT_SETOPTIONS PTRACE_SETOPTIONS + + /* Get last ptrace message. */ + PTRACE_GETEVENTMSG = 0x4201, +#define PT_GETEVENTMSG PTRACE_GETEVENTMSG + + /* Get siginfo for process. */ + PTRACE_GETSIGINFO = 0x4202, +#define PT_GETSIGINFO PTRACE_GETSIGINFO + + /* Set new siginfo for process. */ + PTRACE_SETSIGINFO = 0x4203 +#define PT_SETSIGINFO PTRACE_SETSIGINFO +}; + + +/* Options set using PTRACE_SETOPTIONS. */ +enum __ptrace_setoptions { + PTRACE_O_TRACESYSGOOD = 0x00000001, + PTRACE_O_TRACEFORK = 0x00000002, + PTRACE_O_TRACEVFORK = 0x00000004, + PTRACE_O_TRACECLONE = 0x00000008, + PTRACE_O_TRACEEXEC = 0x00000010, + PTRACE_O_TRACEVFORKDONE = 0x00000020, + PTRACE_O_TRACEEXIT = 0x00000040, + PTRACE_O_MASK = 0x0000007f +}; + +/* Wait extended result codes for the above trace options. */ +enum __ptrace_eventcodes { + PTRACE_EVENT_FORK = 1, + PTRACE_EVENT_VFORK = 2, + PTRACE_EVENT_CLONE = 3, + PTRACE_EVENT_EXEC = 4, + PTRACE_EVENT_VFORK_DONE = 5, + PTRACE_EVENT_EXIT = 6 }; /* Perform process tracing functions. REQUEST is one of the values diff --git a/libpthread/nptl/pthread_cancel.c b/libpthread/nptl/pthread_cancel.c index a13af56b3..0ea990693 100644 --- a/libpthread/nptl/pthread_cancel.c +++ b/libpthread/nptl/pthread_cancel.c @@ -22,7 +22,7 @@ #include "pthreadP.h" #include "atomic.h" #include <sysdep.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> int diff --git a/libpthread/nptl/pthread_condattr_setclock.c b/libpthread/nptl/pthread_condattr_setclock.c index 04e246b74..6dc25636a 100644 --- a/libpthread/nptl/pthread_condattr_setclock.c +++ b/libpthread/nptl/pthread_condattr_setclock.c @@ -23,7 +23,7 @@ #include <time.h> #include <sysdep.h> #include "pthreadP.h" -#include <kernel-features.h> +#include <bits/kernel-features.h> int diff --git a/libpthread/nptl/sysdeps/pthread/createthread.c b/libpthread/nptl/sysdeps/pthread/createthread.c index 03a0f1aa3..88ffe09d3 100644 --- a/libpthread/nptl/sysdeps/pthread/createthread.c +++ b/libpthread/nptl/sysdeps/pthread/createthread.c @@ -25,7 +25,7 @@ #include <ldsodefs.h> #include <tls.h> -#include "kernel-features.h" +#include <bits/kernel-features.h> #define CLONE_SIGNAL (CLONE_SIGHAND | CLONE_THREAD) diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_broadcast.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_broadcast.c index f767dcf39..d83524182 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread_cond_broadcast.c +++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_broadcast.c @@ -23,7 +23,7 @@ #include <lowlevellock.h> #include <pthread.h> #include <pthreadP.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> int diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_signal.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_signal.c index b49131c86..863b0a029 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread_cond_signal.c +++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_signal.c @@ -23,7 +23,7 @@ #include <lowlevellock.h> #include <pthread.h> #include <pthreadP.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> int diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S index 5471c1c92..dc9b2b12a 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -20,7 +20,7 @@ #include <sysdep.h> #include <shlib-compat.h> #include <lowlevelcond.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #ifdef UP # define LOCK diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S index 3c5a1db59..d16f8b60f 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -20,7 +20,7 @@ #include <sysdep.h> #include <shlib-compat.h> #include <lowlevelcond.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #ifdef UP # define LOCK diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S index 24f5a1d29..7ab222e1b 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S @@ -20,7 +20,7 @@ #include <sysdep.h> #define _ERRNO_H 1 #include <bits/errno.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include <tcb-offsets.h> /* Save the PID value. */ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/pt-vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/pt-vfork.S index 002af8590..61651fd97 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/pt-vfork.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/pt-vfork.S @@ -20,7 +20,7 @@ #include <sysdep.h> #define _ERRNO_H 1 #include <bits/errno.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include <tcb-offsets.h> /* Clone the calling process, but without copying the whole address space. diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S index 61a712e44..b7e2cf6e7 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S @@ -20,7 +20,7 @@ #include <sysdep.h> #define _ERRNO_H 1 #include <bits/errno.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include <tcb-offsets.h> /* Clone the calling process, but without copying the whole address space. diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/pt-vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/pt-vfork.S index 82864c91f..e5b7b535c 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/pt-vfork.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/pt-vfork.S @@ -20,7 +20,7 @@ #include <sysdep.h> #define _ERRNO_H 1 #include <bits/errno.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include <tcb-offsets.h> /* Clone the calling process, but without copying the whole address space. diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S index ca054bce6..018132136 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S @@ -20,7 +20,7 @@ #include <sysdep.h> #define _ERRNO_H 1 #include <bits/errno.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include <tcb-offsets.h> /* Clone the calling process, but without copying the whole address space. diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pt-raise.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pt-raise.c index fa4f75471..7bee29784 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pt-raise.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pt-raise.c @@ -21,7 +21,7 @@ #include <signal.h> #include <sysdep.h> #include <tls.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> extern __typeof(raise) __raise; int __raise (int sig) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c index 82c2446d5..5f9380814 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c @@ -21,7 +21,7 @@ #include <pthreadP.h> #include <sys/time.h> #include <tls.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include <kernel-posix-cpu-timers.h> diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c index 9115d6f40..104472468 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c @@ -22,7 +22,7 @@ #include <pthreadP.h> #include <tls.h> #include <sysdep.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> int diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c b/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c index 7c7c32c4e..de794e4ab 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c @@ -22,7 +22,7 @@ #include <signal.h> #include <sysdep.h> #include <pthreadP.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> extern __typeof(raise) __raise; diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S index 99533165b..36eccf1e6 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S @@ -18,7 +18,7 @@ #include <sysdep.h> #include <lowlevelcond.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include "lowlevel-atomic.h" #define FUTEX_WAIT 0 diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S index 7b0c2e2b5..8729b4b6c 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S @@ -18,7 +18,7 @@ #include <sysdep.h> #include <lowlevelcond.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include "lowlevel-atomic.h" #define FUTEX_WAIT 0 diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c index 8ca24c7f9..09a571659 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c @@ -24,7 +24,7 @@ #include <string.h> #include <time.h> #include <sysdep.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include <internaltypes.h> #include <pthreadP.h> #include "kernel-posix-timers.h" diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c index 35055212a..3ebbbce30 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <time.h> #include <sysdep.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include "kernel-posix-timers.h" diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c index fdbdaa7c8..4c97f97ce 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c @@ -20,7 +20,7 @@ #include <errno.h> #include <time.h> #include <sysdep.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include "kernel-posix-timers.h" diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c index a2fcfd1b5..3ce0916a8 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <time.h> #include <sysdep.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include "kernel-posix-timers.h" diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c index e2b8ddae6..0ddfe8a51 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c @@ -22,7 +22,7 @@ #include <signal.h> #include <stdbool.h> #include <sysdep.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include <pthreadP.h> #include "kernel-posix-timers.h" diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c index fe08080a1..558c63f26 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <time.h> #include <sysdep.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #include "kernel-posix-timers.h" diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S index 72e7bc5b2..8b3833392 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -20,7 +20,7 @@ #include <sysdep.h> #include <shlib-compat.h> #include <lowlevelcond.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #ifdef UP # define LOCK diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S index de9e109f4..bc5843564 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -20,7 +20,7 @@ #include <sysdep.h> #include <shlib-compat.h> #include <lowlevelcond.h> -#include <kernel-features.h> +#include <bits/kernel-features.h> #ifdef UP # define LOCK diff --git a/librt/clock_getcpuclockid.c b/librt/clock_getcpuclockid.c index e6f669a7c..704c57402 100644 --- a/librt/clock_getcpuclockid.c +++ b/librt/clock_getcpuclockid.c @@ -21,7 +21,7 @@ #include <time.h> #include <sysdep.h> #include <unistd.h> -#include "kernel-features.h" +#include <bits/kernel-features.h> #include "kernel-posix-cpu-timers.h" #ifndef HAS_CPUCLOCK diff --git a/librt/clock_gettime.c b/librt/clock_gettime.c index a670799a9..8308329b2 100644 --- a/librt/clock_gettime.c +++ b/librt/clock_gettime.c @@ -21,7 +21,7 @@ #include <errno.h> #include <time.h> #include "kernel-posix-cpu-timers.h" -#include "kernel-features.h" +#include <bits/kernel-features.h> #define SYSCALL_GETTIME \ diff --git a/librt/clock_nanosleep.c b/librt/clock_nanosleep.c index 3fb14b48a..69e60087e 100644 --- a/librt/clock_nanosleep.c +++ b/librt/clock_nanosleep.c @@ -20,7 +20,7 @@ #include <errno.h> #include <sysdep-cancel.h> -#include "kernel-features.h" +#include <bits/kernel-features.h> #include "kernel-posix-cpu-timers.h" |