From dd0632273f1d7e31d040f34b9b3aeeca1c680ddc Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 24 Jun 2015 17:40:40 -0700
Subject: [PATCH] Patch android-21 with x86 gdbserver <sys/procfs.h> and
 <sys/user.h> fixes.

This makes the files match (AOSP ToT post-M) bionic.

Bug: http://b/22068064
Change-Id: I100ac14afc06c2fe09ef5ecf9c2e3afa13b68c3b
---
 ndk/platforms/android-21/include/sys/procfs.h | 4 ++++
 ndk/platforms/android-21/include/sys/user.h   | 6 +-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ndk/platforms/android-21/include/sys/procfs.h b/ndk/platforms/android-21/include/sys/procfs.h
index b5b1a4667..7ef5023ab 100644
--- a/ndk/platforms/android-21/include/sys/procfs.h
+++ b/ndk/platforms/android-21/include/sys/procfs.h
@@ -39,6 +39,10 @@ typedef elf_greg_t elf_gregset_t[NGREG];
 
 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_fpregset_t prfpregset_t;
 
diff --git a/ndk/platforms/android-21/include/sys/user.h b/ndk/platforms/android-21/include/sys/user.h
index c969726a4..d63fe6aa5 100644
--- a/ndk/platforms/android-21/include/sys/user.h
+++ b/ndk/platforms/android-21/include/sys/user.h
@@ -47,7 +47,7 @@ struct user_fpregs_struct {
   long fos;
   long st_space[20];
 };
-struct user_fxsr_struct {
+struct user_fpxregs_struct {
   unsigned short cwd;
   unsigned short swd;
   unsigned short twd;
@@ -166,10 +166,6 @@ struct user {
 };
 
 #elif defined(__mips__)
-struct user_regs_struct
-{
-  unsigned long regs[180 / sizeof(unsigned long) + 64];
-};
 
 struct user {
   unsigned long regs[180 / sizeof(unsigned long) + 64];