Remove process_stratum_target::hostio_last_error abstraction
authorPedro Alves <pedro@palves.net>
Mon, 12 Apr 2021 19:23:54 +0000 (20:23 +0100)
committerPedro Alves <pedro@palves.net>
Tue, 13 Apr 2021 12:26:44 +0000 (13:26 +0100)
Now that the WinCE port is gone, all ports map host I/O errors from
errno, so this abstraction is no longer necessary.

Basically undoes:
  https://sourceware.org/pipermail/gdb-patches/2008-January/055511.html
  https://sourceware.org/pipermail/gdb-patches/attachments/20080131/f44e7012/attachment.bin

gdbserver/ChangeLog:

* Makefile.in (SFILES): Remove hostio-errno.cc.
* configure: Regenerate.
* configure.ac (GDBSERVER_DEPFILES): No longer add
$srv_hostio_err_objs.
* configure.srv (srv_hostio_err_objs): Delete.
* hostio-errno.cc: Delete.
* hostio.cc (hostio_error): Inline hostio_last_error_from_errno
here.
* hostio.h (hostio_last_error_from_errno): Delete.
* target.cc (process_stratum_target::hostio_last_error): Delete.
* target.h (class process_stratum_target) <hostio_last_error>:
Delete.

gdbserver/ChangeLog
gdbserver/Makefile.in
gdbserver/configure
gdbserver/configure.ac
gdbserver/configure.srv
gdbserver/hostio-errno.cc [deleted file]
gdbserver/hostio.cc
gdbserver/hostio.h
gdbserver/target.cc
gdbserver/target.h

index e558364b9eb9ef45f534ed8d3b567b393272546a..dfaaa60419715a8c7a612389368019ec413b421a 100644 (file)
@@ -1,3 +1,18 @@
+2021-04-13  Pedro Alves  <pedro@palves.net>
+
+       * Makefile.in (SFILES): Remove hostio-errno.cc.
+       * configure: Regenerate.
+       * configure.ac (GDBSERVER_DEPFILES): No longer add
+       $srv_hostio_err_objs.
+       * configure.srv (srv_hostio_err_objs): Delete.
+       * hostio-errno.cc: Delete.
+       * hostio.cc (hostio_error): Inline hostio_last_error_from_errno
+       here.
+       * hostio.h (hostio_last_error_from_errno): Delete.
+       * target.cc (process_stratum_target::hostio_last_error): Delete.
+       * target.h (class process_stratum_target) <hostio_last_error>:
+       Delete.
+
 2021-04-12  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * win32-low.cc: Remove all code guarded by _WIN32_WCE.
index a05cd1a57ade5d32dcc01e20fca2bdfa3a58feb3..f7ade7d61d5c9e1c9a6a4abfaeb9320d86a18c84 100644 (file)
@@ -186,7 +186,6 @@ SFILES = \
        $(srcdir)/dll.cc \
        $(srcdir)/gdbreplay.cc \
        $(srcdir)/hostio.cc \
-       $(srcdir)/hostio-errno.cc \
        $(srcdir)/i387-fp.cc \
        $(srcdir)/inferiors.cc \
        $(srcdir)/linux-aarch64-low.cc \
index 0db0ad3f4fbd942500e1abe820a4b335b20631ea..032b4ae65bbc49c8ba10d8bfc947c35602b5db40 100755 (executable)
@@ -10633,7 +10633,7 @@ $as_echo "#define USE_XML 1" >>confdefs.h
   done
 fi
 
-GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles"
+GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_thread_depfiles"
 GDBSERVER_LIBS="$srv_libs"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the target supports __sync_*_compare_and_swap" >&5
index 6c504777d09e57fd7612cb874cbb53947b91e019..5ec222dfc6055695b5e06b1d8c99d5d5789c9b96 100644 (file)
@@ -379,7 +379,7 @@ if test "$srv_xmlfiles" != ""; then
   done
 fi
 
-GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles"
+GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_thread_depfiles"
 GDBSERVER_LIBS="$srv_libs"
 
 dnl Check whether the target supports __sync_*_compare_and_swap.
index 2dd8f75a4e064cc20bd4bbc0d12edd6d5ad45fe6..971f537bffa434dc4a7cf80056b1a94e23be1400 100644 (file)
@@ -8,8 +8,6 @@
 #   srv_regobj         The register protocol appropriate for this target.
 #   srv_tgtobj         Any other target-specific modules appropriate
 #                      for this target.
