From 3614424e107849c53759ef93b9166e69a76818df Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 30 Jan 2014 10:39:02 -0800
Subject: [PATCH] Make ARM <user.h> more glibc-compatible.

Change-Id: I681930ad7f80a5e7bc40eb0f36872e415445f0f9
---
 libc/include/sys/user.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libc/include/sys/user.h b/libc/include/sys/user.h
index 9f11a83d1..90cce8083 100644
--- a/libc/include/sys/user.h
+++ b/libc/include/sys/user.h
@@ -181,7 +181,7 @@ struct user {
 
 #elif defined(__arm__)
 
-struct user_fp {
+struct user_fpregs {
   struct fp_reg {
     unsigned int sign1:1;
     unsigned int unused:15;
@@ -196,6 +196,9 @@ struct user_fp {
   unsigned char ftype[8];
   unsigned int init_flag;
 };
+struct user_regs {
+  unsigned long uregs[18];
+};
 struct user_vfp {
   unsigned long long fpregs[32];
   unsigned long fpscr;
@@ -206,7 +209,7 @@ struct user_vfp_exc {
   unsigned long fpinst2;
 };
 struct user {
-  struct pt_regs regs;
+  struct user_regs regs;
   int u_fpvalid;
   unsigned long int u_tsize;
   unsigned long int u_dsize;
@@ -215,12 +218,12 @@ struct user {
   unsigned long start_stack;
   long int signal;
   int reserved;
-  unsigned long u_ar0;
+  struct user_regs* u_ar0;
   unsigned long magic;
   char u_comm[32];
   int u_debugreg[8];
-  struct user_fp u_fp;
-  struct user_fp_struct* u_fp0;
+  struct user_fpregs u_fp;
+  struct user_fpregs* u_fp0;
 };
 
 #elif defined(__aarch64__)