[binutils-gdb] cleanup: Add missing feature/ XML files to Makefile

[binutils-gdb] cleanup: Add missing feature/ XML files to Makefile

[Keith Seitz]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ee8cc2b3f2d121718165b1cab2f537bbf30cae89

commit ee8cc2b3f2d121718165b1cab2f537bbf30cae89
Author: Keith Seitz <keiths@redhat.com>
Date:   Mon Sep 12 07:56:58 2022 -0700

    cleanup: Add missing feature/ XML files to Makefile
    
    This patch adds some missing .xml files to features/Makefile so that when the
    directory's C files are regenerated, all files are appropriately remade.
    
    This has demonstrated that there have been several "misses" in regenerating
    files in this directory. Namely, arm-secext.c and sparc{32,64}-solaris.c. For
    the former case, there was what essentially amounts to a typo regarding the
    create feature function's name. In the later case, this file has missed at least
    one important update in July, 2020, when allocate_target_description was
    changed to return a unique pointer.
    
    Those corrections are included.

Diff:
---
 gdb/features/Makefile                |  4 ++++
 gdb/features/arm/arm-secext.c        |  2 +-
 gdb/features/sparc/sparc32-solaris.c | 16 ++++++++--------
 gdb/features/sparc/sparc64-solaris.c | 22 +++++++++++-----------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index 4bc85962dfe..1f2b8963ad8 100644
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -108,6 +108,7 @@ XMLTOC = \
 	nds32.xml \
 	nios2.xml \
 	or1k.xml \
+	or1k-linux.xml \
 	rs6000/powerpc-32.xml \
 	rs6000/powerpc-32l.xml \
 	rs6000/powerpc-403.xml \
@@ -164,6 +165,8 @@ XMLTOC = \
 	s390x-vx-linux64.xml \
 	s390-gs-linux64.xml \
 	s390x-gs-linux64.xml \
+	sparc/sparc32-solaris.xml \
+	sparc/sparc64-solaris.xml \
 	z80.xml
 
 TDESC_CFILES = $(patsubst %.xml,%.c,$(XMLTOC))
@@ -209,6 +212,7 @@ FEATURE_XMLFILES = aarch64-core.xml \
 	arm/arm-m-profile-mve.xml \
 	arm/arm-m-system.xml \
 	arm/arm-m-profile-with-fpa.xml \
+	arm/arm-secext.xml \
 	arm/arm-tls.xml \
 	arm/arm-vfpv2.xml \
 	arm/arm-vfpv3.xml \
diff --git a/gdb/features/arm/arm-secext.c b/gdb/features/arm/arm-secext.c
index 39ef4afb05f..c71cffd2db6 100644
--- a/gdb/features/arm/arm-secext.c
+++ b/gdb/features/arm/arm-secext.c
@@ -4,7 +4,7 @@
 #include "gdbsupport/tdesc.h"
 
 static int
