Revert "gdbserver: pass osabi to GDB in target description"

This reverts commit 98bcde5e268ea7cd54186c5f2c27c65103218fc3.  This
commit was causing build problems on at least sparc, ppc, and s390,
though I suspect some other targets might be impacted too.

diff --git a/gdbserver/linux-aarch32-tdesc.cc b/gdbserver/linux-aarch32-tdesc.cc
index 441fe668e6a4a236b09a4dd22f45b172eb5f492c..b8987752b9f8bab5e9a514f78ffcd0e9e843a1d5 100644 (file)
--- a/gdbserver/linux-aarch32-tdesc.cc
+++ b/gdbserver/linux-aarch32-tdesc.cc
@@ -34,7 +34,7 @@ aarch32_linux_read_description ()
       tdesc_aarch32 = aarch32_create_target_description (false);
 
       static const char *expedite_regs[] = { "r11", "sp", "pc", 0 };
-      init_target_desc (tdesc_aarch32, expedite_regs, GDB_OSABI_LINUX);
+      init_target_desc (tdesc_aarch32, expedite_regs);
     }
   return tdesc_aarch32;
 }

diff --git a/gdbserver/linux-aarch64-tdesc.cc b/gdbserver/linux-aarch64-tdesc.cc
index 39d5bccdce18aba294440e5ed73fc73582c5db71..31ec7854cc0bd1124ddb1c7954ee6f6964b2a134 100644 (file)
--- a/gdbserver/linux-aarch64-tdesc.cc
+++ b/gdbserver/linux-aarch64-tdesc.cc
@@ -67,8 +67,7 @@ aarch64_linux_read_description (const aarch64_features &features)
 
       expedited_registers.push_back (nullptr);
 
-      init_target_desc (tdesc, (const char **) expedited_registers.data (),
-                       GDB_OSABI_LINUX);
+      init_target_desc (tdesc, (const char **) expedited_registers.data ());
 
       tdesc_aarch64_map[features] = tdesc;
     }

diff --git a/gdbserver/linux-arc-low.cc b/gdbserver/linux-arc-low.cc
index 16d8d5824aa2f075f9d7920d48d121ddcbb84466..1bcaf6c3f91118fbe8262173a33d26b28038900d 100644 (file)
--- a/gdbserver/linux-arc-low.cc
+++ b/gdbserver/linux-arc-low.cc
@@ -114,7 +114,7 @@ arc_linux_read_description (void)
   target_desc_up tdesc = arc_create_target_description (features);
 
   static const char *expedite_regs[] = { "sp", "status32", nullptr };
-  init_target_desc (tdesc.get (), expedite_regs, GDB_OSABI_LINUX);
+  init_target_desc (tdesc.get (), expedite_regs);
 
   return tdesc.release ();
 }

diff --git a/gdbserver/linux-arm-tdesc.cc b/gdbserver/linux-arm-tdesc.cc
index fff2e948f81f4b40e4cfec86e7ad07bf2a1d5199..559f9b0f3dc34fca09e64dede98d90784ac830a9 100644 (file)
--- a/gdbserver/linux-arm-tdesc.cc
+++ b/gdbserver/linux-arm-tdesc.cc
@@ -37,7 +37,7 @@ arm_linux_read_description (arm_fp_type fp_type)
       tdesc = arm_create_target_description (fp_type, false);
 
       static const char *expedite_regs[] = { "r11", "sp", "pc", 0 };
-      init_target_desc (tdesc, expedite_regs, GDB_OSABI_LINUX);
+      init_target_desc (tdesc, expedite_regs);
 
       tdesc_arm_list[fp_type] = tdesc;
     }

diff --git a/gdbserver/linux-csky-low.cc b/gdbserver/linux-csky-low.cc
index 18a0d152b5ae9b27446675d37c2123b8e7169bc6..2eb5a2df17b9e6a5c58dcca714716b74cb5cd077 100644 (file)
--- a/gdbserver/linux-csky-low.cc
+++ b/gdbserver/linux-csky-low.cc
@@ -133,7 +133,7 @@ csky_target::low_arch_setup ()
 
   if (tdesc->expedite_regs.empty ())
     {
-      init_target_desc (tdesc.get (), expedite_regs, GDB_OSABI_LINUX);
+      init_target_desc (tdesc.get (), expedite_regs);
       gdb_assert (!tdesc->expedite_regs.empty ());
     }
 

diff --git a/gdbserver/linux-loongarch-low.cc b/gdbserver/linux-loongarch-low.cc
index cf7d6c0743cb16a2f032d418eb2600cb4cb48ed9..584ea64a7d95a4391758e850140274b05b0ef39c 100644 (file)
--- a/gdbserver/linux-loongarch-low.cc
+++ b/gdbserver/linux-loongarch-low.cc
@@ -85,7 +85,7 @@ loongarch_target::low_arch_setup ()
 
   if (tdesc->expedite_regs.empty ())
     {
-      init_target_desc (tdesc.get (), expedite_regs, GDB_OSABI_LINUX);
+      init_target_desc (tdesc.get (), expedite_regs);
       gdb_assert (!tdesc->expedite_regs.empty ());
     }
   current_process ()->tdesc = tdesc.release ();

diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc
index 7170ad9922ef20d9fcbe0ab5e3c66b245d974a72..c4554c507a8c658612e295544465c076d33fa363 100644 (file)
--- a/gdbserver/linux-riscv-low.cc
+++ b/gdbserver/linux-riscv-low.cc
@@ -91,7 +91,7 @@ riscv_target::low_arch_setup ()
 
   if (tdesc->expedite_regs.empty ())
     {
-      init_target_desc (tdesc.get (), expedite_regs, GDB_OSABI_LINUX);
+      init_target_desc (tdesc.get (), expedite_regs);
       gdb_assert (!tdesc->expedite_regs.empty ());
     }
 

diff --git a/gdbserver/linux-tic6x-low.cc b/gdbserver/linux-tic6x-low.cc
index 754dd00590c747ad20f7cf5b13d7d07a6fad5675..707be2e7b0f9843ffafb4627f63d2de43f908bc8 100644 (file)
--- a/gdbserver/linux-tic6x-low.cc
+++ b/gdbserver/linux-tic6x-low.cc
@@ -228,7 +228,7 @@ tic6x_read_description (enum c6x_feature feature)
     {
       *tdesc = tic6x_create_target_description (feature);
       static const char *expedite_regs[] = { "A15", "PC", NULL };
-      init_target_desc (*tdesc, expedite_regs, GDB_OSABI_LINUX);
+      init_target_desc (*tdesc, expedite_regs);
     }
 
   return *tdesc;

diff --git a/gdbserver/linux-x86-tdesc.cc b/gdbserver/linux-x86-tdesc.cc
index 6aa5c4ab9705a7e6e7b1ef0a06cc7894536f6e77..13c80762605c658a4a6d0c1105eadf270cd7fb83 100644 (file)
--- a/gdbserver/linux-x86-tdesc.cc
+++ b/gdbserver/linux-x86-tdesc.cc
@@ -26,21 +26,10 @@
 void
 x86_linux_post_init_tdesc (target_desc *tdesc, bool is_64bit)
 {
-  enum gdb_osabi osabi = GDB_OSABI_LINUX;
-
-#ifndef IN_PROCESS_AGENT
-  /* x86 target descriptions are created with the osabi already set.
-     However, init_target_desc requires us to override the already set
-     value.  That's fine, out new string should match the old one.  */
-  gdb_assert (tdesc_osabi_name (tdesc) != nullptr);
-  gdb_assert (strcmp (tdesc_osabi_name (tdesc),
-                     gdbarch_osabi_name (osabi)) == 0);
-#endif /* ! IN_PROCESS_AGENT */
-
 #ifdef __x86_64__
   if (is_64bit)
-    init_target_desc (tdesc, amd64_expedite_regs, osabi);
+    init_target_desc (tdesc, amd64_expedite_regs);
   else
 #endif
-    init_target_desc (tdesc, i386_expedite_regs, osabi);
+    init_target_desc (tdesc, i386_expedite_regs);
 }

diff --git a/gdbserver/netbsd-aarch64-low.cc b/gdbserver/netbsd-aarch64-low.cc
index 8834e0ad89406ea905cc4cd3af86134ec62b30b6..f20a1a717733831e5af654fff108c79a784d7865 100644 (file)
--- a/gdbserver/netbsd-aarch64-low.cc
+++ b/gdbserver/netbsd-aarch64-low.cc
@@ -98,7 +98,7 @@ netbsd_aarch64_target::low_arch_setup ()
     = aarch64_create_target_description ({});
 
   static const char *expedite_regs_aarch64[] = { "x29", "sp", "pc", NULL };
-  init_target_desc (tdesc, expedite_regs_aarch64, GDB_OSABI_NETBSD);
+  init_target_desc (tdesc, expedite_regs_aarch64);
 
   current_process ()->tdesc = tdesc;
 }

diff --git a/gdbserver/netbsd-amd64-low.cc b/gdbserver/netbsd-amd64-low.cc
index ad7cb430b9208b625fdc705bd5159879df874b7f..b3f3aab5ec357876e0ea6b83d68bdaf0ef51fd52 100644 (file)
--- a/gdbserver/netbsd-amd64-low.cc
+++ b/gdbserver/netbsd-amd64-low.cc
@@ -193,7 +193,7 @@ netbsd_amd64_target::low_arch_setup ()
   target_desc *tdesc
     = amd64_create_target_description (X86_XSTATE_SSE_MASK, false, false, false);
 
