LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 138e4eb4: am 71142c8d: Merge "Patch android-21 with x86 gdbserver <sys/procfs.h> and <sys/user.h> fixes."

Browse Source 
* commit '138e4eb4bc3982991232da7870e7553c068d117d':
  Patch android-21 with x86 gdbserver <sys/procfs.h> and <sys/user.h> fixes.
This commit is contained in:
Elliott Hughes
2015-06-25 14:44:53 +00:00
committed by Android Git Automerger
parent 7c0000afd6 138e4eb4bc
commit 2824beac4d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ndk/platforms/android-21/include/sys/procfs.h
View File

@@ -39,6 +39,10 @@ typedef elf_greg_t elf_gregset_t[NGREG];
typedef fpregset_t elf_fpregset_t; typedef fpregset_t elf_fpregset_t;
#if defined(__i386__)
typedef struct user_fpxregs_struct elf_fpxregset_t;
#endif
typedef elf_gregset_t prgregset_t; typedef elf_gregset_t prgregset_t;
typedef elf_fpregset_t prfpregset_t; typedef elf_fpregset_t prfpregset_t;

6
ndk/platforms/android-21/include/sys/user.h
View File

@@ -47,7 +47,7 @@ struct user_fpregs_struct {
long fos; long fos;
long st_space[20]; long st_space[20];
}; };
struct user_fxsr_struct { struct user_fpxregs_struct {
unsigned short cwd; unsigned short cwd;
unsigned short swd; unsigned short swd;
unsigned short twd; unsigned short twd;
@@ -166,10 +166,6 @@ struct user {
}; };
#elif defined(__mips__) #elif defined(__mips__)
struct user_regs_struct
{
unsigned long regs[180 / sizeof(unsigned long) + 64];
};
struct user { struct user {
unsigned long regs[180 / sizeof(unsigned long) + 64]; unsigned long regs[180 / sizeof(unsigned long) + 64];