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
74 lines
1.6 KiB
C
74 lines
1.6 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 USER32_H
|
|
#define USER32_H 1
|
|
|
|
struct user_i387_ia32_struct {
|
|
u32 cwd;
|
|
u32 swd;
|
|
u32 twd;
|
|
u32 fip;
|
|
u32 fcs;
|
|
u32 foo;
|
|
u32 fos;
|
|
u32 st_space[20];
|
|
};
|
|
|
|
struct user32_fxsr_struct {
|
|
unsigned short cwd;
|
|
unsigned short swd;
|
|
unsigned short twd;
|
|
unsigned short fop;
|
|
int fip;
|
|
int fcs;
|
|
int foo;
|
|
int fos;
|
|
int mxcsr;
|
|
int reserved;
|
|
int st_space[32];
|
|
int xmm_space[32];
|
|
int padding[56];
|
|
};
|
|
|
|
struct user_regs_struct32 {
|
|
__u32 ebx, ecx, edx, esi, edi, ebp, eax;
|
|
unsigned short ds, __ds, es, __es;
|
|
unsigned short fs, __fs, gs, __gs;
|
|
__u32 orig_eax, eip;
|
|
unsigned short cs, __cs;
|
|
__u32 eflags, esp;
|
|
unsigned short ss, __ss;
|
|
};
|
|
|
|
struct user32 {
|
|
struct user_regs_struct32 regs;
|
|
int u_fpvalid;
|
|
|
|
struct user_i387_ia32_struct i387;
|
|
|
|
__u32 u_tsize;
|
|
__u32 u_dsize;
|
|
__u32 u_ssize;
|
|
__u32 start_code;
|
|
__u32 start_stack;
|
|
__u32 signal;
|
|
int reserved;
|
|
__u32 u_ar0;
|
|
|
|
__u32 u_fpstate;
|
|
__u32 magic;
|
|
char u_comm[32];
|
|
int u_debugreg[8];
|
|
};
|
|
|
|
#endif
|