diff --git a/.gitignore b/.gitignore
index b365cea..2c2ddad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz
 /v2.0.tar.gz
-/gdb-8.3.50.20190304.tar.xz
+/gdb-8.3.50.20190319.tar.xz
diff --git a/_git_upstream_commit b/_git_upstream_commit
index 919fbcf..926106b 100644
--- a/_git_upstream_commit
+++ b/_git_upstream_commit
@@ -1 +1 @@
-67490c6bad8c8d3fcbcbd5a3012ab5d189fd3981
+4faa59bbb7ad8665b6eb7c93bdb726e412850811
diff --git a/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch b/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
index b36e47e..3a1fe0c 100644
--- a/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
+++ b/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
@@ -44,7 +44,7 @@ glibc-debuginfo-2.7-2.x86_64: /usr/lib/debug/lib64/libc.so.6.debug:
 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
-@@ -1183,6 +1183,10 @@ print_command_1 (const char *exp, int voidprint)
+@@ -1182,6 +1182,10 @@ print_command_1 (const char *exp, int voidprint)
  
    if (exp && *exp)
      {
diff --git a/gdb-6.5-bz216711-clone-is-outermost.patch b/gdb-6.5-bz216711-clone-is-outermost.patch
index abb52b0..16f7fc4 100644
--- a/gdb-6.5-bz216711-clone-is-outermost.patch
+++ b/gdb-6.5-bz216711-clone-is-outermost.patch
@@ -169,7 +169,7 @@ diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
 diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
 --- a/gdb/i386-tdep.c
 +++ b/gdb/i386-tdep.c
-@@ -8407,6 +8407,9 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
+@@ -8420,6 +8420,9 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
  
    tdep->xsave_xcr0_offset = -1;
  
@@ -182,7 +182,7 @@ diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
 diff --git a/gdb/i386-tdep.h b/gdb/i386-tdep.h
 --- a/gdb/i386-tdep.h
 +++ b/gdb/i386-tdep.h
-@@ -251,6 +251,9 @@ struct gdbarch_tdep
+@@ -255,6 +255,9 @@ struct gdbarch_tdep
  
    /* Regsets. */
    const struct regset *fpregset;
diff --git a/gdb-6.6-buildid-locate-core-as-arg.patch b/gdb-6.6-buildid-locate-core-as-arg.patch
index a59c2b7..f8a8315 100644
--- a/gdb-6.6-buildid-locate-core-as-arg.patch
+++ b/gdb-6.6-buildid-locate-core-as-arg.patch
@@ -119,7 +119,7 @@ diff --git a/gdb/exec.c b/gdb/exec.c
 diff --git a/gdb/main.c b/gdb/main.c
 --- a/gdb/main.c
 +++ b/gdb/main.c
-@@ -448,6 +448,35 @@ struct cmdarg
+@@ -440,6 +440,35 @@ struct cmdarg
    char *string;
  };
  