-  init_target_desc (tdesc, amd64_expedite_regs, GDB_OSABI_NETBSD);
+  init_target_desc (tdesc, amd64_expedite_regs);
 
   current_process ()->tdesc = tdesc;
 }

diff --git a/gdbserver/netbsd-i386-low.cc b/gdbserver/netbsd-i386-low.cc
index ea6fce4c6f96728756bd15c8571c49f153e97f77..247a39797c41b267088a1798fe552ac6d886cdbc 100644 (file)
--- a/gdbserver/netbsd-i386-low.cc
+++ b/gdbserver/netbsd-i386-low.cc
@@ -142,7 +142,7 @@ netbsd_i386_target::low_arch_setup ()
   target_desc *tdesc
     = i386_create_target_description (X86_XSTATE_SSE_MASK, false, false);
 
-  init_target_desc (tdesc, i386_expedite_regs, GDB_OSABI_NETBSD);
+  init_target_desc (tdesc, i386_expedite_regs);
 
   current_process ()->tdesc = tdesc;
 }

diff --git a/gdbserver/tdesc.cc b/gdbserver/tdesc.cc
index da1287abbbed5933bf8ceddd4aa5d7a70ad4d473..d052f43c76e69c6f47f40e124b08866de3b2ba40 100644 (file)
--- a/gdbserver/tdesc.cc
+++ b/gdbserver/tdesc.cc
@@ -53,8 +53,7 @@ void target_desc::accept (tdesc_element_visitor &v) const
 
 void
 init_target_desc (struct target_desc *tdesc,
-                 const char **expedite_regs,
-                 enum gdb_osabi osabi)
+                 const char **expedite_regs)
 {
   int offset = 0;
 
@@ -89,8 +88,6 @@ init_target_desc (struct target_desc *tdesc,
   int expedite_count = 0;
   while (expedite_regs[expedite_count] != nullptr)
     tdesc->expedite_regs.push_back (expedite_regs[expedite_count++]);
-
-  set_tdesc_osabi (tdesc, osabi);
 #endif
 }
 

diff --git a/gdbserver/tdesc.h b/gdbserver/tdesc.h
index e6cefe5af3ed53c427a6edb324cbd2a2b9b1db55..4796b50b4d137758ee36def867ec6530e04e8f2b 100644 (file)
--- a/gdbserver/tdesc.h
+++ b/gdbserver/tdesc.h
@@ -81,11 +81,10 @@ void copy_target_description (struct target_desc *dest,
                              const struct target_desc *src);
 
 /* Initialize TDESC, and then set its expedite_regs field to
-   EXPEDITE_REGS and its osabi to OSABI.  */
+   EXPEDITE_REGS.  */
 
 void init_target_desc (struct target_desc *tdesc,
-                      const char **expedite_regs,
-                      enum gdb_osabi osabi);
+                      const char **expedite_regs);
 
 /* Return the current inferior's target description.  Never returns
    NULL.  */

diff --git a/gdbserver/win32-i386-low.cc b/gdbserver/win32-i386-low.cc
index 13f9aca99b12147aa57d8700ee1acc209401e454..0a761ca58ef38d89844c931175c0f468e560f2cd 100644 (file)
--- a/gdbserver/win32-i386-low.cc
+++ b/gdbserver/win32-i386-low.cc
@@ -596,12 +596,12 @@ i386_arch_setup (void)
 #ifdef __x86_64__
   tdesc = amd64_create_target_description (X86_XSTATE_SSE_MASK, false,
                                           false, false);
-  init_target_desc (tdesc, amd64_expedite_regs, WINDOWS_OSABI);
+  init_target_desc (tdesc, amd64_expedite_regs);
   win32_tdesc = tdesc;
 #endif
 
   tdesc = i386_create_target_description (X86_XSTATE_SSE_MASK, false, false);
-  init_target_desc (tdesc, i386_expedite_regs, WINDOWS_OSABI);
+  init_target_desc (tdesc, i386_expedite_regs);
 #ifdef __x86_64__
   wow64_win32_tdesc = tdesc;
 #else

diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index daed16a6ae6a097ad4383c7ebe8b3cd3752b5eae..ff997df0a66b351b0fe9a8fce5fc51d627e71bb2 100644 (file)
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -21,7 +21,6 @@
 
 #include <windows.h>
 #include "nat/windows-nat.h"
-#include "gdbsupport/osabi.h"
 
 struct target_desc;
 
@@ -32,12 +31,6 @@ extern const struct target_desc *win32_tdesc;
 extern const struct target_desc *wow64_win32_tdesc;
 #endif
 
-#ifdef __CYGWIN__
-constexpr enum gdb_osabi WINDOWS_OSABI = GDB_OSABI_CYGWIN;
-#else
-constexpr enum gdb_osabi WINDOWS_OSABI = GDB_OSABI_WINDOWS;
-#endif
-
 struct win32_target_ops
 {
   /* Architecture-specific setup.  */