Set GDB version number to 11.1.

gdb/ChangeLog: * version.in: Set GDB version number to 11.1.
Automatic date update in version.in
2025-11-16 12:34:43 +00:00 · 2021-09-12 18:32:10 -07:00 · 2021-09-13 00:00:33 +00:00 · 2021-09-12 00:00:16 +00:00 · 2021-09-11 00:00:19 +00:00 · 2021-09-10 18:36:36 +02:00
119 changed files with 10187 additions and 545 deletions
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,16 @@
+2021-09-07  Luis Machado  <luis.machado@linaro.org>
+
+	Revert: [AArch64] MTE corefile support
+
+	2021-05-21  Luis Machado  <luis.machado@linaro.org>
+
+	* elf.c (elfcore_make_memtag_note_section): New function.
+	(elfcore_grok_note): Handle NT_MEMTAG note types.
+
+2021-07-03  Joel Brobecker  <brobecker@adacore.com>
+
+	* development.sh (development): Set to false.
+
 2021-07-03  Nick Clifton  <nickc@redhat.com>

 	* version.m4: Update version number.
--- a/bfd/development.sh
+++ b/bfd/development.sh
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Controls whether to enable development-mode features by default.
-development=true
+development=false

 # Indicate whether this is a release branch.
 experimental=true
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -9599,23 +9599,6 @@ elfcore_make_auxv_note_section (bfd *abfd, Elf_Internal_Note *note,
  return true;
 }

-static bool
-elfcore_make_memtag_note_section (bfd *abfd, Elf_Internal_Note *note,
-				  size_t offs)
-{
-  asection *sect = bfd_make_section_anyway_with_flags (abfd, ".memtag",
-						       SEC_HAS_CONTENTS);
-
-  if (sect == NULL)
-    return false;
-
-  sect->size = note->descsz - offs;
-  sect->filepos = note->descpos + offs;
-  sect->alignment_power = 1 + bfd_get_arch_size (abfd) / 32;
-
-  return true;
-}
-
 /* prstatus_t exists on:
     solaris 2.5+
     linux 2.[01] + glibc
@@ -10676,8 +10659,6 @@ elfcore_grok_note (bfd *abfd, Elf_Internal_Note *note)
      return elfcore_make_note_pseudosection (abfd, ".note.linuxcore.siginfo",
 					      note);

-    case NT_MEMTAG:
-      return elfcore_make_memtag_note_section (abfd, note, 0);
    }
 }

--- a/bfd/version.h
+++ b/bfd/version.h
@@ -16,7 +16,7 @@

   In releases, the date is not included in either version strings or
   sonames.  */
-#define BFD_VERSION_DATE 20210703
+#define BFD_VERSION_DATE 20210913
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,11 @@
+2021-09-07  Luis Machado  <luis.machado@linaro.org>
+
+	Revert: [AArch64] MTE corefile support
+
+	2021-05-21  Luis Machado  <luis.machado@linaro.org>
+
+	* readelf.c (get_note_type): Handle NT_MEMTAG note types.
+
 2021-07-03  Nick Clifton  <nickc@redhat.com>

 	* configure: Regenerate.
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -18843,8 +18843,6 @@ get_note_type (Filedata * filedata, unsigned e_type)
 	return _("NT_SIGINFO (siginfo_t data)");
      case NT_FILE:
 	return _("NT_FILE (mapped files)");
-      case NT_MEMTAG:
-	return _("NT_MEMTAG (memory tags)");
      default:
 	break;
      }
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,211 @@
+2021-09-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* version.in: Set GDB version number to 11.1.
+
+2021-09-08  Tom Tromey  <tom@tromey.com>
+
+	* dwarf2/read.h (dwarf2_per_objfile::resize_symtabs): Remove.
+	* dwarf2/read.c (all_comp_units_iterator, all_comp_units_range):
+	New classes.
+	(dwarf2_per_objfile::symtab_set_p)
+	(dwarf2_per_objfile::get_symtab, dwarf2_per_objfile::set_symtab):
+	Adjust to resizeable vectors.
+	(dwarf2_gdb_index::expand_symtabs_matching)
+	(dwarf2_base_index_functions::map_symbol_filenames)
+	(dwarf2_debug_names_index::expand_symtabs_matching): Use
+	all_comp_units_range.
+	(dwarf2_initialize_objfile, dwarf2_build_psymtabs)
+	(add_type_unit): Don't call resize_symtabs.
+
+2021-09-07  John Baldwin  <jhb@FreeBSD.org>
+
+	* fbsd-nat.c (fbsd_nat_target::info_proc): Use plongest and
+	pulongest instead of %j.
+
+2021-08-30  Tom de Vries  <tdevries@suse.de>
+
+	PR cli/28290
+	* gdb/corelow.c (core_target_open): Skip call to gdb_abspath in the
+	empty-string case.
+
+2021-08-23  Tom de Vries  <tdevries@suse.de>
+
+	PR gdb/26880
+	* gdb/exec.c (exec_file_attach): Use %s instead of %ps in call to
+	error function.
+
+2021-08-06  Simon Marchi  <simon.marchi@polymtl.ca>
+	    Tom de Vries  <tdevries@suse.de>
+
+	PR symtab/28004
+	* dwarf2/read.c (dwarf2_rnglists_process, dwarf2_ranges_process):
+	Fix zero address complaint.
+
+2021-08-02  Tom Tromey  <tromey@adacore.com>
+
+	PR varobj/28131
+	* varobj.c (~varobj): Delete 'dynamic' before 'root'.
+
+2021-08-02  Shahab Vahedi  <shahab@synopsys.com>
+
+	PR gdb/28104
+	* gdbtypes.c (gdbtypes_post_init): Use
+	"arch_boolean_type (..., unsigned=1, ...) to construct
+	"boolean".
+	cp-valprint.c (test_print_flags): New.
+	(_initialize_cp_valprint): Run the "test_print_flags" unit-test.
+
+2021-07-28  Tom de Vries  <tdevries@suse.de>
+
+	* dwarf2/read.c (attr_to_dynamic_prop): Handle DW_FORM_data16.
+
+2021-07-27  Tom de Vries  <tdevries@suse.de>
+
+	PR testsuite/26904
+	* gdb/testsuite/gdb.ada/big_packed_array.exp: Add xfail.
+
+2021-07-27  Tom de Vries  <tdevries@suse.de>
+
+	PR testsuite/26903
+	* gdb/testsuite/gdb.ada/array_of_variant.exp: Add xfails.
+
+2021-07-26  Frederic Cambus  <fred@statdns.com>
+
+	* syscalls/netbsd.xml: Regenerate.
+
+2021-07-26  Shahab Vahedi  <shahab@synopsys.com>
+	    Simon Marchi  <simon.marchi@efficios.com>
+
+	PR gdb/28103
+	* valprint.c (val_print_type_code_flags): Merely shift the VAL
+	to the right to get rid of the lower bits.
+	(test_print_flags): New.
+	(_initialize_valprint): Invoke the "test_print_flags" as a unit-test.
+
+2021-07-26  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
+
+	PR gdb/28076
+	* mi/mi-cmd-break.c (mi_cmd_break_condition): Handle the case
+	of having no condition argument.
+
+2021-07-20  Luis Machado  <luis.machado@linaro.org>
+	    Pedro Alves  <pedro@palves.net>
+
+	PR gdb/28110
+	* gdbarch.sh: Updated documentation for gdbarch_tagged_address_p.
+	* gdbarch.h: Regenerate.
+	* printcmd.c (should_validate_memtags): Reorder comparisons and only
+	validate tags for pointer and reference types.  Skip validation of
+	optimized out or unavailable values.
+	(print_command_1): Guard call memory tagging validation code with
+	a try/catch block.
+
+2021-07-19  Tom Tromey  <tromey@adacore.com>
+
+	PR gdb/28093
+	* language.c (auto_or_unknown_language::parser): Call error.
+
+2021-07-17  Sergey Belyashov  <Sergey.Belyashov@gmail.com>
+
+	* Makefile.in (ALL_TARGET_OBS): Add z80-tdep.c.
+	* NEWS: Mention z80 support.
+	* configure.tgt: Handle z80*.
+	* features/Makefile (XMLTOC): Add z80.xml.
+	* features/z80-cpu.xml: New.
+	* features/z80.c: Generate.
+	* features/z80.xml: New.
+	* z80-tdep.c: New file.
+	* z80-tdep.h: New file.
+
+2021-07-13  Lancelot Six  <lsix@lancelotsix.com>
+
+	* make-init-c: Use /bin/sh as shebang.
+
+2021-07-13  Pedro Alves  <pedro@palves.net>
+
+	PR gdb/28080
+	* gdb_bfd.c (gdb_bfd_close_warning): New.
+	(gdb_bfd_iovec_fileio_close): Wrap target_fileio_close in
+	try/catch and print warning on exception.
+	(gdb_bfd_close_or_warn): Use gdb_bfd_close_warning.
+
+2021-07-13  Pedro Alves  <pedro@palves.net>
+
+	PR gdb/28080
+	* remote.c (remote_unpush_target): Invalidate file I/O target
+	handles.
+	* target.c (fileio_handles_invalidate_target): Make extern.
+	* target.h (fileio_handles_invalidate_target): Declare.
+
+2021-07-13  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* mi/mi-main.c (mi_cmd_exec_interrupt): Use
+	scoped_disable_commit_resumed in the --thread-group case.
+
+2021-07-13  John Ericson  <git@JohnEricson.me>
+
+	* sparc-tdep.h: Fix comment.
+	* netbsd-tdep.c (nbsd_info_proc_mappings_header): Fix comment.
+	(nbsd_init_abi): Fix comment.
+	* configure.tgt (*-*-netbsd* | *-*-knetbsd*-gnu): Fix netbsd
+	file name.
+	(alpha*-*-openbsd*): Likewise.
+	(sparc-*-openbsd*): Likewise.
+	(sparc64-*-openbsd*): Likewise.
+
+2021-07-11  Tom Tromey  <tom@tromey.com>
+
+	Committed by Joel Brobecker  <brobecker@adacore.com>:
+	* gdb/symtab.c (info_sources_filter::matches): Add default
+	case hander in switch statement.
+
+2021-07-08  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* s390-linux-tdep.c (s390_linux_init_abi_any): Pass 1 (number
+	of displaced stepping buffers to linux_init_abi.
+	* s390-tdep.c (s390_gdbarch_init): Don't set the Linux-specific
+	displaced-stepping gdbarch callbacks.
+
+2021-07-08  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* Makefile.in (SUBDIRS): Remove testsuite.
+
+2021-07-06  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* configure.ac: Remove things that were moved from
+	testsuite/configure.ac.
+	* configure: Re-generate.
+
+2021-07-05  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* config.in, configure: Re-generate.
+
+2021-07-04  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* solib-darwin.c (darwin_solib_create_inferior_hook): Return
+	early if no execution.
+
+2021-07-03  Joel Brobecker  <brobecker@adacore.com>
+
+	* version.in: Set GDB version number to 11.0.90.DATE-git.
+
+2021-07-03  Joel Brobecker  <brobecker@adacore.com>
+
+	GDB 11.0.90 released.
+
+2021-07-03  Joel Brobecker  <brobecker@adacore.com>
+
+	* version.in: Set GDB version number to 11.0.90.
+
+2021-07-03  Joel Brobecker  <brobecker@adacore.com>
+
+	* NEWS: Replace "Changes since GDB 10" by "Changes in GDB 11".
+
+2021-07-03  Joel Brobecker  <brobecker@adacore.com>
+
+	GDB 11 branch created (4b51505e33441c6165e7789fa2b6d21930242927):
+	* version.in: Bump version to 11.0.90.DATE-git.
+
 2021-07-02  Tom Tromey  <tromey@adacore.com>

 	* ada-exp.y (chop_selector, chop_separator, write_selectors)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -852,7 +852,8 @@ ALL_TARGET_OBS = \
 	xstormy16-tdep.o \
 	xtensa-config.o \
 	xtensa-linux-tdep.o \
-	xtensa-tdep.o
+	xtensa-tdep.o \
+	z80-tdep.o

 # The following native-target dependent variables are defined on
 # configure.nat.
@@ -1591,7 +1592,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 	$(SUBDIR_TARGET_OBS) \
 	$(SUBDIR_GCC_COMPILE_OBS)

-SUBDIRS = doc @subdirs@ data-directory testsuite
+SUBDIRS = doc @subdirs@ data-directory
 CLEANDIRS = $(SUBDIRS)

 # List of subdirectories in the build tree that must exist.
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -1,7 +1,7 @@
 		What has changed in GDB?
 	     (Organized release by release)

-*** Changes since GDB 10
+*** Changes in GDB 11

 * The 'set disassembler-options' command now supports specifying options
  for the ARC target.
@@ -424,6 +424,7 @@ alias [-a] [--] ALIAS = COMMAND [DEFAULT-ARGS...]

 GNU/Linux/RISC-V (gdbserver)	riscv*-*-linux*
 BPF				bpf-unknown-none
+Z80				z80-unknown-*

 * Python API

--- a/gdb/config.in
+++ b/gdb/config.in
@@ -414,6 +414,9 @@
 /* Define to 1 if you have the `sigsetmask' function. */
 #undef HAVE_SIGSETMASK

+/* Define to 1 if you have the `sigtimedwait' function. */
+#undef HAVE_SIGTIMEDWAIT
+
 /* Define to 1 if you have the `socketpair' function. */
 #undef HAVE_SOCKETPAIR

--- a/gdb/configure
+++ b/gdb/configure
@@ -619,14 +619,10 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"

-ac_header_list=
 enable_option_checking=no
+ac_header_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-NM_TRANSFORM_NAME
-GAS_TRANSFORM_NAME
-READELF_TRANSFORM_NAME
-STRIP_TRANSFORM_NAME
 GCORE_TRANSFORM_NAME
 GDB_TRANSFORM_NAME
 XSLTPROC
@@ -637,7 +633,6 @@ LIBXXHASH
 HAVE_LIBXXHASH
 CTF_DEPS
 LIBCTF
-enable_libctf
 LTLIBBABELTRACE
 LIBBABELTRACE
 HAVE_LIBBABELTRACE
@@ -668,7 +663,6 @@ GDBTKLIBS
 X_LIBS
 X_LDFLAGS
 X_CFLAGS
-subdirs
 TK_XINCLUDES
 TK_DEPS
 TK_LIBRARY
@@ -776,7 +770,7 @@ PKG_CONFIG_PATH
 PKG_CONFIG
 HAVE_NATIVE_GCORE_TARGET
 TARGET_OBS
-RPATH_ENVVAR
+subdirs
 GDB_DATADIR
 DEBUGDIR
 MAKEINFO_EXTRA_FLAGS
@@ -882,7 +876,6 @@ with_gdb_datadir
 with_relocated_sources
 with_auto_load_dir
 with_auto_load_safe_path
-enable_shared
 enable_targets
 enable_64_bit_bfd
 enable_gdbmi
@@ -963,7 +956,8 @@ DEBUGINFOD_LIBS
 YACC
 YFLAGS
 XMKMF'
-ac_subdirs_all='gdbtk'
+ac_subdirs_all='testsuite
+gdbtk'

 # Initialize some variables set by options.
 ac_init_help=
@@ -1589,7 +1583,6 @@ Optional Features:
                          sometimes confusing) to the casual installer
  --enable-plugins        Enable support for plugins
  --disable-largefile     omit support for large files
-  --enable-shared         build shared libraries [default=yes]
  --enable-targets=TARGETS
                          alternative target configurations
  --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
@@ -6623,34 +6616,9 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5
 $as_echo "$with_auto_load_safe_path" >&6; }

-# Enable shared libraries.
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared;
-else
-  enable_shared=yes
-fi


-# If we have shared libraries, try to set RPATH_ENVVAR reasonably,
-# such that we can find the shared libraries in the build tree.
-if test $enable_shared = no; then
-  # The variable `RPATH_ENVVAR' itself is not likely to be used on any
-  # platform.
-  RPATH_ENVVAR=RPATH_ENVVAR
-else
-  # The variable `LD_LIBRARY_PATH' is used on most platforms.
-  RPATH_ENVVAR=LD_LIBRARY_PATH
-  # The following exceptions are taken from Libtool 1.4.3.
-  case $host_os in
-    aix*)
-      if test $host_cpu != ia64; then
-        RPATH_ENVVAR=LIBPATH
-      fi ;;
-    darwin* | rhapsody*)
-      RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
-  esac
-fi
+subdirs="$subdirs testsuite"


 # Check whether to support alternative target configurations
@@ -13857,7 +13825,7 @@ fi

  for ac_func in fdwalk getrlimit pipe pipe2 poll socketpair sigaction \
 		  ptrace64 sbrk setns sigaltstack sigprocmask \
-		  setpgid setpgrp getrusage getauxval
+		  setpgid setpgrp getrusage getauxval sigtimedwait
 do :
  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -18325,9 +18293,7 @@ $as_echo "${private_dir}" >&6; }
 	  CONFIG_OBS="${CONFIG_OBS} gdbres.o"
 	fi

-
-
-subdirs="$subdirs gdbtk"
+        subdirs="$subdirs gdbtk"

    fi
 fi
@@ -19209,7 +19175,6 @@ fi



-
 # If nativefile (NAT_FILE) is not set in configure.nat, we link to an
 # empty version.

@@ -19841,44 +19806,6 @@ ac_config_files="$ac_config_files gcore"

 ac_config_files="$ac_config_files Makefile gdb-gdb.gdb gdb-gdb.py doc/Makefile data-directory/Makefile"

-# Transform the name of some programs for the testsuite/lib/pdtrace
-# test tool.
-
-  gdb_ac_transform=`echo "$program_transform_name" | sed -e 's/\\$\\$/\\$/g'`
-  STRIP_TRANSFORM_NAME=`echo strip | sed -e "$gdb_ac_transform"`
-  if test "x$STRIP_TRANSFORM_NAME" = x; then
-     STRIP_TRANSFORM_NAME=strip
-  fi
-
-
-
-  gdb_ac_transform=`echo "$program_transform_name" | sed -e 's/\\$\\$/\\$/g'`
-  READELF_TRANSFORM_NAME=`echo readelf | sed -e "$gdb_ac_transform"`
-  if test "x$READELF_TRANSFORM_NAME" = x; then
-     READELF_TRANSFORM_NAME=readelf
-  fi
-
-
-
-  gdb_ac_transform=`echo "$program_transform_name" | sed -e 's/\\$\\$/\\$/g'`
-  GAS_TRANSFORM_NAME=`echo as | sed -e "$gdb_ac_transform"`
-  if test "x$GAS_TRANSFORM_NAME" = x; then
-     GAS_TRANSFORM_NAME=as
-  fi
-
-
-
-  gdb_ac_transform=`echo "$program_transform_name" | sed -e 's/\\$\\$/\\$/g'`
-  NM_TRANSFORM_NAME=`echo nm | sed -e "$gdb_ac_transform"`
-  if test "x$NM_TRANSFORM_NAME" = x; then
-     NM_TRANSFORM_NAME=nm
-  fi
-
-
-ac_config_files="$ac_config_files testsuite/lib/pdtrace"
-
-ac_config_files="$ac_config_files testsuite/Makefile"
-

 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -20608,8 +20535,6 @@ do
    "gdb-gdb.py") CONFIG_FILES="$CONFIG_FILES gdb-gdb.py" ;;
    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
    "data-directory/Makefile") CONFIG_FILES="$CONFIG_FILES data-directory/Makefile" ;;
-    "testsuite/lib/pdtrace") CONFIG_FILES="$CONFIG_FILES testsuite/lib/pdtrace" ;;
-    "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;

  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  esac
@@ -21240,7 +21165,6 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
    "depdir":C) $SHELL $ac_aux_dir/mkinstalldirs $DEPDIR ;;
    "nm.h":L) echo > stamp-nmh ;;
    "gcore":F) chmod +x gcore ;;
-    "testsuite/lib/pdtrace":F) chmod +x testsuite/lib/pdtrace ;;

  esac
 done # for ac_tag
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -153,31 +153,7 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escape_dir,
 	      [Directories safe to hold auto-loaded files.])
 AC_MSG_RESULT([$with_auto_load_safe_path])

