diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 82278e7bb20..2e98158aa6f 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-06  Kevin Buettner  <kevinb@redhat.com>
+
+	* linux-x86-low.c (x86_fill_gregset): Don't compile 64-bit
+	sign extension code on 32-bit builds.
+
 2019-05-03  Eli Zaretskii  <eliz@gnu.org>
 
 	* remote-utils.c:
diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
index dd7673126ed..adddfe77971 100644
--- a/gdb/gdbserver/linux-x86-low.c
+++ b/gdb/gdbserver/linux-x86-low.c
@@ -339,6 +339,7 @@ x86_fill_gregset (struct regcache *regcache, void *buf)
   collect_register_by_name (regcache, "orig_eax",
 			    ((char *) buf) + ORIG_EAX * REGSIZE);
 
+#ifdef __x86_64__
   /* Sign extend EAX value to avoid potential syscall restart
      problems. 
 
@@ -351,6 +352,7 @@ x86_fill_gregset (struct regcache *regcache, void *buf)
 
       *(int64_t *) ptr = *(int32_t *) ptr;
     }
+#endif
 }
 
 static void