Upgrade submodule, sync patches and code.

diff --git a/binutils-gdb b/binutils-gdb
index b284a87b49c9546445469fd4fa7c61bb782c6bd6..646d754d14c2fe70a492a893506a74b0463b6ae8 160000 (submodule)
--- a/binutils-gdb
+++ b/binutils-gdb
@@ -1 +1 @@
-Subproject commit b284a87b49c9546445469fd4fa7c61bb782c6bd6
+Subproject commit 646d754d14c2fe70a492a893506a74b0463b6ae8

diff --git a/gdbtk/generic/gdbtk-cmds.c b/gdbtk/generic/gdbtk-cmds.c
index 86e4cfc9a5dba33dd1498e1f524959086e71433e..5e824b05fd052e1b3abfa55b3c2266a39fe70dc5 100644 (file)
--- a/gdbtk/generic/gdbtk-cmds.c
+++ b/gdbtk/generic/gdbtk-cmds.c
@@ -1408,8 +1408,12 @@ gdb_search (ClientData clientData, Tcl_Interp *interp,
            try
               {
                for (i = 0; i < nfiles; i++)
-                 spec.filenames.push_back (Tcl_GetStringFromObj (file_list[i],
-                                                                 NULL));
+                 {
+                   gdb::unique_xmalloc_ptr<char> file_name =
+                       make_unique_xstrdup (Tcl_GetStringFromObj (file_list[i],
+                                                                   NULL));
+                   spec.add_filename (std::move (file_name));
+                 }
              }
            catch (...)
               {

diff --git a/gdbtk/generic/gdbtk-hooks.c b/gdbtk/generic/gdbtk-hooks.c
index a7a0c77121ec6aff08c255f2bd3f8241940168b7..25583089aac7c51f1389f8d709d38736ade0d57f 100644 (file)
--- a/gdbtk/generic/gdbtk-hooks.c
+++ b/gdbtk/generic/gdbtk-hooks.c
@@ -759,9 +759,9 @@ gdbtk_file_changed (const char *filename)
 static void
 gdbtk_executable_changed (program_space *pspace, bool reload_p)
 {
-  if (pspace->exec_filename.get () != nullptr)
+  if (pspace->exec_filename () != nullptr)
     gdbtk_two_elem_cmd ("gdbtk_tcl_exec_file_display",
-                        pspace->exec_filename.get ());
+                        pspace->exec_filename ());
 }
 
 /* Called from error_begin, this hook is used to warn the gui

diff --git a/patches/binutils-gdb/001-itcltk4.patch b/patches/binutils-gdb/001-itcltk4.patch
index c4ebb7f8947ce2dae591db71e59e14bde3ce2681..6c64f58e9f16781410bec3c91b50dab53fc9b508 100644 (file)
--- a/patches/binutils-gdb/001-itcltk4.patch
+++ b/patches/binutils-gdb/001-itcltk4.patch
@@ -4,7 +4,7 @@
 diff -Naurp a/configure.ac b/configure.ac
 --- a/configure.ac     2024-02-09 11:02:21.196926258 +0100
 +++ b/configure.ac     2024-03-15 15:57:15.229597331 +0100
-@@ -133,7 +133,7 @@ build_tools="build-texinfo build-flex bu
+@@ -134,7 +134,7 @@ build_tools="build-texinfo build-flex bu
  
  # these libraries are used by various programs built for the host environment
  #f
@@ -13,7 +13,7 @@ diff -Naurp a/configure.ac b/configure.ac
  
  # these tools are built for the host environment
  # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
-@@ -264,7 +264,7 @@ AC_ARG_WITH(zstd,
+@@ -265,7 +265,7 @@ AC_ARG_WITH(zstd,
  case ${with_x} in
    yes | "") ;; # the default value for this tree is that X11 is available
    no)
@@ -22,7 +22,7 @@ diff -Naurp a/configure.ac b/configure.ac
      # We won't be able to build gdbtk without X.
      enable_gdbtk=no 
      ;;
-@@ -450,16 +450,6 @@ esac
+@@ -451,16 +451,6 @@ esac
  # Only spaces may be used in this macro; not newlines or tabs.
  unsupported_languages=
  
@@ -39,7 +39,7 @@ diff -Naurp a/configure.ac b/configure.ac
  # Default to --disable-year2038 until we can handle differences between
  # projects that use gnulib (which understands year 2038) and projects that
  # do not (like BFD).
-@@ -1054,7 +1044,7 @@ case "${target}" in
+@@ -1055,7 +1045,7 @@ case "${target}" in
      ;;
      # The tpf target doesn't support gdb yet.
    *-*-tpf*)
@@ -48,7 +48,7 @@ diff -Naurp a/configure.ac b/configure.ac
      ;;
    *-*-uclinux*)
      noconfigdirs="$noconfigdirs target-rda"
-@@ -1077,7 +1067,7 @@ case "${target}" in
+@@ -1078,7 +1068,7 @@ case "${target}" in
      noconfigdirs="$noconfigdirs target-libobjc target-libbacktrace"
      ;;
    sh*-*-pe|mips*-*-pe|*arm-wince-pe)
@@ -57,7 +57,7 @@ diff -Naurp a/configure.ac b/configure.ac
      ;;
    arc*-*-*)
      noconfigdirs="$noconfigdirs sim"
-@@ -1147,15 +1137,15 @@ case "${target}" in
+@@ -1148,15 +1138,15 @@ case "${target}" in
      ;;
    ia64*-*-elf*)
      # No gdb support yet.
@@ -76,7 +76,7 @@ diff -Naurp a/configure.ac b/configure.ac
      ;;
    i[[3456789]]86-w64-mingw*)
      ;;
-@@ -1217,13 +1207,13 @@ case "${target}" in
+@@ -1218,13 +1208,13 @@ case "${target}" in
      ;;
    powerpc*-*-winnt* | powerpc*-*-pe*)
      target_configdirs="$target_configdirs target-winsup"
@@ -92,7 +92,7 @@ diff -Naurp a/configure.ac b/configure.ac
      ;;
    powerpc-*-beos*)
      noconfigdirs="$noconfigdirs gdb"
-@@ -3066,7 +3056,7 @@ if echo " ${target_configdirs} " | grep
+@@ -3067,7 +3057,7 @@ if echo " ${target_configdirs} " | grep
    esac
  fi
  
@@ -101,7 +101,7 @@ diff -Naurp a/configure.ac b/configure.ac
  # Use 'maybe' since enable_gdbtk might be true even if tk isn't available
  # and in that case we want gdb to be built without tk.  Ugh!
  # In fact I believe gdb is the *only* package directly dependent on tk,
-@@ -3074,7 +3064,7 @@ fi
+@@ -3075,7 +3065,7 @@ fi
  # leave out the maybe dependencies when enable_gdbtk is false.  I'm not
  # 100% sure that that's safe though.
  

diff --git a/patches/binutils-gdb/007-gdbtk-obj-in-subdir.patch b/patches/binutils-gdb/007-gdbtk-obj-in-subdir.patch
index e649b97b0fdb91db95ed30514694f684f77f711b..0824df2501c0522430000b8645646316be7759b0 100644 (file)
--- a/patches/binutils-gdb/007-gdbtk-obj-in-subdir.patch
+++ b/patches/binutils-gdb/007-gdbtk-obj-in-subdir.patch
@@ -37,7 +37,7 @@ diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in
  CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
  
  # -I. for config files.
-@@ -1954,10 +1954,8 @@ $(CONFIG_DEP_SUBDIR):
+@@ -1962,10 +1962,8 @@ $(CONFIG_DEP_SUBDIR):
  # Python files need special flags.
  python/%.o: INTERNAL_CFLAGS += $(PYTHON_CFLAGS)
  
@@ -50,7 +50,7 @@ diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in
  
  installcheck:
  
-@@ -2163,6 +2161,7 @@ uninstall: force $(CONFIG_UNINSTALL)
+@@ -2171,6 +2169,7 @@ uninstall: force $(CONFIG_UNINSTALL)
  # computing the list of source files from the list of object files.
  
  INIT_FILES_FILTER_OUT = \
@@ -58,7 +58,7 @@ diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in
        init.o \
        version.o \
        xml-builtin.o \
-@@ -2634,10 +2633,10 @@ clean-gdbtk:
+@@ -2642,10 +2641,10 @@ clean-gdbtk:
        rm -f insight$(EXEEXT)
  
  # Removing the old gdb first works better if it is running, at least on SunOS.
@@ -71,7 +71,7 @@ diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in
                $(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES)
  
  gdbres.o: $(srcdir)/gdbtk/gdb.rc $(srcdir)/gdbtk/gdbtool.ico
-@@ -2672,7 +2671,7 @@ endif
+@@ -2680,7 +2679,7 @@ endif
  
  # A list of all the objects we might care about in this build, for
  # dependency tracking.