-# Enable shared libraries.
-AC_ARG_ENABLE(shared,
-AS_HELP_STRING([--enable-shared], [build shared libraries [default=yes]]),,
-  enable_shared=yes)
-
-# If we have shared libraries, try to set RPATH_ENVVAR reasonably,
-# such that we can find the shared libraries in the build tree.
-if test $enable_shared = no; then
-  # The variable `RPATH_ENVVAR' itself is not likely to be used on any
-  # platform.
-  RPATH_ENVVAR=RPATH_ENVVAR
-else
-  # The variable `LD_LIBRARY_PATH' is used on most platforms.
-  RPATH_ENVVAR=LD_LIBRARY_PATH
-  # The following exceptions are taken from Libtool 1.4.3.
-  case $host_os in
-    aix*)
-      if test $host_cpu != ia64; then
-        RPATH_ENVVAR=LIBPATH
-      fi ;;
-    darwin* | rhapsody*)
-      RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
-  esac
-fi
-AC_SUBST(RPATH_ENVVAR)
+AC_CONFIG_SUBDIRS(testsuite)

 # Check whether to support alternative target configurations
 AC_ARG_ENABLE(targets,
@@ -2195,7 +2171,6 @@ else
  LIBCTF=
  CTF_DEPS=
 fi
-AC_SUBST(enable_libctf)
 AC_SUBST(LIBCTF)
 AC_SUBST(CTF_DEPS)

@@ -2261,13 +2236,5 @@ GDB_AC_TRANSFORM([gdb], [GDB_TRANSFORM_NAME])
 GDB_AC_TRANSFORM([gcore], [GCORE_TRANSFORM_NAME])
 AC_CONFIG_FILES([gcore], [chmod +x gcore])
 AC_CONFIG_FILES([Makefile gdb-gdb.gdb gdb-gdb.py doc/Makefile data-directory/Makefile])
-# Transform the name of some programs for the testsuite/lib/pdtrace
-# test tool.
-GDB_AC_TRANSFORM(strip, STRIP_TRANSFORM_NAME)
-GDB_AC_TRANSFORM(readelf, READELF_TRANSFORM_NAME)
-GDB_AC_TRANSFORM(as, GAS_TRANSFORM_NAME)
-GDB_AC_TRANSFORM(nm, NM_TRANSFORM_NAME)
-AC_CONFIG_FILES([testsuite/lib/pdtrace], [chmod +x testsuite/lib/pdtrace])
-AC_CONFIG_FILES([testsuite/Makefile])

 AC_OUTPUT
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -105,7 +105,7 @@ case "${targ}" in
 *-*-freebsd* | *-*-kfreebsd*-gnu)
 	os_obs="fbsd-tdep.o solib-svr4.o";;
 *-*-netbsd* | *-*-knetbsd*-gnu)
-	os_obs="nbsd-tdep.o solib-svr4.o";;
+	os_obs="netbsd-tdep.o solib-svr4.o";;
 *-*-openbsd*)
 	os_obs="obsd-tdep.o solib-svr4.o";;
 esac
@@ -146,7 +146,7 @@ alpha*-*-netbsd* | alpha*-*-knetbsd*-gnu)
 alpha*-*-openbsd*)
 	# Target: OpenBSD/alpha
 	gdb_target_obs="alpha-mdebug-tdep.o alpha-bsd-tdep.o \
-			alpha-netbsd-tdep.o alpha-obsd-tdep.o nbsd-tdep.o"
+			alpha-netbsd-tdep.o alpha-obsd-tdep.o netbsd-tdep.o"
 	;;

 am33_2.0*-*-linux*)
@@ -632,14 +632,14 @@ sparc64-*-netbsd* | sparc64-*-knetbsd*-gnu)
 sparc-*-openbsd*)
 	# Target: OpenBSD/sparc
 	gdb_target_obs="sparc-tdep.o sparc-netbsd-tdep.o sparc-obsd-tdep.o \
-			nbsd-tdep.o bsd-uthread.o \
+			netbsd-tdep.o bsd-uthread.o \
 			ravenscar-thread.o sparc-ravenscar-thread.o"
 	;;
 sparc64-*-openbsd*)
 	# Target: OpenBSD/sparc64
 	gdb_target_obs="sparc64-tdep.o sparc64-netbsd-tdep.o sparc64-obsd-tdep.o \
 			sparc-tdep.o sparc-netbsd-tdep.o sparc-obsd-tdep.o \
-			nbsd-tdep.o bsd-uthread.o \
+			netbsd-tdep.o bsd-uthread.o \
 			ravenscar-thread.o sparc-ravenscar-thread.o"
 	;;
 sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*)
@@ -761,6 +761,10 @@ xtensa*-*-*linux*)
 	# Target: GNU/Linux Xtensa
 	gdb_target_obs="xtensa-linux-tdep.o symfile-mem.o linux-tdep.o"
 	;;
+z80*)
+	# Target: Z80
+	gdb_target_obs="z80-tdep.o"
+	;;

 esac

--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -428,7 +428,8 @@ core_target_open (const char *arg, int from_tty)
    }

  gdb::unique_xmalloc_ptr<char> filename (tilde_expand (arg));
-  if (!IS_ABSOLUTE_PATH (filename.get ()))
+  if (strlen (filename.get ()) != 0
+      && !IS_ABSOLUTE_PATH (filename.get ()))
    filename = gdb_abspath (filename.get ());

  flags = O_BINARY | O_LARGEFILE;
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -38,6 +38,8 @@
 #include "gdbsupport/byte-vector.h"
 #include "gdbarch.h"
 #include "cli/cli-style.h"
+#include "gdbsupport/selftest.h"
+#include "selftest-arch.h"

 static struct obstack dont_print_vb_obstack;
 static struct obstack dont_print_statmem_obstack;
@@ -715,11 +717,77 @@ cp_print_class_member (const gdb_byte *valaddr, struct type *type,
    fprintf_filtered (stream, "%ld", (long) val);
 }

