diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index 6ae486539f..44a44f4712 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -7498,9 +7498,9 @@ _ACEOF
fi
-# See if <sys/user.h> supports the %fs_base and %gs_base amd64 segment
-# registers. Older amd64 Linux's don't have the fs_base and gs_base
-# members of `struct user_regs_struct'.
+# See if <sys/user.h> supports the %fs_base and %gs_bas amd64 segment
registers.
+# Older amd64 Linux's don't have the fs_base and gs_base members of
+# `struct user_regs_struct'.
ac_fn_c_check_member "$LINENO" "struct user_regs_struct" "fs_base"
"ac_cv_member_struct_user_regs_struct_fs_base" "#include <sys/user.h>
"
if test "x$ac_cv_member_struct_user_regs_struct_fs_base" = x""yes;
then :
@@ -8252,7 +8252,7 @@ $as_echo "#define USE_LIBTHREAD_DB_DIRECTLY 1"
>>confdefs.h
fi
if test "$srv_xmlfiles" != ""; then
- srv_xmlbuiltin="xml-builtin.o"
+ srv_xmlbuiltin="xml-builtin-generated.o"