diff options
author | Christopher Ferris <cferris@google.com> | 2016-02-04 13:16:38 -0800 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2016-02-05 16:03:55 -0800 |
commit | 05d08e9716b5974d6ed08973f44930804890b902 (patch) | |
tree | e3a33c02c6a918c04d30d93a315bf5b90b6cb512 /libc/kernel/uapi/asm-x86/asm/ptrace-abi.h | |
parent | d2be3802582e69bfaf1a8ab02849bc44c4fa2ce6 (diff) | |
download | android_bionic-05d08e9716b5974d6ed08973f44930804890b902.tar.gz android_bionic-05d08e9716b5974d6ed08973f44930804890b902.tar.bz2 android_bionic-05d08e9716b5974d6ed08973f44930804890b902.zip |
Updated to v4.4.1 kernel headers.
Small modifications needed to allow compilation with the new headers:
- Manually modify bionic/libc/kernel/uapi/asm-mips/asm/siginfo.h to
remove the uapi from the include.
- PR_XXX defines are now available for mips, so remove the definition
from linker_mips.cpp.
Bug: 23789423
Change-Id: I6dc8a03b012426d3a937db15cb24d3a50fab5a8c
Diffstat (limited to 'libc/kernel/uapi/asm-x86/asm/ptrace-abi.h')
-rw-r--r-- | libc/kernel/uapi/asm-x86/asm/ptrace-abi.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libc/kernel/uapi/asm-x86/asm/ptrace-abi.h b/libc/kernel/uapi/asm-x86/asm/ptrace-abi.h index f10a19508..b09aedb68 100644 --- a/libc/kernel/uapi/asm-x86/asm/ptrace-abi.h +++ b/libc/kernel/uapi/asm-x86/asm/ptrace-abi.h @@ -71,31 +71,30 @@ #define RSP 152 #define SS 160 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -#define ARGOFFSET R11 #endif #define FRAME_SIZE 168 #endif -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define PTRACE_GETREGS 12 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define PTRACE_SETREGS 13 #define PTRACE_GETFPREGS 14 #define PTRACE_SETFPREGS 15 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define PTRACE_GETFPXREGS 18 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define PTRACE_SETFPXREGS 19 #define PTRACE_OLDSETOPTIONS 21 #define PTRACE_GET_THREAD_AREA 25 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define PTRACE_SET_THREAD_AREA 26 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #ifdef __x86_64__ #define PTRACE_ARCH_PRCTL 30 #endif -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define PTRACE_SYSEMU 31 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define PTRACE_SYSEMU_SINGLESTEP 32 #define PTRACE_SINGLEBLOCK 33 #ifndef __ASSEMBLY__ -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #include <linux/types.h> +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif #endif |