From fef58353f4ecd7ef2b48ad7f4d80013dbf786606 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 24 Jun 2015 17:31:24 -0700
Subject: [PATCH] Fix x86 gdbserver build.

Add the x86-only elf_fpxregset_t to <sys/procfs.h>, and rename
user_fxsr_struct (the kernel's name) to user_fpxregs_struct (the
userspace name).

Bug: http://b/22068064
Change-Id: Id466096bf02baf6bd49b193f49d9036848d33548
---
 libc/include/sys/procfs.h | 4 ++++
 libc/include/sys/user.h   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libc/include/sys/procfs.h b/libc/include/sys/procfs.h
index b5b1a4667..7ef5023ab 100644
--- a/libc/include/sys/procfs.h
+++ b/libc/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/libc/include/sys/user.h b/libc/include/sys/user.h
index b370add7f..d63fe6aa5 100644
--- a/libc/include/sys/user.h
+++ b/libc/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;