gdb/features: set osabi in all Linux related features/*.xml files

Some of the top level (i.e. those that contain the <target> element)
xml files in gdb/features/ are clearly Linux only.  I conclude this
based on the files names containing the string "linux".

I think that all of these files should have the <osabi> element
included with the value "GNU/Linux".

This commits adds the <osabi> element where I believe it is
appropriate and regenerates the associated .c files.

The benefit of this change is that gdbserver, which makes use of these
files, will now send the osabi back in more cases.  Sending back more
descriptive target descriptions is a good thing as this makes it
easier for GDB to select the correct gdbarch.

Approved-By: Kevin Buettner <kevinb@redhat.com>

38 files changed, 57 insertions, 0 deletions

diff --git a/gdb/features/mips64-dsp-linux.c b/gdb/features/mips64-dsp-linux.c
index 7ea0bb7..646f548 100644
--- a/gdb/features/mips64-dsp-linux.c
+++ b/gdb/features/mips64-dsp-linux.c
@@ -11,6 +11,8 @@ initialize_tdesc_mips64_dsp_linux (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("mips"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.mips.cpu");
diff --git a/gdb/features/mips64-dsp-linux.xml b/gdb/features/mips64-dsp-linux.xml
index 69518e4..6c10855 100644
--- a/gdb/features/mips64-dsp-linux.xml
+++ b/gdb/features/mips64-dsp-linux.xml
@@ -8,6 +8,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>mips</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="mips64-cpu.xml"/>
   <xi:include href="mips64-cp0.xml"/>
   <xi:include href="mips64-fpu.xml"/>
diff --git a/gdb/features/mips64-linux.c b/gdb/features/mips64-linux.c
index f4dcf8b..98b3d34 100644
--- a/gdb/features/mips64-linux.c
+++ b/gdb/features/mips64-linux.c
@@ -11,6 +11,8 @@ initialize_tdesc_mips64_linux (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("mips"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.mips.cpu");
diff --git a/gdb/features/mips64-linux.xml b/gdb/features/mips64-linux.xml
index 4c99206..f861982 100644
--- a/gdb/features/mips64-linux.xml
+++ b/gdb/features/mips64-linux.xml
@@ -8,6 +8,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>mips</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="mips64-cpu.xml"/>
   <xi:include href="mips64-cp0.xml"/>
   <xi:include href="mips64-fpu.xml"/>
diff --git a/gdb/features/s390-gs-linux64.c b/gdb/features/s390-gs-linux64.c
index 49ea08b..ab6ad6f 100644
--- a/gdb/features/s390-gs-linux64.c
+++ b/gdb/features/s390-gs-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_gs_linux64 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-gs-linux64.xml b/gdb/features/s390-gs-linux64.xml
index 035e794..e33e8a4 100644
--- a/gdb/features/s390-gs-linux64.xml
+++ b/gdb/features/s390-gs-linux64.xml
@@ -11,6 +11,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:31-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux32.c b/gdb/features/s390-linux32.c
index 43ceb9c..e45321a 100644
--- a/gdb/features/s390-linux32.c
+++ b/gdb/features/s390-linux32.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux32 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux32.xml b/gdb/features/s390-linux32.xml
index 4225e5c..6a51c21 100644
--- a/gdb/features/s390-linux32.xml
+++ b/gdb/features/s390-linux32.xml
@@ -11,6 +11,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:31-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390-core32.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux32v1.c b/gdb/features/s390-linux32v1.c
index 291784f..cea14c1 100644
--- a/gdb/features/s390-linux32v1.c
+++ b/gdb/features/s390-linux32v1.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux32v1 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux32v1.xml b/gdb/features/s390-linux32v1.xml
index 60f8ab6..6378076 100644
--- a/gdb/features/s390-linux32v1.xml
+++ b/gdb/features/s390-linux32v1.xml
@@ -11,6 +11,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:31-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390-core32.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux32v2.c b/gdb/features/s390-linux32v2.c
index 6fa26da..182ab2f 100644
--- a/gdb/features/s390-linux32v2.c
+++ b/gdb/features/s390-linux32v2.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux32v2 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux32v2.xml b/gdb/features/s390-linux32v2.xml
index 58b1478..0646ce3 100644
--- a/gdb/features/s390-linux32v2.xml
+++ b/gdb/features/s390-linux32v2.xml
@@ -11,6 +11,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:31-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390-core32.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux64.c b/gdb/features/s390-linux64.c
index 74c338c..8bcec09 100644
--- a/gdb/features/s390-linux64.c
+++ b/gdb/features/s390-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux64 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux64.xml b/gdb/features/s390-linux64.xml
index dcd5029..e8d8f03 100644
--- a/gdb/features/s390-linux64.xml
+++ b/gdb/features/s390-linux64.xml
@@ -11,6 +11,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:31-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux64v1.c b/gdb/features/s390-linux64v1.c
index 0aebbdb..3a6394b 100644
--- a/gdb/features/s390-linux64v1.c
+++ b/gdb/features/s390-linux64v1.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux64v1 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux64v1.xml b/gdb/features/s390-linux64v1.xml
index a849e79..fc63a16 100644
--- a/gdb/features/s390-linux64v1.xml
+++ b/gdb/features/s390-linux64v1.xml
@@ -11,6 +11,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:31-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux64v2.c b/gdb/features/s390-linux64v2.c
index 3b3b491..5ff9a57 100644
--- a/gdb/features/s390-linux64v2.c
+++ b/gdb/features/s390-linux64v2.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux64v2 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux64v2.xml b/gdb/features/s390-linux64v2.xml
index 4bbfb09..3d0c9f9 100644
--- a/gdb/features/s390-linux64v2.xml
+++ b/gdb/features/s390-linux64v2.xml
@@ -11,6 +11,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:31-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-te-linux64.c b/gdb/features/s390-te-linux64.c
index d49e744..2abddd5 100644
--- a/gdb/features/s390-te-linux64.c
+++ b/gdb/features/s390-te-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_te_linux64 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-te-linux64.xml b/gdb/features/s390-te-linux64.xml
index e141e0b..399053a 100644
--- a/gdb/features/s390-te-linux64.xml
+++ b/gdb/features/s390-te-linux64.xml
@@ -11,6 +11,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:31-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-tevx-linux64.c b/gdb/features/s390-tevx-linux64.c
index ffe1ddf..8e38a5c 100644
--- a/gdb/features/s390-tevx-linux64.c
+++ b/gdb/features/s390-tevx-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_tevx_linux64 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-tevx-linux64.xml b/gdb/features/s390-tevx-linux64.xml
index f9dc796..2dbb039 100644
--- a/gdb/features/s390-tevx-linux64.xml
+++ b/gdb/features/s390-tevx-linux64.xml
@@ -11,6 +11,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:31-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-vx-linux64.c b/gdb/features/s390-vx-linux64.c
index 30262a6..1ce5ad3 100644
--- a/gdb/features/s390-vx-linux64.c
+++ b/gdb/features/s390-vx-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_vx_linux64 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-vx-linux64.xml b/gdb/features/s390-vx-linux64.xml
index fe55fb2..6b32bf8 100644
--- a/gdb/features/s390-vx-linux64.xml
+++ b/gdb/features/s390-vx-linux64.xml
@@ -11,6 +11,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:31-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-gs-linux64.c b/gdb/features/s390x-gs-linux64.c
index 501b3b2..76b8124 100644
--- a/gdb/features/s390x-gs-linux64.c
+++ b/gdb/features/s390x-gs-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_gs_linux64 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-gs-linux64.xml b/gdb/features/s390x-gs-linux64.xml
index 6131aaa..c41e460 100644
--- a/gdb/features/s390x-gs-linux64.xml
+++ b/gdb/features/s390x-gs-linux64.xml
@@ -10,6 +10,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:64-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390x-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-linux64.c b/gdb/features/s390x-linux64.c
index 8655d5a..eb6b181 100644
--- a/gdb/features/s390x-linux64.c
+++ b/gdb/features/s390x-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_linux64 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-linux64.xml b/gdb/features/s390x-linux64.xml
index a70f637..31afe82 100644
--- a/gdb/features/s390x-linux64.xml
+++ b/gdb/features/s390x-linux64.xml
@@ -10,6 +10,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:64-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390x-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-linux64v1.c b/gdb/features/s390x-linux64v1.c
index 11bfd85..6b43f88 100644
--- a/gdb/features/s390x-linux64v1.c
+++ b/gdb/features/s390x-linux64v1.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_linux64v1 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-linux64v1.xml b/gdb/features/s390x-linux64v1.xml
index ffc0505..8aa26b4 100644
--- a/gdb/features/s390x-linux64v1.xml
+++ b/gdb/features/s390x-linux64v1.xml
@@ -10,6 +10,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:64-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390x-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-linux64v2.c b/gdb/features/s390x-linux64v2.c
index 400b1af..eeba787 100644
--- a/gdb/features/s390x-linux64v2.c
+++ b/gdb/features/s390x-linux64v2.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_linux64v2 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-linux64v2.xml b/gdb/features/s390x-linux64v2.xml
index 4b2abc6..3769a75 100644
--- a/gdb/features/s390x-linux64v2.xml
+++ b/gdb/features/s390x-linux64v2.xml
@@ -10,6 +10,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:64-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390x-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-te-linux64.c b/gdb/features/s390x-te-linux64.c
index 74883e3..0fec2b0 100644
--- a/gdb/features/s390x-te-linux64.c
+++ b/gdb/features/s390x-te-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_te_linux64 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-te-linux64.xml b/gdb/features/s390x-te-linux64.xml
index b38c7c0..c48831d 100644
--- a/gdb/features/s390x-te-linux64.xml
+++ b/gdb/features/s390x-te-linux64.xml
@@ -10,6 +10,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:64-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390x-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-tevx-linux64.c b/gdb/features/s390x-tevx-linux64.c
index 1d45d60..c1b8900 100644
--- a/gdb/features/s390x-tevx-linux64.c
+++ b/gdb/features/s390x-tevx-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_tevx_linux64 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-tevx-linux64.xml b/gdb/features/s390x-tevx-linux64.xml
index 2d7672e..a53bfff 100644
--- a/gdb/features/s390x-tevx-linux64.xml
+++ b/gdb/features/s390x-tevx-linux64.xml
@@ -10,6 +10,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:64-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390x-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-vx-linux64.c b/gdb/features/s390x-vx-linux64.c
index 4de6585..af57e05 100644
--- a/gdb/features/s390x-vx-linux64.c
+++ b/gdb/features/s390x-vx-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_vx_linux64 (void)
   target_desc_up result = allocate_target_description ();
   set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
 
+  set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-vx-linux64.xml b/gdb/features/s390x-vx-linux64.xml
index 8903f18..fcf75de 100644
--- a/gdb/features/s390x-vx-linux64.xml
+++ b/gdb/features/s390x-vx-linux64.xml
@@ -10,6 +10,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>s390:64-bit</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="s390x-core64.xml"/>
   <xi:include href="s390-acr.xml"/>
   <xi:include href="s390-fpr.xml"/>