@@ -155,7 +155,7 @@ diff --git a/gdb/main.c b/gdb/main.c
  static void
  captured_main_1 (struct captured_main_args *context)
  {
-@@ -893,6 +922,8 @@ captured_main_1 (struct captured_main_args *context)
+@@ -885,6 +914,8 @@ captured_main_1 (struct captured_main_args *context)
  	{
  	  symarg = argv[optind];
  	  execarg = argv[optind];
@@ -164,7 +164,7 @@ diff --git a/gdb/main.c b/gdb/main.c
  	  optind++;
  	}
  
-@@ -1043,12 +1074,25 @@ captured_main_1 (struct captured_main_args *context)
+@@ -1035,12 +1066,25 @@ captured_main_1 (struct captured_main_args *context)
        && symarg != NULL
        && strcmp (execarg, symarg) == 0)
      {
diff --git a/gdb-6.6-buildid-locate-rpm-librpm-workaround.patch b/gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
index f8dcbeb..61baf82 100644
--- a/gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+++ b/gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
@@ -9,7 +9,7 @@ Subject: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 diff --git a/gdb/build-id.c b/gdb/build-id.c
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
-@@ -712,6 +712,19 @@ build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
+@@ -711,6 +711,19 @@ build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
  #include <dlfcn.h>
  #endif
  
diff --git a/gdb-6.6-buildid-locate-rpm-scl.patch b/gdb-6.6-buildid-locate-rpm-scl.patch
index 5b3d4ad..12e15eb 100644
--- a/gdb-6.6-buildid-locate-rpm-scl.patch
+++ b/gdb-6.6-buildid-locate-rpm-scl.patch
@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=953585
 diff --git a/gdb/build-id.c b/gdb/build-id.c
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
-@@ -746,7 +746,11 @@ static int missing_rpm_list_entries;
+@@ -745,7 +745,11 @@ static int missing_rpm_list_entries;
  /* Returns the count of newly added rpms.  */
  
  static int
@@ -24,7 +24,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
  {
    static int rpm_init_done = 0;
    rpmts ts;
-@@ -853,7 +857,11 @@ missing_rpm_enlist (const char *filename)
+@@ -852,7 +856,11 @@ missing_rpm_enlist (const char *filename)
    mi = rpmtsInitIterator_p (ts, RPMTAG_BASENAMES, filename, 0);
    if (mi != NULL)
      {
@@ -36,7 +36,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
  	{
  	  Header h;
  	  char *debuginfo, **slot, *s, *s2;
-@@ -971,6 +979,37 @@ missing_rpm_enlist (const char *filename)
+@@ -970,6 +978,37 @@ missing_rpm_enlist (const char *filename)
  	    xfree (debuginfo);
  	  count++;
  	}
@@ -74,10 +74,10 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
  
        rpmdbFreeIterator_p (mi);
      }
-@@ -981,6 +1020,21 @@ missing_rpm_enlist (const char *filename)
+@@ -979,6 +1018,20 @@ missing_rpm_enlist (const char *filename)
+   return count;
  }
  
- static int
 +#ifdef GDB_INDEX_VERIFY_VENDOR
 +missing_rpm_enlist (const char *filename)
 +{
@@ -90,16 +90,15 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +{
 +  return missing_rpm_enlist_1 (filename, 1);
 +}
-+
-+static int
 +#endif
- missing_rpm_list_compar (const char *const *ap, const char *const *bp)
++
+ static bool
+ missing_rpm_list_compar (const char *ap, const char *bp)
  {
-   return strcoll (*ap, *bp);
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -3501,6 +3501,16 @@ read_gdb_index_from_buffer (struct objfile *objfile,
+@@ -3500,6 +3500,16 @@ read_gdb_index_from_buffer (struct objfile *objfile,
       "set use-deprecated-index-sections on".  */
    if (version < 6 && !deprecated_ok)
      {
@@ -116,7 +115,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
        static int warning_printed = 0;
        if (!warning_printed)
  	{
-@@ -3512,6 +3522,10 @@ to use the section anyway."),
+@@ -3511,6 +3521,10 @@ to use the section anyway."),
  	  warning_printed = 1;
  	}
        return 0;
diff --git a/gdb-6.6-buildid-locate-rpm.patch b/gdb-6.6-buildid-locate-rpm.patch
index 3f7c651..ff2cc65 100644
--- a/gdb-6.6-buildid-locate-rpm.patch
+++ b/gdb-6.6-buildid-locate-rpm.patch
@@ -244,7 +244,11 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
  
  #define BUILD_ID_VERBOSE_NONE 0
  #define BUILD_ID_VERBOSE_FILENAMES 1
-@@ -700,8 +702,366 @@ build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
+@@ -696,12 +698,362 @@ build_id_to_filename (const struct bfd_build_id *build_id, char **link_return)
+     return NULL;
+ 
+   result = xstrdup (bfd_get_filename (abfd));
+-  abfd.release ();
    return result;
  }
  
@@ -513,10 +517,10 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +  return count;
 +}
 +
-+static int
-+missing_rpm_list_compar (const char *const *ap, const char *const *bp)
++static bool
++missing_rpm_list_compar (const char *ap, const char *bp)
 +{
-+  return strcoll (*ap, *bp);
++  return strcoll (ap, bp);
 +}
 +
 +/* It returns a NULL-terminated array of strings needing to be FREEd.  It may
@@ -525,37 +529,32 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +static void
 +missing_rpm_list_print (void)
 +{
-+  char **array, **array_iter;
 +  struct missing_rpm *list_iter;
-+  struct cleanup *cleanups;
 +
 +  if (missing_rpm_list_entries == 0)
 +    return;
 +
-+  array = (char **) xmalloc (sizeof (*array) * missing_rpm_list_entries);
-+  cleanups = make_cleanup (xfree, array);
++  std::vector<const char *> array (missing_rpm_list_entries);
++  size_t idx = 0;
 +
-+  array_iter = array;
 +  for (list_iter = missing_rpm_list; list_iter != NULL;
 +       list_iter = list_iter->next)
 +    {
-+      *array_iter++ = list_iter->rpm;
++      array[idx++] = list_iter->rpm;
 +    }
-+  gdb_assert (array_iter == array + missing_rpm_list_entries);
++  gdb_assert (idx == missing_rpm_list_entries);
 +
-+  qsort (array, missing_rpm_list_entries, sizeof (*array),
-+	 (int (*) (const void *, const void *)) missing_rpm_list_compar);
++  std::sort (array.begin (), array.end (), missing_rpm_list_compar);
 +
 +  printf_unfiltered (_("Missing separate debuginfos, use: %s"),
 +#ifdef DNF_DEBUGINFO_INSTALL
 +		     "dnf "
 +#endif
 +		     "debuginfo-install");
-+  for (array_iter = array; array_iter < array + missing_rpm_list_entries;
-+       array_iter++)
++  for (const char *el : array)
 +    {
 +      putchar_unfiltered (' ');
-+      puts_unfiltered (*array_iter);
++      puts_unfiltered (el);
 +    }
 +  putchar_unfiltered ('\n');
 +
@@ -566,8 +565,6 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +      xfree (list_iter);
 +    }
 +  missing_rpm_list_entries = 0;
-+
-+  do_cleanups (cleanups);
 +}
 +
 +static void
@@ -612,7 +609,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
     avoidance.  */
  
  struct missing_filepair
-@@ -755,11 +1115,17 @@ missing_filepair_change (void)
+@@ -755,11 +1107,17 @@ missing_filepair_change (void)
        /* All their memory came just from missing_filepair_OBSTACK.  */
        missing_filepair_hash = NULL;
      }
@@ -630,7 +627,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
    missing_filepair_change ();
  }
  
-@@ -826,14 +1192,39 @@ debug_print_missing (const char *binary, const char *debug)
+@@ -826,14 +1184,39 @@ debug_print_missing (const char *binary, const char *debug)
  
    *slot = missing_filepair;
  
@@ -1459,15 +1456,59 @@ diff --git a/gdb/configure.ac b/gdb/configure.ac
 diff --git a/gdb/corelow.c b/gdb/corelow.c
 --- a/gdb/corelow.c
 +++ b/gdb/corelow.c
-@@ -365,7 +365,7 @@ build_id_locate_exec (int from_tty)
+@@ -330,10 +330,9 @@ static void
+ build_id_locate_exec (int from_tty)
+ {
+   CORE_ADDR at_entry;
+-  struct bfd_build_id *build_id;
+-  char *execfilename;
++  gdb::unique_xmalloc_ptr<struct bfd_build_id> build_id;
++  gdb::unique_xmalloc_ptr<char> execfilename;
+   char *build_id_filename;
+-  struct cleanup *back_to;
+ 
+   if (exec_bfd != NULL || symfile_objfile != NULL)
+     return;
+@@ -341,10 +340,9 @@ build_id_locate_exec (int from_tty)
+   if (target_auxv_search (current_top_target (), AT_ENTRY, &at_entry) <= 0)
+     return;
+ 
+-  build_id = build_id_addr_get (at_entry);
++  build_id.reset (build_id_addr_get (at_entry));
+   if (build_id == NULL)
+     return;
+-  back_to = make_cleanup (xfree, build_id);
+ 
+   /* SYMFILE_OBJFILE should refer to the main executable (not only to its
+      separate debug info file).  gcc44+ keeps .eh_frame only in the main
+@@ -352,22 +350,19 @@ build_id_locate_exec (int from_tty)
+      file - such .eh_frame would not be found if SYMFILE_OBJFILE would refer
+      directly to the separate debug info file.  */
+ 
+-  execfilename = build_id_to_filename (build_id, &build_id_filename);
+-  make_cleanup (xfree, build_id_filename);
++  execfilename.reset (build_id_to_filename (build_id.get (),
++					    &build_id_filename));
+ 
+   if (execfilename != NULL)
+     {
+-      make_cleanup (xfree, execfilename);
+-      exec_file_attach (execfilename, from_tty);
+-      symbol_file_add_main (execfilename,
++      exec_file_attach (execfilename.get (), from_tty);
++      symbol_file_add_main (execfilename.get (),
+ 			    symfile_add_flag (!from_tty ? 0 : SYMFILE_VERBOSE));
+       if (symfile_objfile != NULL)
          symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
      }
    else
 -    debug_print_missing (_("the main executable file"), build_id_filename);
+-
+-  do_cleanups (back_to);
 +    debug_print_missing (BUILD_ID_MAIN_EXECUTABLE_FILENAME, build_id_filename);
  
-   do_cleanups (back_to);
- 
+   /* No automatic SOLIB_ADD as the libraries would get read twice.  */
+ }
 diff --git a/gdb/event-top.c b/gdb/event-top.c
 --- a/gdb/event-top.c
 +++ b/gdb/event-top.c
diff --git a/gdb-6.6-buildid-locate-solib-missing-ids.patch b/gdb-6.6-buildid-locate-solib-missing-ids.patch
index e86920b..797ded0 100644
--- a/gdb-6.6-buildid-locate-solib-missing-ids.patch
+++ b/gdb-6.6-buildid-locate-solib-missing-ids.patch
@@ -14,7 +14,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1339862
 diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
 --- a/gdb/solib-svr4.c
 +++ b/gdb/solib-svr4.c
-@@ -1347,14 +1347,27 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
+@@ -1348,14 +1348,27 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
  	}
  
        {
@@ -44,7 +44,7 @@ diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
  	if (build_id != NULL)
  	  {
  	    char *name, *build_id_filename;
-@@ -1369,23 +1382,7 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
+@@ -1370,23 +1383,7 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
  		xfree (name);
  	      }
  	    else
diff --git a/gdb-6.6-buildid-locate.patch b/gdb-6.6-buildid-locate.patch
index c588eb1..6db8389 100644
--- a/gdb-6.6-buildid-locate.patch
+++ b/gdb-6.6-buildid-locate.patch
@@ -927,7 +927,7 @@ diff --git a/gdb/build-id.h b/gdb/build-id.h
 diff --git a/gdb/coffread.c b/gdb/coffread.c
 --- a/gdb/coffread.c
 +++ b/gdb/coffread.c
-@@ -729,7 +729,8 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
+@@ -720,7 +720,8 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
    /* Try to add separate debug file if no symbols table found.   */
    if (!objfile_has_partial_symbols (objfile))
      {
@@ -1021,7 +1021,7 @@ diff --git a/gdb/corelow.c b/gdb/corelow.c
    post_create_inferior (target, from_tty);
  
    /* Now go through the target stack looking for threads since there
-@@ -1063,4 +1123,11 @@ void
+@@ -1061,4 +1121,11 @@ void
  _initialize_corelow (void)
  {
    add_target (core_target_info, core_target_open, filename_completer);
@@ -1079,7 +1079,7 @@ diff --git a/gdb/dwarf-index-cache.c b/gdb/dwarf-index-cache.c
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -2727,7 +2727,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
+@@ -2726,7 +2726,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile)
      }
  
    if (dwz_bfd == NULL)
@@ -1088,7 +1088,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
  
    if (dwz_bfd == NULL)
      error (_("could not find '.gnu_debugaltlink' file for %s"),
-@@ -6237,7 +6237,7 @@ get_gdb_index_contents_from_section (objfile *obj, T *section_owner)
+@@ -6236,7 +6236,7 @@ get_gdb_index_contents_from_section (objfile *obj, T *section_owner)
  static gdb::array_view<const gdb_byte>
  get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_objfile *dwarf2_obj)
  {
@@ -1097,7 +1097,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
    if (build_id == nullptr)
      return {};
  
-@@ -6250,7 +6250,7 @@ get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_objfile *dwarf2_obj)
+@@ -6249,7 +6249,7 @@ get_gdb_index_contents_from_cache (objfile *obj, dwarf2_per_objfile *dwarf2_obj)
  static gdb::array_view<const gdb_byte>
  get_gdb_index_contents_from_cache_dwz (objfile *obj, dwz_file *dwz)
  {
@@ -1134,7 +1134,7 @@ diff --git a/gdb/elfread.c b/gdb/elfread.c
 diff --git a/gdb/objfiles.h b/gdb/objfiles.h
 --- a/gdb/objfiles.h
 +++ b/gdb/objfiles.h
-@@ -554,6 +554,10 @@ struct objfile
+@@ -553,6 +553,10 @@ struct objfile
    htab_t static_links {};
  };
  
@@ -1177,7 +1177,7 @@ diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
  
  static struct link_map_offsets *svr4_fetch_link_map_offsets (void);
  static int svr4_have_link_map_offsets (void);
-@@ -1345,9 +1346,51 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
+@@ -1346,9 +1347,51 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
  	  continue;
  	}
  
diff --git a/gdb-6.6-scheduler_locking-step-is-default.patch b/gdb-6.6-scheduler_locking-step-is-default.patch
index 0c1acc2..8bf061c 100644
--- a/gdb-6.6-scheduler_locking-step-is-default.patch
+++ b/gdb-6.6-scheduler_locking-step-is-default.patch
@@ -9,7 +9,7 @@ Subject: gdb-6.6-scheduler_locking-step-is-default.patch
 diff --git a/gdb/infrun.c b/gdb/infrun.c
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -2075,7 +2075,7 @@ static const char *const scheduler_enums[] = {
+@@ -2065,7 +2065,7 @@ static const char *const scheduler_enums[] = {
    schedlock_replay,
    NULL
  };
diff --git a/gdb-archer-pie-addons-keep-disabled.patch b/gdb-archer-pie-addons-keep-disabled.patch
index df78828..0a40fa4 100644
--- a/gdb-archer-pie-addons-keep-disabled.patch
+++ b/gdb-archer-pie-addons-keep-disabled.patch
@@ -8,7 +8,7 @@ Subject: gdb-archer-pie-addons-keep-disabled.patch
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
-@@ -15441,6 +15441,50 @@ static struct cmd_list_element *enablebreaklist = NULL;
+@@ -15451,6 +15451,50 @@ static struct cmd_list_element *enablebreaklist = NULL;
  
  cmd_list_element *commands_cmd_element = nullptr;
  
@@ -75,7 +75,7 @@ diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
 diff --git a/gdb/objfiles.c b/gdb/objfiles.c
 --- a/gdb/objfiles.c
 +++ b/gdb/objfiles.c
-@@ -875,6 +875,11 @@ objfile_relocate1 (struct objfile *objfile,
+@@ -849,6 +849,11 @@ objfile_relocate1 (struct objfile *objfile,
  				obj_section_addr (s));
      }
  
diff --git a/gdb-archer.patch b/gdb-archer.patch
index 5df4f56..01788c4 100644
--- a/gdb-archer.patch
+++ b/gdb-archer.patch
@@ -112,7 +112,7 @@ diff --git a/gdb/main.c b/gdb/main.c
  #include "source.h"
  #include "cli/cli-cmds.h"
  #include "objfiles.h"
-@@ -478,7 +479,7 @@ exec_or_core_file_attach (const char *filename, int from_tty)
+@@ -470,7 +471,7 @@ exec_or_core_file_attach (const char *filename, int from_tty)
  }
  
  static void
@@ -121,7 +121,7 @@ diff --git a/gdb/main.c b/gdb/main.c
  {
    int argc = context->argc;
    char **argv = context->argv;
-@@ -698,10 +699,14 @@ captured_main_1 (struct captured_main_args *context)
+@@ -690,10 +691,14 @@ captured_main_1 (struct captured_main_args *context)
        {"args", no_argument, &set_args, 1},
        {"l", required_argument, 0, 'l'},
        {"return-child-result", no_argument, &return_child_result, 1},
@@ -137,7 +137,7 @@ diff --git a/gdb/main.c b/gdb/main.c
        {
  	int option_index;
  
-@@ -719,6 +724,9 @@ captured_main_1 (struct captured_main_args *context)
+@@ -711,6 +716,9 @@ captured_main_1 (struct captured_main_args *context)
  	  case 0:
  	    /* Long option that just sets a flag.  */
  	    break;
@@ -147,7 +147,7 @@ diff --git a/gdb/main.c b/gdb/main.c
  	  case OPT_SE:
  	    symarg = optarg;
  	    execarg = optarg;
-@@ -898,7 +906,31 @@ captured_main_1 (struct captured_main_args *context)
+@@ -890,7 +898,31 @@ captured_main_1 (struct captured_main_args *context)
  
    /* Now that gdb_init has created the initial inferior, we're in
       position to set args for that inferior.  */
@@ -180,7 +180,7 @@ diff --git a/gdb/main.c b/gdb/main.c
      {
        /* The remaining options are the command-line options for the
  	 inferior.  The first one is the sym/exec file, and the rest
-@@ -1199,7 +1231,8 @@ captured_main_1 (struct captured_main_args *context)
+@@ -1191,7 +1223,8 @@ captured_main_1 (struct captured_main_args *context)
  
    /* Read in the old history after all the command files have been
       read.  */
@@ -190,7 +190,7 @@ diff --git a/gdb/main.c b/gdb/main.c
  
    if (batch_flag)
      {
-@@ -1215,24 +1248,37 @@ static void
+@@ -1207,24 +1240,37 @@ static void
  captured_main (void *data)
  {
    struct captured_main_args *context = (struct captured_main_args *) data;
@@ -241,7 +241,7 @@ diff --git a/gdb/main.c b/gdb/main.c
      }
    /* No exit -- exit is through quit_command.  */
  }
-@@ -1275,6 +1321,12 @@ print_gdb_help (struct ui_file *stream)
+@@ -1267,6 +1313,12 @@ print_gdb_help (struct ui_file *stream)
    fputs_unfiltered (_("\
  This is the GNU debugger.  Usage:\n\n\
      gdb [options] [executable-file [core-file or process-id]]\n\
@@ -254,7 +254,7 @@ diff --git a/gdb/main.c b/gdb/main.c
      gdb [options] --args executable-file [inferior-arguments ...]\n\n\
  "), stream);
    fputs_unfiltered (_("\
-@@ -1320,6 +1372,13 @@ Output and user interface control:\n\n\
+@@ -1312,6 +1364,13 @@ Output and user interface control:\n\n\
  #endif
    fputs_unfiltered (_("\
    --dbx              DBX compatibility mode.\n\
@@ -362,19 +362,6 @@ new file mode 100644
 +        return wanted == found
 +
 +InScope ()
-diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
---- a/gdb/python/python-internal.h
-+++ b/gdb/python/python-internal.h
-@@ -658,6 +658,9 @@ private:
-   PyThreadState *m_save;
- };
- 
-+struct cleanup *ensure_python_env (struct gdbarch *gdbarch,
-+				   const struct language_defn *language);
-+
- extern struct gdbarch *python_gdbarch;
- extern const struct language_defn *python_language;
- 
 diff --git a/gdb/python/python.c b/gdb/python/python.c
 --- a/gdb/python/python.c
 +++ b/gdb/python/python.c
@@ -387,37 +374,7 @@ diff --git a/gdb/python/python.c b/gdb/python/python.c
  #include "target.h"
  #include "gdbthread.h"
  #include "interps.h"
-@@ -235,6 +237,29 @@ gdbpy_enter::~gdbpy_enter ()
-   restore_active_ext_lang (m_previous_active);
- }
- 
-+static void
-+restore_python_env (void *p)
-+{
-+  gdbpy_enter *env = (gdbpy_enter *) p;
-+
-+  delete env;
-+}
-+
-+/* Called before entering the Python interpreter to install the
-+   current language and architecture to be used for Python values.
-+   Also set the active extension language for GDB so that SIGINT's
-+   are directed our way, and if necessary install the right SIGINT
-+   handler.  */
-+
-+struct cleanup *
-+ensure_python_env (struct gdbarch *gdbarch,
-+                   const struct language_defn *language)
-+{
-+  gdbpy_enter *env = new gdbpy_enter (gdbarch, language);
-+
-+  return make_cleanup (restore_python_env, env);
-+}
-+
- /* Set the quit flag.  */
- 
- static void
-@@ -1283,6 +1308,92 @@ gdbpy_print_stack_or_quit ()
+@@ -1283,6 +1285,94 @@ gdbpy_print_stack_or_quit ()
  
  
  
@@ -461,7 +418,9 @@ diff --git a/gdb/python/python.c b/gdb/python/python.c
 +  FILE *input;
 +
 +  /* We never free this, since we plan to exit at the end.  */
-+  ensure_python_env (get_current_arch (), current_language);
++  gdbpy_enter *env = new gdbpy_enter (get_current_arch (), current_language);
++  /* "Use" env, to suppress GCC warnings.  */
++  (void) env;
 +
 +  running_python_script = 1;
 +
@@ -510,7 +469,7 @@ diff --git a/gdb/python/python.c b/gdb/python/python.c
  /* Return a sequence holding all the Progspaces.  */
  
  static PyObject *
-@@ -1935,6 +2046,8 @@ PyMethodDef python_GdbMethods[] =
+@@ -1935,6 +2025,8 @@ PyMethodDef python_GdbMethods[] =
  Evaluate command, a string, as a gdb CLI command.  Optionally returns\n\
  a Python String containing the output of the command if to_string is\n\
  set to True." },
@@ -575,30 +534,11 @@ diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py
 diff --git a/gdb/varobj.c b/gdb/varobj.c
 --- a/gdb/varobj.c
 +++ b/gdb/varobj.c
-@@ -217,6 +217,14 @@ is_root_p (const struct varobj *var)
+@@ -217,7 +217,6 @@ is_root_p (const struct varobj *var)
  }
  
  #ifdef HAVE_PYTHON
-+/* Helper function to install a Python environment suitable for
-+   use during operations on VAR.  */
-+struct cleanup *
-+varobj_ensure_python_env (const struct varobj *var)
-+{
-+  return ensure_python_env (var->root->exp->gdbarch,
-+			    var->root->exp->language_defn);
-+}
- 
+-
  /* See python-internal.h.  */
  gdbpy_enter_varobj::gdbpy_enter_varobj (const struct varobj *var)
-diff --git a/gdb/varobj.h b/gdb/varobj.h
---- a/gdb/varobj.h
-+++ b/gdb/varobj.h
-@@ -328,6 +328,8 @@ extern bool varobj_has_more (const struct varobj *var, int to);
- 
- extern bool varobj_is_dynamic_p (const struct varobj *var);
- 
-+extern struct cleanup *varobj_ensure_python_env (const struct varobj *var);
-+
- extern bool varobj_default_value_is_changeable_p (const struct varobj *var);
- extern bool varobj_value_is_changeable_p (const struct varobj *var);
- 
+ : gdbpy_enter (var->root->exp->gdbarch, var->root->exp->language_defn)
diff --git a/gdb-attach-fail-reasons-5of5.patch b/gdb-attach-fail-reasons-5of5.patch
index 897a557..1ed78da 100644
--- a/gdb-attach-fail-reasons-5of5.patch
+++ b/gdb-attach-fail-reasons-5of5.patch
@@ -276,7 +276,7 @@ diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
 diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
-@@ -1099,7 +1099,17 @@ linux_nat_target::create_inferior (const char *exec_file,
+@@ -1098,7 +1098,17 @@ linux_nat_target::create_inferior (const char *exec_file,
    /* Make sure we report all signals during startup.  */
    pass_signals ({});
  
diff --git a/gdb-bz1219747-attach-kills.patch b/gdb-bz1219747-attach-kills.patch
index 6127999..4ed6c0d 100644
--- a/gdb-bz1219747-attach-kills.patch
+++ b/gdb-bz1219747-attach-kills.patch
@@ -80,7 +80,7 @@ gdb/testsuite/ChangeLog
 diff --git a/gdb/main.c b/gdb/main.c
 --- a/gdb/main.c
 +++ b/gdb/main.c
-@@ -1129,7 +1129,10 @@ captured_main_1 (struct captured_main_args *context)
+@@ -1121,7 +1121,10 @@ captured_main_1 (struct captured_main_args *context)
  	{
  	  ret = catch_command_errors (attach_command, pid_or_core_arg,
  				      !batch_flag);
diff --git a/gdb-bz533176-fortran-omp-step.patch b/gdb-bz533176-fortran-omp-step.patch
index 07c3e0e..f4515f6 100644
--- a/gdb-bz533176-fortran-omp-step.patch
+++ b/gdb-bz533176-fortran-omp-step.patch
@@ -30,7 +30,7 @@ debugging problem of GOMP outside of the scope of this Bug.
 diff --git a/gdb/infrun.c b/gdb/infrun.c
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -6510,6 +6510,16 @@ process_event_stop_test (struct execution_control_state *ecs)
+@@ -6503,6 +6503,16 @@ process_event_stop_test (struct execution_control_state *ecs)
  
        if (ecs->event_thread->control.step_over_calls == STEP_OVER_ALL)
  	{
@@ -47,7 +47,7 @@ diff --git a/gdb/infrun.c b/gdb/infrun.c
  	  /* We're doing a "next".
  
  	     Normal (forward) execution: set a breakpoint at the
-@@ -6543,6 +6553,7 @@ process_event_stop_test (struct execution_control_state *ecs)
+@@ -6536,6 +6546,7 @@ process_event_stop_test (struct execution_control_state *ecs)
  
  	  keep_going (ecs);
  	  return;
diff --git a/gdb-bz541866-rwatch-before-run.patch b/gdb-bz541866-rwatch-before-run.patch
index fb90054..b7c8ecf 100644
--- a/gdb-bz541866-rwatch-before-run.patch
+++ b/gdb-bz541866-rwatch-before-run.patch
@@ -10,7 +10,7 @@ Subject: gdb-bz541866-rwatch-before-run.patch
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
-@@ -8773,7 +8773,7 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
+@@ -8783,7 +8783,7 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
  		     int enabled, int internal, unsigned flags,
  		     int display_canonical)
  {
@@ -19,7 +19,7 @@ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
  
    if (type == bp_hardware_breakpoint)
      {
-@@ -14271,7 +14271,7 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
+@@ -14281,7 +14281,7 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
  
    if (bpt->type == bp_hardware_breakpoint)
      {
diff --git a/gdb-bz568248-oom-is-error.patch b/gdb-bz568248-oom-is-error.patch
index d08aefb..48116f0 100644
--- a/gdb-bz568248-oom-is-error.patch
+++ b/gdb-bz568248-oom-is-error.patch
@@ -53,7 +53,7 @@ gdb/
 diff --git a/gdb/utils.c b/gdb/utils.c
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
-@@ -721,13 +721,11 @@ malloc_failure (long size)
+@@ -692,13 +692,11 @@ malloc_failure (long size)
  {
    if (size > 0)
      {
diff --git a/gdb-container-rh-pkg.patch b/gdb-container-rh-pkg.patch
index 87c53dd..73955f0 100644
--- a/gdb-container-rh-pkg.patch
+++ b/gdb-container-rh-pkg.patch
@@ -9,7 +9,7 @@ Subject: gdb-container-rh-pkg.patch
 diff --git a/gdb/remote.c b/gdb/remote.c
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
-@@ -13966,7 +13966,17 @@ remote_target::pid_to_exec_file (int pid)
+@@ -13922,7 +13922,17 @@ remote_target::pid_to_exec_file (int pid)
    char *annex = NULL;
  
    if (packet_support (PACKET_qXfer_exec_file) != PACKET_ENABLE)
diff --git a/gdb-follow-child-stale-parent.patch b/gdb-follow-child-stale-parent.patch
index 9b7b0f5..57660ed 100644
--- a/gdb-follow-child-stale-parent.patch
+++ b/gdb-follow-child-stale-parent.patch
@@ -24,7 +24,7 @@ unwinders try to access it, breaking:
 diff --git a/gdb/infrun.c b/gdb/infrun.c
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -754,6 +754,9 @@ follow_fork (void)
+@@ -755,6 +755,9 @@ follow_fork (void)
  	  }
  	else
  	  {
diff --git a/gdb-gnat-dwarf-crash-3of3.patch b/gdb-gnat-dwarf-crash-3of3.patch
index 6db7801..4865715 100644
--- a/gdb-gnat-dwarf-crash-3of3.patch
+++ b/gdb-gnat-dwarf-crash-3of3.patch
@@ -42,7 +42,7 @@ gdb/
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -10588,6 +10588,13 @@ private:
+@@ -10587,6 +10587,13 @@ private:
  static void
  process_die (struct die_info *die, struct dwarf2_cu *cu)
  {
@@ -59,8 +59,8 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 diff --git a/gdb/infrun.c b/gdb/infrun.c
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
-@@ -609,6 +609,13 @@ holding the child stopped.  Try \"set detach-on-fork\" or \
- 				target_pid_to_str (process_ptid));
+@@ -610,6 +610,13 @@ holding the child stopped.  Try \"set detach-on-fork\" or \
+ 				target_pid_to_str (process_ptid).c_str ());
  	    }
  
 +#ifdef NEED_DETACH_SIGSTOP
@@ -89,7 +89,7 @@ diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
  static unsigned int debug_linux_nat;
  static void
  show_debug_linux_nat (struct ui_file *file, int from_tty,
-@@ -1037,6 +1043,9 @@ linux_nat_post_attach_wait (ptid_t ptid, int *signalled)
+@@ -1036,6 +1042,9 @@ linux_nat_post_attach_wait (ptid_t ptid, int *signalled)
        if (debug_linux_nat)
  	fprintf_unfiltered (gdb_stdlog,
  			    "LNPAW: Attaching to a stopped process\n");
@@ -99,7 +99,7 @@ diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
  
        /* The process is definitely stopped.  It is in a job control
  	 stop, unless the kernel predates the TASK_STOPPED /
-@@ -1369,6 +1378,25 @@ get_detach_signal (struct lwp_info *lp)
+@@ -1368,6 +1377,25 @@ get_detach_signal (struct lwp_info *lp)
        return gdb_signal_to_host (signo);
      }
  
@@ -151,9 +151,9 @@ diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
 +
 +#endif
    if (resume_many)
-     iterate_over_lwps (ptid, linux_nat_resume_callback, lp);
- 
-@@ -3763,6 +3805,10 @@ linux_nat_target::mourn_inferior ()
+     iterate_over_lwps (ptid, [=] (struct lwp_info *info)
+ 			     {
+@@ -3777,6 +3819,10 @@ linux_nat_target::mourn_inferior ()
  
    /* Let the arch-specific native code know this process is gone.  */
    linux_target->low_forget_process (pid);
diff --git a/gdb-moribund-utrace-workaround.patch b/gdb-moribund-utrace-workaround.patch
index a32f942..4facb74 100644
--- a/gdb-moribund-utrace-workaround.patch
+++ b/gdb-moribund-utrace-workaround.patch
@@ -14,7 +14,7 @@ Bug in FSF GDB exploited by the ptrace-on-utrace interaction.
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
-@@ -11929,6 +11929,8 @@ update_global_location_list (enum ugll_insert_mode insert_mode)
+@@ -11939,6 +11939,8 @@ update_global_location_list (enum ugll_insert_mode insert_mode)
  		 traps we can no longer explain.  */
  
  	      old_loc->events_till_retirement = 3 * (thread_count () + 1);
diff --git a/gdb-rhbz795424-bitpos-20of25.patch b/gdb-rhbz795424-bitpos-20of25.patch
index 2d64afc..c8d0ed0 100644
--- a/gdb-rhbz795424-bitpos-20of25.patch
+++ b/gdb-rhbz795424-bitpos-20of25.patch
@@ -665,7 +665,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
  
    val = value_cast (value_type (component), val);
  
-@@ -4445,7 +4446,7 @@ ensure_lval (struct value *val)
+@@ -4447,7 +4448,7 @@ ensure_lval (struct value *val)
    if (VALUE_LVAL (val) == not_lval
        || VALUE_LVAL (val) == lval_internalvar)
      {
@@ -674,7 +674,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
        const CORE_ADDR addr =
          value_as_long (value_allocate_space_in_inferior (len));
  
-@@ -4529,7 +4530,7 @@ static CORE_ADDR
+@@ -4531,7 +4532,7 @@ static CORE_ADDR
  value_pointer (struct value *value, struct type *type)
  {
    struct gdbarch *gdbarch = get_type_arch (type);
@@ -683,7 +683,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
    gdb_byte *buf = (gdb_byte *) alloca (len);
    CORE_ADDR addr;
  
-@@ -6642,7 +6643,7 @@ value_tag_from_contents_and_address (struct type *type,
+@@ -6644,7 +6645,7 @@ value_tag_from_contents_and_address (struct type *type,
  				     const gdb_byte *valaddr,
                                       CORE_ADDR address)
  {
@@ -692,7 +692,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
    struct type *tag_type;
  
    if (find_struct_field ("_tag", type, 0, &tag_type, &tag_byte_offset,
-@@ -7135,7 +7136,7 @@ ada_in_variant (LONGEST val, struct type *type, int field_num)
+@@ -7137,7 +7138,7 @@ ada_in_variant (LONGEST val, struct type *type, int field_num)
     only in that it can handle packed values of arbitrary type.  */
  
  static struct value *
@@ -701,7 +701,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
                             struct type *arg_type)
  {
    struct type *type;
-@@ -7147,7 +7148,7 @@ ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
+@@ -7149,7 +7150,7 @@ ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
  
    if (TYPE_FIELD_BITSIZE (arg_type, fieldno) != 0)
      {
@@ -710,7 +710,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
        int bit_size = TYPE_FIELD_BITSIZE (arg_type, fieldno);
  
        return ada_value_primitive_packed_val (arg1, value_contents (arg1),
-@@ -7224,9 +7225,9 @@ ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
+@@ -7226,9 +7227,9 @@ ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
     Returns 1 if found, 0 otherwise.  */
  
  static int
@@ -722,7 +722,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
  		   int *index_p)
  {
    int i;
-@@ -7245,8 +7246,8 @@ find_struct_field (const char *name, struct type *type, int offset,
+@@ -7247,8 +7248,8 @@ find_struct_field (const char *name, struct type *type, int offset,
  
    for (i = 0; i < TYPE_NFIELDS (type); i += 1)
      {
@@ -733,7 +733,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
        const char *t_field_name = TYPE_FIELD_NAME (type, i);
  
        if (t_field_name == NULL)
-@@ -7348,7 +7349,7 @@ num_visible_fields (struct type *type)
+@@ -7350,7 +7351,7 @@ num_visible_fields (struct type *type)
     long explanation in find_struct_field's function documentation.  */
  
  static struct value *
@@ -742,7 +742,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
                           struct type *type)
  {
    int i;
-@@ -7396,7 +7397,7 @@ ada_search_struct_field (const char *name, struct value *arg, int offset,
+@@ -7398,7 +7399,7 @@ ada_search_struct_field (const char *name, struct value *arg, int offset,
            int j;
            struct type *field_type = ada_check_typedef (TYPE_FIELD_TYPE (type,
  									i));
@@ -751,7 +751,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
  
            for (j = 0; j < TYPE_NFIELDS (field_type); j += 1)
              {
-@@ -7428,8 +7429,8 @@ ada_search_struct_field (const char *name, struct value *arg, int offset,
+@@ -7430,8 +7431,8 @@ ada_search_struct_field (const char *name, struct value *arg, int offset,
    return NULL;
  }
  
@@ -762,7 +762,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
  
  
  /* Return field #INDEX in ARG, where the index is that returned by
-@@ -7438,7 +7439,7 @@ static struct value *ada_index_struct_field_1 (int *, struct value *,
+@@ -7440,7 +7441,7 @@ static struct value *ada_index_struct_field_1 (int *, struct value *,
   * If found, return value, else return NULL.  */
  
  static struct value *
@@ -771,7 +771,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
  			struct type *type)
  {
    return ada_index_struct_field_1 (&index, arg, offset, type);
-@@ -7450,7 +7451,7 @@ ada_index_struct_field (int index, struct value *arg, int offset,
+@@ -7452,7 +7453,7 @@ ada_index_struct_field (int index, struct value *arg, int offset,
   * *INDEX_P.  */
  
  static struct value *
@@ -780,7 +780,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
  			  struct type *type)
  {
    int i;
-@@ -7541,7 +7542,8 @@ ada_value_struct_elt (struct value *arg, const char *name, int no_err)
+@@ -7543,7 +7544,8 @@ ada_value_struct_elt (struct value *arg, const char *name, int no_err)
      v = ada_search_struct_field (name, arg, 0, t);
    else
      {
@@ -790,7 +790,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
        struct type *field_type;
        CORE_ADDR address;
  
-@@ -7890,8 +7892,8 @@ ada_coerce_ref (struct value *val0)
+@@ -7892,8 +7894,8 @@ ada_coerce_ref (struct value *val0)
  /* Return OFF rounded upward if necessary to a multiple of
     ALIGNMENT (a power of 2).  */
  
@@ -801,7 +801,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
  {
    return (off + alignment - 1) & ~(alignment - 1);
  }
-@@ -8281,10 +8283,9 @@ ada_template_to_fixed_record_type_1 (struct type *type,
+@@ -8283,10 +8285,9 @@ ada_template_to_fixed_record_type_1 (struct type *type,
    struct value *mark = value_mark ();
    struct value *dval;
    struct type *rtype;
@@ -814,7 +814,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
    int f;
  
    /* Compute the number of fields in this record type that are going
-@@ -8361,7 +8362,7 @@ ada_template_to_fixed_record_type_1 (struct type *type,
+@@ -8363,7 +8364,7 @@ ada_template_to_fixed_record_type_1 (struct type *type,
  	     that follow this one.  */
  	  if (ada_is_aligner_type (field_type))
  	    {
@@ -823,7 +823,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
  
  	      field_valaddr = cond_offset_host (field_valaddr, field_offset);
  	      field_address = cond_offset_target (field_address, field_offset);
-@@ -8497,11 +8498,11 @@ ada_template_to_fixed_record_type_1 (struct type *type,
+@@ -8499,11 +8500,11 @@ ada_template_to_fixed_record_type_1 (struct type *type,
    if (TYPE_LENGTH (type) <= 0)
      {
        if (TYPE_NAME (rtype))
@@ -839,7 +839,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
      }
    else
      {
-@@ -8965,7 +8966,8 @@ to_fixed_array_type (struct type *type0, struct value *dval,
+@@ -8967,7 +8968,8 @@ to_fixed_array_type (struct type *type0, struct value *dval,
  	 type was a regular (non-packed) array type.  As a result, the
  	 bitsize of the array elements needs to be set again, and the array
  	 length needs to be recomputed based on that bitsize.  */
@@ -929,7 +929,7 @@ diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
  	 enum bfd_endian byte_order)
  {
    if (type_len == 1)
-@@ -476,11 +476,11 @@ ada_print_scalar (struct type *type, LONGEST val, struct ui_file *stream)
+@@ -475,11 +475,11 @@ ada_print_scalar (struct type *type, LONGEST val, struct ui_file *stream)
  
  static void
  printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,
@@ -943,7 +943,7 @@ diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
    unsigned int things_printed = 0;
    int in_quotes = 0;
    int need_comma = 0;
-@@ -495,9 +495,9 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,
+@@ -494,9 +494,9 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,
      {
        /* Position of the character we are examining
           to see whether it is repeated.  */
@@ -955,7 +955,7 @@ diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
  
        QUIT;
  
-@@ -528,7 +528,8 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,
+@@ -527,7 +527,8 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,
  	  ada_emit_char (char_at (string, i, type_len, byte_order),
  			 elttype, stream, '\'', type_len);
  	  fputs_filtered ("'", stream);
@@ -965,7 +965,7 @@ diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
  	  i = rep1 - 1;
  	  things_printed += options->repeat_count_threshold;
  	  need_comma = 1;
-@@ -556,7 +557,7 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,
+@@ -555,7 +556,7 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,
  
  void
  ada_printstr (struct ui_file *stream, struct type *type,
@@ -974,7 +974,7 @@ diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
  	      const char *encoding, int force_ellipses,
  	      const struct value_print_options *options)
  {
-@@ -566,12 +567,12 @@ ada_printstr (struct ui_file *stream, struct type *type,
+@@ -565,12 +566,12 @@ ada_printstr (struct ui_file *stream, struct type *type,
  
  static int
  print_variant_part (struct type *type, int field_num,
@@ -989,7 +989,7 @@ diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
  		    const struct language_defn *language)
  {
    struct type *var_type = TYPE_FIELD_TYPE (type, field_num);
-@@ -607,11 +608,11 @@ print_variant_part (struct type *type, int field_num,
+@@ -606,11 +607,11 @@ print_variant_part (struct type *type, int field_num,
  
  static int
  print_field_values (struct type *type, const gdb_byte *valaddr,
@@ -1003,7 +1003,7 @@ diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
  		    const struct language_defn *language)
  {
    int i, len;
-@@ -677,7 +678,7 @@ print_field_values (struct type *type, const gdb_byte *valaddr,
+@@ -676,7 +677,7 @@ print_field_values (struct type *type, const gdb_byte *valaddr,
  	  else
  	    {
  	      struct value *v;
@@ -1012,7 +1012,7 @@ diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
  	      int bit_size = TYPE_FIELD_BITSIZE (type, i);
  	      struct value_print_options opts;
  
-@@ -722,8 +723,8 @@ ada_val_print_string (struct type *type, const gdb_byte *valaddr,
+@@ -721,8 +722,8 @@ ada_val_print_string (struct type *type, const gdb_byte *valaddr,
  {
    enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type));
    struct type *elttype = TYPE_TARGET_TYPE (type);
@@ -1023,7 +1023,7 @@ diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
  
    /* We know that ELTTYPE cannot possibly be null, because we assume
       that we're called only when TYPE is a string-like type.
-@@ -742,7 +743,7 @@ ada_val_print_string (struct type *type, const gdb_byte *valaddr,
+@@ -741,7 +742,7 @@ ada_val_print_string (struct type *type, const gdb_byte *valaddr,
       elements up to it.  */
    if (options->stop_print_at_null)
      {
@@ -1032,7 +1032,7 @@ diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
  
        /* Look for a NULL char.  */
        for (temp_len = 0;
-@@ -1115,7 +1116,7 @@ ada_val_print_ref (struct type *type, const gdb_byte *valaddr,
+@@ -1114,7 +1115,7 @@ ada_val_print_ref (struct type *type, const gdb_byte *valaddr,
  
  static void
  ada_val_print_1 (struct type *type,
@@ -1041,7 +1041,7 @@ diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
  		 struct ui_file *stream, int recurse,
  		 struct value *original_value,
  		 const struct value_print_options *options,
-@@ -1199,7 +1200,7 @@ ada_val_print_1 (struct type *type,
+@@ -1198,7 +1199,7 @@ ada_val_print_1 (struct type *type,
  
  void
  ada_val_print (struct type *type,
@@ -1145,7 +1145,7 @@ diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
 diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
 --- a/gdb/arm-linux-nat.c
 +++ b/gdb/arm-linux-nat.c
-@@ -1096,7 +1096,7 @@ arm_linux_nat_target::remove_hw_breakpoint (struct gdbarch *gdbarch,
+@@ -1090,7 +1090,7 @@ arm_linux_nat_target::remove_hw_breakpoint (struct gdbarch *gdbarch,
  /* Are we able to use a hardware watchpoint for the LEN bytes starting at 
     ADDR?  */
  int
@@ -1280,7 +1280,7 @@ diff --git a/gdb/ax.h b/gdb/ax.h
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
-@@ -2056,9 +2056,9 @@ should_be_inserted (struct bp_location *bl)
+@@ -2057,9 +2057,9 @@ should_be_inserted (struct bp_location *bl)
  	{
  	  fprintf_unfiltered (gdb_stdlog,
  			      "infrun: stepping past non-steppable watchpoint. "
@@ -1292,7 +1292,7 @@ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
  	}
        return 0;
      }
-@@ -6793,7 +6793,7 @@ breakpoint_address_match (const address_space *aspace1, CORE_ADDR addr1,
+@@ -6803,7 +6803,7 @@ breakpoint_address_match (const address_space *aspace1, CORE_ADDR addr1,
  static int
  breakpoint_address_match_range (const address_space *aspace1,
  				CORE_ADDR addr1,
@@ -1301,7 +1301,7 @@ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
  				CORE_ADDR addr2)
  {
    return ((gdbarch_has_global_breakpoints (target_gdbarch ())
-@@ -10859,7 +10859,7 @@ can_use_hardware_watchpoint (const std::vector<value_ref_ptr> &vals)
+@@ -10869,7 +10869,7 @@ can_use_hardware_watchpoint (const std::vector<value_ref_ptr> &vals)
  		      && TYPE_CODE (vtype) != TYPE_CODE_ARRAY))
  		{
  		  CORE_ADDR vaddr = value_address (v);
@@ -1552,7 +1552,7 @@ diff --git a/gdb/d-valprint.c b/gdb/d-valprint.c
 diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
 --- a/gdb/dwarf2loc.c
 +++ b/gdb/dwarf2loc.c
-@@ -1625,7 +1625,7 @@ rw_pieced_value (struct value *v, struct value *from)
+@@ -1624,7 +1624,7 @@ rw_pieced_value (struct value *v, struct value *from)
    for (; i < c->pieces.size () && offset < max_offset; i++)
      {
        struct dwarf_expr_piece *p = &c->pieces[i];
@@ -1561,7 +1561,7 @@ diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
  
        this_size_bits = p->size - bits_to_skip;
        if (this_size_bits > max_offset - offset)
-@@ -1872,7 +1872,7 @@ write_pieced_value (struct value *to, struct value *from)
+@@ -1871,7 +1871,7 @@ write_pieced_value (struct value *to, struct value *from)
  
  static int
  check_pieced_synthetic_pointer (const struct value *value, LONGEST bit_offset,
@@ -1570,7 +1570,7 @@ diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
  {
    struct piece_closure *c
      = (struct piece_closure *) value_computed_closure (value);
-@@ -1885,7 +1885,7 @@ check_pieced_synthetic_pointer (const struct value *value, LONGEST bit_offset,
+@@ -1884,7 +1884,7 @@ check_pieced_synthetic_pointer (const struct value *value, LONGEST bit_offset,
    for (i = 0; i < c->pieces.size () && bit_length > 0; i++)
      {
        struct dwarf_expr_piece *p = &c->pieces[i];
@@ -1579,7 +1579,7 @@ diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
  
        if (bit_offset > 0)
  	{
-@@ -1989,8 +1989,8 @@ indirect_pieced_value (struct value *value)
+@@ -1988,8 +1988,8 @@ indirect_pieced_value (struct value *value)
      = (struct piece_closure *) value_computed_closure (value);
    struct type *type;
    struct frame_info *frame;
@@ -1590,7 +1590,7 @@ diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
    struct dwarf_expr_piece *piece = NULL;
    LONGEST byte_offset;
    enum bfd_endian byte_order;
-@@ -2007,7 +2007,7 @@ indirect_pieced_value (struct value *value)
+@@ -2006,7 +2006,7 @@ indirect_pieced_value (struct value *value)
    for (i = 0; i < c->pieces.size () && bit_length > 0; i++)
      {
        struct dwarf_expr_piece *p = &c->pieces[i];
@@ -1599,7 +1599,7 @@ diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
  
        if (bit_offset > 0)
  	{
-@@ -2296,9 +2296,9 @@ if (frame != NULL) select_frame (frame);
+@@ -2295,9 +2295,9 @@ if (frame != NULL) select_frame (frame);
  	case DWARF_VALUE_STACK:
  	  {
  	    struct value *value = ctx.fetch (0);
@@ -1615,7 +1615,7 @@ diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -2065,11 +2065,11 @@ dwarf2_complex_location_expr_complaint (void)
+@@ -2064,11 +2064,11 @@ dwarf2_complex_location_expr_complaint (void)
  }
  
  static void
@@ -1631,7 +1631,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
  }
  
  static void
-@@ -15104,8 +15104,8 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
+@@ -15103,8 +15103,8 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
  	         object, and then subtract off the number of bits of
  	         the field itself.  The result is the bit offset of
  	         the LSB of the field.  */
@@ -1700,7 +1700,7 @@ diff --git a/gdb/eval.c b/gdb/eval.c
 diff --git a/gdb/f-lang.c b/gdb/f-lang.c
 --- a/gdb/f-lang.c
 +++ b/gdb/f-lang.c
-@@ -101,7 +101,7 @@ f_printchar (int c, struct type *type, struct ui_file *stream)
+@@ -104,7 +104,7 @@ f_printchar (int c, struct type *type, struct ui_file *stream)
  
  static void
  f_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
@@ -1846,7 +1846,7 @@ diff --git a/gdb/frame.h b/gdb/frame.h
 diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
 --- a/gdb/gdbarch.c
 +++ b/gdb/gdbarch.c
-@@ -1795,7 +1795,7 @@ set_gdbarch_wchar_signed (struct gdbarch *gdbarch,
+@@ -1803,7 +1803,7 @@ set_gdbarch_wchar_signed (struct gdbarch *gdbarch,
  }
  
  const struct floatformat **
@@ -1884,7 +1884,7 @@ diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
 diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
 --- a/gdb/gdbtypes.c
 +++ b/gdb/gdbtypes.c
-@@ -2889,7 +2889,7 @@ floatformat_from_type (const struct type *type)
+@@ -2873,7 +2873,7 @@ floatformat_from_type (const struct type *type)
     least as long as OBJFILE.  */
  
  struct type *
@@ -1893,7 +1893,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
  	   const char *name)
  {
    struct type *type;
-@@ -3346,8 +3346,8 @@ is_public_ancestor (struct type *base, struct type *dclass)
+@@ -3330,8 +3330,8 @@ is_public_ancestor (struct type *base, struct type *dclass)
  
  static int
  is_unique_ancestor_worker (struct type *base, struct type *dclass,
@@ -1904,7 +1904,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
  			   CORE_ADDR address, struct value *val)
  {
    int i, count = 0;
-@@ -3358,7 +3358,7 @@ is_unique_ancestor_worker (struct type *base, struct type *dclass,
+@@ -3342,7 +3342,7 @@ is_unique_ancestor_worker (struct type *base, struct type *dclass,
    for (i = 0; i < TYPE_N_BASECLASSES (dclass) && count < 2; ++i)
      {
        struct type *iter;
@@ -1913,7 +1913,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
  
        iter = check_typedef (TYPE_BASECLASS (dclass, i));
  
-@@ -3399,7 +3399,7 @@ is_unique_ancestor_worker (struct type *base, struct type *dclass,
+@@ -3383,7 +3383,7 @@ is_unique_ancestor_worker (struct type *base, struct type *dclass,
  int
  is_unique_ancestor (struct type *base, struct value *val)
  {
@@ -1922,7 +1922,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
  
    return is_unique_ancestor_worker (base, value_type (val), &offset,
  				    value_contents_for_printing (val),
-@@ -4626,7 +4626,7 @@ recursive_dump_type (struct type *type, int spaces)
+@@ -4643,7 +4643,7 @@ recursive_dump_type (struct type *type, int spaces)
        break;
      }
    puts_filtered ("\n");
@@ -1931,7 +1931,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
    if (TYPE_OBJFILE_OWNED (type))
      {
        printfi_filtered (spaces, "objfile ");
-@@ -5071,7 +5071,7 @@ copy_type (const struct type *type)
+@@ -5088,7 +5088,7 @@ copy_type (const struct type *type)
  
  struct type *
  arch_type (struct gdbarch *gdbarch,
@@ -2285,7 +2285,7 @@ diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c
  
  		  /* Look for a NULL char.  */
  		  for (temp_len = 0;
-@@ -415,7 +415,7 @@ m2_val_print (struct type *type, int embedded_offset,
+@@ -414,7 +414,7 @@ m2_val_print (struct type *type, int embedded_offset,
  	{
  	  struct type *range = elttype;
  	  LONGEST low_bound, high_bound;
@@ -2603,7 +2603,7 @@ diff --git a/gdb/printcmd.c b/gdb/printcmd.c
 diff --git a/gdb/procfs.c b/gdb/procfs.c
 --- a/gdb/procfs.c
 +++ b/gdb/procfs.c
-@@ -3374,7 +3374,7 @@ procfs_target::remove_watchpoint (CORE_ADDR addr, int len,
+@@ -3368,7 +3368,7 @@ procfs_target::remove_watchpoint (CORE_ADDR addr, int len,
  }
  
  int
@@ -2730,7 +2730,7 @@ diff --git a/gdb/regcache.h b/gdb/regcache.h
 diff --git a/gdb/remote.c b/gdb/remote.c
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
-@@ -458,7 +458,7 @@ public:
+@@ -448,7 +448,7 @@ public:
  
    int remove_hw_breakpoint (struct gdbarch *, struct bp_target_info *) override;
  
@@ -2739,7 +2739,7 @@ diff --git a/gdb/remote.c b/gdb/remote.c
  
    int insert_watchpoint (CORE_ADDR, int, enum target_hw_bp_type,
  			 struct expression *) override;
-@@ -10406,7 +10406,7 @@ int remote_hw_watchpoint_length_limit = -1;
+@@ -10369,7 +10369,7 @@ int remote_hw_watchpoint_length_limit = -1;
  int remote_hw_breakpoint_limit = -1;
  
  int
@@ -2847,7 +2847,7 @@ diff --git a/gdb/stack.c b/gdb/stack.c
 diff --git a/gdb/symmisc.c b/gdb/symmisc.c
 --- a/gdb/symmisc.c
 +++ b/gdb/symmisc.c
-@@ -587,11 +587,11 @@ print_symbol (struct gdbarch *gdbarch, struct symbol *symbol,
+@@ -584,11 +584,11 @@ print_symbol (struct gdbarch *gdbarch, struct symbol *symbol,
  
  	case LOC_CONST_BYTES:
  	  {
@@ -2927,7 +2927,7 @@ diff --git a/gdb/target.c b/gdb/target.c
  
  static void default_rcmd (struct target_ops *, const char *, struct ui_file *);
  
-@@ -3114,7 +3114,7 @@ target_fileio_read_stralloc (struct inferior *inf, const char *filename)
+@@ -3117,7 +3117,7 @@ target_fileio_read_stralloc (struct inferior *inf, const char *filename)
  
  static int
  default_region_ok_for_hw_watchpoint (struct target_ops *self,
@@ -3218,7 +3218,7 @@ diff --git a/gdb/valprint.c b/gdb/valprint.c
  		   struct ui_file *stream, int recurse,
  		   struct value *original_value,
  		   const struct value_print_options *options,
-@@ -1774,7 +1774,7 @@ print_decimal_chars (struct ui_file *stream, const gdb_byte *valaddr,
+@@ -1772,7 +1772,7 @@ print_decimal_chars (struct ui_file *stream, const gdb_byte *valaddr,
  
  void
  print_hex_chars (struct ui_file *stream, const gdb_byte *valaddr,
@@ -3227,7 +3227,7 @@ diff --git a/gdb/valprint.c b/gdb/valprint.c
  		 bool zero_pad)
  {
    const gdb_byte *p;
-@@ -1927,17 +1927,17 @@ val_print_array_elements (struct type *type,
+@@ -1925,17 +1925,17 @@ val_print_array_elements (struct type *type,
  			  int recurse,
  			  struct value *val,
  			  const struct value_print_options *options,
@@ -3250,7 +3250,7 @@ diff --git a/gdb/valprint.c b/gdb/valprint.c
    LONGEST low_bound, high_bound;
    LONGEST low_pos, high_pos;
  
-@@ -2027,7 +2027,7 @@ val_print_array_elements (struct type *type,
+@@ -2025,7 +2025,7 @@ val_print_array_elements (struct type *type,
  		     address, stream, recurse + 1, val, options,
  		     current_language);
  	  annotate_elt_rep (reps);
@@ -3259,7 +3259,7 @@ diff --git a/gdb/valprint.c b/gdb/valprint.c
  	  annotate_elt_rep_end ();
  
  	  i = rep1 - 1;
-@@ -2669,7 +2669,7 @@ print_converted_chars_to_obstack (struct obstack *obstack,
+@@ -2667,7 +2667,7 @@ print_converted_chars_to_obstack (struct obstack *obstack,
  
  void
  generic_printstr (struct ui_file *stream, struct type *type, 
@@ -3372,7 +3372,7 @@ diff --git a/gdb/value.h b/gdb/value.h
  
  /* Mark VALUE's content bits starting at OFFSET and extending for
     LENGTH bits as optimized out.  */
-@@ -849,12 +850,11 @@ extern struct value *value_primitive_field (struct value *arg1, LONGEST offset,
+@@ -850,12 +851,11 @@ extern struct value *value_primitive_field (struct value *arg1, LONGEST offset,
  					    int fieldno,
  					    struct type *arg_type);
  
@@ -3386,7 +3386,7 @@ diff --git a/gdb/value.h b/gdb/value.h
  
  extern struct value *value_cast_pointers (struct type *, struct value *, int);
  
-@@ -1147,10 +1147,11 @@ extern struct value *value_literal_complex (struct value *, struct value *,
+@@ -1148,10 +1148,11 @@ extern struct value *value_literal_complex (struct value *, struct value *,
  extern struct value *find_function_in_inferior (const char *,
  						struct objfile **);
  
diff --git a/gdb-rhbz795424-bitpos-21of25.patch b/gdb-rhbz795424-bitpos-21of25.patch
index fab38d2..b178db2 100644
--- a/gdb-rhbz795424-bitpos-21of25.patch
+++ b/gdb-rhbz795424-bitpos-21of25.patch
@@ -100,7 +100,7 @@ diff --git a/gdb/defs.h b/gdb/defs.h
 diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
 --- a/gdb/p-valprint.c
 +++ b/gdb/p-valprint.c
-@@ -775,6 +775,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
+@@ -773,6 +773,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
  
  	  if (boffset < 0 || boffset >= TYPE_LENGTH (type))
  	    {
@@ -111,7 +111,7 @@ diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
 diff --git a/gdb/utils.c b/gdb/utils.c
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
-@@ -2952,6 +2952,17 @@ string_to_core_addr (const char *my_string)
+@@ -2932,6 +2932,17 @@ string_to_core_addr (const char *my_string)
    return addr;
  }
  
diff --git a/gdb-rhbz795424-bitpos-22of25.patch b/gdb-rhbz795424-bitpos-22of25.patch
index af17971..a3d0355 100644
--- a/gdb-rhbz795424-bitpos-22of25.patch
+++ b/gdb-rhbz795424-bitpos-22of25.patch
@@ -154,7 +154,7 @@ diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
  
    const struct target_desc *read_description () override;
  
-@@ -1203,7 +1203,7 @@ arm_linux_nat_target::stopped_by_watchpoint ()
+@@ -1197,7 +1197,7 @@ arm_linux_nat_target::stopped_by_watchpoint ()
  bool
  arm_linux_nat_target::watchpoint_addr_within_range (CORE_ADDR addr,
  						    CORE_ADDR start,
@@ -188,7 +188,7 @@ diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c
  			  CORE_ADDR *next_addr_orig_p)
  {
    int aligned_len;
-@@ -611,7 +612,7 @@ aarch64_handle_aligned_watchpoint (enum target_hw_bp_type type,
+@@ -602,7 +603,7 @@ aarch64_handle_aligned_watchpoint (enum target_hw_bp_type type,
  
  static int
  aarch64_handle_unaligned_watchpoint (enum target_hw_bp_type type,
@@ -197,7 +197,7 @@ diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c
  				     struct aarch64_debug_reg_state *state)
  {
    CORE_ADDR addr_orig = addr;
-@@ -641,12 +642,12 @@ aarch64_handle_unaligned_watchpoint (enum target_hw_bp_type type,
+@@ -632,12 +633,12 @@ aarch64_handle_unaligned_watchpoint (enum target_hw_bp_type type,
  		      "                                "
  		      "addr_orig: %s\n"
  		      "                                "
@@ -212,7 +212,7 @@ diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c
  		      core_addr_to_string_nz (addr_orig_next));
  
        addr_orig = addr_orig_next;
-@@ -660,7 +661,7 @@ aarch64_handle_unaligned_watchpoint (enum target_hw_bp_type type,
+@@ -651,7 +652,7 @@ aarch64_handle_unaligned_watchpoint (enum target_hw_bp_type type,
  
  int
  aarch64_handle_watchpoint (enum target_hw_bp_type type, CORE_ADDR addr,
@@ -221,7 +221,7 @@ diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c
  			   struct aarch64_debug_reg_state *state)
  {
    if (aarch64_point_is_aligned (1 /* is_watchpoint */ , addr, len))
-@@ -742,14 +743,14 @@ aarch64_linux_any_set_debug_regs_state (aarch64_debug_reg_state *state,
+@@ -733,14 +734,14 @@ aarch64_linux_any_set_debug_regs_state (aarch64_debug_reg_state *state,
  void
  aarch64_show_debug_reg_state (struct aarch64_debug_reg_state *state,
  			      const char *func, CORE_ADDR addr,
@@ -239,7 +239,7 @@ diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c
  		  type == hw_write ? "hw-write-watchpoint"
  		  : (type == hw_read ? "hw-read-watchpoint"
  		     : (type == hw_access ? "hw-access-watchpoint"
-@@ -832,7 +833,7 @@ aarch64_linux_get_debug_reg_capacity (int tid)
+@@ -823,7 +824,7 @@ aarch64_linux_get_debug_reg_capacity (int tid)
     ADDR and whose length is LEN in bytes.  */
  
  int
@@ -363,7 +363,7 @@ diff --git a/gdb/procfs.c b/gdb/procfs.c
  {
    struct {
      procfs_ctl_t cmd;
-@@ -3238,7 +3238,7 @@ procfs_target::pid_to_exec_file (int pid)
+@@ -3232,7 +3232,7 @@ procfs_target::pid_to_exec_file (int pid)
  /* Insert a watchpoint.  */
  
  static int
@@ -375,7 +375,7 @@ diff --git a/gdb/procfs.c b/gdb/procfs.c
 diff --git a/gdb/remote.c b/gdb/remote.c
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
-@@ -450,7 +450,7 @@ public:
+@@ -440,7 +440,7 @@ public:
  
    bool stopped_data_address (CORE_ADDR *) override;
  
@@ -384,7 +384,7 @@ diff --git a/gdb/remote.c b/gdb/remote.c
  
    int can_use_hw_breakpoint (enum bptype, int, int) override;
  
-@@ -10335,7 +10335,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len,
+@@ -10298,7 +10298,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len,
    p = strchr (rs->buf.data (), '\0');
    addr = remote_address_masked (addr);
    p += hexnumstr (p, (ULONGEST) addr);
@@ -393,7 +393,7 @@ diff --git a/gdb/remote.c b/gdb/remote.c
  
    putpkt (rs->buf);
    getpkt (&rs->buf, 0);
-@@ -10355,7 +10355,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len,
+@@ -10318,7 +10318,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len,
  
  bool
  remote_target::watchpoint_addr_within_range (CORE_ADDR addr,
@@ -402,7 +402,7 @@ diff --git a/gdb/remote.c b/gdb/remote.c
  {
    CORE_ADDR diff = remote_address_masked (addr - start);
  
-@@ -10384,7 +10384,7 @@ remote_target::remove_watchpoint (CORE_ADDR addr, int len,
+@@ -10347,7 +10347,7 @@ remote_target::remove_watchpoint (CORE_ADDR addr, int len,
    p = strchr (rs->buf.data (), '\0');
    addr = remote_address_masked (addr);
    p += hexnumstr (p, (ULONGEST) addr);
@@ -526,7 +526,7 @@ diff --git a/gdb/target.c b/gdb/target.c
  
  static int default_region_ok_for_hw_watchpoint (struct target_ops *,
  						CORE_ADDR, LONGEST);
-@@ -3122,7 +3122,7 @@ default_region_ok_for_hw_watchpoint (struct target_ops *self,
+@@ -3125,7 +3125,7 @@ default_region_ok_for_hw_watchpoint (struct target_ops *self,
  static int
  default_watchpoint_addr_within_range (struct target_ops *target,
  				      CORE_ADDR addr,
diff --git a/gdb-rhbz795424-bitpos-23of25.patch b/gdb-rhbz795424-bitpos-23of25.patch
index e258042..0500f6d 100644
--- a/gdb-rhbz795424-bitpos-23of25.patch
+++ b/gdb-rhbz795424-bitpos-23of25.patch
@@ -982,7 +982,7 @@ diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
 diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
 --- a/gdb/sparc64-tdep.c
 +++ b/gdb/sparc64-tdep.c
-@@ -1206,7 +1206,7 @@ sparc64_16_byte_align_p (struct type *type)
+@@ -1205,7 +1205,7 @@ sparc64_16_byte_align_p (struct type *type)
  
  static void
  sparc64_store_floating_fields (struct regcache *regcache, struct type *type,
@@ -991,7 +991,7 @@ diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
  {
    struct gdbarch *gdbarch = regcache->arch ();
    int len = TYPE_LENGTH (type);
-@@ -1266,7 +1266,7 @@ sparc64_store_floating_fields (struct regcache *regcache, struct type *type,
+@@ -1265,7 +1265,7 @@ sparc64_store_floating_fields (struct regcache *regcache, struct type *type,
        for (i = 0; i < TYPE_NFIELDS (type); i++)
  	{
  	  struct type *subtype = check_typedef (TYPE_FIELD_TYPE (type, i));
@@ -1000,7 +1000,7 @@ diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
  
  	  sparc64_store_floating_fields (regcache, subtype, valbuf,
  					 element, subpos);
-@@ -1298,7 +1298,7 @@ sparc64_store_floating_fields (struct regcache *regcache, struct type *type,
+@@ -1297,7 +1297,7 @@ sparc64_store_floating_fields (struct regcache *regcache, struct type *type,
  
  static void
  sparc64_extract_floating_fields (struct regcache *regcache, struct type *type,
@@ -1009,7 +1009,7 @@ diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
  {
    struct gdbarch *gdbarch = regcache->arch ();
  
-@@ -1354,7 +1354,7 @@ sparc64_extract_floating_fields (struct regcache *regcache, struct type *type,
+@@ -1353,7 +1353,7 @@ sparc64_extract_floating_fields (struct regcache *regcache, struct type *type,
        for (i = 0; i < TYPE_NFIELDS (type); i++)
  	{
  	  struct type *subtype = check_typedef (TYPE_FIELD_TYPE (type, i));
@@ -1018,7 +1018,7 @@ diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
  
  	  sparc64_extract_floating_fields (regcache, subtype, valbuf, subpos);
  	}
-@@ -1388,7 +1388,7 @@ sparc64_store_arguments (struct regcache *regcache, int nargs,
+@@ -1387,7 +1387,7 @@ sparc64_store_arguments (struct regcache *regcache, int nargs,
    for (i = 0; i < nargs; i++)
      {
        struct type *type = value_type (args[i]);
@@ -1027,7 +1027,7 @@ diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
  
        if (sparc64_structure_or_union_p (type)
  	  || (sparc64_complex_floating_p (type) && len == 32))
-@@ -1488,7 +1488,7 @@ sparc64_store_arguments (struct regcache *regcache, int nargs,
+@@ -1487,7 +1487,7 @@ sparc64_store_arguments (struct regcache *regcache, int nargs,
      {
        const gdb_byte *valbuf = value_contents (args[i]);
        struct type *type = value_type (args[i]);
diff --git a/gdb-vla-intel-fortran-strides.patch b/gdb-vla-intel-fortran-strides.patch
index eb6e58a..7b0fbe3 100644
--- a/gdb-vla-intel-fortran-strides.patch
+++ b/gdb-vla-intel-fortran-strides.patch
@@ -37,7 +37,7 @@ dbfd7140bf4c0500d1f5d192be781f83f78f7922
 diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
 --- a/gdb/dwarf2loc.c
 +++ b/gdb/dwarf2loc.c
-@@ -2429,11 +2429,14 @@ dwarf2_locexpr_baton_eval (const struct dwarf2_locexpr_baton *dlbaton,
+@@ -2428,11 +2428,14 @@ dwarf2_locexpr_baton_eval (const struct dwarf2_locexpr_baton *dlbaton,
  /* See dwarf2loc.h.  */
  
  int
@@ -54,7 +54,7 @@ diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
    if (prop == NULL)
      return 0;
  
-@@ -2457,7 +2460,7 @@ dwarf2_evaluate_property (const struct dynamic_prop *prop,
+@@ -2456,7 +2459,7 @@ dwarf2_evaluate_property (const struct dynamic_prop *prop,
  
  		*value = value_as_address (val);
  	      }
@@ -63,7 +63,7 @@ diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
  	  }
        }
        break;
-@@ -2479,7 +2482,7 @@ dwarf2_evaluate_property (const struct dynamic_prop *prop,
+@@ -2478,7 +2481,7 @@ dwarf2_evaluate_property (const struct dynamic_prop *prop,
  	    if (!value_optimized_out (val))
  	      {
  		*value = value_as_address (val);
@@ -72,7 +72,7 @@ diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
  	      }
  	  }
        }
-@@ -2487,8 +2490,8 @@ dwarf2_evaluate_property (const struct dynamic_prop *prop,
+@@ -2486,8 +2489,8 @@ dwarf2_evaluate_property (const struct dynamic_prop *prop,
  
      case PROP_CONST:
        *value = prop->data.const_val;
@@ -83,7 +83,7 @@ diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
      case PROP_ADDR_OFFSET:
        {
  	struct dwarf2_property_baton *baton
-@@ -2509,11 +2512,38 @@ dwarf2_evaluate_property (const struct dynamic_prop *prop,
+@@ -2508,11 +2511,38 @@ dwarf2_evaluate_property (const struct dynamic_prop *prop,
  	  val = value_at (baton->offset_info.type,
  			  pinfo->addr + baton->offset_info.offset);
  	*value = value_as_address (val);
@@ -143,7 +143,7 @@ diff --git a/gdb/dwarf2loc.h b/gdb/dwarf2loc.h
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -17752,7 +17752,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17751,7 +17751,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
    struct type *base_type, *orig_base_type;
    struct type *range_type;
    struct attribute *attr;
@@ -152,7 +152,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
    int low_default_is_valid;
    int high_bound_is_count = 0;
    const char *name;
-@@ -17772,7 +17772,9 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17771,7 +17771,9 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
  
    low.kind = PROP_CONST;
    high.kind = PROP_CONST;
@@ -162,7 +162,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
  
    /* Set LOW_DEFAULT_IS_VALID if current language and DWARF version allow
       omitting DW_AT_lower_bound.  */
-@@ -17805,6 +17807,14 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17804,6 +17806,14 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
        break;
      }
  
@@ -177,7 +177,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
    attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
    if (attr)
      attr_to_dynamic_prop (attr, die, cu, &low);
-@@ -17897,7 +17907,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17896,7 +17906,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
        && !TYPE_UNSIGNED (base_type) && (high.data.const_val & negative_mask))
      high.data.const_val |= negative_mask;
  
@@ -588,7 +588,7 @@ diff --git a/gdb/eval.c b/gdb/eval.c
  
  	case TYPE_CODE_PTR:
  	case TYPE_CODE_FUNC:
-@@ -2372,49 +2629,6 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -2385,49 +2642,6 @@ evaluate_subexp_standard (struct type *expect_type,
  	}
        return (arg1);
  
@@ -638,7 +638,7 @@ diff --git a/gdb/eval.c b/gdb/eval.c
      case BINOP_LOGICAL_AND:
        arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
        if (noside == EVAL_SKIP)
-@@ -3334,6 +3548,9 @@ calc_f77_array_dims (struct type *array_type)
+@@ -3347,6 +3561,9 @@ calc_f77_array_dims (struct type *array_type)
    int ndimen = 1;
    struct type *tmp_type;
  
@@ -673,7 +673,7 @@ diff --git a/gdb/expprint.c b/gdb/expprint.c
  	  print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
  	fputs_filtered (")", stream);
  	return;
-@@ -1105,22 +1102,24 @@ dump_subexp_body_standard (struct expression *exp,
+@@ -1106,22 +1103,24 @@ dump_subexp_body_standard (struct expression *exp,
  
  	switch (range_type)
  	  {
@@ -706,7 +706,7 @@ diff --git a/gdb/expprint.c b/gdb/expprint.c
  	    fputs_filtered ("ExclusiveRange 'EXP..EXP'", stream);
  	    break;
  	  default:
-@@ -1128,11 +1127,9 @@ dump_subexp_body_standard (struct expression *exp,
+@@ -1129,11 +1128,9 @@ dump_subexp_body_standard (struct expression *exp,
  	    break;
  	  }
  
@@ -775,7 +775,7 @@ diff --git a/gdb/expression.h b/gdb/expression.h
 diff --git a/gdb/f-exp.y b/gdb/f-exp.y
 --- a/gdb/f-exp.y
 +++ b/gdb/f-exp.y
-@@ -257,31 +257,63 @@ arglist :	subrange
+@@ -270,31 +270,63 @@ arglist :	subrange
     
  arglist	:	arglist ',' exp   %prec ABOVE_COMMA
  			{ arglist_len++; }
@@ -928,7 +928,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
        else if (bit_stride > 0)
  	TYPE_LENGTH (result_type) =
  	  (bit_stride * (high_bound - low_bound + 1) + 7) / 8;
-@@ -1990,12 +2000,12 @@ resolve_dynamic_range (struct type *dyn_range_type,
+@@ -1974,12 +1984,12 @@ resolve_dynamic_range (struct type *dyn_range_type,
    CORE_ADDR value;
    struct type *static_range_type, *static_target_type;
    const struct dynamic_prop *prop;
@@ -943,7 +943,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
      {
        low_bound.kind = PROP_CONST;
        low_bound.data.const_val = value;
-@@ -2007,7 +2017,7 @@ resolve_dynamic_range (struct type *dyn_range_type,
+@@ -1991,7 +2001,7 @@ resolve_dynamic_range (struct type *dyn_range_type,
      }
  
    prop = &TYPE_RANGE_DATA (dyn_range_type)->high;
@@ -952,7 +952,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
      {
        high_bound.kind = PROP_CONST;
        high_bound.data.const_val = value;
-@@ -2022,12 +2032,20 @@ resolve_dynamic_range (struct type *dyn_range_type,
+@@ -2006,12 +2016,20 @@ resolve_dynamic_range (struct type *dyn_range_type,
        high_bound.data.const_val = 0;
      }
  
@@ -1022,7 +1022,7 @@ diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
  
  #define TYPE_ARRAY_UPPER_BOUND_VALUE(arraytype) \
     (TYPE_HIGH_BOUND(TYPE_INDEX_TYPE((arraytype))))
-@@ -1896,6 +1911,7 @@ extern struct type *create_array_type_with_stride
+@@ -1934,6 +1949,7 @@ extern struct type *create_array_type_with_stride
     struct dynamic_prop *, unsigned int);
  
  extern struct type *create_range_type (struct type *, struct type *,
@@ -1033,7 +1033,7 @@ diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
 diff --git a/gdb/parse.c b/gdb/parse.c
 --- a/gdb/parse.c
 +++ b/gdb/parse.c
-@@ -989,24 +989,20 @@ operator_length_standard (const struct expression *expr, int endpos,
+@@ -990,24 +990,20 @@ operator_length_standard (const struct expression *expr, int endpos,
  
      case OP_RANGE:
        oplen = 3;
@@ -2047,7 +2047,7 @@ diff --git a/gdb/valops.c b/gdb/valops.c
 diff --git a/gdb/value.h b/gdb/value.h
 --- a/gdb/value.h
 +++ b/gdb/value.h
-@@ -1139,6 +1139,8 @@ extern struct value *varying_to_slice (struct value *);
+@@ -1140,6 +1140,8 @@ extern struct value *varying_to_slice (struct value *);
  
  extern struct value *value_slice (struct value *, int, int);
  
diff --git a/gdb-vla-intel-fortran-vla-strings.patch b/gdb-vla-intel-fortran-vla-strings.patch
index 16c24d1..c2494e0 100644
--- a/gdb-vla-intel-fortran-vla-strings.patch
+++ b/gdb-vla-intel-fortran-vla-strings.patch
@@ -33,7 +33,7 @@ git diff --stat -p gdb/master...gdb/users/bheckel/fortran-vla-strings
 diff --git a/gdb/NEWS b/gdb/NEWS
 --- a/gdb/NEWS
 +++ b/gdb/NEWS
-@@ -335,6 +335,8 @@ SH-5/SH64 running OpenBSD 	SH-5/SH64 support in sh*-*-openbsd*
+@@ -352,6 +352,8 @@ SH-5/SH64 running OpenBSD 	SH-5/SH64 support in sh*-*-openbsd*
  
  *** Changes in GDB 8.1
  
@@ -45,7 +45,7 @@ diff --git a/gdb/NEWS b/gdb/NEWS
 diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
 --- a/gdb/c-valprint.c
 +++ b/gdb/c-valprint.c
-@@ -653,6 +653,28 @@ c_value_print (struct value *val, struct ui_file *stream,
+@@ -652,6 +652,28 @@ c_value_print (struct value *val, struct ui_file *stream,
        else
  	{
  	  /* normal case */
@@ -77,7 +77,7 @@ diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -1833,7 +1833,8 @@ static void read_signatured_type (struct signatured_type *);
+@@ -1832,7 +1832,8 @@ static void read_signatured_type (struct signatured_type *);
  
  static int attr_to_dynamic_prop (const struct attribute *attr,
  				 struct die_info *die, struct dwarf2_cu *cu,
@@ -87,7 +87,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
  
  /* memory allocation interface */
  
-@@ -13757,7 +13758,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -13756,7 +13757,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
      {
        newobj->static_link
  	= XOBNEW (&objfile->objfile_obstack, struct dynamic_prop);
@@ -96,7 +96,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
      }
  
    cu->list_in_scope = cu->get_builder ()->get_local_symbols ();
-@@ -16495,7 +16496,8 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -16494,7 +16495,8 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
  
        byte_stride_prop
  	= (struct dynamic_prop *) alloca (sizeof (struct dynamic_prop));
@@ -106,7 +106,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
        if (!stride_ok)
  	{
  	  complaint (_("unable to read array DW_AT_byte_stride "
-@@ -17256,29 +17258,90 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17255,29 +17257,90 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
    struct gdbarch *gdbarch = get_objfile_arch (objfile);
    struct type *type, *range_type, *index_type, *char_type;
    struct attribute *attr;
@@ -208,7 +208,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
    char_type = language_string_char_type (cu->language_defn, gdbarch);
    type = create_string_type (NULL, char_type, range_type);
  
-@@ -17646,7 +17709,8 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17645,7 +17708,8 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)
  
  static int
  attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
@@ -218,7 +218,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
  {
    struct dwarf2_property_baton *baton;
    struct obstack *obstack
-@@ -17657,14 +17721,33 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
+@@ -17656,14 +17720,33 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
  
    if (attr_form_is_block (attr))
      {
@@ -256,7 +256,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
      }
    else if (attr_form_is_ref (attr))
      {
-@@ -17697,8 +17780,28 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
+@@ -17696,8 +17779,28 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die,
  		baton = XOBNEW (obstack, struct dwarf2_property_baton);
  		baton->referenced_type = die_type (target_die, target_cu);
  		baton->locexpr.per_cu = cu->per_cu;
@@ -287,7 +287,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
  		prop->data.baton = baton;
  		prop->kind = PROP_LOCEXPR;
  		gdb_assert (prop->data.baton != NULL);
-@@ -17809,7 +17912,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17808,7 +17911,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
  
    attr = dwarf2_attr (die, DW_AT_byte_stride, cu);
    if (attr)
@@ -296,7 +296,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
          complaint (_("Missing DW_AT_byte_stride "
  		     "- DIE at 0x%s [in module %s]"),
  		   sect_offset_str (die->sect_off),
-@@ -17817,7 +17920,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17816,7 +17919,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
  
    attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
    if (attr)
@@ -305,7 +305,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
    else if (!low_default_is_valid)
      complaint (_("Missing DW_AT_lower_bound "
  				      "- DIE at %s [in module %s]"),
-@@ -17826,10 +17929,10 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -17825,10 +17928,10 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
  
    struct attribute *attr_ub, *attr_count;
    attr = attr_ub = dwarf2_attr (die, DW_AT_upper_bound, cu);
@@ -318,7 +318,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
  	{
  	  /* If bounds are constant do the final calculation here.  */
  	  if (low.kind == PROP_CONST && high.kind == PROP_CONST)
-@@ -25396,7 +25499,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -25394,7 +25497,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
    attr = dwarf2_attr (die, DW_AT_allocated, cu);
    if (attr_form_is_block (attr))
      {
@@ -327,7 +327,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
          add_dyn_prop (DYN_PROP_ALLOCATED, prop, type);
      }
    else if (attr != NULL)
-@@ -25410,7 +25513,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -25408,7 +25511,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
    attr = dwarf2_attr (die, DW_AT_associated, cu);
    if (attr_form_is_block (attr))
      {
@@ -336,7 +336,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
          add_dyn_prop (DYN_PROP_ASSOCIATED, prop, type);
      }
    else if (attr != NULL)
-@@ -25422,7 +25525,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -25420,7 +25523,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  
    /* Read DW_AT_data_location and set in type.  */
    attr = dwarf2_attr (die, DW_AT_data_location, cu);
@@ -500,7 +500,7 @@ diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
 diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
 --- a/gdb/gdbtypes.c
 +++ b/gdb/gdbtypes.c
-@@ -1913,7 +1913,8 @@ is_dynamic_type_internal (struct type *type, int top_level)
+@@ -1897,7 +1897,8 @@ is_dynamic_type_internal (struct type *type, int top_level)
    type = check_typedef (type);
  
    /* We only want to recognize references at the outermost level.  */
@@ -510,7 +510,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
      type = check_typedef (TYPE_TARGET_TYPE (type));
  
    /* Types that have a dynamic TYPE_DATA_LOCATION are considered
-@@ -1947,6 +1948,7 @@ is_dynamic_type_internal (struct type *type, int top_level)
+@@ -1931,6 +1932,7 @@ is_dynamic_type_internal (struct type *type, int top_level)
        }
  
      case TYPE_CODE_ARRAY:
@@ -518,7 +518,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
        {
  	gdb_assert (TYPE_NFIELDS (type) == 1);
  
-@@ -2065,7 +2067,8 @@ resolve_dynamic_array (struct type *type,
+@@ -2049,7 +2051,8 @@ resolve_dynamic_array (struct type *type,
    struct dynamic_prop *prop;
    unsigned int bit_stride = 0;
  
@@ -528,7 +528,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
  
    type = copy_type (type);
  
-@@ -2090,11 +2093,15 @@ resolve_dynamic_array (struct type *type,
+@@ -2074,11 +2077,15 @@ resolve_dynamic_array (struct type *type,
  
    ary_dim = check_typedef (TYPE_TARGET_TYPE (elt_type));
  
@@ -545,7 +545,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
    prop = get_dyn_prop (DYN_PROP_BYTE_STRIDE, type);
    if (prop != NULL)
      {
-@@ -2249,6 +2256,28 @@ resolve_dynamic_struct (struct type *type,
+@@ -2233,6 +2240,28 @@ resolve_dynamic_struct (struct type *type,
    return resolved_type;
  }
  
@@ -574,7 +574,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
  /* Worker for resolved_dynamic_type.  */
  
  static struct type *
-@@ -2297,7 +2326,12 @@ resolve_dynamic_type_internal (struct type *type,
+@@ -2281,7 +2310,12 @@ resolve_dynamic_type_internal (struct type *type,
  	    break;
  	  }
  
@@ -1339,7 +1339,7 @@ diff --git a/gdb/valops.c b/gdb/valops.c
 diff --git a/gdb/valprint.c b/gdb/valprint.c
 --- a/gdb/valprint.c
 +++ b/gdb/valprint.c
-@@ -1108,12 +1108,6 @@ value_check_printable (struct value *val, struct ui_file *stream,
+@@ -1106,12 +1106,6 @@ value_check_printable (struct value *val, struct ui_file *stream,
        return 0;
      }
  
diff --git a/gdb-vla-intel-stringbt-fix.patch b/gdb-vla-intel-stringbt-fix.patch
index 7ef64a5..63be80a 100644
--- a/gdb-vla-intel-stringbt-fix.patch
+++ b/gdb-vla-intel-stringbt-fix.patch
@@ -38,7 +38,7 @@ diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
  #include "common/underlying.h"
  #include "common/byte-vector.h"
  
-@@ -2158,6 +2159,20 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
+@@ -2157,6 +2158,20 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
    ctx.per_cu = per_cu;
    ctx.obj_address = 0;
  
diff --git a/gdb.spec b/gdb.spec
index e4d38a2..3e6e235 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -22,7 +22,7 @@
 Name: %{?scl_prefix}gdb
 
 # Freeze it when GDB gets branched
-%global snapsrc    20190304
+%global snapsrc    20190319
 # See timestamp of source gnulib installed into gdb/gnulib/ .
 %global snapgnulib 20161115
 %global tarname gdb-%{version}
@@ -30,7 +30,7 @@ Version: 8.3.50.%{snapsrc}
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
 # Do not provide URL for snapshots as the file lasts there only for 2 days.
@@ -1025,6 +1025,9 @@ fi
 %endif
 
 %changelog
+* Tue Mar 19 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 8.3.50.20190319-2
+- Rebase to FSF GDB 8.3.50.20190319 (8.4pre).
+
 * Mon Mar  4 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 8.3.50.20190304-1
 - Rebase to FSF GDB 8.3.50.20190304 (8.4pre).
 - Rewrite gdb-6.6-buildid-locate.patch.
diff --git a/sources b/sources
index 82ca3fc..fb4519a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz) = a8b1c54dd348cfeb37da73f968742896be3dd13a4215f8d8519870c2abea915f5176c3fa6989ddd10f20020a16f0fab20cbae68ee8d58a82234d8778023520f8
 SHA512 (v2.0.tar.gz) = ec63151e842c81cc73ea11ba560b63e005cefbe19d98de24ae5c8caa4de7c9c1d71d1ec5b6214a347592eac675b75a3d2b26d4691ca86f91020ebfea8e912939
-SHA512 (gdb-8.3.50.20190304.tar.xz) = 89d6462451e7c70c3c89741e49b765b96ee6d1e34a9857337fc8a6ff2aa160360974a0f3db52bd5a13767a6ae44675f0cdd5de1e664458ad2b543246d14cb0e3
+SHA512 (gdb-8.3.50.20190319.tar.xz) = 099f03a5103412940cc10e3628f28d790e124df01e5d79e868284dba04817a9f8c63066b7f4e2b33b4e8c0bcda04a3be85247ca0a5ecb70fdf721f9d2c1365b9