gdb/regformats: add osabi information to generated .dat files

Some gdbserver targets generate their target description based on the
gdb/regformats/*.dat files.  These .dat files are generated from a
matching xml file in gdb/features/.

Lets consider a concrete example:

Take gdb/features/or1k-linux.xml, this file is processed by
gdb/features/Makefile to create gdb/regformats/or1k-linux.dat.

When gdbserver is built for the or1k target the file
or1k-linux-generated.cc is generated using the
gdb/regformats/regdat.sh script.  This .cc file is then compiled and
linked into gdbserver.

The or1k-linux-generated.cc file contains the function
init_registers_or1k_linux which is called from within gdbserver, this
function creates a target_desc object and sets its xmltarget field to
a fixed string.  This fixed string is the xml filename that was
originally used to generate the xml file, in this case or1k-linux.xml.

Additionally, as part of the gdbserver build the file or1k-linux.xml
is converted to a string and placed in the file
xml-builtin-generated.cc which is then built into gdbserver.

Now when GDB asks gdbserver for the target description, gdbserver
returns the fixed xmltarget string, which is the name of an xml file.
GDB will then ask gdbserver for that file and gdbserver will return
the contents of that file thanks to the xml-builtin-generated.cc
file's contents.

This is all rather complicated, but it does work.  So what's the
problem that I'm fixing?

Well or1k-linux.xml does contain the osabi information, so this will
be returned from gdbserver to GDB.  That's good.

However, the target_desc object created in init_registers_or1k_linux
will not have its osabi set correctly.

Now this doesn't really matter too much except
init_registers_or1k_linux includes a call to init_target_desc.

In the next commit I want to extend init_target_desc to require an
osabi to be passed in.  The motivation for this will be explained in
the next commit, but if we accept for a moment that this is something
that should be done, then the question is what osabi should we use in
init_registers_or1k_linux?

Ideally we'd use the osabi which is set in or1k-linux.xml.  If we do
that then everything will remain consistent, which is a good thing.

And so, to get the osabi from or1k-linux.xml into
init_registers_or1k_linux, we first need to get the osabi information
into or1k-linux.dat file, and this is what this commit does.

I've added a new xsl script print-osabi.xsl and updated
gdb/features/Makefile to make use of this script.  Then I regenerated
all of the .dat files.  Now every .dat file contains either:

  osabi:GNU/Linux
  osabi:unknown

The first is for xml files containing <osabi>GNU/Linux</osabi> and the
second is for xml files that don't contain an osabi element.

This commit doesn't attempt to make use of the osabi information in
the .dat files, that will come in the next commit.  There should be no
user visible changes after this commit.

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

48 files changed, 87 insertions, 0 deletions

diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index 01b327c..4f42d00 100644
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -191,6 +191,8 @@ $(outdir)/%.dat: %.xml number-regs.xsl sort-regs.xsl gdbserver-regs.xsl
 	echo "xmltarget:$(<F)" >> $(outdir)/$*.tmp
 	echo "expedite:$(if $($*-expedite),$($*-expedite),$($(firstword $(subst -, ,$(notdir $*)))-expedite))" \
 	  >> $(outdir)/$*.tmp
+	$(XSLTPROC) --path "$(PWD)" --xinclude print-osabi.xsl $< \
+	  >> $(outdir)/$*.tmp
 	$(XSLTPROC) --path "$(PWD)" --xinclude number-regs.xsl $< | \
 	  $(XSLTPROC) sort-regs.xsl - | \
 	  $(XSLTPROC) gdbserver-regs.xsl - >> $(outdir)/$*.tmp
diff --git a/gdb/features/print-osabi.xsl b/gdb/features/print-osabi.xsl
new file mode 100644
index 0000000..77f9931
--- /dev/null
+++ b/gdb/features/print-osabi.xsl
@@ -0,0 +1,39 @@
+<!--
+
+   Copyright (C) 2024 Free Software Foundation, Inc.
+
+   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/>.
+
+-->
+
+<xsl:stylesheet version="1.0"
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="text"/>
+  <xsl:variable name="total" select="count(/target/osabi)"/>
+  <xsl:template match = "/target">
+    <xsl:text>osabi:</xsl:text>
+    <xsl:choose>
+      <xsl:when test="osabi">
+	<xsl:value-of select="osabi"/>
+      </xsl:when>
+      <xsl:otherwise>
+	<xsl:text>unknown</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:text>
+</xsl:text>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/gdb/regformats/mips-dsp-linux.dat b/gdb/regformats/mips-dsp-linux.dat
index ce37bf3..dd22285 100644
--- a/gdb/regformats/mips-dsp-linux.dat
+++ b/gdb/regformats/mips-dsp-linux.dat
@@ -3,6 +3,7 @@
 name:mips_dsp_linux
 xmltarget:mips-dsp-linux.xml
 expedite:r29,pc
+osabi:GNU/Linux
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/mips-linux.dat b/gdb/regformats/mips-linux.dat
index d95e2c9..d333602 100644
--- a/gdb/regformats/mips-linux.dat
+++ b/gdb/regformats/mips-linux.dat
@@ -3,6 +3,7 @@
 name:mips_linux
 xmltarget:mips-linux.xml
 expedite:r29,pc
+osabi:GNU/Linux
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/mips64-dsp-linux.dat b/gdb/regformats/mips64-dsp-linux.dat
index e73df93..5712424 100644
--- a/gdb/regformats/mips64-dsp-linux.dat
+++ b/gdb/regformats/mips64-dsp-linux.dat
@@ -3,6 +3,7 @@
 name:mips64_dsp_linux
 xmltarget:mips64-dsp-linux.xml
 expedite:r29,pc
+osabi:GNU/Linux
 64:r0
 64:r1
 64:r2
diff --git a/gdb/regformats/mips64-linux.dat b/gdb/regformats/mips64-linux.dat
index 6770c8f..843320d 100644
--- a/gdb/regformats/mips64-linux.dat
+++ b/gdb/regformats/mips64-linux.dat
@@ -3,6 +3,7 @@
 name:mips64_linux
 xmltarget:mips64-linux.xml
 expedite:r29,pc
+osabi:GNU/Linux
 64:r0
 64:r1
 64:r2
diff --git a/gdb/regformats/nios2-linux.dat b/gdb/regformats/nios2-linux.dat
index fe4af2f..ecfca72 100644
--- a/gdb/regformats/nios2-linux.dat
+++ b/gdb/regformats/nios2-linux.dat
@@ -3,6 +3,7 @@
 name:nios2_linux
 xmltarget:nios2-linux.xml
 expedite:sp,pc
+osabi:GNU/Linux
 32:zero
 32:at
 32:r2
diff --git a/gdb/regformats/or1k-linux.dat b/gdb/regformats/or1k-linux.dat
index 7b64646..d2d94c6 100644
--- a/gdb/regformats/or1k-linux.dat
+++ b/gdb/regformats/or1k-linux.dat
@@ -3,6 +3,7 @@
 name:or1k_linux
 xmltarget:or1k-linux.xml
 expedite:r1,npc
+osabi:GNU/Linux
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/rs6000/powerpc-32.dat b/gdb/regformats/rs6000/powerpc-32.dat
index 266636b..f85f95d 100644
--- a/gdb/regformats/rs6000/powerpc-32.dat
+++ b/gdb/regformats/rs6000/powerpc-32.dat
@@ -3,6 +3,7 @@
 name:powerpc_32
 xmltarget:powerpc-32.xml
 expedite:r1,pc
+osabi:unknown
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/rs6000/powerpc-32l.dat b/gdb/regformats/rs6000/powerpc-32l.dat
index 2c8ccbe..286f1a5 100644
--- a/gdb/regformats/rs6000/powerpc-32l.dat
+++ b/gdb/regformats/rs6000/powerpc-32l.dat
@@ -3,6 +3,7 @@
 name:powerpc_32l
 xmltarget:powerpc-32l.xml
 expedite:r1,pc
+osabi:unknown
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/rs6000/powerpc-64l.dat b/gdb/regformats/rs6000/powerpc-64l.dat
index 10f43b1..b304c61 100644
--- a/gdb/regformats/rs6000/powerpc-64l.dat
+++ b/gdb/regformats/rs6000/powerpc-64l.dat
@@ -3,6 +3,7 @@
 name:powerpc_64l
 xmltarget:powerpc-64l.xml
 expedite:r1,pc
+osabi:unknown
 64:r0
 64:r1
 64:r2
diff --git a/gdb/regformats/rs6000/powerpc-altivec32l.dat b/gdb/regformats/rs6000/powerpc-altivec32l.dat
index c792a2f..3b1740b 100644
--- a/gdb/regformats/rs6000/powerpc-altivec32l.dat
+++ b/gdb/regformats/rs6000/powerpc-altivec32l.dat
@@ -3,6 +3,7 @@
 name:powerpc_altivec32l
 xmltarget:powerpc-altivec32l.xml
 expedite:r1,pc
+osabi:unknown
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/rs6000/powerpc-altivec64l.dat b/gdb/regformats/rs6000/powerpc-altivec64l.dat
index a806141..6cd79ea 100644
--- a/gdb/regformats/rs6000/powerpc-altivec64l.dat
+++ b/gdb/regformats/rs6000/powerpc-altivec64l.dat
@@ -3,6 +3,7 @@
 name:powerpc_altivec64l
 xmltarget:powerpc-altivec64l.xml
 expedite:r1,pc
+osabi:unknown
 64:r0
 64:r1
 64:r2
diff --git a/gdb/regformats/rs6000/powerpc-e500l.dat b/gdb/regformats/rs6000/powerpc-e500l.dat
index 750eafe..44d96d1 100644
--- a/gdb/regformats/rs6000/powerpc-e500l.dat
+++ b/gdb/regformats/rs6000/powerpc-e500l.dat
@@ -3,6 +3,7 @@
 name:powerpc_e500l
 xmltarget:powerpc-e500l.xml
 expedite:r1,pc
+osabi:unknown
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-32l.dat b/gdb/regformats/rs6000/powerpc-isa205-32l.dat
index 7227d06..61f06e0 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-32l.dat
@@ -3,6 +3,7 @@
 name:powerpc_isa205_32l
 xmltarget:powerpc-isa205-32l.xml
 expedite:r1,pc
+osabi:unknown
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-64l.dat b/gdb/regformats/rs6000/powerpc-isa205-64l.dat
index 13a72c7..bd62eb9 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-64l.dat
@@ -3,6 +3,7 @@
 name:powerpc_isa205_64l
 xmltarget:powerpc-isa205-64l.xml
 expedite:r1,pc
+osabi:unknown
 64:r0
 64:r1
 64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-altivec32l.dat b/gdb/regformats/rs6000/powerpc-isa205-altivec32l.dat
index 051724c..1e9da0f 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-altivec32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-altivec32l.dat
@@ -3,6 +3,7 @@
 name:powerpc_isa205_altivec32l
 xmltarget:powerpc-isa205-altivec32l.xml
 expedite:r1,pc
+osabi:unknown
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-altivec64l.dat b/gdb/regformats/rs6000/powerpc-isa205-altivec64l.dat
index 867e821..7944d39 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-altivec64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-altivec64l.dat
@@ -3,6 +3,7 @@
 name:powerpc_isa205_altivec64l
 xmltarget:powerpc-isa205-altivec64l.xml
 expedite:r1,pc
+osabi:unknown
 64:r0
 64:r1
 64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat b/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat
index 31a7d02..c033738 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat
@@ -3,6 +3,7 @@
 name:powerpc_isa205_ppr_dscr_vsx32l
 xmltarget:powerpc-isa205-ppr-dscr-vsx32l.xml
 expedite:r1,pc
+osabi:unknown
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat b/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat
index 74c8feb..91cd86f 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat
@@ -3,6 +3,7 @@
 name:powerpc_isa205_ppr_dscr_vsx64l
 xmltarget:powerpc-isa205-ppr-dscr-vsx64l.xml
 expedite:r1,pc
+osabi:unknown
 64:r0
 64:r1
 64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-vsx32l.dat b/gdb/regformats/rs6000/powerpc-isa205-vsx32l.dat
index fa05cae..72e7f68 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-vsx32l.dat
@@ -3,6 +3,7 @@
 name:powerpc_isa205_vsx32l
 xmltarget:powerpc-isa205-vsx32l.xml
 expedite:r1,pc
+osabi:unknown
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-vsx64l.dat b/gdb/regformats/rs6000/powerpc-isa205-vsx64l.dat
index 75bd453..ff5e8bd 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-vsx64l.dat
@@ -3,6 +3,7 @@
 name:powerpc_isa205_vsx64l
 xmltarget:powerpc-isa205-vsx64l.xml
 expedite:r1,pc
+osabi:unknown
 64:r0
 64:r1
 64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa207-htm-vsx32l.dat b/gdb/regformats/rs6000/powerpc-isa207-htm-vsx32l.dat
index c19416d..8c38c53 100644
--- a/gdb/regformats/rs6000/powerpc-isa207-htm-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa207-htm-vsx32l.dat
@@ -3,6 +3,7 @@
 name:powerpc_isa207_htm_vsx32l
 xmltarget:powerpc-isa207-htm-vsx32l.xml
 expedite:r1,pc
+osabi:unknown
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa207-htm-vsx64l.dat b/gdb/regformats/rs6000/powerpc-isa207-htm-vsx64l.dat
index 3835995..4a4aceb 100644
--- a/gdb/regformats/rs6000/powerpc-isa207-htm-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa207-htm-vsx64l.dat
@@ -3,6 +3,7 @@
 name:powerpc_isa207_htm_vsx64l
 xmltarget:powerpc-isa207-htm-vsx64l.xml
 expedite:r1,pc
+osabi:unknown
 64:r0
 64:r1
 64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa207-vsx32l.dat b/gdb/regformats/rs6000/powerpc-isa207-vsx32l.dat
index 0718d72..36891b3 100644
--- a/gdb/regformats/rs6000/powerpc-isa207-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa207-vsx32l.dat
@@ -3,6 +3,7 @@
 name:powerpc_isa207_vsx32l
 xmltarget:powerpc-isa207-vsx32l.xml
 expedite:r1,pc
+osabi:unknown
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa207-vsx64l.dat b/gdb/regformats/rs6000/powerpc-isa207-vsx64l.dat
index 510c6c8..28515f7 100644
--- a/gdb/regformats/rs6000/powerpc-isa207-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa207-vsx64l.dat
@@ -3,6 +3,7 @@
 name:powerpc_isa207_vsx64l
 xmltarget:powerpc-isa207-vsx64l.xml
 expedite:r1,pc
+osabi:unknown
 64:r0
 64:r1
 64:r2
diff --git a/gdb/regformats/rs6000/powerpc-vsx32l.dat b/gdb/regformats/rs6000/powerpc-vsx32l.dat
index 6db3e38..2ff8979 100644
--- a/gdb/regformats/rs6000/powerpc-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-vsx32l.dat
@@ -3,6 +3,7 @@
 name:powerpc_vsx32l
 xmltarget:powerpc-vsx32l.xml
 expedite:r1,pc
+osabi:unknown
 32:r0
 32:r1
 32:r2
diff --git a/gdb/regformats/rs6000/powerpc-vsx64l.dat b/gdb/regformats/rs6000/powerpc-vsx64l.dat
index bc0a455..4b78038 100644
--- a/gdb/regformats/rs6000/powerpc-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-vsx64l.dat
@@ -3,6 +3,7 @@
 name:powerpc_vsx64l
 xmltarget:powerpc-vsx64l.xml
 expedite:r1,pc
+osabi:unknown
 64:r0
 64:r1
 64:r2
diff --git a/gdb/regformats/s390-gs-linux64.dat b/gdb/regformats/s390-gs-linux64.dat
index 130c8ec..ced8c8c 100644
--- a/gdb/regformats/s390-gs-linux64.dat
+++ b/gdb/regformats/s390-gs-linux64.dat
@@ -3,6 +3,7 @@
 name:s390_gs_linux64
 xmltarget:s390-gs-linux64.xml
 expedite:r14,r15,pswa
+osabi:GNU/Linux
 32:pswm
 32:pswa
 32:r0h
diff --git a/gdb/regformats/s390-linux32.dat b/gdb/regformats/s390-linux32.dat
index 545dd0f..1a494bc 100644
--- a/gdb/regformats/s390-linux32.dat
+++ b/gdb/regformats/s390-linux32.dat
@@ -3,6 +3,7 @@
 name:s390_linux32
 xmltarget:s390-linux32.xml
 expedite:r14,r15,pswa
+osabi:GNU/Linux
 32:pswm
 32:pswa
 32:r0
diff --git a/gdb/regformats/s390-linux32v1.dat b/gdb/regformats/s390-linux32v1.dat
index b9e7fc8..9d26f2e 100644
--- a/gdb/regformats/s390-linux32v1.dat
+++ b/gdb/regformats/s390-linux32v1.dat
@@ -3,6 +3,7 @@
 name:s390_linux32v1
 xmltarget:s390-linux32v1.xml
 expedite:r14,r15,pswa
+osabi:GNU/Linux
 32:pswm
 32:pswa
 32:r0
diff --git a/gdb/regformats/s390-linux32v2.dat b/gdb/regformats/s390-linux32v2.dat
index 220af5e..33bd546 100644
--- a/gdb/regformats/s390-linux32v2.dat
+++ b/gdb/regformats/s390-linux32v2.dat
@@ -3,6 +3,7 @@
 name:s390_linux32v2
 xmltarget:s390-linux32v2.xml
 expedite:r14,r15,pswa
+osabi:GNU/Linux
 32:pswm
 32:pswa
 32:r0
diff --git a/gdb/regformats/s390-linux64.dat b/gdb/regformats/s390-linux64.dat
index b347b6b..b63a932 100644
--- a/gdb/regformats/s390-linux64.dat
+++ b/gdb/regformats/s390-linux64.dat
@@ -3,6 +3,7 @@
 name:s390_linux64
 xmltarget:s390-linux64.xml
 expedite:r14l,r15l,pswa
+osabi:GNU/Linux
 32:pswm
 32:pswa
 32:r0h
diff --git a/gdb/regformats/s390-linux64v1.dat b/gdb/regformats/s390-linux64v1.dat
index 8abd92d..71737fa 100644
--- a/gdb/regformats/s390-linux64v1.dat
+++ b/gdb/regformats/s390-linux64v1.dat
@@ -3,6 +3,7 @@
 name:s390_linux64v1
 xmltarget:s390-linux64v1.xml
 expedite:r14l,r15l,pswa
+osabi:GNU/Linux
 32:pswm
 32:pswa
 32:r0h
diff --git a/gdb/regformats/s390-linux64v2.dat b/gdb/regformats/s390-linux64v2.dat
index b282025..b25fa04 100644
--- a/gdb/regformats/s390-linux64v2.dat
+++ b/gdb/regformats/s390-linux64v2.dat
@@ -3,6 +3,7 @@
 name:s390_linux64v2
 xmltarget:s390-linux64v2.xml
 expedite:r14l,r15l,pswa
+osabi:GNU/Linux
 32:pswm
 32:pswa
 32:r0h
diff --git a/gdb/regformats/s390-te-linux64.dat b/gdb/regformats/s390-te-linux64.dat
index 28e1b87..2c7bdb0 100644
--- a/gdb/regformats/s390-te-linux64.dat
+++ b/gdb/regformats/s390-te-linux64.dat
@@ -3,6 +3,7 @@
 name:s390_te_linux64
 xmltarget:s390-te-linux64.xml
 expedite:r14l,r15l,pswa
+osabi:GNU/Linux
 32:pswm
 32:pswa
 32:r0h
diff --git a/gdb/regformats/s390-tevx-linux64.dat b/gdb/regformats/s390-tevx-linux64.dat
index 3db7a91..20d0b92 100644
--- a/gdb/regformats/s390-tevx-linux64.dat
+++ b/gdb/regformats/s390-tevx-linux64.dat
@@ -3,6 +3,7 @@
 name:s390_tevx_linux64
 xmltarget:s390-tevx-linux64.xml
 expedite:r14l,r15l,pswa
+osabi:GNU/Linux
 32:pswm
 32:pswa
 32:r0h
diff --git a/gdb/regformats/s390-vx-linux64.dat b/gdb/regformats/s390-vx-linux64.dat
index 6a821fd..4ebb36b 100644
--- a/gdb/regformats/s390-vx-linux64.dat
+++ b/gdb/regformats/s390-vx-linux64.dat
@@ -3,6 +3,7 @@
 name:s390_vx_linux64
 xmltarget:s390-vx-linux64.xml
 expedite:r14l,r15l,pswa
+osabi:GNU/Linux
 32:pswm
 32:pswa
 32:r0h
diff --git a/gdb/regformats/s390x-gs-linux64.dat b/gdb/regformats/s390x-gs-linux64.dat
index 8cd5751..9d44d89 100644
--- a/gdb/regformats/s390x-gs-linux64.dat
+++ b/gdb/regformats/s390x-gs-linux64.dat
@@ -3,6 +3,7 @@
 name:s390x_gs_linux64
 xmltarget:s390x-gs-linux64.xml
 expedite:r14,r15,pswa
+osabi:GNU/Linux
 64:pswm
 64:pswa
 64:r0
diff --git a/gdb/regformats/s390x-linux64.dat b/gdb/regformats/s390x-linux64.dat
index 5832c43..a393b58 100644
--- a/gdb/regformats/s390x-linux64.dat
+++ b/gdb/regformats/s390x-linux64.dat
@@ -3,6 +3,7 @@
 name:s390x_linux64
 xmltarget:s390x-linux64.xml
 expedite:r14,r15,pswa
+osabi:GNU/Linux
 64:pswm
 64:pswa
 64:r0
diff --git a/gdb/regformats/s390x-linux64v1.dat b/gdb/regformats/s390x-linux64v1.dat
index 4d4de0a..e5092d0 100644
--- a/gdb/regformats/s390x-linux64v1.dat
+++ b/gdb/regformats/s390x-linux64v1.dat
@@ -3,6 +3,7 @@
 name:s390x_linux64v1
 xmltarget:s390x-linux64v1.xml
 expedite:r14,r15,pswa
+osabi:GNU/Linux
 64:pswm
 64:pswa
 64:r0
diff --git a/gdb/regformats/s390x-linux64v2.dat b/gdb/regformats/s390x-linux64v2.dat
index b1c5f83..7f097d5 100644
--- a/gdb/regformats/s390x-linux64v2.dat
+++ b/gdb/regformats/s390x-linux64v2.dat
@@ -3,6 +3,7 @@
 name:s390x_linux64v2
 xmltarget:s390x-linux64v2.xml
 expedite:r14,r15,pswa
+osabi:GNU/Linux
 64:pswm
 64:pswa
 64:r0
diff --git a/gdb/regformats/s390x-te-linux64.dat b/gdb/regformats/s390x-te-linux64.dat
index 80f5ab1..2f8a752 100644
--- a/gdb/regformats/s390x-te-linux64.dat
+++ b/gdb/regformats/s390x-te-linux64.dat
@@ -3,6 +3,7 @@
 name:s390x_te_linux64
 xmltarget:s390x-te-linux64.xml
 expedite:r14,r15,pswa
+osabi:GNU/Linux
 64:pswm
 64:pswa
 64:r0
diff --git a/gdb/regformats/s390x-tevx-linux64.dat b/gdb/regformats/s390x-tevx-linux64.dat
index 2df31e6..2624b64 100644
--- a/gdb/regformats/s390x-tevx-linux64.dat
+++ b/gdb/regformats/s390x-tevx-linux64.dat
@@ -3,6 +3,7 @@
 name:s390x_tevx_linux64
 xmltarget:s390x-tevx-linux64.xml
 expedite:r14,r15,pswa
+osabi:GNU/Linux
 64:pswm
 64:pswa
 64:r0
diff --git a/gdb/regformats/s390x-vx-linux64.dat b/gdb/regformats/s390x-vx-linux64.dat
index 1d8f2b6..7548e02 100644
--- a/gdb/regformats/s390x-vx-linux64.dat
+++ b/gdb/regformats/s390x-vx-linux64.dat
@@ -3,6 +3,7 @@
 name:s390x_vx_linux64
 xmltarget:s390x-vx-linux64.xml
 expedite:r14,r15,pswa
+osabi:GNU/Linux
 64:pswm
 64:pswa
 64:r0
diff --git a/gdb/regformats/tic6x-c62x-linux.dat b/gdb/regformats/tic6x-c62x-linux.dat
index 98ca39e..0818ace 100644
--- a/gdb/regformats/tic6x-c62x-linux.dat
+++ b/gdb/regformats/tic6x-c62x-linux.dat
@@ -4,6 +4,7 @@ name:tic6x_c62x_linux
 feature:1
 xmltarget:tic6x-c62x-linux.xml
 expedite:A15,PC
+osabi:GNU/Linux
 32:A0
 32:A1
 32:A2
diff --git a/gdb/regformats/tic6x-c64x-linux.dat b/gdb/regformats/tic6x-c64x-linux.dat
index 91e84ba..fafa53a 100644
--- a/gdb/regformats/tic6x-c64x-linux.dat
+++ b/gdb/regformats/tic6x-c64x-linux.dat
@@ -4,6 +4,7 @@ name:tic6x_c64x_linux
 feature:1
 xmltarget:tic6x-c64x-linux.xml
 expedite:A15,PC
+osabi:GNU/Linux
 32:A0
 32:A1
 32:A2
diff --git a/gdb/regformats/tic6x-c64xp-linux.dat b/gdb/regformats/tic6x-c64xp-linux.dat
index a3fa3b7..56fc3d7 100644
--- a/gdb/regformats/tic6x-c64xp-linux.dat
+++ b/gdb/regformats/tic6x-c64xp-linux.dat
@@ -4,6 +4,7 @@ name:tic6x_c64xp_linux
 feature:1
 xmltarget:tic6x-c64xp-linux.xml
 expedite:A15,PC
+osabi:GNU/Linux
 32:A0
 32:A1
 32:A2