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

am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes."

Browse Source 
* commit '1a8697f91c7f95477e5e1de4580d5b9e5ea3e6fd':
  Patch android-21 with aarch64 <sys/user.h> fixes.
This commit is contained in:
Elliott Hughes
2015-08-26 15:29:20 +00:00
committed by Android Git Automerger
parent 4cacf1124d 1a8697f91c
commit b851cbc2cd
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,12 +82,6 @@ typedef struct ucontext {
#define NGREG 34 /* x0..x30 + sp + pc + pstate */ #define NGREG 34 /* x0..x30 + sp + pc + pstate */
typedef unsigned long greg_t; typedef unsigned long greg_t;
typedef greg_t gregset_t[NGREG]; typedef greg_t gregset_t[NGREG];
struct user_fpsimd_struct {
long double vregs[32];
uint32_t fpsr;
uint32_t fpcr;
};
typedef struct user_fpsimd_struct fpregset_t; typedef struct user_fpsimd_struct fpregset_t;
#include <asm/sigcontext.h> #include <asm/sigcontext.h>

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

@@ -30,11 +30,13 @@
#define _SYS_USER_H_ #define _SYS_USER_H_
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <limits.h> /* For PAGE_SIZE. */
#include <stddef.h> /* For size_t. */ #include <stddef.h> /* For size_t. */
__BEGIN_DECLS __BEGIN_DECLS
#define PAGE_SIZE 4096
#define PAGE_MASK (~(PAGE_SIZE - 1))
#if __i386__ #if __i386__
struct user_fpregs_struct { struct user_fpregs_struct {
@@ -230,7 +232,17 @@ struct user {
#elif defined(__aarch64__) #elif defined(__aarch64__)
// There are no user structures for 64 bit arm. struct user_regs_struct {
uint64_t regs[31];
uint64_t sp;
uint64_t pc;
uint64_t pstate;
};
struct user_fpsimd_struct {
__uint128_t vregs[32];
uint32_t fpsr;
uint32_t fpcr;
};
#else #else