From 05d08e9716b5974d6ed08973f44930804890b902 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Thu, 4 Feb 2016 13:16:38 -0800 Subject: 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 --- libc/kernel/uapi/asm-x86/asm/ptrace-abi.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'libc/kernel/uapi/asm-x86/asm/ptrace-abi.h') 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 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif #endif -- cgit v1.2.3