+2013-05-28  Pedro Alves  <palves@redhat.com>
+
+       * Makefile.in (clean): Remove reference to aarch64-without-fpu.c.
+       (aarch64-without-fpu.c): Delete rule.
+       * configure.srv (aarch64*-*-linux*): Remove references to
+       aarch64-without-fpu.o and aarch64-without-fpu.xml.
+       * linux-aarch64-low.c (init_registers_aarch64_without_fpu): Remove
+       declaration.
+
 2013-05-24  Pedro Alves  <palves@redhat.com>
 
        * server.c (handle_v_cont) <vCont;r>: Use unpack_varlen_hex
 
        rm -f version.c
        rm -f gdbserver$(EXEEXT) gdbreplay$(EXEEXT) core make.log
        rm -f $(IPA_LIB)
-       rm -f aarch64.c aarch64-without-fpu.c
+       rm -f aarch64.c
        rm -f reg-arm.c reg-bfin.c i386.c reg-ia64.c reg-m32r.c reg-m68k.c
        rm -f reg-sh.c reg-sparc.c reg-spu.c amd64.c i386-linux.c
        rm -f reg-cris.c reg-crisv32.c amd64-linux.c reg-xtensa.c
 
 aarch64.c : $(srcdir)/../regformats/aarch64.dat $(regdat_sh)
        $(SHELL) $(regdat_sh) $(srcdir)/../regformats/aarch64.dat aarch64.c
-aarch64-without-fpu.c : $(srcdir)/../regformats/aarch64-without-fpu.dat $(regdat_sh)
-       $(SHELL) $(regdat_sh) $(srcdir)/../regformats/aarch64-without-fpu.dat aarch64-without-fpu.c
 reg-arm.c : $(srcdir)/../regformats/reg-arm.dat $(regdat_sh)
        $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-arm.dat reg-arm.c
 arm-with-iwmmxt.c : $(srcdir)/../regformats/arm-with-iwmmxt.dat $(regdat_sh)
 
 
 case "${target}" in
   aarch64*-*-linux*)
-                       srv_regobj="aarch64.o aarch64-without-fpu.o"
+                       srv_regobj="aarch64.o"
                        srv_tgtobj="linux-aarch64-low.o"
                        srv_tgtobj="${srv_tgtobj} linux-low.o"
                        srv_tgtobj="${srv_tgtobj} linux-osdata.o"
                        srv_xmlfiles="aarch64.xml"
                        srv_xmlfiles="${srv_xmlfiles} aarch64-core.xml"
                        srv_xmlfiles="${srv_xmlfiles} aarch64-fpu.xml"
-                       srv_xmlfiles="${srv_xmlfiles} aarch64-without-fpu.xml"
                        srv_linux_usrregs=yes
                        srv_linux_regsets=yes
                        srv_linux_thread_db=yes
 
 /* Defined in auto-generated files.  */
 void init_registers_aarch64 (void);
 
-/* Defined in auto-generated files.  */
-void init_registers_aarch64_without_fpu (void);
-
 #ifdef HAVE_SYS_REG_H
 #include <sys/reg.h>
 #endif