-create_feature_arm_arm_m_system (struct target_desc *result, long regnum)
+create_feature_arm_arm_secext (struct target_desc *result, long regnum)
 {
   struct tdesc_feature *feature;
 
diff --git a/gdb/features/sparc/sparc32-solaris.c b/gdb/features/sparc/sparc32-solaris.c
index 2f13292b72b..c2f16062fc1 100644
--- a/gdb/features/sparc/sparc32-solaris.c
+++ b/gdb/features/sparc/sparc32-solaris.c
@@ -9,14 +9,14 @@ struct target_desc *tdesc_sparc32_solaris;
 static void
 initialize_tdesc_sparc32_solaris (void)
 {
-  struct target_desc *result = allocate_target_description ();
-  struct tdesc_feature *feature;
+  target_desc_up result = allocate_target_description ();
+  set_tdesc_architecture (result.get (), bfd_scan_arch ("sparc"));
 
-  set_tdesc_architecture (result, bfd_scan_arch ("sparc"));
+  set_tdesc_osabi (result.get (), osabi_from_tdesc_string ("Solaris"));
 
-  set_tdesc_osabi (result, osabi_from_tdesc_string ("Solaris"));
+  struct tdesc_feature *feature;
 
-  feature = tdesc_create_feature (result, "org.gnu.gdb.sparc.cpu");
+  feature = tdesc_create_feature (result.get (), "org.gnu.gdb.sparc.cpu");
   tdesc_create_reg (feature, "g0", 0, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "g1", 1, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "g2", 2, 1, NULL, 32, "uint32");
@@ -50,7 +50,7 @@ initialize_tdesc_sparc32_solaris (void)
   tdesc_create_reg (feature, "fp", 30, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "i7", 31, 1, NULL, 32, "uint32");
 
-  feature = tdesc_create_feature (result, "org.gnu.gdb.sparc.cp0");
+  feature = tdesc_create_feature (result.get (), "org.gnu.gdb.sparc.cp0");
   tdesc_create_reg (feature, "y", 64, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "psr", 65, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "wim", 66, 1, NULL, 32, "uint32");
@@ -60,7 +60,7 @@ initialize_tdesc_sparc32_solaris (void)
   tdesc_create_reg (feature, "fsr", 70, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "csr", 71, 1, NULL, 32, "uint32");
 
-  feature = tdesc_create_feature (result, "org.gnu.gdb.sparc.fpu");
+  feature = tdesc_create_feature (result.get (), "org.gnu.gdb.sparc.fpu");
   tdesc_create_reg (feature, "f0", 32, 1, NULL, 32, "ieee_single");
   tdesc_create_reg (feature, "f1", 33, 1, NULL, 32, "ieee_single");
   tdesc_create_reg (feature, "f2", 34, 1, NULL, 32, "ieee_single");
@@ -94,5 +94,5 @@ initialize_tdesc_sparc32_solaris (void)
   tdesc_create_reg (feature, "f30", 62, 1, NULL, 32, "ieee_single");
   tdesc_create_reg (feature, "f31", 63, 1, NULL, 32, "ieee_single");
 
-  tdesc_sparc_solaris = result;
+  tdesc_sparc32_solaris = result.release ();
 }
diff --git a/gdb/features/sparc/sparc64-solaris.c b/gdb/features/sparc/sparc64-solaris.c
index ecc7b0fa58f..bb8f6853841 100644
--- a/gdb/features/sparc/sparc64-solaris.c
+++ b/gdb/features/sparc/sparc64-solaris.c
@@ -9,14 +9,14 @@ struct target_desc *tdesc_sparc64_solaris;
 static void
 initialize_tdesc_sparc64_solaris (void)
 {
-  struct target_desc *result = allocate_target_description ();
-  struct tdesc_feature *feature;
+  target_desc_up result = allocate_target_description ();
+  set_tdesc_architecture (result.get (), bfd_scan_arch ("sparc:v9"));
 
-  set_tdesc_architecture (result, bfd_scan_arch ("sparc"));
+  set_tdesc_osabi (result.get (), osabi_from_tdesc_string ("Solaris"));
 
-  set_tdesc_osabi (result, osabi_from_tdesc_string ("Solaris"));
+  struct tdesc_feature *feature;
 
-  feature = tdesc_create_feature (result, "org.gnu.gdb.sparc.cpu");
+  feature = tdesc_create_feature (result.get (), "org.gnu.gdb.sparc.cpu");
   tdesc_create_reg (feature, "g0", 0, 1, NULL, 64, "uint64");
   tdesc_create_reg (feature, "g1", 1, 1, NULL, 64, "uint64");
   tdesc_create_reg (feature, "g2", 2, 1, NULL, 64, "uint64");
@@ -47,18 +47,18 @@ initialize_tdesc_sparc64_solaris (void)
   tdesc_create_reg (feature, "i3", 27, 1, NULL, 64, "uint64");
   tdesc_create_reg (feature, "i4", 28, 1, NULL, 64, "uint64");
   tdesc_create_reg (feature, "i5", 29, 1, NULL, 64, "uint64");
-  tdesc_create_reg (feature, "fp", 30, 1, NULL, 32, "uint64");
+  tdesc_create_reg (feature, "fp", 30, 1, NULL, 64, "uint64");
   tdesc_create_reg (feature, "i7", 31, 1, NULL, 64, "uint64");
 
-  feature = tdesc_create_feature (result, "org.gnu.gdb.sparc.cp0");
+  feature = tdesc_create_feature (result.get (), "org.gnu.gdb.sparc.cp0");
   tdesc_create_reg (feature, "pc", 80, 1, NULL, 64, "code_ptr");
   tdesc_create_reg (feature, "npc", 81, 1, NULL, 64, "code_ptr");
   tdesc_create_reg (feature, "state", 82, 1, NULL, 64, "uint64");
-  tdesc_create_reg (feature, "fsr", 83, 1, NULL, 32, "ieee_single");
-  tdesc_create_reg (feature, "fprs", 84, 1, NULL, 32, "ieee_single");
+  tdesc_create_reg (feature, "fsr", 83, 1, NULL, 64, "uint64");
+  tdesc_create_reg (feature, "fprs", 84, 1, NULL, 64, "uint64");
   tdesc_create_reg (feature, "y", 85, 1, NULL, 64, "uint64");
 
-  feature = tdesc_create_feature (result, "org.gnu.gdb.sparc.fpu");
+  feature = tdesc_create_feature (result.get (), "org.gnu.gdb.sparc.fpu");
   tdesc_create_reg (feature, "f0", 32, 1, NULL, 32, "ieee_single");
   tdesc_create_reg (feature, "f1", 33, 1, NULL, 32, "ieee_single");
   tdesc_create_reg (feature, "f2", 34, 1, NULL, 32, "ieee_single");
@@ -108,5 +108,5 @@ initialize_tdesc_sparc64_solaris (void)
   tdesc_create_reg (feature, "f60", 78, 1, NULL, 64, "ieee_double");
   tdesc_create_reg (feature, "f62", 79, 1, NULL, 64, "ieee_double");
 
-  tdesc_sparc64_solaris = result;
+  tdesc_sparc64_solaris = result.release ();
 }