-#   srv_hostio_err     The object implementing the hostio_last_error
-#                      target method.
 #   srv_xmlfiles       All XML files which should be available for
 #                      gdbserver in this configuration.
 #   ipa_obj            Any other target-specific modules appropriate
@@ -24,9 +22,6 @@
 #   srv_linux_usrregs  Set to "yes" if we can get at registers via
 #                      PTRACE_PEEKUSR / PTRACE_POKEUSR.
 
-# Default hostio_last_error implementation
-srv_hostio_err_objs="hostio-errno.o"
-
 ipa_ppc_linux_regobj="powerpc-32l-ipa.o powerpc-altivec32l-ipa.o powerpc-vsx32l-ipa.o powerpc-isa205-32l-ipa.o powerpc-isa205-altivec32l-ipa.o powerpc-isa205-vsx32l-ipa.o powerpc-isa205-ppr-dscr-vsx32l-ipa.o powerpc-isa207-vsx32l-ipa.o powerpc-isa207-htm-vsx32l-ipa.o powerpc-e500l-ipa.o powerpc-64l-ipa.o powerpc-altivec64l-ipa.o powerpc-vsx64l-ipa.o powerpc-isa205-64l-ipa.o powerpc-isa205-altivec64l-ipa.o powerpc-isa205-vsx64l-ipa.o powerpc-isa205-ppr-dscr-vsx64l-ipa.o powerpc-isa207-vsx64l-ipa.o powerpc-isa207-htm-vsx64l-ipa.o"
 
 # Linux object files.  This is so we don't have to repeat
diff --git a/gdbserver/hostio-errno.cc b/gdbserver/hostio-errno.cc
deleted file mode 100644 (file)
index 4cb3922..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Host file transfer support for gdbserver.
-   Copyright (C) 2007-2021 Free Software Foundation, Inc.
-
-   Contributed by CodeSourcery.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* This file implements the hostio_last_error target callback
-   on top of errno.  */
-
-#include "server.h"
-
-#include "hostio.h"
-
-#include "gdbsupport/fileio.h"
-
-void
-hostio_last_error_from_errno (char *buf)
-{
-  int error = errno;
-  int fileio_error = host_to_fileio_error (error);
-  sprintf (buf, "F-1,%x", fileio_error);
-}
index 26c0f119d20638a19c4e5544468f1feeeafcbade..0654bba3a6fa5392685937c137a60ae9cfbd2f56 100644 (file)
@@ -191,12 +191,14 @@ require_valid_fd (int fd)
   return -1;
 }
 
-/* Fill in own_buf with the last hostio error packet, however it
-   suitable for the target.  */
+/* Fill BUF with an hostio error packet representing the last hostio
+   error, from errno.  */
+
 static void
 hostio_error (char *own_buf)
 {
-  the_target->hostio_last_error (own_buf);
+  int fileio_error = host_to_fileio_error (errno);
+  sprintf (own_buf, "F-1,%x", fileio_error);
 }
 
 static void
index 61c42196e54cfefafacfe04b970be2816605f1f1..97c27c6b744584ae8d559d66b6a92e16deb57864 100644 (file)
 /* Per-connection setup.  */
 extern void hostio_handle_new_gdb_connection (void);
 
-/* Functions from hostio.c.  */
 extern int handle_vFile (char *, int, int *);
 
-/* Functions from hostio-errno.c.  */
-extern void hostio_last_error_from_errno (char *own_buf);
-
 #endif /* GDBSERVER_HOSTIO_H */
index 5ec3e5cce9f9184dd49bfbad9a0b4fb0e1c99bfe..6660cc04fd50f2ca23308110db778ad90a7c5b01 100644 (file)
@@ -505,12 +505,6 @@ process_stratum_target::get_tls_address (thread_info *thread,
   gdb_assert_not_reached ("target op get_tls_address not supported");
 }
 
-void
-process_stratum_target::hostio_last_error (char *buf)
-{
-  hostio_last_error_from_errno (buf);
-}
-
 bool
 process_stratum_target::supports_qxfer_osdata ()
 {
index 769d82811766572258d352ab99cd1e2c08629de8..2c4393ec8c61a20d36392bb5f7e6277109a2d627 100644 (file)
@@ -256,10 +256,6 @@ public:
   virtual int get_tls_address (thread_info *thread, CORE_ADDR offset,
                               CORE_ADDR load_module, CORE_ADDR *address);
 
-  /* Fill BUF with an hostio error packet representing the last hostio
-     error.  */
-  virtual void hostio_last_error (char *buf);
-
   /* Return true if the qxfer_osdata target op is supported.  */
   virtual bool supports_qxfer_osdata ();