This change sanitizes the x86-specific platform headers and libraries. It does two things: - Remove the stuff under android-3/arch-x86 - Update the content of android-9/arch-x86 from a recent AOSP full_x86-eng build (see caveats below). Some files appear to move because they didn't change (e.g. kernel headers). This change was generated by following these steps: 1/ Build full_x86-eng from the AOSP tree 2/ From $ANDROID_ROOT/ndk, run: build/tools/dev-system-import.sh --direct --arch=x86 9 3/ Under $ANDROID_ROOT/development/ndk, do: git rm -r android-3/arch-x86 git add android-9/arch-x86 git checkout -- android-9/include git ls-files -o | xargs rm git commit IMPORTANT: The AOSP tip-of-tree used to generate these files includes post-Gingerbread changes !! The final version of the android-9/arch-x86 files will have to be generated from the gingerbread branch after we back-port all x86-support changes to it. These binaries are thus not final, but can be used to generate working experimental NDK packages, including prebuilt GNU libstdc++ and STLport binaries that implement -fstack-protector correctly. Change-Id: I260896185a098b9b356bd26f492692e4a4f66f8f
75 lines
1.5 KiB
C
75 lines
1.5 KiB
C
/****************************************************************************
|
|
****************************************************************************
|
|
***
|
|
*** This header was automatically generated from a Linux kernel header
|
|
*** of the same name, to make information necessary for userspace to
|
|
*** call into the kernel available to libc. It contains only constants,
|
|
*** structures, and macros generated from the original header, and thus,
|
|
*** contains no copyrightable information.
|
|
***
|
|
****************************************************************************
|
|
****************************************************************************/
|
|
#ifndef _ASM_X86_PTRACE_H
|
|
#define _ASM_X86_PTRACE_H
|
|
|
|
#include <linux/compiler.h>
|
|
#include <asm/ptrace-abi.h>
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#ifdef __i386__
|
|
|
|
struct pt_regs {
|
|
long ebx;
|
|
long ecx;
|
|
long edx;
|
|
long esi;
|
|
long edi;
|
|
long ebp;
|
|
long eax;
|
|
int xds;
|
|
int xes;
|
|
int xfs;
|
|
|
|
long orig_eax;
|
|
long eip;
|
|
int xcs;
|
|
long eflags;
|
|
long esp;
|
|
int xss;
|
|
};
|
|
|
|
#else
|
|
|
|
struct pt_regs {
|
|
unsigned long r15;
|
|
unsigned long r14;
|
|
unsigned long r13;
|
|
unsigned long r12;
|
|
unsigned long rbp;
|
|
unsigned long rbx;
|
|
|
|
unsigned long r11;
|
|
unsigned long r10;
|
|
unsigned long r9;
|
|
unsigned long r8;
|
|
unsigned long rax;
|
|
unsigned long rcx;
|
|
unsigned long rdx;
|
|
unsigned long rsi;
|
|
unsigned long rdi;
|
|
unsigned long orig_rax;
|
|
|
|
unsigned long rip;
|
|
unsigned long cs;
|
|
unsigned long eflags;
|
|
unsigned long rsp;
|
|
unsigned long ss;
|
|
|
|
};
|
|
|
|
#endif
|
|
#endif
|
|
|
|
#endif
|