+#if GDB_SELF_TEST
+
+/* Test printing of TYPE_CODE_STRUCT values.  */
+
+static void
+test_print_fields (gdbarch *arch)
+{
+  struct field *f;
+  type *uint8_type = builtin_type (arch)->builtin_uint8;
+  type *bool_type = builtin_type (arch)->builtin_bool;
+  type *the_struct = arch_composite_type (arch, NULL, TYPE_CODE_STRUCT);
+  TYPE_LENGTH (the_struct) = 4;
+
+  /* Value:  1110 1001
+     Fields: C-BB B-A- */
+  if (gdbarch_byte_order (arch) == BFD_ENDIAN_LITTLE)
+    {
+      f = append_composite_type_field_raw (the_struct, "A", bool_type);
+      SET_FIELD_BITPOS (*f, 1);
+      FIELD_BITSIZE (*f) = 1;
+      f = append_composite_type_field_raw (the_struct, "B", uint8_type);
+      SET_FIELD_BITPOS (*f, 3);
+      FIELD_BITSIZE (*f) = 3;
+      f = append_composite_type_field_raw (the_struct, "C", bool_type);
+      SET_FIELD_BITPOS (*f, 7);
+      FIELD_BITSIZE (*f) = 1;
+    }
+  /* According to the logic commented in "make_gdb_type_struct ()" of
+   * target-descriptions.c, bit positions are numbered differently for
+   * little and big endians.  */
+  else
+    {
+      f = append_composite_type_field_raw (the_struct, "A", bool_type);
+      SET_FIELD_BITPOS (*f, 30);
+      FIELD_BITSIZE (*f) = 1;
+      f = append_composite_type_field_raw (the_struct, "B", uint8_type);
+      SET_FIELD_BITPOS (*f, 26);
+      FIELD_BITSIZE (*f) = 3;
+      f = append_composite_type_field_raw (the_struct, "C", bool_type);
+      SET_FIELD_BITPOS (*f, 24);
+      FIELD_BITSIZE (*f) = 1;
+    }
+
+  value *val = allocate_value (the_struct);
+  gdb_byte *contents = value_contents_writeable (val);
+  store_unsigned_integer (contents, TYPE_LENGTH (value_enclosing_type (val)),
+			  gdbarch_byte_order (arch), 0xe9);
+
+  string_file out;
+  struct value_print_options opts;
+  get_no_prettyformat_print_options (&opts);
+  cp_print_value_fields(val, &out, 0, &opts, NULL, 0);
+  SELF_CHECK (out.string () == "{A = false, B = 5, C = true}");
+
+  out.clear();
+  opts.format = 'x';
+  cp_print_value_fields(val, &out, 0, &opts, NULL, 0);
+  SELF_CHECK (out.string () == "{A = 0x0, B = 0x5, C = 0x1}");
+}
+
+#endif
+

 void _initialize_cp_valprint ();
 void
 _initialize_cp_valprint ()
 {
+#if GDB_SELF_TEST
+  selftests::register_test_foreach_arch ("print-fields", test_print_fields);
+#endif
+
  obstack_begin (&dont_print_stat_array_obstack,
 		 32 * sizeof (struct type *));
  obstack_begin (&dont_print_statmem_obstack,
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,13 @@
+2021-08-12  Tom Tromey  <tromey@adacore.com>
+
+	* gdb.texinfo (Output Styling): Mention Pygments.
+
+2021-07-26  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
+
+	PR gdb/28076
+	* gdb.texinfo (GDB/MI Breakpoint Commands): Mention clearing
+	the condition in the -break-condition command.
+
 2021-07-02  Pedro Alves  <pedro@palves.net>

 	* gdb.texinfo (TUI): <TUI Mouse Support>: New node/section.
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -26033,10 +26033,16 @@ Show the current state of styling.

@item set style sources @samp{on|off}
 Enable or disable source code styling.  This affects whether source
-code, such as the output of the @code{list} command, is styled.  Note
-that source styling only works if styling in general is enabled, and
-if @value{GDBN} was linked with the GNU Source Highlight library.  The
-default is @samp{on}.
+code, such as the output of the @code{list} command, is styled.  The
+default is @samp{on}.  Note that source styling only works if styling
+in general is enabled, and if a source highlighting library is
+available to @value{GDBN}.
+
+There are two ways that highlighting can be done.  First, if
+@value{GDBN} was linked with the GNU Source Highlight library, then it
+is used.  Otherwise, if @value{GDBN} was configured with Python
+scripting support, and if the Python Pygments package is available,
+then it will be used.

@item show style sources
 Show the current state of source code styling.
@@ -30565,7 +30571,7 @@ times="0"@}
@subsubheading Synopsis

@smallexample
- -break-condition [ --force ] @var{number} @var{expr}
+ -break-condition [ --force ] @var{number} [ @var{expr} ]
@end smallexample

 Breakpoint @var{number} will stop the program only if the condition in
@@ -30573,7 +30579,8 @@ Breakpoint @var{number} will stop the program only if the condition in
@samp{-break-list} output (see the description of the @samp{-break-list}
 command below).  If the @samp{--force} flag is passed, the condition
 is forcibly defined even when it is invalid for all locations of
-breakpoint @var{number}.
+breakpoint @var{number}.  If the @var{expr} argument is omitted,
+breakpoint @var{number} becomes unconditional.

@subsubheading @value{GDBN} Command

--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -1639,6 +1639,73 @@ line_header_eq_voidp (const void *item_lhs, const void *item_rhs)



+/* An iterator for all_comp_units that is based on index.  This
+   approach makes it possible to iterate over all_comp_units safely,
+   when some caller in the loop may add new units.  */
+
+class all_comp_units_iterator
+{
+public:
+
+  all_comp_units_iterator (dwarf2_per_bfd *per_bfd, bool start)
+    : m_per_bfd (per_bfd),
+      m_index (start ? 0 : per_bfd->all_comp_units.size ())
+  {
+  }
+
+  all_comp_units_iterator &operator++ ()
+  {
+    ++m_index;
+    return *this;
+  }
+
+  dwarf2_per_cu_data *operator* () const
+  {
+    return m_per_bfd->get_cu (m_index);
+  }
+
+  bool operator== (const all_comp_units_iterator &other) const
+  {
+    return m_index == other.m_index;
+  }
+
+
+  bool operator!= (const all_comp_units_iterator &other) const
+  {
+    return m_index != other.m_index;
+  }
+
+private:
+
+  dwarf2_per_bfd *m_per_bfd;
+  size_t m_index;
+};
+
+/* A range adapter for the all_comp_units_iterator.  */
+class all_comp_units_range
+{
+public:
+
+  all_comp_units_range (dwarf2_per_bfd *per_bfd)
+    : m_per_bfd (per_bfd)
+  {
+  }
+
+  all_comp_units_iterator begin ()
+  {
+    return all_comp_units_iterator (m_per_bfd, true);
+  }
+
+  all_comp_units_iterator end ()
+  {
+    return all_comp_units_iterator (m_per_bfd, false);
+  }
+
+private:
+
+  dwarf2_per_bfd *m_per_bfd;
+};
+
 /* See declaration.  */

 dwarf2_per_bfd::dwarf2_per_bfd (bfd *obfd, const dwarf2_debug_sections *names,
@@ -1703,9 +1770,9 @@ private:
 bool
 dwarf2_per_objfile::symtab_set_p (const dwarf2_per_cu_data *per_cu) const
 {
-  gdb_assert (per_cu->index < this->m_symtabs.size ());
-
-  return this->m_symtabs[per_cu->index] != nullptr;
+  if (per_cu->index < this->m_symtabs.size ())
+    return this->m_symtabs[per_cu->index] != nullptr;
+  return false;
 }

 /* See read.h.  */
@@ -1713,9 +1780,9 @@ dwarf2_per_objfile::symtab_set_p (const dwarf2_per_cu_data *per_cu) const
 compunit_symtab *
 dwarf2_per_objfile::get_symtab (const dwarf2_per_cu_data *per_cu) const
 {
-  gdb_assert (per_cu->index < this->m_symtabs.size ());
-
-  return this->m_symtabs[per_cu->index];
+  if (per_cu->index < this->m_symtabs.size ())
+    return this->m_symtabs[per_cu->index];
+  return nullptr;
 }

 /* See read.h.  */
@@ -1724,9 +1791,9 @@ void
 dwarf2_per_objfile::set_symtab (const dwarf2_per_cu_data *per_cu,
 				compunit_symtab *symtab)
 {
-  gdb_assert (per_cu->index < this->m_symtabs.size ());
+  if (per_cu->index >= this->m_symtabs.size ())
+    this->m_symtabs.resize (per_cu->index + 1);
  gdb_assert (this->m_symtabs[per_cu->index] == nullptr);
-
  this->m_symtabs[per_cu->index] = symtab;
 }

@@ -4321,11 +4388,12 @@ dwarf2_gdb_index::expand_symtabs_matching

  if (symbol_matcher == NULL && lookup_name == NULL)
    {
-      for (const auto &per_cu : per_objfile->per_bfd->all_comp_units)
+      for (dwarf2_per_cu_data *per_cu
+	     : all_comp_units_range (per_objfile->per_bfd))
 	{
 	  QUIT;

-	  if (!dw2_expand_symtabs_matching_one (per_cu.get (), per_objfile,
+	  if (!dw2_expand_symtabs_matching_one (per_cu, per_objfile,
 						file_matcher,
 						expansion_notify))
 	    return false;
@@ -4437,14 +4505,14 @@ dwarf2_base_index_functions::map_symbol_filenames
 	}
    }

-  for (const auto &per_cu : per_objfile->per_bfd->all_comp_units)
+  for (dwarf2_per_cu_data *per_cu
+	 : all_comp_units_range (per_objfile->per_bfd))
    {
      /* We only need to look at symtabs not already expanded.  */
-      if (per_objfile->symtab_set_p (per_cu.get ()))
+      if (per_cu->is_debug_types || per_objfile->symtab_set_p (per_cu))
 	continue;

-      quick_file_names *file_data = dw2_get_file_names (per_cu.get (),
-							per_objfile);
+      quick_file_names *file_data = dw2_get_file_names (per_cu, per_objfile);
      if (file_data == nullptr
 	  || qfn_cache.find (file_data) != qfn_cache.end ())
 	continue;
@@ -5309,11 +5377,12 @@ dwarf2_debug_names_index::expand_symtabs_matching

  if (symbol_matcher == NULL && lookup_name == NULL)
    {
-      for (const auto &per_cu : per_objfile->per_bfd->all_comp_units)
+      for (dwarf2_per_cu_data *per_cu
+	     : all_comp_units_range (per_objfile->per_bfd))
 	{
 	  QUIT;

-	  if (!dw2_expand_symtabs_matching_one (per_cu.get (), per_objfile,
+	  if (!dw2_expand_symtabs_matching_one (per_cu, per_objfile,
 						file_matcher,
 						expansion_notify))
 	    return false;
@@ -5421,7 +5490,6 @@ dwarf2_initialize_objfile (struct objfile *objfile)
      if (per_bfd->using_index)
 	{
 	  dwarf_read_debug_printf ("using_index already set");
-	  per_objfile->resize_symtabs ();
 	  objfile->qf.push_front (make_dwarf_gdb_index ());
 	  return;
 	}
@@ -5430,7 +5498,6 @@ dwarf2_initialize_objfile (struct objfile *objfile)
      create_all_comp_units (per_objfile);
      per_bfd->quick_file_names_table
 	= create_quick_file_names_table (per_bfd->all_comp_units.size ());
-      per_objfile->resize_symtabs ();

      for (int i = 0; i < per_bfd->all_comp_units.size (); ++i)
 	{
@@ -5452,7 +5519,6 @@ dwarf2_initialize_objfile (struct objfile *objfile)
  if (per_bfd->debug_names_table != nullptr)
    {
      dwarf_read_debug_printf ("re-using shared debug names table");
-      per_objfile->resize_symtabs ();
      objfile->qf.push_front (make_dwarf_debug_names ());
      return;
    }
@@ -5462,7 +5528,6 @@ dwarf2_initialize_objfile (struct objfile *objfile)
  if (per_bfd->index_table != nullptr)
    {
      dwarf_read_debug_printf ("re-using shared index table");
-      per_objfile->resize_symtabs ();
      objfile->qf.push_front (make_dwarf_gdb_index ());
      return;
    }
@@ -5482,7 +5547,6 @@ dwarf2_initialize_objfile (struct objfile *objfile)
  if (dwarf2_read_debug_names (per_objfile))
    {
      dwarf_read_debug_printf ("found debug names");
-      per_objfile->resize_symtabs ();
      objfile->qf.push_front (make_dwarf_debug_names ());
      return;
    }
@@ -5492,7 +5556,6 @@ dwarf2_initialize_objfile (struct objfile *objfile)
 			     get_gdb_index_contents_from_section<dwz_file>))
    {
      dwarf_read_debug_printf ("found gdb index from file");
-      per_objfile->resize_symtabs ();
      objfile->qf.push_front (make_dwarf_gdb_index ());
      return;
    }
@@ -5504,7 +5567,6 @@ dwarf2_initialize_objfile (struct objfile *objfile)
    {
      dwarf_read_debug_printf ("found gdb index from cache");
      global_index_cache.hit ();
-      per_objfile->resize_symtabs ();
      objfile->qf.push_front (make_dwarf_gdb_index ());
      return;
    }
@@ -5534,7 +5596,6 @@ dwarf2_build_psymtabs (struct objfile *objfile, psymbol_functions *psf)
 	}
      else
 	psf->set_partial_symtabs (per_bfd->partial_symtabs);
-      per_objfile->resize_symtabs ();
      return;
    }

@@ -5561,8 +5622,6 @@ dwarf2_build_psymtabs (struct objfile *objfile, psymbol_functions *psf)
      dwarf2_build_psymtabs_hard (per_objfile);
      psymtabs.keep ();

-      per_objfile->resize_symtabs ();
-
      /* (maybe) store an index in the cache.  */
      global_index_cache.store (per_objfile);
    }
@@ -5904,8 +5963,6 @@ add_type_unit (dwarf2_per_objfile *per_objfile, ULONGEST sig, void **slot)
    = per_objfile->per_bfd->allocate_signatured_type (sig);
  signatured_type *sig_type = sig_type_holder.get ();

-  per_objfile->resize_symtabs ();
-
  per_objfile->per_bfd->all_comp_units.emplace_back
    (sig_type_holder.release ());
  if (per_objfile->per_bfd->using_index)
@@ -13608,7 +13665,6 @@ dwarf2_rnglists_process (unsigned offset, struct dwarf2_cu *cu,
  /* Base address selection entry.  */
  gdb::optional<CORE_ADDR> base;
  const gdb_byte *buffer;
-  CORE_ADDR baseaddr;
  bool overflow = false;
  ULONGEST addr_index;
  struct dwarf2_section_info *rnglists_section;
@@ -13625,8 +13681,6 @@ dwarf2_rnglists_process (unsigned offset, struct dwarf2_cu *cu,
    }
  buffer = rnglists_section->buffer + offset;

-  baseaddr = objfile->text_section_offset ();
-
  while (1)
    {
      /* Initialize it due to a false compiler warning.  */
@@ -13768,7 +13822,7 @@ dwarf2_rnglists_process (unsigned offset, struct dwarf2_cu *cu,

      /* A not-uncommon case of bad debug info.
 	 Don't pollute the addrmap with bad data.  */
-      if (range_beginning + baseaddr == 0
+      if (range_beginning == 0
 	  && !per_objfile->per_bfd->has_section_at_zero)
 	{
 	  complaint (_(".debug_rnglists entry has start address of zero"
@@ -13810,7 +13864,6 @@ dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu, dwarf_tag tag,
  gdb::optional<CORE_ADDR> base;
  unsigned int dummy;
  const gdb_byte *buffer;
-  CORE_ADDR baseaddr;

  if (cu_header->version >= 5)
    return dwarf2_rnglists_process (offset, cu, tag, callback);
@@ -13826,8 +13879,6 @@ dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu, dwarf_tag tag,
    }
  buffer = per_objfile->per_bfd->ranges.buffer + offset;

-  baseaddr = objfile->text_section_offset ();
-
  while (1)
    {
      CORE_ADDR range_beginning, range_end;
@@ -13878,7 +13929,7 @@ dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu, dwarf_tag tag,

      /* A not-uncommon case of bad debug info.
 	 Don't pollute the addrmap with bad data.  */
-      if (range_beginning + baseaddr == 0
+      if (range_beginning == 0
 	  && !per_objfile->per_bfd->has_section_at_zero)
 	{
 	  complaint (_(".debug_ranges entry has start address of zero"
@@ -18231,7 +18282,22 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
      baton->locexpr.per_cu = cu->per_cu;
      baton->locexpr.per_objfile = per_objfile;

-      struct dwarf_block *block = attr->as_block ();
+      struct dwarf_block *block;
+      if (attr->form == DW_FORM_data16)
+	{
+	  size_t data_size = 16;
+	  block = XOBNEW (obstack, struct dwarf_block);
+	  block->size = (data_size
+			 + 2 /* Extra bytes for DW_OP and arg.  */);
+	  gdb_byte *data = XOBNEWVEC (obstack, gdb_byte, block->size);
+	  data[0] = DW_OP_implicit_value;
+	  data[1] = data_size;
+	  memcpy (&data[2], attr->as_block ()->data, data_size);
+	  block->data = data;
+	}
+      else
+	block = attr->as_block ();
+
      baton->locexpr.size = block->size;
      baton->locexpr.data = block->data;
      switch (attr->name)
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -514,16 +514,6 @@ struct dwarf2_per_objfile
 				const struct comp_unit_head *cu_header,
 				unsigned int *bytes_read_ptr);

-  /* Resize the M_SYMTABS vector to the needed size (the number of partial
-     symtabs allocated by the per-bfd).  */
-  void resize_symtabs ()
-  {
-    /* The symtabs vector should only grow, not shrink.  */
-    gdb_assert (per_bfd->all_comp_units.size () >= m_symtabs.size ());
-
-    m_symtabs.resize (per_bfd->all_comp_units.size ());
-  }
-
  /* Return true if the symtab corresponding to PER_CU has been set,
     false otherwise.  */
  bool symtab_set_p (const dwarf2_per_cu_data *per_cu) const;
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -453,9 +453,8 @@ exec_file_attach (const char *filename, int from_tty)

      if (!current_program_space->exec_bfd ())
 	{
-	  error (_("\"%ps\": could not open as an executable file: %s."),
-		 styled_string (file_name_style.style (), scratch_pathname),
-		 bfd_errmsg (bfd_get_error ()));
+	  error (_("\"%s\": could not open as an executable file: %s."),
+		 scratch_pathname, bfd_errmsg (bfd_get_error ()));
 	}

      /* gdb_realpath_keepfile resolves symlinks on the local
@@ -475,8 +474,7 @@ exec_file_attach (const char *filename, int from_tty)
 	  /* Make sure to close exec_bfd, or else "run" might try to use
 	     it.  */
 	  current_program_space->exec_close ();
-	  error (_("\"%ps\": not in executable format: %s"),
-		 styled_string (file_name_style.style (), scratch_pathname),
+	  error (_("\"%s\": not in executable format: %s"), scratch_pathname,
 		 gdb_bfd_errmsg (bfd_get_error (), matching).c_str ());
 	}

--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -365,7 +365,7 @@ fbsd_nat_target::info_proc (const char *args, enum info_proc_what what)
 	  printf_filtered ("Parent process: %d\n", kp.ki_ppid);
 	  printf_filtered ("Process group: %d\n", kp.ki_pgid);
 	  printf_filtered ("Session id: %d\n", kp.ki_sid);
-	  printf_filtered ("TTY: %ju\n", (uintmax_t) kp.ki_tdev);
+	  printf_filtered ("TTY: %s\n", pulongest (kp.ki_tdev));
 	  printf_filtered ("TTY owner process group: %d\n", kp.ki_tpgid);
 	  printf_filtered ("User IDs (real, effective, saved): %d %d %d\n",
 			   kp.ki_ruid, kp.ki_uid, kp.ki_svuid);
@@ -383,34 +383,35 @@ fbsd_nat_target::info_proc (const char *args, enum info_proc_what what)
 			   kp.ki_rusage.ru_majflt);
 	  printf_filtered ("Major faults, children: %ld\n",
 			   kp.ki_rusage_ch.ru_majflt);
-	  printf_filtered ("utime: %jd.%06ld\n",
-			   (intmax_t) kp.ki_rusage.ru_utime.tv_sec,
+	  printf_filtered ("utime: %s.%06ld\n",
+			   plongest (kp.ki_rusage.ru_utime.tv_sec),
 			   kp.ki_rusage.ru_utime.tv_usec);
-	  printf_filtered ("stime: %jd.%06ld\n",
-			   (intmax_t) kp.ki_rusage.ru_stime.tv_sec,
+	  printf_filtered ("stime: %s.%06ld\n",
+			   plongest (kp.ki_rusage.ru_stime.tv_sec),
 			   kp.ki_rusage.ru_stime.tv_usec);
-	  printf_filtered ("utime, children: %jd.%06ld\n",
-			   (intmax_t) kp.ki_rusage_ch.ru_utime.tv_sec,
+	  printf_filtered ("utime, children: %s.%06ld\n",
+			   plongest (kp.ki_rusage_ch.ru_utime.tv_sec),
 			   kp.ki_rusage_ch.ru_utime.tv_usec);
-	  printf_filtered ("stime, children: %jd.%06ld\n",
-			   (intmax_t) kp.ki_rusage_ch.ru_stime.tv_sec,
+	  printf_filtered ("stime, children: %s.%06ld\n",
+			   plongest (kp.ki_rusage_ch.ru_stime.tv_sec),
 			   kp.ki_rusage_ch.ru_stime.tv_usec);
 	  printf_filtered ("'nice' value: %d\n", kp.ki_nice);
-	  printf_filtered ("Start time: %jd.%06ld\n", kp.ki_start.tv_sec,
+	  printf_filtered ("Start time: %s.%06ld\n",
+			   plongest (kp.ki_start.tv_sec),
 			   kp.ki_start.tv_usec);
 	  pgtok = getpagesize () / 1024;
-	  printf_filtered ("Virtual memory size: %ju kB\n",
-			   (uintmax_t) kp.ki_size / 1024);
-	  printf_filtered ("Data size: %ju kB\n",
-			   (uintmax_t) kp.ki_dsize * pgtok);
-	  printf_filtered ("Stack size: %ju kB\n",
-			   (uintmax_t) kp.ki_ssize * pgtok);
-	  printf_filtered ("Text size: %ju kB\n",
-			   (uintmax_t) kp.ki_tsize * pgtok);
-	  printf_filtered ("Resident set size: %ju kB\n",
-			   (uintmax_t) kp.ki_rssize * pgtok);
-	  printf_filtered ("Maximum RSS: %ju kB\n",
-			   (uintmax_t) kp.ki_rusage.ru_maxrss);
+	  printf_filtered ("Virtual memory size: %s kB\n",
+			   pulongest (kp.ki_size / 1024));
+	  printf_filtered ("Data size: %s kB\n",
+			   pulongest (kp.ki_dsize * pgtok));
+	  printf_filtered ("Stack size: %s kB\n",
+			   pulongest (kp.ki_ssize * pgtok));
+	  printf_filtered ("Text size: %s kB\n",
+			   pulongest (kp.ki_tsize * pgtok));
+	  printf_filtered ("Resident set size: %s kB\n",
+			   pulongest (kp.ki_rssize * pgtok));
+	  printf_filtered ("Maximum RSS: %s kB\n",
+			   pulongest (kp.ki_rusage.ru_maxrss));
 	  printf_filtered ("Pending Signals: ");
 	  for (int i = 0; i < _SIG_WORDS; i++)
 	    printf_filtered ("%08x ", kp.ki_siglist.__bits[i]);
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -170,7 +170,8 @@ XMLTOC = \
 	s390x-tevx-linux64.xml \
 	s390x-vx-linux64.xml \
 	s390-gs-linux64.xml \
-	s390x-gs-linux64.xml
+	s390x-gs-linux64.xml \
+	z80.xml

 TDESC_CFILES = $(patsubst %.xml,%.c,$(XMLTOC))
 GDB = false
--- a/gdb/features/z80-cpu.xml
+++ b/gdb/features/z80-cpu.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2020 Free Software Foundation, Inc.
+
+     Copying and distribution of this file, with or without modification,
+     are permitted in any medium without royalty provided the copyright
+     notice and this notice are preserved.  -->
+
+<!DOCTYPE feature SYSTEM "gdb-target.dtd">
+<feature name="org.gnu.gdb.z80.cpu">
+  <flags id="af_flags" size="2">
+    <field name="C" start="0" end="0"/>
+    <field name="N" start="1" end="1"/>
+    <field name="P/V" start="2" end="2"/>
+    <field name="F3" start="3" end="3"/>
+    <field name="H" start="4" end="4"/>
+    <field name="F5" start="5" end="5"/>
+    <field name="Z" start="6" end="6"/>
+    <field name="S" start="7" end="7"/>
+  </flags>
+  <reg name="af" bitsize="16" type="af_flags"/>
+  <reg name="bc" bitsize="16" type="uint16"/>
+  <reg name="de" bitsize="16" type="data_ptr"/>
+  <reg name="hl" bitsize="16" type="data_ptr"/>
+  <reg name="sp" bitsize="16" type="data_ptr" />
+  <reg name="pc" bitsize="32" type="code_ptr" />
+  <reg name="ix" bitsize="16" type="data_ptr"/>
+  <reg name="iy" bitsize="16" type="data_ptr"/>
+  <reg name="af'" bitsize="16" type="af_flags"/>
+  <reg name="bc'" bitsize="16" type="uint16"/>
+  <reg name="de'" bitsize="16" type="data_ptr"/>
+  <reg name="hl'" bitsize="16" type="data_ptr"/>
+  <reg name="ir" bitsize="16" type="uint16"/>
+</feature>
--- a/gdb/features/z80.c
+++ b/gdb/features/z80.c
@@ -0,0 +1,44 @@
+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
+  Original: z80.xml */
+
+#include "defs.h"
+#include "osabi.h"
+#include "target-descriptions.h"
+
+struct target_desc *tdesc_z80;
+static void
+initialize_tdesc_z80 (void)
+{
+  target_desc_up result = allocate_target_description ();
+  set_tdesc_architecture (result.get (), bfd_scan_arch ("z80"));
+
+  struct tdesc_feature *feature;
+
+  feature = tdesc_create_feature (result.get (), "org.gnu.gdb.z80.cpu");
+  tdesc_type_with_fields *type_with_fields;
+  type_with_fields = tdesc_create_flags (feature, "af_flags", 2);
+  tdesc_add_flag (type_with_fields, 0, "C");
+  tdesc_add_flag (type_with_fields, 1, "N");
+  tdesc_add_flag (type_with_fields, 2, "P/V");
+  tdesc_add_flag (type_with_fields, 3, "F3");
+  tdesc_add_flag (type_with_fields, 4, "H");
+  tdesc_add_flag (type_with_fields, 5, "F5");
+  tdesc_add_flag (type_with_fields, 6, "Z");
+  tdesc_add_flag (type_with_fields, 7, "S");
+
+  tdesc_create_reg (feature, "af", 0, 1, NULL, 16, "af_flags");
+  tdesc_create_reg (feature, "bc", 1, 1, NULL, 16, "uint16");
+  tdesc_create_reg (feature, "de", 2, 1, NULL, 16, "data_ptr");
+  tdesc_create_reg (feature, "hl", 3, 1, NULL, 16, "data_ptr");
+  tdesc_create_reg (feature, "sp", 4, 1, NULL, 16, "data_ptr");
+  tdesc_create_reg (feature, "pc", 5, 1, NULL, 32, "code_ptr");
+  tdesc_create_reg (feature, "ix", 6, 1, NULL, 16, "data_ptr");
+  tdesc_create_reg (feature, "iy", 7, 1, NULL, 16, "data_ptr");
+  tdesc_create_reg (feature, "af'", 8, 1, NULL, 16, "af_flags");
+  tdesc_create_reg (feature, "bc'", 9, 1, NULL, 16, "uint16");
+  tdesc_create_reg (feature, "de'", 10, 1, NULL, 16, "data_ptr");
+  tdesc_create_reg (feature, "hl'", 11, 1, NULL, 16, "data_ptr");
+  tdesc_create_reg (feature, "ir", 12, 1, NULL, 16, "uint16");
+
+  tdesc_z80 = result.release ();
+}
--- a/gdb/features/z80.xml
+++ b/gdb/features/z80.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2020 Free Software Foundation, Inc.
+
+     Copying and distribution of this file, with or without modification,
+     are permitted in any medium without royalty provided the copyright
+     notice and this notice are preserved.  -->
+
+<!DOCTYPE target SYSTEM "gdb-target.dtd">
+<target>
+  <architecture>z80</architecture>
+  <xi:include href="z80-cpu.xml"/>
+</target>
--- a/gdb/gdb_bfd.c
+++ b/gdb/gdb_bfd.c
@@ -423,6 +423,15 @@ gdb_bfd_iovec_fileio_pread (struct bfd *abfd, void *stream, void *buf,
  return pos;
 }

+/* Warn that it wasn't possible to close a bfd for file NAME, because
+   of REASON.  */
+
+static void
+gdb_bfd_close_warning (const char *name, const char *reason)
+{
+  warning (_("cannot close \"%s\": %s"), name, reason);
+}
+
 /* Wrapper for target_fileio_close suitable for passing as the
   CLOSE_FUNC argument to gdb_bfd_openr_iovec.  */

@@ -436,7 +445,16 @@ gdb_bfd_iovec_fileio_close (struct bfd *abfd, void *stream)

  /* Ignore errors on close.  These may happen with remote
     targets if the connection has already been torn down.  */
-  target_fileio_close (fd, &target_errno);
+  try
+    {
+      target_fileio_close (fd, &target_errno);
+    }
+  catch (const gdb_exception &ex)
+    {
+      /* Also avoid crossing exceptions over bfd.  */
+      gdb_bfd_close_warning (bfd_get_filename (abfd),
+			     ex.message->c_str ());
+    }

  /* Zero means success.  */
  return 0;
@@ -626,8 +644,8 @@ gdb_bfd_close_or_warn (struct bfd *abfd)
  ret = bfd_close (abfd);

  if (!ret)
-    warning (_("cannot close \"%s\": %s"),
-	     name, bfd_errmsg (bfd_get_error ()));
+    gdb_bfd_close_warning (name,
+			   bfd_errmsg (bfd_get_error ()));

  return ret;
 }
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -730,7 +730,8 @@ typedef std::string (gdbarch_memtag_to_string_ftype) (struct gdbarch *gdbarch, s
 extern std::string gdbarch_memtag_to_string (struct gdbarch *gdbarch, struct value *tag);
 extern void set_gdbarch_memtag_to_string (struct gdbarch *gdbarch, gdbarch_memtag_to_string_ftype *memtag_to_string);

-/* Return true if ADDRESS contains a tag and false otherwise. */
+/* Return true if ADDRESS contains a tag and false otherwise.  ADDRESS
+   must be either a pointer or a reference type. */

 typedef bool (gdbarch_tagged_address_p_ftype) (struct gdbarch *gdbarch, struct value *address);
 extern bool gdbarch_tagged_address_p (struct gdbarch *gdbarch, struct value *address);
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -608,7 +608,8 @@ v;int;significant_addr_bit;;;;;;0
 # Return a string representation of the memory tag TAG.
 m;std::string;memtag_to_string;struct value *tag;tag;;default_memtag_to_string;;0

-# Return true if ADDRESS contains a tag and false otherwise.
+# Return true if ADDRESS contains a tag and false otherwise.  ADDRESS
+# must be either a pointer or a reference type.
 m;bool;tagged_address_p;struct value *address;address;;default_tagged_address_p;;0

 # Return true if the tag from ADDRESS matches the memory tag for that
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -6093,7 +6093,7 @@ gdbtypes_post_init (struct gdbarch *gdbarch)
  builtin_type->builtin_string
    = arch_type (gdbarch, TYPE_CODE_STRING, TARGET_CHAR_BIT, "string");
  builtin_type->builtin_bool
-    = arch_type (gdbarch, TYPE_CODE_BOOL, TARGET_CHAR_BIT, "bool");
+    = arch_boolean_type (gdbarch, TARGET_CHAR_BIT, 1, "bool");

  /* The following three are about decimal floating point types, which
     are 32-bits, 64-bits and 128-bits respectively.  */
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -825,8 +825,8 @@ public:

  int parser (struct parser_state *ps) const override
  {
-    /* No parsing is done, just claim success.  */
-    return 1;
+    error (_("expression parsing not implemented for language \"%s\""),
+	   natural_name ());
  }

  /* See language.h.  */
--- a/gdb/make-init-c
+++ b/gdb/make-init-c
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh

 # Copyright (C) 2013-2021 Free Software Foundation, Inc.
 #
--- a/gdb/mi/mi-cmd-break.c
+++ b/gdb/mi/mi-cmd-break.c
@@ -423,20 +423,19 @@ mi_cmd_break_condition (const char *command, char **argv, int argc)
 	}
    }

-  /* There must be at least two more args: a bpnum and a condition
-     expression.  */
-  if (oind + 1 >= argc)
-    error (_("-break-condition: Missing the <number> and/or <expr> "
-	     "argument"));
+  /* There must be at least one more arg: a bpnum.  */
+  if (oind >= argc)
+    error (_("-break-condition: Missing the <number> argument"));

  int bpnum = atoi (argv[oind]);

  /* The rest form the condition expr.  */
-  std::string expr (argv[oind + 1]);
-  for (int i = oind + 2; i < argc; ++i)
+  std::string expr = "";
+  for (int i = oind + 1; i < argc; ++i)
    {
-      expr += " ";
      expr += argv[i];
+      if (i + 1 < argc)
+	expr += " ";
    }

  set_breakpoint_condition (bpnum, expr.c_str (), 0 /* from_tty */,
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -383,6 +383,9 @@ mi_cmd_exec_interrupt (const char *command, char **argv, int argc)
    {
      struct inferior *inf = find_inferior_id (current_context->thread_group);

+      scoped_disable_commit_resumed disable_commit_resumed
+	("interrupting all threads of thread group");
+
      iterate_over_threads (interrupt_thread_callback, &inf->pid);
    }
  else
--- a/gdb/netbsd-tdep.c
+++ b/gdb/netbsd-tdep.c
@@ -520,7 +520,7 @@ nbsd_get_siginfo_type (struct gdbarch *gdbarch)
  return siginfo_type;
 }

-/* See nbsd-tdep.h.  */
+/* See netbsd-tdep.h.  */

 void
 nbsd_info_proc_mappings_header (int addr_bit)
@@ -607,7 +607,7 @@ nbsd_get_syscall_number (struct gdbarch *gdbarch, thread_info *thread)
  internal_error (__FILE__, __LINE__, _("nbsd_get_sycall_number called"));
 }

-/* See nbsd-tdep.h.  */
+/* See netbsd-tdep.h.  */

 void
 nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1266,19 +1266,26 @@ print_value (value *val, const value_print_options &opts)
 static bool
 should_validate_memtags (struct value *value)
 {
-  if (target_supports_memory_tagging ()
-      && gdbarch_tagged_address_p (target_gdbarch (), value))
-    {
-      gdb_assert (value != nullptr && value_type (value) != nullptr);
+  gdb_assert (value != nullptr && value_type (value) != nullptr);

-      enum type_code code = value_type (value)->code ();
+  if (!target_supports_memory_tagging ())
+    return false;

-      return (code == TYPE_CODE_PTR
-	      || code == TYPE_CODE_REF
-	      || code == TYPE_CODE_METHODPTR
-	      || code == TYPE_CODE_MEMBERPTR);
-    }
-  return false;
+  enum type_code code = value_type (value)->code ();
+
+  /* Skip non-address values.  */
+  if (code != TYPE_CODE_PTR
+      && !TYPE_IS_REFERENCE (value_type (value)))
+    return false;
+
+  /* OK, we have an address value.  Check we have a complete value we
+     can extract.  */
+  if (value_optimized_out (value)
+      || !value_entirely_available (value))
+    return false;
+
+  /* We do.  Check whether it includes any tags.  */
+  return gdbarch_tagged_address_p (target_gdbarch (), value);
 }

 /* Helper for parsing arguments for print_command_1.  */
@@ -1321,26 +1328,42 @@ print_command_1 (const char *args, int voidprint)
 		    value_type (val)->code () != TYPE_CODE_VOID))
    {
      /* If memory tagging validation is on, check if the tag is valid.  */
-      if (print_opts.memory_tag_violations && should_validate_memtags (val)
-	  && !gdbarch_memtag_matches_p (target_gdbarch (), val))
+      if (print_opts.memory_tag_violations)
 	{
-	  /* Fetch the logical tag.  */
-	  struct value *tag
-	    = gdbarch_get_memtag (target_gdbarch (), val,
-				  memtag_type::logical);
-	  std::string ltag
-	    = gdbarch_memtag_to_string (target_gdbarch (), tag);
+	  try
+	    {
+	      if (should_validate_memtags (val)
+		  && !gdbarch_memtag_matches_p (target_gdbarch (), val))
+		{
+		  /* Fetch the logical tag.  */
+		  struct value *tag
+		    = gdbarch_get_memtag (target_gdbarch (), val,
+					  memtag_type::logical);
+		  std::string ltag
+		    = gdbarch_memtag_to_string (target_gdbarch (), tag);

-	  /* Fetch the allocation tag.  */
-	  tag = gdbarch_get_memtag (target_gdbarch (), val,
-				    memtag_type::allocation);
-	  std::string atag
-	    = gdbarch_memtag_to_string (target_gdbarch (), tag);
+		  /* Fetch the allocation tag.  */
+		  tag = gdbarch_get_memtag (target_gdbarch (), val,
+					    memtag_type::allocation);
+		  std::string atag
+		    = gdbarch_memtag_to_string (target_gdbarch (), tag);

-	  printf_filtered (_("Logical tag (%s) does not match the "
-			     "allocation tag (%s).\n"),
-			   ltag.c_str (), atag.c_str ());
+		  printf_filtered (_("Logical tag (%s) does not match the "
+				     "allocation tag (%s).\n"),
+				   ltag.c_str (), atag.c_str ());
+		}
+	    }
+	  catch (gdb_exception_error &ex)
+	    {
+	      if (ex.error == TARGET_CLOSE_ERROR)
+		throw;
+
+	      fprintf_filtered (gdb_stderr,
+				_("Could not validate memory tag: %s\n"),
+				ex.message->c_str ());
+	    }
 	}
+
      print_value (val, print_opts);
    }
 }
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -5624,6 +5624,15 @@ remote_unpush_target (remote_target *target)
      pop_all_targets_at_and_above (process_stratum);
      generic_mourn_inferior ();
    }
+
+  /* Don't rely on target_close doing this when the target is popped
+     from the last remote inferior above, because something may be
+     holding a reference to the target higher up on the stack, meaning
+     target_close won't be called yet.  We lost the connection to the
+     target, so clear these now, otherwise we may later throw
+     TARGET_CLOSE_ERROR while trying to tell the remote target to
+     close the file.  */
+  fileio_handles_invalidate_target (target);
 }

 static void
--- a/gdb/s390-linux-tdep.c
+++ b/gdb/s390-linux-tdep.c
@@ -1120,7 +1120,7 @@ s390_linux_init_abi_any (struct gdbarch_info info, struct gdbarch *gdbarch)

  tdep->s390_syscall_record = s390_linux_syscall_record;

-  linux_init_abi (info, gdbarch, 0);
+  linux_init_abi (info, gdbarch, 1);

  /* Register handling.  */
  set_gdbarch_core_read_description (gdbarch, s390_core_read_description);
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -7050,10 +7050,6 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
  set_gdbarch_displaced_step_copy_insn (gdbarch,
 					s390_displaced_step_copy_insn);
  set_gdbarch_displaced_step_fixup (gdbarch, s390_displaced_step_fixup);
-  set_gdbarch_displaced_step_prepare (gdbarch, linux_displaced_step_prepare);
-  set_gdbarch_displaced_step_finish (gdbarch, linux_displaced_step_finish);
-  set_gdbarch_displaced_step_restore_all_in_ptid
-    (gdbarch, linux_displaced_step_restore_all_in_ptid);
  set_gdbarch_displaced_step_hw_singlestep (gdbarch, s390_displaced_step_hw_singlestep);
  set_gdbarch_software_single_step (gdbarch, s390_software_single_step);
  set_gdbarch_max_insn_length (gdbarch, S390_MAX_INSTR_SIZE);
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -504,6 +504,10 @@ darwin_solib_read_all_image_info_addr (struct darwin_info *info)
 static void
 darwin_solib_create_inferior_hook (int from_tty)
 {
+  /* Everything below only makes sense if we have a running inferior.  */
+  if (!target_has_execution ())
+    return;
+
  struct darwin_info *info = get_darwin_info ();
  CORE_ADDR load_addr;

--- a/gdb/sparc-tdep.h
+++ b/gdb/sparc-tdep.h
@@ -245,7 +245,7 @@ extern int sparc_is_annulled_branch_insn (CORE_ADDR pc);
 extern const struct sparc_gregmap sparc32_sol2_gregmap;
 extern const struct sparc_fpregmap sparc32_sol2_fpregmap;

-/* Functions and variables exported from sparcnbsd-tdep.c.  */
+/* Functions and variables exported from sparc-netbsd-tdep.c.  */

 /* Register offsets for NetBSD.  */
 extern const struct sparc_gregmap sparc32nbsd_gregmap;
--- a/gdb/stubs/ChangeLog
+++ b/gdb/stubs/ChangeLog
@@ -1,3 +1,7 @@
+2021-07-17  Sergey Belyashov  <Sergey.Belyashov@gmail.com>
+
+	* z80-stub.c: New file.
+
 2020-04-28  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>

 	* ia64vms-stub.c: Fix typo in comment (thead -> thread).
--- a/gdb/stubs/z80-stub.c
+++ b/gdb/stubs/z80-stub.c
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -4242,6 +4242,8 @@ info_sources_filter::matches (const char *fullname) const
        case match_on::FULLNAME:
          to_match = fullname;
          break;
+	default:
+	  gdb_assert_not_reached ("bad m_match_type");
        }

      if (m_c_regexp->exec (to_match, 0, NULL, 0) != 0)
--- a/gdb/syscalls/netbsd.xml
+++ b/gdb/syscalls/netbsd.xml
@@ -105,6 +105,7 @@
  <syscall name="compat_43_osethostname" number="88"/>
  <syscall name="compat_43_ogetdtablesize" number="89"/>
  <syscall name="dup2" number="90"/>
+  <syscall name="getrandom" number="91"/>
  <syscall name="fcntl" number="92"/>
  <syscall name="compat_50_select" number="93"/>
  <syscall name="fsync" number="95"/>
@@ -171,6 +172,9 @@
  <syscall name="compat_09_osetdomainname" number="163"/>
  <syscall name="compat_09_ouname" number="164"/>
  <syscall name="sysarch" number="165"/>
+  <syscall name="__futex" number="166"/>
+  <syscall name="__futex_set_robust_list" number="167"/>
+  <syscall name="__futex_get_robust_list" number="168"/>
  <syscall name="compat_10_osemsys" number="169"/>
  <syscall name="compat_10_omsgsys" number="170"/>
  <syscall name="compat_10_oshmsys" number="171"/>
@@ -310,7 +314,6 @@
  <syscall name="_lwp_setname" number="323"/>
  <syscall name="_lwp_getname" number="324"/>
  <syscall name="_lwp_ctl" number="325"/>
-  <syscall name="_lwp_gettid" number="326"/>
  <syscall name="compat_60_sa_register" number="330"/>
  <syscall name="compat_60_sa_stacks" number="331"/>
  <syscall name="compat_60_sa_enable" number="332"/>
@@ -458,4 +461,17 @@
  <syscall name="__statvfs190" number="484"/>
  <syscall name="__fstatvfs190" number="485"/>
  <syscall name="__fhstatvfs190" number="486"/>
+  <syscall name="__acl_get_link" number="487"/>
+  <syscall name="__acl_set_link" number="488"/>
+  <syscall name="__acl_delete_link" number="489"/>
+  <syscall name="__acl_aclcheck_link" number="490"/>
+  <syscall name="__acl_get_file" number="491"/>
+  <syscall name="__acl_set_file" number="492"/>
+  <syscall name="__acl_get_fd" number="493"/>
+  <syscall name="__acl_set_fd" number="494"/>
+  <syscall name="__acl_delete_file" number="495"/>
+  <syscall name="__acl_delete_fd" number="496"/>
+  <syscall name="__acl_aclcheck_file" number="497"/>
+  <syscall name="__acl_aclcheck_fd" number="498"/>
+  <syscall name="lpathconf" number="499"/>
 </syscalls_info>
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -3121,13 +3121,9 @@ static std::vector<fileio_fh_t> fileio_fhandles;
   list each time a new file is opened.  */
 static int lowest_closed_fd;

-/* Invalidate the target associated with open handles that were open
-   on target TARG, since we're about to close (and maybe destroy) the
-   target.  The handles remain open from the client's perspective, but
-   trying to do anything with them other than closing them will fail
-   with EIO.  */
+/* See target.h.  */

-static void
+void
 fileio_handles_invalidate_target (target_ops *targ)
 {
  for (fileio_fh_t &fh : fileio_fhandles)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -2230,6 +2230,12 @@ extern LONGEST target_fileio_read_alloc (struct inferior *inf,
 extern gdb::unique_xmalloc_ptr<char> target_fileio_read_stralloc
    (struct inferior *inf, const char *filename);

+/* Invalidate the target associated with open handles that were open
+   on target TARG, since we're about to close (and maybe destroy) the
+   target.  The handles remain open from the client's perspective, but
+   trying to do anything with them other than closing them will fail
+   with EIO.  */
+extern void fileio_handles_invalidate_target (target_ops *targ);

 /* Tracepoint-related operations.  */

--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,171 @@
+2021-09-10  Tom de Vries  <tdevries@suse.de>
+
+	* lib/gdb.exp (gdb_compile_test): Handle unrecognized command line
+	option.
+
+2021-09-09  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.base/coredump-filter-build-id.exp: Handle older eu-unstrip.
+
+2021-09-09  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.mi/mi-sym-info.exp: Fix regexps.  Add missing message argument
+	to mi_gdb_test.  Factor out regexps for functions and variables.
+
+2021-09-04  Tom de Vries  <tdevries@suse.de>
+
+	PR testsuite/26950
+	* gdb/testsuite/gdb.arch/i386-avx.c (main): Remove call to have_avx.
+	(have_avx): Move ...
+	* gdb/testsuite/lib/gdb.exp (have_avx): ... here.  New proc.
+	* gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp: Use have_avx.
+	* gdb/testsuite/gdb.arch/i386-avx.exp: Same.
+
+2021-09-03  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.gdb/complaints.exp: Use untested if clear_complaints cannot
+	be found.
+
+2021-09-03  Tom de Vries  <tdevries@suse.de>
+
+	* lib/selftest-support.exp: Emit untested when not being able to set
+	breakpoint.
+
+2021-09-01  Tom de Vries  <tdevries@suse.de>
+
+	PR testsuite/28298
+	* gdb.dwarf2/fission-base.S: Use DWO instead of XSTR(DWO).
+	* gdb.dwarf2/fission-loclists-pie.S: Same.
+	* gdb.dwarf2/fission-loclists.S: Same.
+	* gdb.dwarf2/fission-reread.S: Same.
+	* gdb.dwarf2/fission-base.exp: Use additional_flags=-DDWO=\"$dwo\".
+	* gdb.dwarf2/fission-loclists-pie.exp: Same.
+	* gdb.dwarf2/fission-loclists.exp: Same.
+	* gdb.dwarf2/fission-reread.exp: Same.
+
+2021-09-01  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.fortran/call-no-debug.exp: Avoid shared lib symbols for
+	find_mangled_name calls.
+
+2021-08-30  Tom de Vries  <tdevries@suse.de>
+
+	PR cli/28290
+	* gdb.base/batch-exit-status.exp: Add gdb '' and gdb '' '' tests.
+
+2021-08-23  Tom de Vries  <tdevries@suse.de>
+
+	PR gdb/26880
+	* gdb.base/non-executable.exp: New file.
+
+2021-08-06  Simon Marchi  <simon.marchi@polymtl.ca>
+	    Tom de Vries  <tdevries@suse.de>
+
+	PR symtab/28004
+	* gdb.dwarf2/dw2-zero-range-shlib.c: New test.
+	* gdb.dwarf2/dw2-zero-range.c: New test.
+	* gdb.dwarf2/dw2-zero-range.exp: New file.
+
+2021-08-02  Tom Tromey  <tromey@adacore.com>
+
+	PR varobj/28131
+	* gdb.python/py-mi-var-info-path-expression.exp: Add regression
+	test.
+
+2021-07-26  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
+
+	PR gdb/28076
+	* gdb.mi/mi-break.exp: Add more tests to check clearing the
+	breakpoint condition.
+
+2021-07-22  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.ada/formatted_ref.exp: Add xfail for PR gcc/101575.
+	* gdb.ada/iwide.exp: Same.
+	* gdb.ada/pkd_arr_elem.exp: Same.
+
+2021-07-22  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.cp/step-and-next-inline.cc (tree_check, get_alias_set, main):
+	Tag closing brace with comment.
+	* gdb.cp/step-and-next-inline.h: Update to keep identical with
+	step-and-next-inline.cc.
+	* gdb.cp/step-and-next-inline.exp: Issue extra next when required.
+
+2021-07-21  Tom de Vries  <tdevries@suse.de>
+
+	* lib/gdb.exp (gcc_major_version): New proc.
+	* gdb.base/ptype-offsets.cc: Define static member static_member::Empty.
+	* gdb.cp/templates.exp: Define static member using -DGCC_BUG.
+	* gdb.cp/m-static.exp: Add
+	additional_flags=-fno-eliminate-unused-debug-types.
+	* gdb.cp/pr-574.exp: Same.
+	* gdb.cp/pr9167.exp: Same.
+
+2021-07-21  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.ada/arrayptr.exp: Add KFAILs for PR20991 and PR28115.
+	* gdb.ada/exprs.exp: Add KFAILs for PR20991.
+	* gdb.ada/packed_array_assign.exp: Same.
+
+2021-07-19  Tom Tromey  <tromey@adacore.com>
+
+	PR gdb/28093
+	* gdb.base/langs.exp: Add tests.
+
+2021-07-14  Tom de Vries  <tdevries@suse.de>
+
+	* lib/gdb.exp (have_index): New proc.
+	* gdb.base/gold-gdb-index.exp: Use have_index.
+
+2021-07-13  Pedro Alves  <pedro@palves.net>
+
+	PR gdb/28080
+	* gdb.base/detach-sysroot-target.exp: New.
+	* gdb.base/detach-sysroot-target.c: New.
+
+2021-07-13  Tom de Vries  <tdevries@suse.de>
+
+	PR testsuite/27690
+	* gdb.threads/check-libthread-db.exp: Update patterns for glibc 2.33.
+
+2021-07-13  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* gdb.mi/interrupt-thread-group.c: New.
+	* gdb.mi/interrupt-thread-group.exp: New.
+
+2021-07-12  Tom de Vries  <tdevries@suse.de>
+
+	PR testsuite/28057
+	* gdb.btrace/tsx.exp: Add pattern for system with tsx disabled in
+	microcode.
+
+2021-07-12  Tom de Vries  <tdevries@suse.de>
+
+	* lib/mi-support.exp (mi_readnow): New proc.
+	* gdb.mi/mi-info-sources.exp: Use nosharedlibrary.  Update patterns.
+	Skip tests for readnow.  Use "maint expand-symtabs".
+
+2021-07-08  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.guile/scm-breakpoint.exp: Make additional "ERROR: " prefix in
+	exception printing optional.
+
+2021-07-06  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* configure.ac: Restore.
+	* configure: Re-generate.
+	* aclocal.m4: Re-generate.
+	* Makefile.in (distclean): Add config.status.
+	(Makefile): Adjust paths.
+	(lib/pdtrace): Adjust paths.
+	(config.status): Add.
+
+2021-07-06  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.fortran/ptype-on-functions.exp: Allow both $integer8 and
+	$integer4 for size of string length.
+
 2021-07-01  Pedro Alves  <pedro@palves.net>

 	PR mi/15729
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -348,14 +348,17 @@ clean mostlyclean:

 distclean maintainer-clean realclean: clean
 	-rm -f *~ core
-	-rm -f Makefile *-init.exp
+	-rm -f Makefile config.status *-init.exp
 	-rm -fr *.log summary detail *.plog *.sum *.psum site.*

-Makefile : Makefile.in ../config.status $(host_makefile_frag)
-	cd .. && $(SHELL) ./config.status testsuite/Makefile
+Makefile : Makefile.in config.status $(host_makefile_frag)
+	$(SHELL) config.status Makefile

-lib/pdtrace: pdtrace.in ../config.status
-	cd .. && $(SHELL) ./config.status testsuite/lib/pdtrace
+lib/pdtrace: pdtrace.in config.status
+	$(SHELL) config.status lib/pdtrace
+
+config.status: configure
+	$(SHELL) config.status --recheck

 TAGS: force
 	find $(srcdir) -name '*.exp' -print | \
--- a/gdb/testsuite/aclocal.m4
+++ b/gdb/testsuite/aclocal.m4
@@ -0,0 +1,37 @@
+m4_include(../../config/acx.m4)
+m4_include(../../config/override.m4)
+m4_include(../../config/enable.m4)
+m4_include(../transform.m4)
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 7
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
--- a/gdb/testsuite/configure
+++ b/gdb/testsuite/configure
--- a/gdb/testsuite/configure.ac
+++ b/gdb/testsuite/configure.ac
@@ -0,0 +1,99 @@
+#                                                       -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+# Copyright 2002-2021 Free Software Foundation, Inc.
+#
+# 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/>.
+
+AC_INIT
+AC_CONFIG_SRCDIR([gdb.base])
+
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
+ACX_NONCANONICAL_TARGET
+
+# Enable gdbtk.
+AC_ARG_ENABLE(gdbtk,
+[  --enable-gtk            enable gdbtk graphical user interface (GUI)],,
+  [if test -d $srcdir/../gdbtk && test -d $srcdir/gdb.gdbtk; then
+    enable_gdbtk=yes
+  else
+    enable_gdbtk=no
+  fi])
+# We unconditionally disable gdbtk tests on selected platforms.
+case $host_os in
+  go32* | windows*)
+    enable_gdbtk=no ;;
+esac
+
+# Add gdbtk tests when appropriate.
+if test $enable_gdbtk = yes; then
+   AC_CONFIG_SUBDIRS(gdb.gdbtk)
+fi
+
+GCC_ENABLE([libctf], [yes], [], [Handle .ctf type-info sections])
+AC_SUBST(enable_libctf)
+
+# Enable shared libraries.
+AC_ARG_ENABLE(shared,
+[  --enable-shared         build shared libraries [deault=yes]],,
+  enable_shared=yes)
+
+# If we have shared libraries, try to set RPATH_ENVVAR reasonably,
+# such that we can find the shared libraries in the build tree.
+if test $enable_shared = no; then
+  # The variable `RPATH_ENVVAR' itself is not likely to be used on any
+  # platform.
+  RPATH_ENVVAR=RPATH_ENVVAR
+else
+  # The variable `LD_LIBRARY_PATH' is used on most platforms.
+  RPATH_ENVVAR=LD_LIBRARY_PATH
+  # The following exceptions are taken from Libtool 1.4.3.
+  case $host_os in
+    aix*)
+      if test $host_cpu != ia64; then
+        RPATH_ENVVAR=LIBPATH
+      fi ;;
+    darwin* | rhapsody*)
+      RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
+  esac
+fi
+AC_SUBST(RPATH_ENVVAR)
+
+AC_CHECK_HEADERS(pthread.h)
+
+AC_EXEEXT
+
+if test "${build}" = "${host}" -a "${host}" = "${target}"; then
+   case "${host}" in
+     *gnu*)
+       EXTRA_RULES=read1
+       ;;
+   esac
+fi
+AC_SUBST(EXTRA_RULES)
+
+# Transform the name of some programs and generate the lib/pdtrace
+# test tool.
+AC_ARG_PROGRAM
+GDB_AC_TRANSFORM(strip, STRIP_TRANSFORM_NAME)
+GDB_AC_TRANSFORM(readelf, READELF_TRANSFORM_NAME)
+GDB_AC_TRANSFORM(as, GAS_TRANSFORM_NAME)
+GDB_AC_TRANSFORM(nm, NM_TRANSFORM_NAME)
+AC_CONFIG_FILES([lib/pdtrace], [chmod +x lib/pdtrace])
+AC_CONFIG_FILES([Makefile])
+
+AC_OUTPUT
--- a/gdb/testsuite/gdb.ada/array_of_variant.exp
+++ b/gdb/testsuite/gdb.ada/array_of_variant.exp
@@ -19,6 +19,29 @@ if { [skip_ada_tests] } { return -1 }

 standard_ada_testfile p

+if [get_compiler_info] {
+    return -1
+}
+set old_gcc [expr [test_compiler_info {gcc-[0-7]-*}]]
+
+proc gdb_test_with_xfail { cmd re re_xfail msg } {
+    global scenario old_gcc
+    set have_xfail [expr $old_gcc && [string equal "$scenario" "minimal"]]
+
+    gdb_test_multiple $cmd $msg {
+	-re -wrap $re  {
+	    pass $gdb_test_name
+	}
+	-re -wrap $re_xfail {
+	    if { $have_xfail } {
+		# gcc/101633
+		setup_xfail *-*-*
+	    }
+	    fail $gdb_test_name
+	}
+    }
+}
+
 foreach_with_prefix scenario {all minimal} {
    set flags [list debug additional_flags=-fgnat-encodings=$scenario]

@@ -32,17 +55,23 @@ foreach_with_prefix scenario {all minimal} {
    runto "p.adb:$bp_location"

    set v1 "(tag => object, values => (2, 2, 2, 2, 2))"
+    set v1_xfail "(tag => object, values => ())"
    set v2 "(tag => unused)"

-    gdb_test "print objects" \
-	[string_to_regexp " = ($v1, $v2)"] \
-	"print entire array"
-    gdb_test "print objects(1)" \
-	[string_to_regexp " = $v1"] \
+    set re [string_to_regexp " = ($v1, $v2)"]
+    set re_xfail [string_to_regexp " = ($v1_xfail, $v2)"]
+    gdb_test_with_xfail "print objects" $re $re_xfail "print entire array"
+
+    set re [string_to_regexp " = $v1"]
+    set re_xfail [string_to_regexp " = $v1_xfail"]
+    gdb_test_with_xfail "print objects(1)" $re $re_xfail \
 	"print first array element"
-    gdb_test "print objects(1 .. 1)" \
-	[string_to_regexp " = ($v1)"] \
+
+    set re [string_to_regexp " = ($v1)"]
+    set re_xfail [string_to_regexp " = ($v1_xfail)"]
+    gdb_test_with_xfail "print objects(1 .. 1)" $re $re_xfail \
 	"print first array slice"
+
    gdb_test "print objects(2)" \
 	[string_to_regexp " = $v2"] \
 	"print second array element"
--- a/gdb/testsuite/gdb.ada/arrayptr.exp
+++ b/gdb/testsuite/gdb.ada/arrayptr.exp
@@ -49,10 +49,38 @@ foreach_with_prefix scenario {all minimal} {

    gdb_test "ptype string_access" "= access array \\(<>\\) of character"

-    gdb_test "print pa_ptr.all" \
-	" = \\(10, 20, 30, 40, 50, 60, 62, 63, -23, 42\\)"
+    set kfail_int128support_re \
+	"That operation is not available on integers of more than 8 bytes\\."
+    set kfail_packed_array_range_re \
+	"cannot subscript or call something of type `foo__packed_array_ptr'"

-    gdb_test "print pa_ptr(3)" " = 30"
+    gdb_test_multiple "print pa_ptr.all" "" {
+	-re -wrap " = \\(10, 20, 30, 40, 50, 60, 62, 63, -23, 42\\)" {
+	    pass $gdb_test_name
+	}
+	-re -wrap $kfail_int128support_re {
+	    kfail gdb/20991 $gdb_test_name
+	}
+    }

-    gdb_test "print pa_ptr.all(3)" " = 30"
+    gdb_test_multiple "print pa_ptr(3)" "" {
+	-re -wrap " = 30" {
+	    pass $gdb_test_name
+	}
+	-re -wrap $kfail_int128support_re {
+	    kfail gdb/20991 $gdb_test_name
+	}
+	-re -wrap $kfail_packed_array_range_re {
+	    kfail gdb/28115 $gdb_test_name
+	}
+    }
+
+    gdb_test_multiple "print pa_ptr.all(3)" "" {
+	-re -wrap " = 30" {
+	    pass $gdb_test_name
+	}
+	-re -wrap $kfail_int128support_re {
+	    kfail gdb/20991 $gdb_test_name
+	}
+    }
 }
--- a/gdb/testsuite/gdb.ada/big_packed_array.exp
+++ b/gdb/testsuite/gdb.ada/big_packed_array.exp
@@ -19,6 +19,11 @@ if { [skip_ada_tests] } { return -1 }

 standard_ada_testfile foo_ra24_010

+if [get_compiler_info] {
+    return -1
+}
+set old_gcc [expr [test_compiler_info {gcc-[0-8]-*}]]
+
 foreach_with_prefix scenario {all minimal} {
    set flags [list debug additional_flags=-fgnat-encodings=$scenario]

@@ -34,6 +39,20 @@ foreach_with_prefix scenario {all minimal} {
    gdb_test "print good" \
 	"= \\(false <repeats 196 times>\\)" \

-    gdb_test "print bad" \
-	"= \\(false <repeats 196 times>\\)"
+    set have_xfail [expr $old_gcc && [string equal "$scenario" "minimal"]]
+
+    set re "= \\(false <repeats 196 times>\\)"
+    set re_xfail "= \\(0 => 0 <repeats 25 times>\\)"
+    gdb_test_multiple "print bad" "" {
+       -re -wrap $re  {
+           pass $gdb_test_name
+       }
+       -re -wrap $re_xfail {
+           if { $have_xfail } {
+               # gcc/101643
+               setup_xfail *-*-*
+           }
+           fail $gdb_test_name
+       }
+    }
 }
--- a/gdb/testsuite/gdb.ada/exprs.exp
+++ b/gdb/testsuite/gdb.ada/exprs.exp
@@ -28,14 +28,34 @@ clean_restart ${testfile}
 set bp_location [gdb_get_line_number "START" ${testdir}/p.adb]
 runto "p.adb:$bp_location"

-gdb_test "print X ** Y = Z" \
-         "= true" \
-         "Long_Long_Integer ** Y"
+set kfail_int128support_re \
+    "That operation is not available on integers of more than 8 bytes\\."

-gdb_test "print long_float'min (long_float (X), 8.0)" \
-         "= 7.0" \
-         "long_float'min"
+gdb_test_multiple "print X ** Y = Z" "Long_Long_Integer ** Y" {
+    -re -wrap "= true" {
+	pass $gdb_test_name
+    }
+    -re -wrap $kfail_int128support_re {
+	kfail gdb/20991 $gdb_test_name
+    }
+}

-gdb_test "print long_float'max (long_float (X), 8.0)" \
-         "= 8.0" \
-         "long_float'max"
+set cmd "print long_float'min (long_float (X), 8.0)"
+gdb_test_multiple $cmd "long_float'min" {
+    -re -wrap "= 7.0" {
+	pass $gdb_test_name
+    }
+    -re -wrap $kfail_int128support_re {
+	kfail gdb/20991 $gdb_test_name
+    }
+}
+
+set cmd "print long_float'max (long_float (X), 8.0)"
+gdb_test_multiple $cmd "long_float'max" {
+    -re -wrap "= 8.0" {
+	pass $gdb_test_name
+    }
+    -re -wrap $kfail_int128support_re {
+	kfail gdb/20991 $gdb_test_name
+    }
+}
--- a/gdb/testsuite/gdb.ada/formatted_ref.exp
+++ b/gdb/testsuite/gdb.ada/formatted_ref.exp
@@ -90,7 +90,30 @@ proc test_p_op1_equals_op2 {op1 op2} {

 clean_restart ${testfile}

-runto defs.adb:[gdb_get_line_number "marker here" ${testdir}/defs.adb ]
+set bp_location \
+    defs.adb:[gdb_get_line_number "marker here" ${testdir}/defs.adb]
+
+# Workaround gcc PR101575.
+#runto $bp_location
+gdb_breakpoint "$bp_location"
+gdb_run_cmd
+set re "Breakpoint $decimal, defs.f1 \\(.*\\) at .*:$decimal.*"
+set re_xfail "Breakpoint $decimal, defs__struct1IP \\(\\) at .*:$decimal.*"
+set ok 1
+gdb_test_multiple "" "Runto to $bp_location" {
+    -re -wrap $re {
+	if { $ok } {
+	    pass $gdb_test_name
+	} else {
+	    xfail $gdb_test_name
+	}
+    }
+    -re -wrap $re_xfail {
+	set ok 0
+	send_gdb "continue\n"
+	exp_continue
+    }
+}

 set s1_address  [get_address "s1"]

--- a/gdb/testsuite/gdb.ada/iwide.exp
+++ b/gdb/testsuite/gdb.ada/iwide.exp
@@ -25,8 +25,29 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional

 clean_restart ${testfile}

-set bp_location [gdb_get_line_number "BREAK" ${testdir}/p.adb]
-runto "p.adb:$bp_location"
+set bp_location p.adb:[gdb_get_line_number "BREAK" ${testdir}/p.adb]
+
+# Workaround gcc PR101575.
+#runto "$bp_location"
+gdb_breakpoint "$bp_location"
+gdb_run_cmd
+set re "Breakpoint $decimal, p \\(\\) at .*:$decimal.*"
+set re_xfail "Breakpoint $decimal, p__P5b.0 \\(\\) at .*:$decimal.*"
+set ok 1
+gdb_test_multiple "" "Runto to $bp_location" {
+    -re -wrap $re {
+	if { $ok } {
+	    pass $gdb_test_name
+	} else {
+	    xfail $gdb_test_name
+	}
+    }
+    -re -wrap $re_xfail {
+	set ok 0
+	send_gdb "continue\n"
+	exp_continue
+    }
+}

 gdb_test "print My_Drawable" \
         "= \\(center => \\(x => 1, y => 2\\), radius => 3\\)"
--- a/gdb/testsuite/gdb.ada/packed_array_assign.exp
+++ b/gdb/testsuite/gdb.ada/packed_array_assign.exp
@@ -27,15 +27,72 @@ clean_restart ${testfile}

 runto "aggregates.run_test"

-gdb_test \
-    "print pra := ((packed_array_assign_x => 2, packed_array_assign_y => 0, packed_array_assign_w => 17), pr, (packed_array_assign_x => 7, packed_array_assign_y => 1, packed_array_assign_w => 23))" \
-    " = \\(\\(packed_array_assign_w => 17, packed_array_assign_x => 2, packed_array_assign_y => 0\\), \\(packed_array_assign_w => 104, packed_array_assign_x => 2, packed_array_assign_y => 3\\), \\(packed_array_assign_w => 23, packed_array_assign_x => 7, packed_array_assign_y => 1\\)\\)" \
-    "value of pra"
+set kfail_int128support_re \
+    "That operation is not available on integers of more than 8 bytes\\."

-gdb_test "print pra(1) := pr" \
-    " = \\(packed_array_assign_w => 104, packed_array_assign_x => 2, packed_array_assign_y => 3\\)"
-gdb_test "print pra(1)" \
-    " = \\(packed_array_assign_w => 104, packed_array_assign_x => 2, packed_array_assign_y => 3\\)"
+set cmd \
+    [list \
+	 "print pra := " \
+	 "((packed_array_assign_x => 2," \
+	 "packed_array_assign_y => 0," \
+	 "packed_array_assign_w => 17)," \
+	 "pr," \
+	 "(packed_array_assign_x => 7," \
+	 "packed_array_assign_y => 1," \
+	 "packed_array_assign_w => 23))"]
+set cmd [join $cmd]
+set re \
+    [list \
+	 " = \\(\\(packed_array_assign_w => 17," \
+	 "packed_array_assign_x => 2," \
+	 "packed_array_assign_y => 0\\)," \
+	 "\\(packed_array_assign_w => 104," \
+	 "packed_array_assign_x => 2," \
+	 "packed_array_assign_y => 3\\)," \
+	 "\\(packed_array_assign_w => 23," \
+	 "packed_array_assign_x => 7," \
+	 "packed_array_assign_y => 1\\)\\)"]
+set re [join $re]
+gdb_test_multiple $cmd "value of pra" {
+    -re -wrap $re {
+	pass $gdb_test_name
+    }
+    -re -wrap $kfail_int128support_re {
+	kfail gdb/20991 $gdb_test_name
+    }
+}
+
+set cmd "print pra(1) := pr"
+set re \
+    [list \
+	 " = \\(packed_array_assign_w => 104," \
+	 "packed_array_assign_x => 2," \
+	 "packed_array_assign_y => 3\\)"]
+set re [join $re]
+gdb_test_multiple $cmd "" {
+    -re -wrap $re {
+	pass $gdb_test_name
+    }
+    -re -wrap $kfail_int128support_re {
+	kfail gdb/20991 $gdb_test_name
+    }
+}
+
+set cmd "print pra(1)"
+set re \
+    [list \
+	 " = \\(packed_array_assign_w => 104," \
+	 "packed_array_assign_x => 2," \
+	 "packed_array_assign_y => 3\\)"]
+set re [join $re]
+gdb_test_multiple $cmd "" {
+    -re -wrap $re {
+	pass $gdb_test_name
+    }
+    -re -wrap $kfail_int128support_re {
+	kfail gdb/20991 $gdb_test_name
+    }
+}

 gdb_test "print npr := (q000 => 3, r000 => (packed_array_assign_x => 6, packed_array_assign_y => 1, packed_array_assign_w => 117))" \
    " = \\(q000 => 3, r000 => \\(packed_array_assign_w => 117, packed_array_assign_x => 6, packed_array_assign_y => 1\\)\\)" \
--- a/gdb/testsuite/gdb.ada/pkd_arr_elem.exp
+++ b/gdb/testsuite/gdb.ada/pkd_arr_elem.exp
@@ -25,8 +25,30 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {

 clean_restart ${testfile}

-set bp_location [gdb_get_line_number "START" ${testdir}/failure.adb]
-runto "failure.adb:$bp_location"
+set bp_location \
+    failure.adb:[gdb_get_line_number "START" ${testdir}/failure.adb]
+
+# Workaround gcc PR101575.
+#runto "$bp_location"
+gdb_breakpoint "$bp_location"
+gdb_run_cmd
+set re "Breakpoint $decimal, failure \\(\\) at .*:$decimal.*"
+set re_xfail "Breakpoint $decimal, failure__bounded_funny_stringIP.0 \\(\\) at .*:$decimal.*"
+set ok 1
+gdb_test_multiple "" "Runto to $bp_location" {
+    -re -wrap $re {
+	if { $ok } {
+	    pass $gdb_test_name
+	} else {
+	    xfail $gdb_test_name
+	}
+    }
+    -re -wrap $re_xfail {
+	set ok 0
+	send_gdb "continue\n"
+	exp_continue
+    }
+}

 # Print Test.  The order of the components depends on which version of
 # the compiler being used, as newer version can re-order the order
--- a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
@@ -23,6 +23,11 @@ if { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
    return
 }

+if { ![have_avx] } {
+    verbose "Skipping x86_64 displaced stepping tests."
+    return
+}
+
 standard_testfile .S

 set options [list debug \
--- a/gdb/testsuite/gdb.arch/i386-avx.c
+++ b/gdb/testsuite/gdb.arch/i386-avx.c
@@ -48,81 +48,64 @@ v8sf_t data[] =
  };


-int
-have_avx (void)
-{
-  unsigned int eax, ebx, ecx, edx;
-
-  if (!x86_cpuid (1, &eax, &ebx, &ecx, &edx))
-    return 0;
-
-  if ((ecx & (bit_AVX | bit_OSXSAVE)) == (bit_AVX | bit_OSXSAVE))
-    return 1;
-  else
-    return 0;
-}
-
 int
 main (int argc, char **argv)
 {
-  if (have_avx ())
-    {
-      asm ("vmovaps 0(%0), %%ymm0\n\t"
-           "vmovaps 32(%0), %%ymm1\n\t"
-           "vmovaps 64(%0), %%ymm2\n\t"
-           "vmovaps 96(%0), %%ymm3\n\t"
-           "vmovaps 128(%0), %%ymm4\n\t"
-           "vmovaps 160(%0), %%ymm5\n\t"
-           "vmovaps 192(%0), %%ymm6\n\t"
-           "vmovaps 224(%0), %%ymm7\n\t"
-           : /* no output operands */
-           : "r" (data) 
-           : "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7");
+  asm ("vmovaps 0(%0), %%ymm0\n\t"
+       "vmovaps 32(%0), %%ymm1\n\t"
+       "vmovaps 64(%0), %%ymm2\n\t"
+       "vmovaps 96(%0), %%ymm3\n\t"
+       "vmovaps 128(%0), %%ymm4\n\t"
+       "vmovaps 160(%0), %%ymm5\n\t"
+       "vmovaps 192(%0), %%ymm6\n\t"
+       "vmovaps 224(%0), %%ymm7\n\t"
+       : /* no output operands */
+       : "r" (data)
+       : "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7");
 #ifdef __x86_64__
-      asm ("vmovaps 256(%0), %%ymm8\n\t"
-           "vmovaps 288(%0), %%ymm9\n\t"
-           "vmovaps 320(%0), %%ymm10\n\t"
-           "vmovaps 352(%0), %%ymm11\n\t"
-           "vmovaps 384(%0), %%ymm12\n\t"
-           "vmovaps 416(%0), %%ymm13\n\t"
-           "vmovaps 448(%0), %%ymm14\n\t"
-           "vmovaps 480(%0), %%ymm15\n\t"
-           : /* no output operands */
-           : "r" (data) 
-           : "xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15");
+  asm ("vmovaps 256(%0), %%ymm8\n\t"
+       "vmovaps 288(%0), %%ymm9\n\t"
+       "vmovaps 320(%0), %%ymm10\n\t"
+       "vmovaps 352(%0), %%ymm11\n\t"
+       "vmovaps 384(%0), %%ymm12\n\t"
+       "vmovaps 416(%0), %%ymm13\n\t"
+       "vmovaps 448(%0), %%ymm14\n\t"
+       "vmovaps 480(%0), %%ymm15\n\t"
+       : /* no output operands */
+       : "r" (data)
+       : "xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15");
 #endif

-      asm ("nop"); /* first breakpoint here */
+  asm ("nop"); /* first breakpoint here */

-      asm (
-           "vmovaps %%ymm0, 0(%0)\n\t"
-           "vmovaps %%ymm1, 32(%0)\n\t"
-           "vmovaps %%ymm2, 64(%0)\n\t"
-           "vmovaps %%ymm3, 96(%0)\n\t"
-           "vmovaps %%ymm4, 128(%0)\n\t"
-           "vmovaps %%ymm5, 160(%0)\n\t"
-           "vmovaps %%ymm6, 192(%0)\n\t"
-           "vmovaps %%ymm7, 224(%0)\n\t"
-           : /* no output operands */
-           : "r" (data) 
-           : "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7");
+  asm (
+       "vmovaps %%ymm0, 0(%0)\n\t"
+       "vmovaps %%ymm1, 32(%0)\n\t"
+       "vmovaps %%ymm2, 64(%0)\n\t"
+       "vmovaps %%ymm3, 96(%0)\n\t"
+       "vmovaps %%ymm4, 128(%0)\n\t"
+       "vmovaps %%ymm5, 160(%0)\n\t"
+       "vmovaps %%ymm6, 192(%0)\n\t"
+       "vmovaps %%ymm7, 224(%0)\n\t"
+       : /* no output operands */
+       : "r" (data)
+       : "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7");
 #ifdef __x86_64__
-      asm (
-           "vmovaps %%ymm8, 256(%0)\n\t"
-           "vmovaps %%ymm9, 288(%0)\n\t"
-           "vmovaps %%ymm10, 320(%0)\n\t"
-           "vmovaps %%ymm11, 352(%0)\n\t"
-           "vmovaps %%ymm12, 384(%0)\n\t"
-           "vmovaps %%ymm13, 416(%0)\n\t"
-           "vmovaps %%ymm14, 448(%0)\n\t"
-           "vmovaps %%ymm15, 480(%0)\n\t"
-           : /* no output operands */
-           : "r" (data) 
-           : "xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15");
+  asm (
+       "vmovaps %%ymm8, 256(%0)\n\t"
+       "vmovaps %%ymm9, 288(%0)\n\t"
+       "vmovaps %%ymm10, 320(%0)\n\t"
+       "vmovaps %%ymm11, 352(%0)\n\t"
+       "vmovaps %%ymm12, 384(%0)\n\t"
+       "vmovaps %%ymm13, 416(%0)\n\t"
+       "vmovaps %%ymm14, 448(%0)\n\t"
+       "vmovaps %%ymm15, 480(%0)\n\t"
+       : /* no output operands */
+       : "r" (data)
+       : "xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15");
 #endif

-      puts ("Bye!"); /* second breakpoint here */
-    }
+  puts ("Bye!"); /* second breakpoint here */

  return 0;
 }
--- a/gdb/testsuite/gdb.arch/i386-avx.exp
+++ b/gdb/testsuite/gdb.arch/i386-avx.exp
@@ -24,6 +24,11 @@ if { ![istarget i?86-*-*] && ![istarget x86_64-*-* ] } {
    return
 }

+if { ![have_avx] } {
+    verbose "Skipping x86 AVX tests."
+    return
+}
+
 standard_testfile .c

 if [get_compiler_info] {
@@ -47,23 +52,6 @@ if ![runto_main] then {
    return 0
 }

-send_gdb "print have_avx ()\r"
-gdb_expect {
-    -re ".. = 1\r\n$gdb_prompt " {
-        pass "check whether processor supports AVX"
-    }
-    -re ".. = 0\r\n$gdb_prompt " {
-        verbose "processor does not support AVX; skipping AVX tests"
-        return
-    }
-    -re ".*$gdb_prompt $" {
-        fail "check whether processor supports AVX"
-    }
-    timeout {
-        fail "check whether processor supports AVX (timeout)"
-    }
-}
-
 gdb_test "break [gdb_get_line_number "first breakpoint here"]" \
         "Breakpoint .* at .*i386-avx.c.*" \
         "set first breakpoint in main"
--- a/gdb/testsuite/gdb.base/batch-exit-status.exp
+++ b/gdb/testsuite/gdb.base/batch-exit-status.exp
@@ -76,3 +76,7 @@ test_exit_status 1 "-batch -x $good_commands -x $bad_commands" \
    "-batch -x good-commands -x bad-commands"
 test_exit_status 1 "-batch -x $good_commands -ex \"set not-a-thing 4\"" \
    "-batch -x good-commands -ex \"set not-a-thing 4\""
+
+set no_such_re ": No such file or directory\\."
+test_exit_status 1 "-batch \"\"" $no_such_re
+test_exit_status 1 "-batch \"\" \"\"" [multi_line $no_such_re $no_such_re]
--- a/gdb/testsuite/gdb.base/coredump-filter-build-id.exp
+++ b/gdb/testsuite/gdb.base/coredump-filter-build-id.exp
@@ -58,7 +58,8 @@ if { [catch "exec [gdb_find_eu-unstrip] -n --core $corefilename" output] == 0 }

    verbose -log "First line of eu-unstrip: $line"

-    if { [regexp "^${hex}\\+${hex} \[a-f0-9\]+@${hex}.*[string_to_regexp $binfile]$" $line] } {
+    set binfile_re (?:[string_to_regexp $binfile]|\\\[(?:exe|pie)\\\])
+    if { [regexp "^${hex}\\+${hex} \[a-f0-9\]+@${hex}.*$binfile_re$" $line] } {
 	pass "$test"
    } else {
 	fail "$test"
--- a/gdb/testsuite/gdb.base/detach-sysroot-target.c
+++ b/gdb/testsuite/gdb.base/detach-sysroot-target.c
@@ -0,0 +1,22 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2021 Free Software Foundation, Inc.
+
+   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/>.  */
+
+int
+main ()
+{
+  return 0;
+}
--- a/gdb/testsuite/gdb.base/detach-sysroot-target.exp
+++ b/gdb/testsuite/gdb.base/detach-sysroot-target.exp
@@ -0,0 +1,59 @@
+# Copyright 2021 Free Software Foundation, Inc.
+
+# 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/>.  */
+
+# Test running a program from the GDB prompt and then detaching it,
+# with "set sysroot target:".  Regression test for PR gdb/28080.
+#
+# It is assumed that it is only safe to tweak the sysroot on the
+# current board if it is currently either empty or already "target:".
+# If set to anything else, we skip the test.
+
+standard_testfile
+
+if {[prepare_for_testing "failed to prepare" ${binfile} ${srcfile}]} {
+    return
+}
+
+gdb_test_multiple "show sysroot" "" {
+    -wrap -re "The current system root is \"\"\\." {
+	pass $gdb_test_name
+
+	# Explicitly set target: sysroot.
+	gdb_test_no_output "set sysroot target:"
+    }
+    -wrap -re "The current system root is \"target:\"\\." {
+	pass $gdb_test_name
+
+	# Nothing else to do.
+    }
+    -re "$gdb_prompt $" {
+	pass $gdb_test_name
+
+	# If testing with any other sysroot, we probably should not
+	# mess with it.
+	unsupported "sysroot is set"
+	return
+    }
+}
+
+if ![runto_main] {
+    fail "couldn't run to main"
+    return
+}
+
+# With PR gdb/28080, this would crash GDB when testing with "target
+# remote".
+set escapedbinfile [string_to_regexp ${binfile}]
+gdb_test "detach" "Detaching from program: .*$escapedbinfile, .*"
--- a/gdb/testsuite/gdb.base/gold-gdb-index.exp
+++ b/gdb/testsuite/gdb.base/gold-gdb-index.exp
@@ -28,7 +28,7 @@ if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" \
    return -1
 }

-if { [readnow] } {
+if { [have_index $binfile] != "gdb_index" } {
    return -1
 }

--- a/gdb/testsuite/gdb.base/langs.exp
+++ b/gdb/testsuite/gdb.base/langs.exp
@@ -111,6 +111,12 @@ if [runto csub] then {
             "set lang to minimal"
    
    gdb_test "print x" " = 5000" "print parameter value"
+
+    # Ensure this at least does not crash.
+    gdb_test_no_output "set language unknown"
+    gdb_test "print x" \
+	"expression parsing not implemented for language .Unknown." \
+	"expression parsing does not crash for unknown"
 }

 set timeout $oldtimeout
--- a/gdb/testsuite/gdb.base/non-executable.exp
+++ b/gdb/testsuite/gdb.base/non-executable.exp
@@ -0,0 +1,32 @@
+# Copyright 2021 Free Software Foundation, Inc.
+
+# 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/>.
+
+# Check that loading an existing but non-executable file
+# results in the correct error message.
+
+set binfile "$srcdir/$subdir/$gdb_test_file_name.exp"
+
+clean_restart
+
+set re \
+    [list \
+	 "\"[string_to_regexp $binfile]\"" \
+	 "not in executable format" \
+	 "file format not recognized"]
+set re [join $re ": "]
+
+# Using gdb_load will generate a dejagnu ERROR, so use
+# plain file command instead.
+gdb_test "file $binfile" $re "error message"
--- a/gdb/testsuite/gdb.base/ptype-offsets.cc
+++ b/gdb/testsuite/gdb.base/ptype-offsets.cc
@@ -185,6 +185,9 @@ struct static_member
  int abc;
 };

+/* Work around PR gcc/101452.  */
+static_member static_member::Empty;
+
 struct empty_member
 {
  struct { } empty;
--- a/gdb/testsuite/gdb.btrace/tsx.exp
+++ b/gdb/testsuite/gdb.btrace/tsx.exp
@@ -59,6 +59,11 @@ set abort_2 [multi_line \
    "\[0-9\]*\t   0x\[0-9a-f\]+ <test\\+\[0-9\]+>:\tmov\[^\\\r\\\n\]*" \
    "\[0-9\]*\t   0x\[0-9a-f\]+ <test\\+\[0-9\]+>:\tret\[^\\\r\\\n\]*" \
    ]
+set abort_3 \
+    [multi_line \
+	 "$decimal\t   $hex <main\\+$decimal>:\t\[^\\\r\\\n\]*" \
+	 "$decimal\t   $hex <test\\+$decimal>:\tmov\[^\\\r\\\n\]*" \
+	 "$decimal\t   $hex <test\\+$decimal>:\tret\[^\\\r\\\n\]*"]

 set test "speculation indication"
 gdb_test_multiple "record instruction-history" $test {
@@ -68,6 +73,9 @@ gdb_test_multiple "record instruction-history" $test {
    -re "$abort_2.*$gdb_prompt $" {
        pass $test
    }
+    -re -wrap "$abort_3.*" {
+        pass $gdb_test_name
+    }
    -re  "$begin_to_end.*$gdb_prompt $" {
        pass $test
    }
--- a/gdb/testsuite/gdb.cp/m-static.exp
+++ b/gdb/testsuite/gdb.cp/m-static.exp
@@ -31,8 +31,14 @@ if [get_compiler_info] {
    return -1
 }

+set flags [list debug c++]
+if { [test_compiler_info gcc-*] && [gcc_major_version] >= 10 } {
+    # Work around PR gcc/101452.
+    lappend flags additional_flags=-fno-eliminate-unused-debug-types
+}
+
 if {[prepare_for_testing "failed to prepare" $testfile \
-	 [list $srcfile $srcfile2] {debug c++}]} {
+	 [list $srcfile $srcfile2] $flags]} {
    return -1
 }

--- a/gdb/testsuite/gdb.cp/pr-574.exp
+++ b/gdb/testsuite/gdb.cp/pr-574.exp
@@ -32,7 +32,13 @@ if [get_compiler_info "c++"] {
    return -1
 }

-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
+set flags [list debug c++]
+if { [test_compiler_info gcc-*] && [gcc_major_version] >= 10 } {
+    # Work around PR gcc/101452.
+    lappend flags additional_flags=-fno-eliminate-unused-debug-types
+}
+
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
    return -1
 }

--- a/gdb/testsuite/gdb.cp/pr9167.exp
+++ b/gdb/testsuite/gdb.cp/pr9167.exp
@@ -15,7 +15,13 @@

 standard_testfile .cc

-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
+set flags [list debug c++]
+if { [test_compiler_info gcc-*] && [gcc_major_version] >= 10 } {
+    # Work around PR gcc/101452.
+    lappend flags additional_flags=-fno-eliminate-unused-debug-types
+}
+
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
    return -1
 }

--- a/gdb/testsuite/gdb.cp/step-and-next-inline.cc
+++ b/gdb/testsuite/gdb.cp/step-and-next-inline.cc
@@ -41,7 +41,7 @@ tree_check (tree *t, int i)
    abort();
  tree *x = t;
  return x;
-}
+} // tree-check

 #endif	/* USE_NEXT_INLINE_H */

@@ -54,7 +54,7 @@ get_alias_set (tree *t)
      && TREE_TYPE (t).z != 3)
    return 0;
  return 1;
-}
+} // get_alias_set

 tree xx;

@@ -63,4 +63,4 @@ main()
 {
  get_alias_set (&xx);
  return 0;
-}
+} // main
--- a/gdb/testsuite/gdb.cp/step-and-next-inline.exp
+++ b/gdb/testsuite/gdb.cp/step-and-next-inline.exp
@@ -67,29 +67,100 @@ proc do_test { use_header } {
    gdb_test "step" ".*" "step into get_alias_set"
    gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \
 	"not in inline 1"
+
    # It's possible that this first failure (when not using a header
    # file) is GCC's fault, though the remaining failures would best
    # be fixed by adding location views support (though it could be
    # that some easier heuristic could be figured out).  Still, it is
    # not certain that the first failure wouldn't also be fixed by
    # having location view support, so for now it is tagged as such.
-    if {[test_compiler_info gcc*] && !$use_header} {
-	setup_kfail "*-*-*" symtab/25507
+    set have_kfail [expr [test_compiler_info gcc*] && !$use_header]
+
+    set ok 1
+    gdb_test_multiple "next" "next step 1" {
+	-re -wrap "if \\(t->x != i\\)" {
+	    set ok 0
+	    send_gdb "next\n"
+	    exp_continue
+	}
+	-re -wrap ".*TREE_TYPE.* != 1" {
+	    if { $ok } {
+		pass $gdb_test_name
+	    } else {
+		if { $have_kfail } {
+		    setup_kfail "*-*-*" symtab/25507
+		}
+		fail $gdb_test_name
+	    }
+	}
    }
-    gdb_test "next" ".*TREE_TYPE.*" "next step 1"
    gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \
 	"not in inline 2"
-    gdb_test "next" ".*TREE_TYPE.*" "next step 2"
+
+    set ok 1
+    gdb_test_multiple "next" "next step 2" {
+	-re -wrap "return x;" {
+	    set ok 0
+	    send_gdb "next\n"
+	    exp_continue
+	}
+	-re -wrap ".*TREE_TYPE.* != 2" {
+	    if { $ok } {
+		pass $gdb_test_name
+	    } else {
+		if { $have_kfail } {
+		    setup_kfail "*-*-*" symtab/25507
+		}
+		fail $gdb_test_name
+	    }
+	}
+    }
    gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \
 	"not in inline 3"
-    if {[test_compiler_info gcc*] && !$use_header} {
-	setup_kfail "*-*-*" symtab/25507
+
+    set ok 1
+    gdb_test_multiple "next" "next step 3" {
+	-re -wrap "return x;" {
+	    set ok 0
+	    send_gdb "next\n"
+	    exp_continue
+	}
+	-re -wrap ".*TREE_TYPE.* != 3\\)" {
+	    if { $ok } {
+		pass $gdb_test_name
+	    } else {
+		if { $have_kfail } {
+		    setup_kfail "*-*-*" symtab/25507
+		}
+		fail $gdb_test_name
+	    }
+	}
    }
-    gdb_test "next" ".*TREE_TYPE.*" "next step 3"
    gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \
 	"not in inline 4"
-    if {!$use_header} { setup_kfail "*-*-*" symtab/25507 }
-    gdb_test "next" "return 0.*" "next step 4"
+
+    set ok 1
+    gdb_test_multiple "next" "next step 4" {
+	-re -wrap "(if \\(t != NULL|\} // get_alias_set)" {
+	    send_gdb "next\n"
+	    exp_continue
+	}
+	-re -wrap "return x;" {
+	    set ok 0
+	    send_gdb "next\n"
+	    exp_continue
+	}
+	-re -wrap "return 0.*" {
+	    if { $ok } {
+		pass $gdb_test_name
+	    } else {
+		if { $have_kfail } {
+		    setup_kfail "*-*-*" symtab/25507
+		}
+		fail $gdb_test_name
+	    }
+	}
+    }
    gdb_test "bt" \
 	"\\s*\\#0\\s+(main|get_alias_set)\[^\r\]*${srcfile}:.*" \
 	"not in inline 5"
--- a/gdb/testsuite/gdb.cp/step-and-next-inline.h
+++ b/gdb/testsuite/gdb.cp/step-and-next-inline.h
@@ -35,4 +35,4 @@ tree_check (tree *t, int i)
    abort();
  tree *x = t;
  return x;
-}
+} // tree_check
--- a/gdb/testsuite/gdb.cp/templates.exp
+++ b/gdb/testsuite/gdb.cp/templates.exp
@@ -27,7 +27,13 @@ if [get_compiler_info "c++"] {
    return -1
 }

-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
+set flags [list debug c++]
+if { [test_compiler_info gcc-*] && [gcc_major_version] >= 10 } {
+    # Work around PR gcc/101452.
+    lappend flags additional_flags=-DGCC_BUG
+}
+
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
    return -1
 }

--- a/gdb/testsuite/gdb.dwarf2/dw2-zero-range-shlib.c
+++ b/gdb/testsuite/gdb.dwarf2/dw2-zero-range-shlib.c
@@ -0,0 +1,21 @@
+/*
+   Copyright 2021 Free Software Foundation, Inc.
+
+   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/>.  */
+
+void
+foo (void)
+{
+  asm ("foo_label: .globl foo_label");
+}
--- a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.c
+++ b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.c
@@ -0,0 +1,24 @@
+/*
+   Copyright 2021 Free Software Foundation, Inc.
+
+   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/>.  */
+
+extern void foo (void);
+
+int
+main (void)
+{
+  asm ("main_label: .globl main_label");
+  foo ();
+}
--- a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp
@@ -0,0 +1,185 @@
+# Copyright 2021 Free Software Foundation, Inc.
+
+# 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/>.
+
+# Check that the ".debug_ranges entry has start address of zero" complaint
+# is triggered for a loaded shared lib.
+
+load_lib dwarf.exp
+
+# This test can only be run on targets which support DWARF-2 and use gas.
+if {![dwarf2_support]} {
+    verbose "Skipping $gdb_test_file_name."
+    return 0
+}
+
+if {[skip_shlib_tests]} {
+    return 0
+}
+
+standard_testfile .c -shlib.c -dw.S
+
+# Test with both a .debug_ranges section (DWARF 4) and a .debug_rnglists
+# section (DWARF 5).
+
+foreach_with_prefix ranges_sect {ranges rnglists} {
+    set asm_file [standard_output_file ${ranges_sect}-$srcfile3]
+
+    if { $ranges_sect == "ranges" } {
+	Dwarf::assemble $asm_file {
+	    global srcdir subdir srcfile2
+	    declare_labels ranges_label
+
+	    cu {} {
+		compile_unit {
+		    {language @DW_LANG_C}
+		    {name $srcfile2}
+		    {ranges ${ranges_label} DW_FORM_sec_offset}
+		} {
+		    subprogram {
+			{external 1 flag}
+			{name foo}
+		    }
+		}
+	    }
+
+	    ranges {is_64 [is_64_target]} {
+		ranges_label: sequence {
+		    base 0
+		    range 0 1
+		}
+	    }
+	}
+    } elseif { $ranges_sect == "rnglists" } {
+	Dwarf::assemble $asm_file {
+	    global srcdir subdir srcfile2
+	    declare_labels rnglists_label
+
+	    cu {
+		version 5
+	    } {
+		compile_unit {
+		    {language @DW_LANG_C}
+		    {name $srcfile2}
+		    {ranges ${rnglists_label} DW_FORM_sec_offset}
+		} {
+		    subprogram {
+			{external 1 flag}
+			{name foo}
+		    }
+		}
+	    }
+
+	    rnglists {
+		table {
+		    rnglists_label: list_ {
+			start_end 0 1
+		    }
+		}
+	    }
+	}
+    } else {
+	error "invalid ranges section kind"
+    }
+
+    set lib1 [standard_output_file shr1.sl]
+    set lib_opts "nodebug"
+
+    set sources [list ${srcdir}/${subdir}/$srcfile2 $asm_file]
+    if { [gdb_compile_shlib $sources ${lib1} $lib_opts] != "" } {
+	untested "failed to compile"
+	return -1
+    }
+
+    set exec_opts [list debug shlib=${lib1}]
+    set sources ${srcdir}/${subdir}/${srcfile}
+    if { [gdb_compile $sources  ${binfile} executable \
+	      $exec_opts] != ""} {
+	untested "failed to compile"
+	return -1
+    }
+
+    clean_restart $binfile
+
+    set readnow_p [readnow]
+
+    # Don't load the symbols for $lib1 during runto_main.
+    # Instead, we do this afterwards using "sharedlibrary $lib1".
+    gdb_test_no_output "set auto-solib-add off"
+
+    if { ![runto_main] } {
+	fail "cannot run to main."
+	return -1
+    }
+
+    set complaint_re ".debug_${ranges_sect} entry has start address of zero"
+    set re \
+	"During symbol reading: $complaint_re \\\[in module \[^\r\n\]*\\\]"
+
+    # Test for presence of complaint, with lib1 relocated.
+    with_complaints 1 {
+	set test "Zero address complaint - relocated - psymtab"
+	set have_complaint 0
+	gdb_test_multiple "sharedlibrary $lib1" $test {
+	    -re -wrap $re {
+		set have_complaint 1
+	    }
+	    -re -wrap "" {
+	    }
+	}
+
+	if { $have_complaint } {
+	    pass $test
+	} else {
+	    set index [have_index $lib1]
+	    if { $index == "gdb_index" } {
+		kfail symtab/28159 $test
+	    } else {
+		fail $test
+	    }
+	}
+    }
+
+    if { ! $readnow_p } {
+	with_complaints 1 {
+	    gdb_test "maint expand-symtabs $srcfile2" $re \
+		"Zero address complaint - relocated - symtab"
+	}
+    }
+
+    clean_restart
+    # Test for presence of complaint, with lib1 unrelocated.
+    with_complaints 1 {
+	gdb_load $lib1
+	set test "Zero address complaint - unrelocated - psymtab"
+	set have_complaint [regexp $re.* $gdb_file_cmd_msg]
+	if { $have_complaint } {
+	    pass $test
+	} else {
+	    set index [have_index $lib1]
+	    if { $index == "gdb_index" } {
+		kfail symtab/28159 $test
+	    } else {
+		fail $test
+	    }
+	}
+    }
+
+    if { ! $readnow_p } {
+	with_complaints 1 {
+	    gdb_test "maint expand-symtabs $srcfile2" $re \
+		"Zero address complaint - unrelocated - symtab"
+	}
+    }
+}
--- a/gdb/testsuite/gdb.dwarf2/fission-base.S
+++ b/gdb/testsuite/gdb.dwarf2/fission-base.S
@@ -20,9 +20,6 @@
   and then massaging the output.
 */

-#define XSTR(s) STR(s)
-#define STR(s) #s
-
 	.file	"fission-base.c"

 	.text
@@ -146,7 +143,7 @@ main:
 	.8byte	.Letext0-.Ltext0	# DW_AT_high_pc
 	.4byte	.Ldebug_line0	# DW_AT_stmt_list
 	.ascii "/tmp/src/gdb/testsuite\0"	# DW_AT_comp_dir
-	.asciz XSTR(DWO)	# DW_AT_GNU_dwo_name
+	.asciz DWO	# DW_AT_GNU_dwo_name
 	.4byte	.Ldebug_pubnames0	# DW_AT_GNU_pubnames
 	.4byte	.Ldebug_pubtypes0	# DW_AT_GNU_pubtypes
 	.4byte	.Ldebug_addr0_begin	# DW_AT_GNU_addr_base
--- a/gdb/testsuite/gdb.dwarf2/fission-base.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-base.exp
@@ -36,7 +36,7 @@ set obj [standard_output_file "${testfile}.o"]
 set dwo [standard_output_file "${testfile}.dwo"]
 if [build_executable_and_dwo_files "$testfile.exp" "${binfile}" {nodebug} \
 	[list $srcfile \
-	     [list nodebug split-dwo additional_flags=-DDWO=$dwo] \
+	     [list nodebug split-dwo additional_flags=-DDWO=\"$dwo\"] \
 	     $obj]] {
    return -1
 }
--- a/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.S
+++ b/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.S
@@ -33,8 +33,6 @@
     return init (&argc);
   }
 */
-#define XSTR(s) STR(s)
-#define STR(s) #s

 	.file	"fission-loclists-pie.c"
 	.text
@@ -463,7 +461,7 @@ main:
 .LASF1:
 	.string	"/tmp/19999/obj64/gdb/testsuite"
 .LASF0:
-	.string	XSTR(DWO)
+	.string	DWO
 	.section	.debug_str_offsets.dwo,"e",@progbits
 	.long	0	# indexed string 0x0: argv
 	.long	0x5	# indexed string 0x1: argc
--- a/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp
@@ -41,7 +41,7 @@ set obj [standard_output_file "${testfile}.o"]
 set dwo [standard_output_file "${testfile}.dwo"]
 if [build_executable_and_dwo_files "$testfile.exp" "${binfile}" \
 	{nodebug ldflags=-pie} \
-	[list $srcfile [list nodebug split-dwo additional_flags=-DDWO=$dwo] \
+	[list $srcfile [list nodebug split-dwo additional_flags=-DDWO=\"$dwo\"] \
 	     $obj]] {
    return -1
 }
--- a/gdb/testsuite/gdb.dwarf2/fission-loclists.S
+++ b/gdb/testsuite/gdb.dwarf2/fission-loclists.S
@@ -33,9 +33,6 @@
   }
 */

-#define XSTR(s) STR(s)
-#define STR(s) #s
-
 	.file	"fission-loclists.c"
 	.text
 .Ltext0:
@@ -243,7 +240,7 @@ main:
 	.byte	0x5
 	.4byte	.Ldebug_ranges0	# DW_AT_GNU_ranges_base
 	.ascii "/tmp/src/gdb/testsuite\0"	# DW_AT_comp_dir
-	.asciz XSTR(DWO)	# DW_AT_GNU_dwo_name
+	.asciz DWO	# DW_AT_GNU_dwo_name
 	.4byte	.Ldebug_pubnames0	# DW_AT_GNU_pubnames
 	.4byte	.Ldebug_pubtypes0	# DW_AT_GNU_pubtypes
 	.4byte	.Ldebug_addr0	# DW_AT_GNU_addr_base
--- a/gdb/testsuite/gdb.dwarf2/fission-loclists.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-loclists.exp
@@ -36,7 +36,7 @@ set obj [standard_output_file "${testfile}.o"]
 set dwo [standard_output_file "${testfile}.dwo"]
 if [build_executable_and_dwo_files "$testfile.exp" "${binfile}" {nodebug} \
 	[list $srcfile \
-	     [list nodebug split-dwo additional_flags=-DDWO=$dwo] \
+	     [list nodebug split-dwo additional_flags=-DDWO=\"$dwo\"] \
 	     $obj]] {
    return -1
 }
--- a/gdb/testsuite/gdb.dwarf2/fission-reread.S
+++ b/gdb/testsuite/gdb.dwarf2/fission-reread.S
@@ -47,9 +47,6 @@
 # define SYMBOL(str)     str
 #endif

-#define XSTR(s) STR(s)
-#define STR(s) #s
-
 	.file	"fission-reread.cc"

 	.globl	SYMBOL(baz)
@@ -146,7 +143,7 @@ SYMBOL(main):
 	.4byte	0	/* Offset to Type DIE */
 	.uleb128 0x2	/* (DIE (0) DW_TAG_type_unit) */
 	.ascii "/tmp/src/gdb/testsuite\0"	/* DW_AT_comp_dir */
-	.asciz XSTR(DWO) /* DW_AT_GNU_dwo_name */
+	.asciz DWO /* DW_AT_GNU_dwo_name */
 	.4byte	.Ldebug_pubnames0	/* DW_AT_GNU_pubnames */
 	.4byte	.Ldebug_pubtypes0	/* DW_AT_GNU_pubtypes */
 	.4byte	.Ldebug_addr0	/* DW_AT_GNU_addr_base */
@@ -217,7 +214,7 @@ SYMBOL(main):
 	.4byte	.Letext0-.Ltext0	/* DW_AT_high_pc */
 	.4byte	.Ldebug_line0	/* DW_AT_stmt_list */
 	.ascii "/tmp/src/gdb/testsuite\0"	/* DW_AT_comp_dir */
-	.asciz XSTR(DWO) /* DW_AT_GNU_dwo_name */
+	.asciz DWO /* DW_AT_GNU_dwo_name */
 	.4byte	.Ldebug_pubnames0	/* DW_AT_GNU_pubnames */
 	.4byte	.Ldebug_pubtypes0	/* DW_AT_GNU_pubtypes */
 	.4byte	.Ldebug_addr0	/* DW_AT_GNU_addr_base */
--- a/gdb/testsuite/gdb.dwarf2/fission-reread.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-reread.exp
@@ -40,7 +40,7 @@ if { $additional_flags != "" } {

 set dwo_options $options
 lappend dwo_options split-dwo
-lappend dwo_options additional_flags=-DDWO=$dwo
+lappend dwo_options additional_flags=-DDWO=\"$dwo\"

 if [build_executable_and_dwo_files "$testfile.exp" "${binfile}" $options \
 	[list $srcfile $dwo_options $obj]] {
--- a/gdb/testsuite/gdb.fortran/call-no-debug.exp
+++ b/gdb/testsuite/gdb.fortran/call-no-debug.exp
@@ -28,11 +28,6 @@ if {[prepare_for_testing_full "failed to prepare" \
    return -1
 }

-if ![fortran_runto_main] {
-    untested "could not run to main"
-    return -1
-}
-
 # Find a possibly mangled version of NAME, a function we want to call
 # that has no debug information available.  We hope that the mangled
 # version of NAME contains the pattern NAME, and so we use 'info
@@ -67,12 +62,22 @@ proc find_mangled_name { name } {
    return $symbol_name
 }

+# Sample before before starting the exec, in order to avoid picking up symbols
+# from shared libs.
+set some_func [find_mangled_name "some_func"]
+set string_func [find_mangled_name "string_func"]
+
+if ![fortran_runto_main] {
+    untested "could not run to main"
+    return -1
+}
+
 # Call the function SOME_FUNC, that takes a single integer and returns
 # an integer.  As the function has no debug information then we have
 # to pass the integer argument as '&1' so that GDB will send the
 # address of an integer '1' (as Fortran arguments are pass by
 # reference).
-set symbol_name [find_mangled_name "some_func"]
+set symbol_name $some_func
 if { $symbol_name == "" } {
    untested "couldn't find suitable name for 'some_func'"
 } else {
@@ -91,7 +96,7 @@ if { $symbol_name == "" } {
 # The compiled program is expecting the address of the string, so we
 # prefix that argument with '&', but the artificial length parameter
 # is pass by value, so there's no need for '&' in that case.
-set symbol_name [find_mangled_name "string_func"]
+set symbol_name $string_func
 if { $symbol_name == "" } {
    untested "couldn't find suitable name for 'string_func'"
 } else {
--- a/gdb/testsuite/gdb.fortran/ptype-on-functions.exp
+++ b/gdb/testsuite/gdb.fortran/ptype-on-functions.exp
@@ -33,6 +33,13 @@ set integer4 [fortran_int4]
 set logical4 [fortran_logical4]
 set integer8 [fortran_int8]

+# A fortran string parameter is passed as a char *, and an additional
+# argument str_ for the string length.  The type used for the string length
+# argument is size_t, but for gcc 7 and earlier, the actual type is int
+# instead ( see
+# https://gcc.gnu.org/onlinedocs/gfortran/Argument-passing-conventions.html ).
+set stringlen ($integer8|$integer4)
+
 if {[test_compiler_info {clang-*}]} {
    set some_module_class_type "Type number"
    set some_module_aux_info ", $integer8 \\(10\\)"
@@ -62,7 +69,7 @@ gdb_test "ptype fun_ptr" \
    "type = PTR TO -> \\( $integer4 \\(\\) \\(${fun_ptr_arg}\\) \\)"

 gdb_test "ptype say_string" \
-    "type = void \\(character\[^,\]+, $integer8\\)"
+    "type = void \\(character\[^,\]+, $stringlen\\)"

 set say_array_artificial_first_arg ""
 if {[test_compiler_info {clang-*}]} {
--- a/gdb/testsuite/gdb.gdb/complaints.exp
+++ b/gdb/testsuite/gdb.gdb/complaints.exp
@@ -104,6 +104,26 @@ proc test_empty_complaint { cmd msg } {
 }

 proc test_empty_complaints { } {
+    global decimal
+
+    set re [multi_line \
+		"All functions matching regular expression \[^:\]*:" \
+		"" \
+		"File \[^\r\n\]*/complaints\\.c:" \
+		"$decimal:\tvoid clear_complaints\\(\\);"]
+
+    set found 0
+    gdb_test_multiple "info function ^clear_complaints()$" "" {
+	-re -wrap $re {
+	    set found 1
+	}
+	-re -wrap "" {
+	}
+    }
+    if { ! $found } {
+	untested "Cannot find clear_complaints, skipping test"
+	return 0
+    }

    test_empty_complaint "call clear_complaints()" \
 	    "clear complaints"
--- a/gdb/testsuite/gdb.guile/scm-breakpoint.exp
+++ b/gdb/testsuite/gdb.guile/scm-breakpoint.exp
@@ -260,10 +260,10 @@ proc_with_prefix test_watchpoints { } {
 	"test watchpoint write"

    gdb_test "guile (define wp2 (make-breakpoint \"result\" #:wp-class WP_WRITE #:type 999))" \
-	"ERROR: In procedure gdbscm_make_breakpoint: Out of range: invalid breakpoint type in position 5: 999\r\n.*" \
+	"(ERROR: )?In procedure gdbscm_make_breakpoint: Out of range: invalid breakpoint type in position 5: 999\r\n.*" \
 	"create a breakpoint with an invalid type number"
    gdb_test "guile (define wp2 (make-breakpoint \"result\" #:wp-class WP_WRITE #:type BP_NONE))" \
-	"ERROR: In procedure gdbscm_make_breakpoint: unsupported breakpoint type in position 5: \"BP_NONE\"\r\n.*" \
+	"(ERROR: )?In procedure gdbscm_make_breakpoint: unsupported breakpoint type in position 5: \"BP_NONE\"\r\n.*" \
 	"create a breakpoint with an unsupported type"
 }

@@ -533,7 +533,7 @@ proc_with_prefix test_catchpoints {} {
    # Try to create a catchpoint, currently this isn't supported via
    # the guile api.
    gdb_test "guile (define cp (make-breakpoint \"syscall\" #:type BP_CATCHPOINT))" \
-	"ERROR: In procedure gdbscm_make_breakpoint: unsupported breakpoint type in position 3: \"BP_CATCHPOINT\"\r\n.*" \
+	"(ERROR: )?In procedure gdbscm_make_breakpoint: unsupported breakpoint type in position 3: \"BP_CATCHPOINT\"\r\n.*" \
 	"create a catchpoint via the api"

    # Setup a catchpoint.
--- a/gdb/testsuite/gdb.mi/interrupt-thread-group.c
+++ b/gdb/testsuite/gdb.mi/interrupt-thread-group.c
@@ -0,0 +1,65 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2021 Free Software Foundation, Inc.
+
+   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/>.  */
+
+#include <unistd.h>
+#include <pthread.h>
+#include <assert.h>
+
+#define NUM_THREADS 4
+
+static pthread_barrier_t barrier;
+
+static void *
+thread_function (void *arg)
+{
+  pthread_barrier_wait (&barrier);
+
+  for (int i = 0; i < 30; i++)
+    sleep (1);
+
+  return NULL;
+}
+
+static void
+all_threads_started (void)
+{}
+
+int
+main (void)
+{
+  pthread_t threads[NUM_THREADS];
+
+  pthread_barrier_init (&barrier, NULL, NUM_THREADS + 1);
+
+  for (int i = 0; i < NUM_THREADS; i++)
+    {
+      int res = pthread_create (&threads[i], NULL, thread_function, NULL);
+      assert (res == 0);
+    }
+
+  pthread_barrier_wait (&barrier);
+  all_threads_started ();
+
+  for (int i = 0; i < NUM_THREADS; i++)
+    {
+      int res = pthread_join (threads[i], NULL);
+      assert (res == 0);
+    }
+
+  return 0;
+}
+
--- a/gdb/testsuite/gdb.mi/interrupt-thread-group.exp
+++ b/gdb/testsuite/gdb.mi/interrupt-thread-group.exp
@@ -0,0 +1,130 @@
+# Copyright 2021 Free Software Foundation, Inc.
+
+# 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/>.
+
+# Test --exec-interrupt with thread-group.
+#
+# Run two inferiors, try interrupting them both with --exec-interrupt +
+# --thread-group.
+
+load_lib mi-support.exp
+set MIFLAGS "-i=mi"
+
+standard_testfile .c
+
+if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
+	executable debug] != "" } {
+    return -1
+}
+
+save_vars { GDBFLAGS } {
+    append GDBFLAGS " -ex \"set non-stop on\" -ex \"set mi-async\""
+    mi_clean_restart $binfile
+}
+
+mi_detect_async
+
+# Create breakpoint by hand instead of using mi_runto, since we'll need it for
+# both inferiors.
+mi_create_breakpoint "all_threads_started" \
+    "set breakpoint on all_threads_started"
+
+# Run first inferior to all_threads_started (to ensure all threads are started)
+# and resume it.
+if { [mi_run_cmd] < 0 } {
+    return
+}
+
+mi_expect_stop "breakpoint-hit" "all_threads_started" ".*" ".*" ".*" {"" "disp=\"keep\""} \
+    "inferior i1 stops at all_threads_started"
+
+mi_send_resuming_command "exec-continue --thread-group i1" \
+    "continue inferior 1"
+
+# We can't run a second inferior on stub targets.  We can still test with one
+# inferior and ensure that the command has the desired effect.
+set use_second_inferior [expr {![use_gdb_stub]}]
+
+if { $use_second_inferior } {
+    # The inferior created by the -add-inferior MI command does not inherit the
+    # target connection of the first inferior.  If debugging through an
+    # extended-remote connection, that means we can't run that second inferior
+    # on the remote connection.  Use the add-inferior CLI command as a stop-gap.
+    if { [mi_is_target_remote] } {
+	mi_gdb_test "add-inferior" \
+	    "\\^done" \
+	    "add inferior 2"
+    } else {
+	mi_gdb_test "-add-inferior" \
+	    "\\^done,inferior=\"i2\"" \
+	    "add inferior 2"
+    }
+    mi_gdb_test "-file-exec-and-symbols --thread-group i2 $::binfile" \
+	"\\^done" \
+	"set executable of inferior 2"
+    # Run second inferior to all_threads_started (to ensure all threads are
+    # started) and resume it.
+    mi_gdb_test "-exec-run --thread-group i2" \
+	"\\^running.*" \
+	"run inferior 2"
+
+    mi_expect_stop "breakpoint-hit" "all_threads_started" ".*" ".*" ".*" {"" "disp=\"keep\""} \
+	"inferior i2 stops at all_threads_started"
+
+    mi_send_resuming_command "exec-continue --thread-group i2" \
+	"continue inferior 2"
+
+    mi_check_thread_states {
+	"running" "running" "running" "running" "running"
+	"running" "running" "running" "running" "running"
+    } "before interrupting"
+} else {
+    mi_check_thread_states {
+	"running" "running" "running" "running" "running"
+    } "before interrupting"
+}
+
+# Interrupt inferior 1, wait for events.
+mi_gdb_test "-exec-interrupt --thread-group i1" \
+    "\\^done" \
+    "interrupt inferior 1"
+
+for {set i 0} {$i < 5} {incr i} {
+    mi_expect_interrupt "inferior 1, interrupt $i"
+}
+
+if { $use_second_inferior } {
+    mi_check_thread_states {
+	"stopped" "stopped" "stopped" "stopped" "stopped"
+	"running" "running" "running" "running" "running"
+    } "after interrupting inferior 1"
+
+    # Interrupt inferior 2, wait for events.
+    mi_gdb_test "-exec-interrupt --thread-group i2" \
+	"\\^done" \
+	"interrupt inferior 2"
+
+    for {set i 0} {$i < 5} {incr i} {
+	mi_expect_interrupt "inferior 2, interrupt $i"
+    }
+
+    mi_check_thread_states {
+	"stopped" "stopped" "stopped" "stopped" "stopped"
+	"stopped" "stopped" "stopped" "stopped" "stopped"
+    } "after interrupting inferior 2"
+} else {
+    mi_check_thread_states {
+	"stopped" "stopped" "stopped" "stopped" "stopped"
+    } "after interrupting inferior 1"
+}
--- a/gdb/testsuite/gdb.mi/mi-break.exp
+++ b/gdb/testsuite/gdb.mi/mi-break.exp
@@ -435,6 +435,28 @@ proc_with_prefix test_forced_conditions {} {
    mi_gdb_test "-break-info 16" \
 	"\\^done,[mi_make_breakpoint_table [list $bp]]" \
        "invalid condition is defined"
+
+    # No cond argument should clear the condition.
+    mi_gdb_test "-break-condition 16" \
+	"~\"Breakpoint 16's condition is now valid at location 1, enabling.*\\^done" \
+	"clear the condition"
+    set bp [mi_make_breakpoint -number 16]
+    mi_gdb_test "-break-info 16" \
+	"\\^done,[mi_make_breakpoint_table [list $bp]]" \
+	"condition is cleared"
+
+    # Zero-argument is an error.
+    mi_gdb_test "-break-condition" \
+	"\\^error,msg=\"-break-condition: Missing the <number> argument\"" \
+	"no arguments to -break-condition"
+
+    # Passing --force with no condition should not crash or raise an error.
+    mi_gdb_test "-break-condition --force 16" \
+	"\\^done" \
+	"clear the condition with --force"
+    mi_gdb_test "-break-condition --force" \
+	"\\^error,msg=\"-break-condition: Missing the <number> argument\"" \
+	"no arguments with --force"
 }

 proc test_break {mi_mode} {
--- a/gdb/testsuite/gdb.mi/mi-info-sources.exp
+++ b/gdb/testsuite/gdb.mi/mi-info-sources.exp
@@ -28,8 +28,14 @@ if {[prepare_for_testing $testfile.exp $testfile \

 mi_clean_restart $binfile

+set readnow_p [mi_readnow]
+
 mi_runto_main

+# Unload symbols for shared libraries to prevent
+# 'ERROR: internal buffer is full'.
+mi_gdb_test "nosharedlibrary" ".*\\^done" "nosharedlibrary"
+
 # Helper to build expected MI output pattern for a list.  NAME is the
 # name of the list (which can be the empty string) and args is one
 # or more strings representing the fields of the list, which will be
@@ -108,27 +114,45 @@ proc check_info_sources { debug_fully_read } {
    with_test_prefix "debug_read=${debug_fully_read}" {

 	if { $debug_fully_read } {
-	    set p [mi_list "files" \
-		       [mi_tuple "" \
-			    [mi_field "file" "\[^\"\]+/mi-info-sources-base\\.c"] \
-			    [mi_field "fullname" "\[^\"\]+/mi-info-sources-base\\.c"] \
-			    [mi_field "debug-fully-read" "${debug_fully_read}"]] \
-		       [mi_tuple "" \
-			    [mi_field "file" "\[^\"\]+/mi-info-sources\\.c"] \
-			    [mi_field "fullname" "\[^\"\]+/mi-info-sources\\.c"] \
-			    [mi_field "debug-fully-read" "true"]]]
+	    set p1 \
+		[mi_list "files" \
+		     ".*" \
+		     [mi_tuple "" \
+			  [mi_field "file" "\[^\"\]+/mi-info-sources-base\\.c"] \
+			  [mi_field "fullname" "\[^\"\]+/mi-info-sources-base\\.c"] \
+			  [mi_field "debug-fully-read" "${debug_fully_read}"]] \
+		     ".*"]
+	    set p2 \
+		[mi_list "files" \
+		     ".*" \
+		     [mi_tuple "" \
+			  [mi_field "file" "\[^\"\]+/mi-info-sources\\.c"] \
+			  [mi_field "fullname" "\[^\"\]+/mi-info-sources\\.c"] \
+			  [mi_field "debug-fully-read" "true"]] \
+		     ".*"]
 	} else {
-	    set p [mi_list "files" \
-		       [mi_tuple "" \
-			    [mi_field "file" "\[^\"\]+/mi-info-sources\\.c"] \
-			    [mi_field "fullname" "\[^\"\]+/mi-info-sources\\.c"] \
-			    [mi_field "debug-fully-read" "true"]] \
-		       [mi_tuple "" \
-			    [mi_field "file" "\[^\"\]+/mi-info-sources-base\\.c"] \
-			    [mi_field "fullname" "\[^\"\]+/mi-info-sources-base\\.c"] \
-			    [mi_field "debug-fully-read" "${debug_fully_read}"]]]
+	    set p1 \
+		[mi_list "files" \
+		     ".*" \
+		     [mi_tuple "" \
+			  [mi_field "file" "\[^\"\]+/mi-info-sources\\.c"] \
+			  [mi_field "fullname" "\[^\"\]+/mi-info-sources\\.c"] \
+			  [mi_field "debug-fully-read" "true"]] \
+		     ".*"]
+	    set p2 \
+		[mi_list "files" \
+		     ".*" \
+		     [mi_tuple "" \
+			  [mi_field "file" "\[^\"\]+/mi-info-sources-base\\.c"] \
+			  [mi_field "fullname" "\[^\"\]+/mi-info-sources-base\\.c"] \
+			  [mi_field "debug-fully-read" "${debug_fully_read}"]] \
+		     ".*"]
 	}
-	mi_gdb_test "-file-list-exec-source-files" ".*\\^done,${p}" "-file-list-exec-source-files"
+
+	mi_gdb_test "-file-list-exec-source-files" ".*\\^done,${p1}" \
+	    "-file-list-exec-source-files, src1"
+	mi_gdb_test "-file-list-exec-source-files" ".*\\^done,${p2}" \
+	    "-file-list-exec-source-files, src2"

 	set p [mi_list "files" \
 		   [mi_tuple "" \
@@ -147,7 +171,7 @@ proc check_info_sources { debug_fully_read } {

 	set p [mi_list "files" \
 		   [mi_tuple "" \
-			[mi_field "filename" "\[^\"\]+/mi-info-sources"] \
+			[mi_field "filename" "\[^\"\]+/mi-info-sources(\.debug)?"] \
 			[mi_field "debug-info" "${debug_info}"] \
 			[mi_list "sources" \
 			     ".*" \
@@ -162,7 +186,7 @@ proc check_info_sources { debug_fully_read } {

 	set p [mi_list "files" \
 		   [mi_tuple "" \
-			[mi_field "filename" "\[^\"\]+/mi-info-sources"] \
+			[mi_field "filename" "\[^\"\]+/mi-info-sources(\.debug)?"] \
 			[mi_field "debug-info" "${debug_info}"] \
 			[mi_list "sources" \
 			     ".*" \
@@ -177,8 +201,13 @@ proc check_info_sources { debug_fully_read } {
    }
 }

-check_info_sources "false"
+if { ! $readnow_p } {
+    check_info_sources "false"
+}

 mi_continue_to "some_other_func"

+# Force "fully-read".
+mi_gdb_test "maint expand-symtabs"
+
 check_info_sources "true"
--- a/gdb/testsuite/gdb.mi/mi-sym-info.exp
+++ b/gdb/testsuite/gdb.mi/mi-sym-info.exp
@@ -189,34 +189,58 @@ with_timeout_factor 4 {
    }
 }

+set f2_re \
+    "\{line=\"33\",name=\"f2\",type=\"float \\(another_float_t\\)\",description=\"float f2\\(another_float_t\\);\"\}"
+set f3_re \
+    "\{line=\"39\",name=\"f3\",type=\"int \\(another_int_t\\)\",description=\"int f3\\(another_int_t\\);\"\}"
+set f4_re \
+    "\{line=\"36\",name=\"f4\",type=\"void \\(int \\*\\)\",description=\"void f4\\(int \\*\\);\"\}"
+
+set global_i1_re \
+    "\{line=\"18\",name=\"global_i1\",type=\"int\",description=\"static int global_i1;\"\}"
+set global_f2_re \
+    "\{line=\"21\",name=\"global_f2\",type=\"int\",description=\"int global_f2;\"\}"
+set global_i2_re \
+    "\{line=\"20\",name=\"global_i2\",type=\"int\",description=\"int global_i2;\"\}"
+set global_f1_s1_re \
+    "\{line=\"25\",name=\"global_f1\",type=\"float\",description=\"static float global_f1;\"\}"
+set global_f1_s2_re \
+    "\{line=\"19\",name=\"global_f1\",type=\"float\",description=\"static float global_f1;\"\}"
+
+set another_int_re "\{line=\"23\",name=\"another_int_t\"\}"
+set my_int_re "\{line=\"27\",name=\"my_int_t\"\}"
+set another_char_re "\{line=\"44\",name=\"another_char_t\"\}"
+set another_float_re "\{line=\"24\",name=\"another_float_t\"\}"
+set another_short_re "\{line=\"45\",name=\"another_short_t\"\}"
+
 # Filter functions by name and type.
 set lineno [gdb_get_line_number "f3 (another_int_t arg)" ${srcfile2}]
 mi_gdb_test "116-symbol-info-functions --name ^f3$" \
-    "116\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"39\",name=\"f3\",type=\"int \\(another_int_t\\)\",description=\"int f3\\(another_int_t\\);\"\}\\\]\}\\\]\}" \
+    "116\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[$f3_re\\\]\}\\\]\}" \
    "List all functions matching pattern f3"

 set lineno [gdb_get_line_number "f4 (int *arg)" ${srcfile}]
 mi_gdb_test "117-symbol-info-functions --type void --name ^f4$" \
-    "117\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"36\",name=\"f4\",type=\"void \\(int \\*\\)\",description=\"void f4\\(int \\*\\);\"\}\\\]\}\\\]\}" \
+    "117\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[$f4_re\\\]\}\\\]\}" \
    "List all functions matching type void"

 # Filter variables by name and type.
 set lineno [gdb_get_line_number "int global_f2;" ${srcfile2}]
 mi_gdb_test "118-symbol-info-variables --name global_f2" \
-    "118\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"21\",name=\"global_f2\",type=\"int\",description=\"int global_f2;\"\}\\\]\}\\\]\}" \
+    "118\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[$global_f2_re\\\]\}\\\]\}" \
    "List all variables matching pattern global_f2"

 set lineno1 [gdb_get_line_number "static float __attribute__ ((used)) global_f1;" ${srcfile}]
 set lineno2 [gdb_get_line_number "static float __attribute__ ((used)) global_f1;" ${srcfile2}]
 mi_gdb_test "119-symbol-info-variables --type float --name ^global_" \
-    "119\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"25\",name=\"global_f1\",type=\"float\",description=\"static float global_f1;\"\}\\\]\},\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"19\",name=\"global_f1\",type=\"float\",description=\"static float global_f1;\"\}\\\]\}\\\]\}" \
+    "119\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[$global_f1_s1_re\\\]\},\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[$global_f1_s2_re\\\]\}\\\]\}" \
    "List all variables matching type float"

 # Fetch types, filtering by name.
 set lineno1 [gdb_get_line_number "typedef int my_int_t;" ${srcfile}]
 set lineno2 [gdb_get_line_number "typedef int another_int_t;" ${srcfile2}]
 mi_gdb_test "120-symbol-info-types --name _int_" \
-    "120\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"27\",name=\"my_int_t\"\}\\\]\},\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"23\",name=\"another_int_t\"\}\\\]\}\\\]\}" \
+    "120\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[$my_int_re\\\]\},\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[$another_int_re\\\]\}\\\]\}" \
    "List all types matching _int_"

 # Test the --max-results parameter.
@@ -225,20 +249,17 @@ mi_gdb_test "121-symbol-info-functions --max-results 0" \
    "-symbol-info-functions --max-results 0"

 mi_gdb_test "122-symbol-info-functions --max-results 1 --name ^\[^_\]" \
-    "122\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"39\",name=\"f3\",type=\"int \\(another_int_t\\)\",description=\"int f3\\(another_int_t\\);\"\}\\\]\}\\\]\}" \
+    "122\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[(?:$f2_re|$f3_re)\\\]\}\\\]\}" \
    "-symbol-info-functions --max-results 1"

 mi_gdb_test "123-symbol-info-functions --max-results 2 --name ^\[^_\]" \
-    "123\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"33\",name=\"f2\",type=\"float \\(another_float_t\\)\",description=\"float f2\\(another_float_t\\);\"\},\{line=\"39\",name=\"f3\",type=\"int \\(another_int_t\\)\",description=\"int f3\\(another_int_t\\);\"\}\\\]\}\\\]\}" \
+    "123\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[$f2_re,$f3_re\\\]\}\\\]\}" \
    "-symbol-info-functions --max-results 2"

 mi_gdb_test "124-symbol-info-variables --max-results 3 --name ^\[^_\]" \
-    "124\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"21\",name=\"global_f2\",type=\"int\",description=\"int global_f2;\"\},\{line=\"20\",name=\"global_i2\",type=\"int\",description=\"int global_i2;\"\},\{line=\"19\",name=\"global_f1\",type=\"float\",description=\"static float global_f1;\"\}\\\]\}\\\]\}" \
+    "124\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[$global_f2_re,$global_i2_re,(?:$global_i1_re|$global_f1_s2_re)\\\]\}\\\]\}" \
+    "-symbol-info-types --max-results 3"

-set s1 "\{line=\"44\",name=\"another_char_t\"\}"
-set s2 "\{line=\"24\",name=\"another_float_t\"\}"
-set s3 "\{line=\"23\",name=\"another_int_t\"\}"
-set s4 "\{line=\"45\",name=\"another_short_t\"\}"
 mi_gdb_test "125-symbol-info-types --max-results 4 --name another_" \
-    "125\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[$s1,$s2,$s3,$s4\\\]\}\\\]\}" \
+    "125\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]*$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[$another_char_re,$another_float_re,$another_int_re,$another_short_re\\\]\}\\\]\}" \
    "-symbol-info-types --max-results 4"
--- a/gdb/testsuite/gdb.python/py-mi-var-info-path-expression.exp
+++ b/gdb/testsuite/gdb.python/py-mi-var-info-path-expression.exp
@@ -85,3 +85,15 @@ mi_gdb_test "-var-list-children c1.car.atom" \
 mi_gdb_test "-var-info-path-expression c1.car.atom.ival" \
  "\\^error,msg=\".*\"" \
  "-var-info-path-expression c1.car.atom.ival"
+
+
+# Regression test for a crasher that would occur when deleting a
+# varobj that held an iterator that hadn't yet been completed.
+# See PR varobj/28131.
+mi_gdb_test "-var-create c1_again * &c1" \
+   "\\^done.*" \
+   "-var-create c1_again * &c1"
+mi_gdb_test "-var-list-children c1_again 0 1" \
+  "\\^done,numchild=\"1\",children=.child=\{name=\"c1_again.car\".*" \
+  "-var-list-children c1_again"
+mi_delete_varobj c1_again "delete c1_again"
--- a/gdb/testsuite/gdb.threads/check-libthread-db.exp
+++ b/gdb/testsuite/gdb.threads/check-libthread-db.exp
@@ -32,6 +32,13 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
    return -1
 }

+# Case 1: libthread_db fakes a single thread with th_unique == NULL.
+set thread_re1 "0 => $decimal => 0"
+# Case 2: libthread_db already initialized.
+set thread_re2 "$hex => $decimal => ${hex}(; errno = 0)?"
+# Match either of the two cases.
+set initial_thread_re "($thread_re1|$thread_re2)"
+
 with_test_prefix "user-initiated check" {

    # User-initiated check with libthread_db not loaded.
@@ -49,18 +56,16 @@ with_test_prefix "user-initiated check" {
 	"No libthread_db loaded" \
 	"no libpthread.so loaded"

-
-    # User-initiated check with NPTL uninitialized.
-    # libthread_db should fake a single thread with th_unique == NULL.
+    # User-initiated check with NPTL possibly uninitialized.
    gdb_test "continue" \
 	".*Stopped due to shared library event.*Inferior loaded .*libpthread.*"

    gdb_test_sequence "maint check libthread-db" \
-	"libpthread.so not initialized" {
-	    "\[\r\n\]+Running libthread_db integrity checks:"
-	    "\[\r\n\]+\[ \]+Got thread 0x0 => \[0-9\]+ => 0x0 ... OK"
-	    "\[\r\n\]+libthread_db integrity checks passed."
-	}
+	"libpthread.so possibly not initialized" \
+	[list \
+	     "\[\r\n\]+Running libthread_db integrity checks:" \
+	     "\[\r\n\]+\[ \]+Got thread $initial_thread_re ... OK" \
+	     "\[\r\n\]+libthread_db integrity checks passed."]

    # User-initiated check with NPTL fully operational.
    gdb_test_no_output "set stop-on-solib-events 0"
@@ -78,8 +83,8 @@ with_test_prefix "user-initiated check" {

 with_test_prefix "automated load-time check" {

-    # Automated load-time check with NPTL uninitialized.
-    with_test_prefix "libpthread.so not initialized" {
+    # Automated load-time check with NPTL possibly uninitialized.
+    with_test_prefix "libpthread.so possibly not initialized" {
 	clean_restart ${binfile}

 	gdb_test_no_output "maint set check-libthread-db 1"
@@ -88,12 +93,12 @@ with_test_prefix "automated load-time check" {
 	gdb_run_cmd

 	gdb_test_sequence "" \
-	    "check debug libthread-db output" {
-		"\[\r\n\]+Running libthread_db integrity checks:"
-		"\[\r\n\]+\[ \]+Got thread 0x0 => \[0-9\]+ => 0x0 ... OK"
-		"\[\r\n\]+libthread_db integrity checks passed."
-		"\[\r\n\]+[Thread debugging using libthread_db enabled]"
-	    }
+	    "check debug libthread-db output" \
+	    [list \
+		 "\[\r\n\]+Running libthread_db integrity checks:" \
+		 "\[\r\n\]+\[ \]+Got thread $initial_thread_re ... OK" \
+		 "\[\r\n\]+libthread_db integrity checks passed." \
+		 "\[\r\n\]+\\\[Thread debugging using libthread_db enabled\\\]"]
    }

    # Automated load-time check with NPTL fully operational.
--- a/Show More
+++ b/Show More