diff --git a/.gitignore b/.gitignore
index 19111c2..67d9856 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /gdb-libstdc++-v3-python-7.1.1-20170526.tar.xz
 /v1.6.1.tar.gz
-/gdb-8.1.50.20180618.tar.xz
+/gdb-8.1.50.20180624.tar.xz
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index 3ee5fa4..edce570 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -325,186 +325,182 @@ Patch078: gdb-runtest-pie-override.patch
 #=push+jan
 Patch079: gdb-attach-fail-reasons-5of5.patch
 
-# Workaround crashes from stale frame_info pointer (BZ 804256).
-#=push+jan
-Patch080: gdb-stale-frame_info.patch
-
 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedora: Compatibility with RHELs (unchecked which ones).
-Patch081: gdb-glibc-strstr-workaround.patch
+Patch080: gdb-glibc-strstr-workaround.patch
 
 # Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
 #=fedoratest
-Patch082: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+Patch081: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch083: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch082: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch084: gdb-rhbz795424-bitpos-20of25.patch
+Patch083: gdb-rhbz795424-bitpos-20of25.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch085: gdb-rhbz795424-bitpos-21of25.patch
+Patch084: gdb-rhbz795424-bitpos-21of25.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch086: gdb-rhbz795424-bitpos-22of25.patch
+Patch085: gdb-rhbz795424-bitpos-22of25.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch087: gdb-rhbz795424-bitpos-23of25.patch
+Patch086: gdb-rhbz795424-bitpos-23of25.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch088: gdb-rhbz795424-bitpos-25of25.patch
+Patch087: gdb-rhbz795424-bitpos-25of25.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch089: gdb-rhbz795424-bitpos-25of25-test.patch
+Patch088: gdb-rhbz795424-bitpos-25of25-test.patch
 
 # Fix `GDB cannot access struct member whose offset is larger than 256MB'
 # (RH BZ 795424).
 #=push
-Patch090: gdb-rhbz795424-bitpos-lazyvalue.patch
+Patch089: gdb-rhbz795424-bitpos-lazyvalue.patch
 
 # Import regression test for `gdb/findvar.c:417: internal-error:
 # read_var_value: Assertion `frame' failed.' (RH BZ 947564) from RHEL 6.5.
 #=fedoratest
-Patch091: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch090: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
 
 # Fix crash of -readnow /usr/lib/debug/usr/bin/gnatbind.debug (BZ 1069211).
 #=push+jan
-Patch092: gdb-gnat-dwarf-crash-3of3.patch
+Patch091: gdb-gnat-dwarf-crash-3of3.patch
 
 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch093: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch092: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
 
 # Fix 'gdb gives highly misleading error when debuginfo pkg is present,
 # but not corresponding binary pkg' (RH BZ 981154).
 #=push+jan
-Patch094: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch093: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 
 #=fedoratest
-Patch095: gdb-archer-vla-tests.patch
+Patch094: gdb-archer-vla-tests.patch
 
 #=fedoratest
-Patch096: gdb-vla-intel-tests.patch
+Patch095: gdb-vla-intel-tests.patch
 
 # Continue backtrace even if a frame filter throws an exception (Phil Muldoon).
 #=push
-Patch097: gdb-btrobust.patch
+Patch096: gdb-btrobust.patch
 
 # Display Fortran strings in backtraces.
 #=fedoratest
-Patch098: gdb-fortran-frame-string.patch
+Patch097: gdb-fortran-frame-string.patch
 
 # Fix Python GIL with gdb.execute("continue") (Phil Muldoon, BZ 1116957).
 #=push
-Patch099: gdb-python-gil.patch
+Patch098: gdb-python-gil.patch
 
 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch100: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch099: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix jit-reader.h for multi-lib.
 #=push+jan
-Patch101: gdb-jit-reader-multilib.patch
+Patch100: gdb-jit-reader-multilib.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch102: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch101: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 
 # Fix 'backport GDB 7.4 fix to RHEL 6.6 GDB' [Original Sourceware bug
 # description: 'C++ (and objc): Internal error on unqualified name
 # re-set', PR 11657] (RH BZ 1186476).
 #=fedoratest
-Patch103: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch102: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
 
 # Test 'info type-printers' Python error (RH BZ 1350436).
 #=fedoratest
-Patch104: gdb-rhbz1350436-type-printers-error.patch
+Patch103: gdb-rhbz1350436-type-printers-error.patch
 
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch105: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch104: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # Never kill PID on: gdb exec PID (Jan Kratochvil, RH BZ 1219747).
 #=push+jan
-Patch106: gdb-bz1219747-attach-kills.patch
+Patch105: gdb-bz1219747-attach-kills.patch
 
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch107: gdb-fedora-libncursesw.patch
+Patch106: gdb-fedora-libncursesw.patch
 
 # Test clflushopt instruction decode (for RH BZ 1262471).
 #=fedoratest
-Patch108: gdb-opcodes-clflushopt-test.patch
+Patch107: gdb-opcodes-clflushopt-test.patch
 
 # [rhel6] DTS backward Python compatibility API (BZ 1020004, Phil Muldoon).
 #=fedora
-Patch109: gdb-dts-rhel6-python-compat.patch
+Patch108: gdb-dts-rhel6-python-compat.patch
 
 # [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
 #=push+jan
-Patch110: gdb-6.6-buildid-locate-rpm-scl.patch
+Patch109: gdb-6.6-buildid-locate-rpm-scl.patch
 
 # Work around readline-6.2 incompatibility not asking for --more-- (BZ 701131).
 #=fedora
-Patch111: gdb-readline62-ask-more-rh.patch
+Patch110: gdb-readline62-ask-more-rh.patch
 
 # Make the GDB quit processing non-abortable to cleanup everything properly.
 #=fedora: It was useful only after gdb-6.8-attach-signalled-detach-stopped.patch .
-Patch112: gdb-6.8-quit-never-aborts.patch
+Patch111: gdb-6.8-quit-never-aborts.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch113: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch112: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch114: gdb-container-rh-pkg.patch
+Patch113: gdb-container-rh-pkg.patch
 
 # New test for Python "Cannot locate object file for block" (for RH BZ 1325795).
 #=fedoratest
-Patch115: gdb-rhbz1325795-framefilters-test.patch
+Patch114: gdb-rhbz1325795-framefilters-test.patch
 
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch116: gdb-linux_perf-bundle.patch
+Patch115: gdb-linux_perf-bundle.patch
 
 # Fix gdb-headless /usr/bin/ executables (BZ 1390251).
 #=fedora
-Patch117: gdb-libexec-add-index.patch
+Patch116: gdb-libexec-add-index.patch
 
 # New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
 #=fedoratest
-Patch118: gdb-rhbz1398387-tab-crash-test.patch
+Patch117: gdb-rhbz1398387-tab-crash-test.patch
 
 # [testsuite] Fix false selftest.exp FAIL from system readline-6.3+ (Patrick Palka).
 #=fedoratest
-Patch119: gdb-testsuite-readline63-sigint.patch
+Patch118: gdb-testsuite-readline63-sigint.patch
 
 # Python patches of: http://sourceware.org/gdb/wiki/ProjectArcher
 #=push
-Patch120: gdb-archer.patch
+Patch119: gdb-archer.patch
 
 # Revert upstream commit 469412dd9ccc4de5874fd3299b105833f36b34cd
-Patch121: gdb-vla-intel-fix-print-char-array.patch
+Patch120: gdb-vla-intel-fix-print-char-array.patch
 
 # [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
 # =fedoratest
-Patch122: gdb-rhbz1553104-s390x-arch12-test.patch
+Patch121: gdb-rhbz1553104-s390x-arch12-test.patch
 
diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index 131cf93..a663edb 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -119,4 +119,3 @@
 %patch119 -p1
 %patch120 -p1
 %patch121 -p1
-%patch122 -p1
diff --git a/_git_upstream_commit b/_git_upstream_commit
index 072c964..7529270 100644
--- a/_git_upstream_commit
+++ b/_git_upstream_commit
@@ -1 +1 @@
-7010835a6c5fd3679feae7e6345f2f10d4d761b4
+6706f7706241eda253d26ce4c927dd5bed4942a7
diff --git a/_patch_order b/_patch_order
index aaec704..1b3a5fe 100644
--- a/_patch_order
+++ b/_patch_order
@@ -77,7 +77,6 @@ gdb-7.2.50-sparc-add-workaround-to-broken-debug-files.patch
 gdb-test-ivy-bridge.patch
 gdb-runtest-pie-override.patch
 gdb-attach-fail-reasons-5of5.patch
-gdb-stale-frame_info.patch
 gdb-glibc-strstr-workaround.patch
 gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
 gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
diff --git a/gdb-6.6-buildid-locate-rpm.patch b/gdb-6.6-buildid-locate-rpm.patch
index db33aa5..8972abe 100644
--- a/gdb-6.6-buildid-locate-rpm.patch
+++ b/gdb-6.6-buildid-locate-rpm.patch
@@ -8,7 +8,7 @@ Subject: gdb-6.6-buildid-locate-rpm.patch
 diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
 --- a/gdb/aclocal.m4
 +++ b/gdb/aclocal.m4
-@@ -12,6 +12,221 @@
+@@ -11,7 +11,223 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -226,10 +226,12 @@ diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
 +
 +AS_VAR_IF([$1], [""], [$5], [$4])dnl
 +])# PKG_CHECK_VAR
++
+ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 +
  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
  
- # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ # Copyright (C) 2001-2017 Free Software Foundation, Inc.
 diff --git a/gdb/build-id.c b/gdb/build-id.c
 --- a/gdb/build-id.c
 +++ b/gdb/build-id.c
@@ -701,7 +703,7 @@ diff --git a/gdb/config.in b/gdb/config.in
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -716,6 +716,11 @@ PKGVERSION
+@@ -748,6 +748,11 @@ PKGVERSION
  HAVE_NATIVE_GCORE_TARGET
  TARGET_OBS
  subdirs
@@ -713,7 +715,7 @@ diff --git a/gdb/configure b/gdb/configure
  GDB_DATADIR
  DEBUGDIR
  MAKEINFO_EXTRA_FLAGS
-@@ -820,6 +825,7 @@ with_gdb_datadir
+@@ -852,6 +857,7 @@ with_gdb_datadir
  with_relocated_sources
  with_auto_load_dir
  with_auto_load_safe_path
@@ -721,7 +723,7 @@ diff --git a/gdb/configure b/gdb/configure
  enable_targets
  enable_64_bit_bfd
  enable_gdbcli
-@@ -878,6 +884,11 @@ CCC
+@@ -910,6 +916,11 @@ CCC
  CPP
  MAKEINFO
  MAKEINFOFLAGS
@@ -733,7 +735,7 @@ diff --git a/gdb/configure b/gdb/configure
  YACC
  YFLAGS
  XMKMF'
-@@ -1548,6 +1559,8 @@ Optional Packages:
+@@ -1580,6 +1591,8 @@ Optional Packages:
                            [--with-auto-load-dir]
    --without-auto-load-safe-path
                            do not restrict auto-loaded files locations
@@ -742,7 +744,7 @@ diff --git a/gdb/configure b/gdb/configure
    --with-libunwind-ia64   use libunwind frame unwinding for ia64 targets
    --with-curses           use the curses library instead of the termcap
                            library
-@@ -1605,6 +1618,13 @@ Some influential environment variables:
+@@ -1637,6 +1650,13 @@ Some influential environment variables:
    MAKEINFO    Parent configure detects if it is of sufficient version.
    MAKEINFOFLAGS
                Parameters for MAKEINFO.
@@ -753,10 +755,10 @@ diff --git a/gdb/configure b/gdb/configure
 +              path overriding pkg-config's built-in search path
 +  RPM_CFLAGS  C compiler flags for RPM, overriding pkg-config
 +  RPM_LIBS    linker flags for RPM, overriding pkg-config
-   YACC        The `Yet Another C Compiler' implementation to use. Defaults to
-               the first program found out of: `bison -y', `byacc', `yacc'.
-   YFLAGS      The list of arguments that will be passed by default to $YACC.
-@@ -6492,6 +6512,494 @@ _ACEOF
+   YACC        The `Yet Another Compiler Compiler' implementation to use.
+               Defaults to the first program found out of: `bison -y', `byacc',
+               `yacc'.
+@@ -6572,6 +6592,494 @@ _ACEOF
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5
  $as_echo "$with_auto_load_safe_path" >&6; }
  
@@ -1254,7 +1256,7 @@ diff --git a/gdb/configure b/gdb/configure
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -167,6 +167,199 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escape_dir,
+@@ -166,6 +166,199 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escape_dir,
  	      [Directories safe to hold auto-loaded files.])
  AC_MSG_RESULT([$with_auto_load_safe_path])
  
@@ -1457,7 +1459,7 @@ 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
-@@ -368,7 +368,7 @@ build_id_locate_exec (int from_tty)
+@@ -366,7 +366,7 @@ build_id_locate_exec (int from_tty)
          symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
      }
    else
diff --git a/gdb-6.6-buildid-locate.patch b/gdb-6.6-buildid-locate.patch
index 847b57e..6b41426 100644
--- a/gdb-6.6-buildid-locate.patch
+++ b/gdb-6.6-buildid-locate.patch
@@ -894,7 +894,7 @@ diff --git a/gdb/corelow.c b/gdb/corelow.c
  
  #ifndef O_LARGEFILE
  #define O_LARGEFILE 0
-@@ -323,6 +327,54 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
+@@ -321,6 +325,54 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
      inferior_ptid = ptid;			/* Yes, make it current.  */
  }
  
@@ -949,8 +949,8 @@ diff --git a/gdb/corelow.c b/gdb/corelow.c
  /* Issue a message saying we have no core to debug, if FROM_TTY.  */
  
  static void
-@@ -466,6 +518,14 @@ core_target_open (const char *arg, int from_tty)
- 	switch_to_thread (thread->ptid);
+@@ -464,6 +516,14 @@ core_target_open (const char *arg, int from_tty)
+ 	switch_to_thread (thread);
      }
  
 +  /* Find the build_id identifiers.  If it gets executed after
@@ -964,7 +964,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
-@@ -1068,4 +1128,11 @@ void
+@@ -1066,4 +1126,11 @@ void
  _initialize_corelow (void)
  {
    add_target (core_target_info, core_target_open, filename_completer);
@@ -1022,7 +1022,7 @@ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
 diff --git a/gdb/elfread.c b/gdb/elfread.c
 --- a/gdb/elfread.c
 +++ b/gdb/elfread.c
-@@ -1288,7 +1288,9 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
+@@ -1290,7 +1290,9 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
  	   && objfile->separate_debug_objfile == NULL
  	   && objfile->separate_debug_objfile_backlink == NULL)
      {
@@ -1033,7 +1033,7 @@ diff --git a/gdb/elfread.c b/gdb/elfread.c
  
        if (debugfile.empty ())
  	debugfile = find_separate_debug_file_by_debuglink (objfile);
-@@ -1300,6 +1302,10 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
+@@ -1302,6 +1304,10 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
  	  symbol_file_add_separate (abfd.get (), debugfile.c_str (),
  				    symfile_flags, objfile);
  	}
diff --git a/gdb-6.6-scheduler_locking-step-is-default.patch b/gdb-6.6-scheduler_locking-step-is-default.patch
index 77468ed..ebc4aa6 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
-@@ -2202,7 +2202,7 @@ static const char *const scheduler_enums[] = {
+@@ -2193,7 +2193,7 @@ static const char *const scheduler_enums[] = {
    schedlock_replay,
    NULL
  };
diff --git a/gdb-6.8-quit-never-aborts.patch b/gdb-6.8-quit-never-aborts.patch
index 0c35b89..f3765de 100644
--- a/gdb-6.8-quit-never-aborts.patch
+++ b/gdb-6.8-quit-never-aborts.patch
@@ -45,7 +45,7 @@ diff --git a/gdb/extension.c b/gdb/extension.c
 diff --git a/gdb/top.c b/gdb/top.c
 --- a/gdb/top.c
 +++ b/gdb/top.c
-@@ -1612,7 +1612,13 @@ quit_force (int *exit_arg, int from_tty)
+@@ -1611,7 +1611,13 @@ quit_force (int *exit_arg, int from_tty)
  
    qt.from_tty = from_tty;
  
diff --git a/gdb-archer-pie-addons-keep-disabled.patch b/gdb-archer-pie-addons-keep-disabled.patch
index 93fdc0f..4dc78f6 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
-@@ -15515,6 +15515,50 @@ initialize_breakpoint_ops (void)
+@@ -15519,6 +15519,50 @@ initialize_breakpoint_ops (void)
  
  static struct cmd_list_element *enablebreaklist = NULL;
  
@@ -62,7 +62,7 @@ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
 --- a/gdb/breakpoint.h
 +++ b/gdb/breakpoint.h
-@@ -1683,6 +1683,9 @@ extern const char *ep_parse_optional_if_clause (const char **arg);
+@@ -1684,6 +1684,9 @@ extern const char *ep_parse_optional_if_clause (const char **arg);
     UIOUT iff debugging multiple threads.  */
  extern void maybe_print_thread_hit_breakpoint (struct ui_out *uiout);
  
diff --git a/gdb-archer.patch b/gdb-archer.patch
index 92e5d81..73006be 100644
--- a/gdb-archer.patch
+++ b/gdb-archer.patch
@@ -452,7 +452,7 @@ new file mode 100644
 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
-@@ -643,6 +643,9 @@ class gdbpy_enter_varobj : public gdbpy_enter
+@@ -644,6 +644,9 @@ class gdbpy_enter_varobj : public gdbpy_enter
  
  };
  
diff --git a/gdb-attach-fail-reasons-5of5.patch b/gdb-attach-fail-reasons-5of5.patch
index 0eb5c55..e1ecd3a 100644
--- a/gdb-attach-fail-reasons-5of5.patch
+++ b/gdb-attach-fail-reasons-5of5.patch
@@ -68,7 +68,7 @@ diff --git a/gdb/config.in b/gdb/config.in
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -15747,6 +15747,64 @@ cat >>confdefs.h <<_ACEOF
+@@ -15843,6 +15843,64 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  
@@ -136,7 +136,7 @@ diff --git a/gdb/configure b/gdb/configure
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -2048,6 +2048,10 @@ case $host_os in
+@@ -2047,6 +2047,10 @@ case $host_os in
  esac
  AC_DEFINE_UNQUOTED(GDBINIT,"$gdbinit",[The .gdbinit filename.])
  
@@ -173,7 +173,7 @@ diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in
 diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
 --- a/gdb/gdbserver/configure
 +++ b/gdb/gdbserver/configure
-@@ -8465,6 +8465,64 @@ if $want_ipa ; then
+@@ -8535,6 +8535,64 @@ if $want_ipa ; then
     fi
  fi
  
@@ -241,7 +241,7 @@ diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
 diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
 --- a/gdb/gdbserver/configure.ac
 +++ b/gdb/gdbserver/configure.ac
-@@ -488,6 +488,10 @@ if $want_ipa ; then
+@@ -486,6 +486,10 @@ if $want_ipa ; then
     fi
  fi
  
diff --git a/gdb-bz533176-fortran-omp-step.patch b/gdb-bz533176-fortran-omp-step.patch
index becfeed..ba1bceb 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
-@@ -6703,6 +6703,16 @@ process_event_stop_test (struct execution_control_state *ecs)
+@@ -6670,6 +6670,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
-@@ -6736,6 +6746,7 @@ process_event_stop_test (struct execution_control_state *ecs)
+@@ -6703,6 +6713,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 e1bd4d6..d5595fa 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
-@@ -8799,7 +8799,7 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
+@@ -8804,7 +8804,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)
      {
-@@ -14349,7 +14349,7 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
+@@ -14353,7 +14353,7 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
  
    if (bpt->type == bp_hardware_breakpoint)
      {
diff --git a/gdb-container-rh-pkg.patch b/gdb-container-rh-pkg.patch
index c53aeb8..35eb798 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
-@@ -13903,7 +13903,17 @@ remote_target::pid_to_exec_file (int pid)
+@@ -13904,7 +13904,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-fedora-libncursesw.patch b/gdb-fedora-libncursesw.patch
index a0e999e..66c7b48 100644
--- a/gdb-fedora-libncursesw.patch
+++ b/gdb-fedora-libncursesw.patch
@@ -12,15 +12,15 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1270534
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -9304,6 +9304,7 @@ if test x"$prefer_curses" = xyes; then
+@@ -9382,6 +9382,7 @@ if test x"$prefer_curses" = xyes; then
    # search /usr/local/include, if ncurses is installed in /usr/local.  A
    # default installation of ncurses on alpha*-dec-osf* will lead to such
    # a situation.
 +  # Fedora: Force libncursesw over libncurses to match the includes.
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing waddstr" >&5
  $as_echo_n "checking for library containing waddstr... " >&6; }
- if test "${ac_cv_search_waddstr+set}" = set; then :
-@@ -9328,7 +9329,7 @@ return waddstr ();
+ if ${ac_cv_search_waddstr+:} false; then :
+@@ -9406,7 +9407,7 @@ return waddstr ();
    return 0;
  }
  _ACEOF
@@ -29,15 +29,15 @@ diff --git a/gdb/configure b/gdb/configure
    if test -z "$ac_lib"; then
      ac_res="none required"
    else
-@@ -9402,6 +9403,7 @@ case $host_os in
+@@ -9480,6 +9481,7 @@ case $host_os in
  esac
  
  # These are the libraries checked by Readline.
 +# Fedora: Force libncursesw over libncurses to match the includes.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
  $as_echo_n "checking for library containing tgetent... " >&6; }
- if test "${ac_cv_search_tgetent+set}" = set; then :
-@@ -9426,7 +9428,7 @@ return tgetent ();
+ if ${ac_cv_search_tgetent+:} false; then :
+@@ -9504,7 +9506,7 @@ return tgetent ();
    return 0;
  }
  _ACEOF
@@ -49,7 +49,7 @@ diff --git a/gdb/configure b/gdb/configure
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -760,7 +760,8 @@ if test x"$prefer_curses" = xyes; then
+@@ -759,7 +759,8 @@ if test x"$prefer_curses" = xyes; then
    # search /usr/local/include, if ncurses is installed in /usr/local.  A
    # default installation of ncurses on alpha*-dec-osf* will lead to such
    # a situation.
@@ -59,7 +59,7 @@ diff --git a/gdb/configure.ac b/gdb/configure.ac
  
    if test "$ac_cv_search_waddstr" != no; then
      curses_found=yes
-@@ -802,7 +803,8 @@ case $host_os in
+@@ -801,7 +802,8 @@ case $host_os in
  esac
  
  # These are the libraries checked by Readline.
diff --git a/gdb-gnat-dwarf-crash-3of3.patch b/gdb-gnat-dwarf-crash-3of3.patch
index 28b26be..5b270bf 100644
--- a/gdb-gnat-dwarf-crash-3of3.patch
+++ b/gdb-gnat-dwarf-crash-3of3.patch
@@ -59,7 +59,7 @@ 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 \
+@@ -607,6 +607,13 @@ holding the child stopped.  Try \"set detach-on-fork\" or \
  				target_pid_to_str (process_ptid));
  	    }
  
@@ -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 /
-@@ -1359,6 +1368,25 @@ get_detach_signal (struct lwp_info *lp)
+@@ -1358,6 +1367,25 @@ get_detach_signal (struct lwp_info *lp)
        return gdb_signal_to_host (signo);
      }
  
@@ -125,7 +125,7 @@ diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
    return 0;
  }
  
-@@ -1507,6 +1535,10 @@ linux_nat_target::detach (inferior *inf, int from_tty)
+@@ -1506,6 +1534,10 @@ linux_nat_target::detach (inferior *inf, int from_tty)
        detach_one_lwp (main_lwp, &signo);
  
        detach_success (inf);
@@ -136,7 +136,7 @@ diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
      }
  }
  
-@@ -1765,6 +1797,16 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
+@@ -1764,6 +1796,16 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
        return;
      }
  
diff --git a/gdb-jit-reader-multilib.patch b/gdb-jit-reader-multilib.patch
index c4fc8b9..6efe38a 100644
--- a/gdb-jit-reader-multilib.patch
+++ b/gdb-jit-reader-multilib.patch
@@ -9,7 +9,7 @@ Subject: gdb-jit-reader-multilib.patch
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -9594,10 +9594,12 @@ _ACEOF
+@@ -9669,10 +9669,12 @@ _ACEOF
  
  
  
@@ -28,7 +28,7 @@ diff --git a/gdb/configure b/gdb/configure
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -837,10 +837,12 @@ AC_CHECK_SIZEOF(unsigned long long)
+@@ -836,10 +836,12 @@ AC_CHECK_SIZEOF(unsigned long long)
  AC_CHECK_SIZEOF(unsigned long)
  AC_CHECK_SIZEOF(unsigned __int128)
  
diff --git a/gdb-linux_perf-bundle.patch b/gdb-linux_perf-bundle.patch
index 7d621dd..f5bcb6e 100644
--- a/gdb-linux_perf-bundle.patch
+++ b/gdb-linux_perf-bundle.patch
@@ -9,7 +9,7 @@ Subject: gdb-linux_perf-bundle.patch
 diff --git a/gdb/configure b/gdb/configure
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -11973,7 +11973,7 @@ else
+@@ -12048,7 +12048,7 @@ else
  
  #include <linux/perf_event.h>
  #ifndef PERF_ATTR_SIZE_VER5
@@ -21,14 +21,14 @@ diff --git a/gdb/configure b/gdb/configure
 diff --git a/gdb/configure.ac b/gdb/configure.ac
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
-@@ -1471,7 +1471,7 @@ else
-   AC_PREPROC_IFELSE(AC_LANG_SOURCE([[
+@@ -1470,7 +1470,7 @@ else
+   AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
  #include <linux/perf_event.h>
  #ifndef PERF_ATTR_SIZE_VER5
 -# error
 +// error // PERF_ATTR_SIZE_VER5_BUNDLE is not available here - Fedora+RHEL
  #endif
-   ]]), [perf_event=yes], [perf_event=no])
+   ]])], [perf_event=yes], [perf_event=no])
    if test "$perf_event" != yes; then
 diff --git a/gdb/gdb.c b/gdb/gdb.c
 --- a/gdb/gdb.c
diff --git a/gdb-moribund-utrace-workaround.patch b/gdb-moribund-utrace-workaround.patch
index 39a0c05..36f985c 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
-@@ -12008,6 +12008,8 @@ update_global_location_list (enum ugll_insert_mode insert_mode)
+@@ -12013,6 +12013,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 cae9ff7..e30b4ee 100644
--- a/gdb-rhbz795424-bitpos-20of25.patch
+++ b/gdb-rhbz795424-bitpos-20of25.patch
@@ -473,7 +473,7 @@ Content-Disposition: attachment; filename=bitpos-main.patch
 diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
 --- a/gdb/aarch64-linux-nat.c
 +++ b/gdb/aarch64-linux-nat.c
-@@ -740,7 +740,7 @@ aarch64_linux_nat_target::remove_watchpoint (CORE_ADDR addr, int len,
+@@ -808,7 +808,7 @@ aarch64_linux_nat_target::remove_watchpoint (CORE_ADDR addr, int len,
  /* Implement the "region_ok_for_hw_watchpoint" target_ops method.  */
  
  int
@@ -871,7 +871,7 @@ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
 diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
 --- a/gdb/ada-lang.h
 +++ b/gdb/ada-lang.h
-@@ -175,7 +175,7 @@ extern void ada_print_type (struct type *, const char *, struct ui_file *, int,
+@@ -173,7 +173,7 @@ extern void ada_print_type (struct type *, const char *, struct ui_file *, int,
  extern void ada_print_typedef (struct type *type, struct symbol *new_symbol,
  			       struct ui_file *stream);
  
@@ -880,7 +880,7 @@ diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
  			   struct ui_file *, int,
  			   struct value *,
  			   const struct value_print_options *);
-@@ -190,7 +190,7 @@ extern void ada_emit_char (int, struct type *, struct ui_file *, int, int);
+@@ -188,7 +188,7 @@ extern void ada_emit_char (int, struct type *, struct ui_file *, int, int);
  extern void ada_printchar (int, struct type *, struct ui_file *);
  
  extern void ada_printstr (struct ui_file *, struct type *, const gdb_byte *,
@@ -889,7 +889,7 @@ diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
  			  const struct value_print_options *);
  
  struct value *ada_convert_actual (struct value *actual,
-@@ -263,7 +263,7 @@ extern int ada_is_constrained_packed_array_type (struct type *);
+@@ -261,7 +261,7 @@ extern int ada_is_constrained_packed_array_type (struct type *);
  
  extern struct value *ada_value_primitive_packed_val (struct value *,
  						     const gdb_byte *,
@@ -1311,7 +1311,7 @@ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
  	}
        return 0;
      }
-@@ -6810,7 +6810,7 @@ breakpoint_address_match (const address_space *aspace1, CORE_ADDR addr1,
+@@ -6819,7 +6819,7 @@ breakpoint_address_match (const address_space *aspace1, CORE_ADDR addr1,
  static int
  breakpoint_address_match_range (const address_space *aspace1,
  				CORE_ADDR addr1,
@@ -1320,7 +1320,7 @@ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
  				CORE_ADDR addr2)
  {
    return ((gdbarch_has_global_breakpoints (target_gdbarch ())
-@@ -10897,7 +10897,7 @@ can_use_hardware_watchpoint (const std::vector<value_ref_ptr> &vals)
+@@ -10902,7 +10902,7 @@ can_use_hardware_watchpoint (const std::vector<value_ref_ptr> &vals)
  		      && TYPE_CODE (vtype) != TYPE_CODE_ARRAY))
  		{
  		  CORE_ADDR vaddr = value_address (v);
@@ -1332,7 +1332,7 @@ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
 diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
 --- a/gdb/breakpoint.h
 +++ b/gdb/breakpoint.h
-@@ -251,7 +251,7 @@ struct bp_target_info
+@@ -252,7 +252,7 @@ struct bp_target_info
  
    /* If this is a ranged breakpoint, then this field contains the
       length of the range that will be watched for execution.  */
@@ -1341,7 +1341,7 @@ diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
  
    /* If the breakpoint lives in memory and reading that memory would
       give back the breakpoint, instead of the original contents, then
-@@ -428,7 +428,7 @@ public:
+@@ -429,7 +429,7 @@ public:
    /* For hardware watchpoints, the size of the memory region being
       watched.  For hardware ranged breakpoints, the size of the
       breakpoint range.  */
@@ -1362,7 +1362,7 @@ diff --git a/gdb/c-lang.c b/gdb/c-lang.c
  	    const char *user_encoding, int force_ellipses,
  	    const struct value_print_options *options)
  {
-@@ -667,7 +667,7 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp,
+@@ -664,7 +664,7 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp,
  	  }
  	else
  	  {
@@ -1371,7 +1371,7 @@ diff --git a/gdb/c-lang.c b/gdb/c-lang.c
  
  	    /* Write the terminating character.  */
  	    for (i = 0; i < TYPE_LENGTH (type); ++i)
-@@ -676,7 +676,7 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp,
+@@ -673,7 +673,7 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp,
  	    if (satisfy_expected)
  	      {
  		LONGEST low_bound, high_bound;
@@ -1383,7 +1383,7 @@ diff --git a/gdb/c-lang.c b/gdb/c-lang.c
 diff --git a/gdb/c-lang.h b/gdb/c-lang.h
 --- a/gdb/c-lang.h
 +++ b/gdb/c-lang.h
-@@ -84,7 +84,7 @@ extern void c_print_typedef (struct type *,
+@@ -82,7 +82,7 @@ extern void c_print_typedef (struct type *,
  			     struct ui_file *);
  
  extern void c_val_print (struct type *,
@@ -1392,7 +1392,7 @@ diff --git a/gdb/c-lang.h b/gdb/c-lang.h
  			 struct ui_file *, int,
  			 struct value *,
  			 const struct value_print_options *);
-@@ -104,7 +104,7 @@ extern void c_printchar (int, struct type *, struct ui_file *);
+@@ -102,7 +102,7 @@ extern void c_printchar (int, struct type *, struct ui_file *);
  extern void c_printstr (struct ui_file * stream,
  			struct type *elttype,
  			const gdb_byte *string,
@@ -1571,7 +1571,7 @@ diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
 diff --git a/gdb/d-lang.h b/gdb/d-lang.h
 --- a/gdb/d-lang.h
 +++ b/gdb/d-lang.h
-@@ -81,7 +81,7 @@ extern struct block_symbol d_lookup_nested_symbol (struct type *, const char *,
+@@ -79,7 +79,7 @@ extern struct block_symbol d_lookup_nested_symbol (struct type *, const char *,
  /* Defined in d-valprint.c  */
  
  extern void d_val_print (struct type *type,
@@ -1755,7 +1755,7 @@ diff --git a/gdb/f-lang.c b/gdb/f-lang.c
 diff --git a/gdb/f-lang.h b/gdb/f-lang.h
 --- a/gdb/f-lang.h
 +++ b/gdb/f-lang.h
-@@ -30,7 +30,7 @@ extern void f_yyerror (const char *);	/* Defined in f-exp.y */
+@@ -28,7 +28,7 @@ extern int f_parse (struct parser_state *);
  extern void f_print_type (struct type *, const char *, struct ui_file *, int,
  			  int, const struct type_print_options *);
  
@@ -1856,7 +1856,7 @@ diff --git a/gdb/findvar.c b/gdb/findvar.c
 diff --git a/gdb/frame.c b/gdb/frame.c
 --- a/gdb/frame.c
 +++ b/gdb/frame.c
-@@ -1398,7 +1398,7 @@ deprecated_frame_register_read (struct frame_info *frame, int regnum,
+@@ -1396,7 +1396,7 @@ deprecated_frame_register_read (struct frame_info *frame, int regnum,
  
  int
  get_frame_register_bytes (struct frame_info *frame, int regnum,
@@ -1865,7 +1865,7 @@ diff --git a/gdb/frame.c b/gdb/frame.c
  			  int *optimizedp, int *unavailablep)
  {
    struct gdbarch *gdbarch = get_frame_arch (frame);
-@@ -1427,7 +1427,7 @@ get_frame_register_bytes (struct frame_info *frame, int regnum,
+@@ -1425,7 +1425,7 @@ get_frame_register_bytes (struct frame_info *frame, int regnum,
      }
    if (len > maxsize)
      error (_("Bad debug information detected: "
@@ -2122,7 +2122,7 @@ diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
 diff --git a/gdb/go-lang.h b/gdb/go-lang.h
 --- a/gdb/go-lang.h
 +++ b/gdb/go-lang.h
-@@ -85,7 +85,7 @@ extern void go_print_type (struct type *type, const char *varstring,
+@@ -83,7 +83,7 @@ extern void go_print_type (struct type *type, const char *varstring,
  /* Defined in go-valprint.c.  */
  
  extern void go_val_print (struct type *type,
@@ -2158,7 +2158,7 @@ diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
 diff --git a/gdb/language.c b/gdb/language.c
 --- a/gdb/language.c
 +++ b/gdb/language.c
-@@ -773,7 +773,7 @@ unk_lang_printchar (int c, struct type *type, struct ui_file *stream)
+@@ -766,7 +766,7 @@ unk_lang_printchar (int c, struct type *type, struct ui_file *stream)
  
  static void
  unk_lang_printstr (struct ui_file *stream, struct type *type,
@@ -2167,7 +2167,7 @@ diff --git a/gdb/language.c b/gdb/language.c
  		   const char *encoding, int force_ellipses,
  		   const struct value_print_options *options)
  {
-@@ -792,7 +792,7 @@ unk_lang_print_type (struct type *type, const char *varstring,
+@@ -785,7 +785,7 @@ unk_lang_print_type (struct type *type, const char *varstring,
  
  static void
  unk_lang_val_print (struct type *type,
@@ -2179,7 +2179,7 @@ diff --git a/gdb/language.c b/gdb/language.c
 diff --git a/gdb/language.h b/gdb/language.h
 --- a/gdb/language.h
 +++ b/gdb/language.h
-@@ -188,7 +188,7 @@ struct language_defn
+@@ -184,7 +184,7 @@ struct language_defn
  			  struct ui_file * stream);
  
      void (*la_printstr) (struct ui_file * stream, struct type *elttype,
@@ -2188,7 +2188,7 @@ diff --git a/gdb/language.h b/gdb/language.h
  			 const char *encoding, int force_ellipses,
  			 const struct value_print_options *);
  
-@@ -226,7 +226,7 @@ struct language_defn
+@@ -222,7 +222,7 @@ struct language_defn
         printing.  */
  
      void (*la_val_print) (struct type *type,
@@ -2237,7 +2237,7 @@ diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c
 diff --git a/gdb/m2-lang.h b/gdb/m2-lang.h
 --- a/gdb/m2-lang.h
 +++ b/gdb/m2-lang.h
-@@ -34,7 +34,7 @@ extern void m2_print_typedef (struct type *, struct symbol *,
+@@ -32,7 +32,7 @@ extern void m2_print_typedef (struct type *, struct symbol *,
  extern int m2_is_long_set (struct type *type);
  extern int m2_is_unbounded_array (struct type *type);
  
@@ -2550,7 +2550,7 @@ diff --git a/gdb/p-lang.c b/gdb/p-lang.c
 diff --git a/gdb/p-lang.h b/gdb/p-lang.h
 --- a/gdb/p-lang.h
 +++ b/gdb/p-lang.h
-@@ -36,7 +36,7 @@ extern void pascal_print_type (struct type *, const char *, struct ui_file *,
+@@ -34,7 +34,7 @@ extern void pascal_print_type (struct type *, const char *, struct ui_file *,
  extern void pascal_print_typedef (struct type *, struct symbol *,
  				  struct ui_file *);
  
@@ -2559,7 +2559,7 @@ diff --git a/gdb/p-lang.h b/gdb/p-lang.h
  			      CORE_ADDR, struct ui_file *, int,
  			      struct value *,
  			      const struct value_print_options *);
-@@ -50,13 +50,13 @@ extern void pascal_type_print_method_args (const char *, const char *,
+@@ -48,13 +48,13 @@ extern void pascal_type_print_method_args (const char *, const char *,
  /* These are in p-lang.c: */
  
  extern int
@@ -2613,7 +2613,7 @@ diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
 diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
 --- a/gdb/ppc-linux-tdep.c
 +++ b/gdb/ppc-linux-tdep.c
-@@ -1705,7 +1705,7 @@ ppc_init_linux_record_tdep (struct linux_record_tdep *record_tdep,
+@@ -1706,7 +1706,7 @@ ppc_init_linux_record_tdep (struct linux_record_tdep *record_tdep,
  
  const struct floatformat **
  ppc_floatformat_for_type (struct gdbarch *gdbarch,
@@ -2658,35 +2658,34 @@ diff --git a/gdb/procfs.c b/gdb/procfs.c
 diff --git a/gdb/regcache.c b/gdb/regcache.c
 --- a/gdb/regcache.c
 +++ b/gdb/regcache.c
-@@ -784,7 +784,7 @@ regcache::cooked_write (int regnum, const gdb_byte *buf)
-    operation.  */
+@@ -795,7 +795,7 @@ regcache::cooked_write (int regnum, const gdb_byte *buf)
+ /* See regcache.h.  */
  
  enum register_status
--readable_regcache::read_part (int regnum, int offset, int len, void *in,
-+readable_regcache::read_part (int regnum, LONGEST offset, LONGEST len, void *in,
- 			      bool is_raw)
+-readable_regcache::read_part (int regnum, int offset, int len,
++readable_regcache::read_part (int regnum, LONGEST offset, LONGEST len,
+ 			      gdb_byte *out, bool is_raw)
  {
-   struct gdbarch *gdbarch = arch ();
-@@ -813,7 +813,7 @@ readable_regcache::read_part (int regnum, int offset, int len, void *in,
- }
+   int reg_size = register_size (arch (), regnum);
+@@ -862,7 +862,7 @@ reg_buffer::raw_collect_part (int regnum, int offset, int len,
+ /* See regcache.h.  */
  
  enum register_status
 -regcache::write_part (int regnum, int offset, int len,
 +regcache::write_part (int regnum, LONGEST offset, LONGEST len,
- 		     const void *out, bool is_raw)
+ 		      const gdb_byte *in, bool is_raw)
  {
-   struct gdbarch *gdbarch = arch ();
-@@ -850,7 +850,8 @@ regcache::write_part (int regnum, int offset, int len,
+   int reg_size = register_size (arch (), regnum);
+@@ -933,7 +933,7 @@ reg_buffer::raw_supply_part (int regnum, int offset, int len,
  }
  
  enum register_status
--readable_regcache::raw_read_part (int regnum, int offset, int len, gdb_byte *buf)
+-readable_regcache::raw_read_part (int regnum, int offset, int len,
 +readable_regcache::raw_read_part (int regnum, int offset, LONGEST len,
-+				  gdb_byte *buf)
+ 				  gdb_byte *buf)
  {
    assert_regnum (regnum);
-   return read_part (regnum, offset, len, buf, true);
-@@ -859,7 +860,7 @@ readable_regcache::raw_read_part (int regnum, int offset, int len, gdb_byte *buf
+@@ -943,7 +943,7 @@ readable_regcache::raw_read_part (int regnum, int offset, int len,
  /* See regcache.h.  */
  
  void
@@ -2695,8 +2694,8 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
  			  const gdb_byte *buf)
  {
    assert_regnum (regnum);
-@@ -867,7 +868,7 @@ regcache::raw_write_part (int regnum, int offset, int len,
- }
+@@ -953,7 +953,7 @@ regcache::raw_write_part (int regnum, int offset, int len,
+ /* See regcache.h.  */
  
  enum register_status
 -readable_regcache::cooked_read_part (int regnum, int offset, int len,
@@ -2704,8 +2703,8 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
  				     gdb_byte *buf)
  {
    gdb_assert (regnum >= 0 && regnum < m_descr->nr_cooked_registers);
-@@ -875,7 +876,7 @@ readable_regcache::cooked_read_part (int regnum, int offset, int len,
- }
+@@ -963,7 +963,7 @@ readable_regcache::cooked_read_part (int regnum, int offset, int len,
+ /* See regcache.h.  */
  
  void
 -regcache::cooked_write_part (int regnum, int offset, int len,
@@ -2716,7 +2715,7 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
 diff --git a/gdb/regcache.h b/gdb/regcache.h
 --- a/gdb/regcache.h
 +++ b/gdb/regcache.h
-@@ -233,8 +233,8 @@ public:
+@@ -244,8 +244,8 @@ public:
    enum register_status raw_read (int regnum, T *val);
  
    /* Partial transfer of raw registers.  Return the status of the register.  */
@@ -2727,7 +2726,7 @@ diff --git a/gdb/regcache.h b/gdb/regcache.h
  
    /* Make certain that the register REGNUM is up-to-date.  */
    virtual void raw_update (int regnum) = 0;
-@@ -246,16 +246,16 @@ public:
+@@ -257,8 +257,8 @@ public:
    enum register_status cooked_read (int regnum, T *val);
  
    /* Partial transfer of a cooked register.  */
@@ -2738,17 +2737,16 @@ diff --git a/gdb/regcache.h b/gdb/regcache.h
  
    /* Read register REGNUM from the regcache and return a new value.  This
       will call mark_value_bytes_unavailable as appropriate.  */
-   struct value *cooked_read_value (int regnum);
+@@ -268,7 +268,7 @@ protected:
  
- protected:
--  enum register_status read_part (int regnum, int offset, int len, void *in,
--				  bool is_raw);
+   /* Perform a partial register transfer using a read, modify, write
+      operation.  Will fail if register is currently invalid.  */
+-  enum register_status read_part (int regnum, int offset, int len,
 +  enum register_status read_part (int regnum, LONGEST offset, LONGEST len,
-+				  void *in, bool is_raw);
+ 				  gdb_byte *out, bool is_raw);
  };
  
- /* Buffer of registers, can be read and written.  */
-@@ -312,11 +312,12 @@ public:
+@@ -326,11 +326,12 @@ public:
  
    /* Partial transfer of raw registers.  Perform read, modify, write style
       operations.  */
@@ -2763,21 +2761,15 @@ diff --git a/gdb/regcache.h b/gdb/regcache.h
  			  const gdb_byte *buf);
  
    void supply_regset (const struct regset *regset,
-@@ -350,13 +351,12 @@ protected:
-   static std::forward_list<regcache *> current_regcache;
- 
- private:
--
-   void transfer_regset (const struct regset *regset,
- 			struct regcache *out_regcache,
- 			int regnum, const void *in_buf,
- 			void *out_buf, size_t size) const;
+@@ -381,7 +382,7 @@ private:
  
+   /* Perform a partial register transfer using a read, modify, write
+      operation.  */
 -  enum register_status write_part (int regnum, int offset, int len,
 +  enum register_status write_part (int regnum, LONGEST offset, LONGEST len,
- 				   const void *out, bool is_raw);
- 
+ 				   const gdb_byte *in, bool is_raw);
  
+   /* The address space of this register cache (for registers where it
 diff --git a/gdb/remote.c b/gdb/remote.c
 --- a/gdb/remote.c
 +++ b/gdb/remote.c
@@ -2790,7 +2782,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;
-@@ -10407,7 +10407,7 @@ int remote_hw_watchpoint_length_limit = -1;
+@@ -10408,7 +10408,7 @@ int remote_hw_watchpoint_length_limit = -1;
  int remote_hw_breakpoint_limit = -1;
  
  int
@@ -2978,7 +2970,7 @@ diff --git a/gdb/target.c b/gdb/target.c
  
  static void default_rcmd (struct target_ops *, const char *, struct ui_file *);
  
-@@ -3182,7 +3182,7 @@ target_fileio_read_stralloc (struct inferior *inf, const char *filename)
+@@ -3180,7 +3180,7 @@ target_fileio_read_stralloc (struct inferior *inf, const char *filename)
  
  static int
  default_region_ok_for_hw_watchpoint (struct target_ops *self,
@@ -3286,7 +3278,7 @@ diff --git a/gdb/valprint.c b/gdb/valprint.c
  	  annotate_elt_rep_end ();
  
  	  i = rep1 - 1;
-@@ -2672,7 +2672,7 @@ print_converted_chars_to_obstack (struct obstack *obstack,
+@@ -2669,7 +2669,7 @@ print_converted_chars_to_obstack (struct obstack *obstack,
  
  void
  generic_printstr (struct ui_file *stream, struct type *type, 
@@ -3316,7 +3308,7 @@ diff --git a/gdb/valprint.h b/gdb/valprint.h
  
  extern void print_char_chars (struct ui_file *, struct type *,
  			      const gdb_byte *, unsigned int, enum bfd_endian);
-@@ -191,7 +191,7 @@ struct generic_val_print_decorations
+@@ -192,7 +192,7 @@ struct generic_val_print_decorations
  
  
  extern void generic_val_print (struct type *type,
@@ -3325,7 +3317,7 @@ diff --git a/gdb/valprint.h b/gdb/valprint.h
  			       struct ui_file *stream, int recurse,
  			       struct value *original_value,
  			       const struct value_print_options *options,
-@@ -201,7 +201,7 @@ extern void generic_emit_char (int c, struct type *type, struct ui_file *stream,
+@@ -202,7 +202,7 @@ extern void generic_emit_char (int c, struct type *type, struct ui_file *stream,
  			       int quoter, const char *encoding);
  
  extern void generic_printstr (struct ui_file *stream, struct type *type, 
diff --git a/gdb-rhbz795424-bitpos-22of25.patch b/gdb-rhbz795424-bitpos-22of25.patch
index dab442a..e02d3f1 100644
--- a/gdb-rhbz795424-bitpos-22of25.patch
+++ b/gdb-rhbz795424-bitpos-22of25.patch
@@ -123,7 +123,7 @@ diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
  
    int can_do_single_step () override;
  
-@@ -819,7 +819,8 @@ aarch64_linux_nat_target::stopped_by_watchpoint ()
+@@ -887,7 +887,8 @@ aarch64_linux_nat_target::stopped_by_watchpoint ()
  
  bool
  aarch64_linux_nat_target::watchpoint_addr_within_range (CORE_ADDR addr,
@@ -384,7 +384,7 @@ diff --git a/gdb/remote.c b/gdb/remote.c
  
    int can_use_hw_breakpoint (enum bptype, int, int) override;
  
-@@ -10336,7 +10336,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len,
+@@ -10337,7 +10337,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len,
    p = strchr (rs->buf, '\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, &rs->buf_size, 0);
-@@ -10356,7 +10356,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len,
+@@ -10357,7 +10357,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);
  
-@@ -10385,7 +10385,7 @@ remote_target::remove_watchpoint (CORE_ADDR addr, int len,
+@@ -10386,7 +10386,7 @@ remote_target::remove_watchpoint (CORE_ADDR addr, int len,
    p = strchr (rs->buf, '\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);
-@@ -3190,7 +3190,7 @@ default_region_ok_for_hw_watchpoint (struct target_ops *self,
+@@ -3188,7 +3188,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-25of25.patch b/gdb-rhbz795424-bitpos-25of25.patch
index f62d8da..de6a324 100644
--- a/gdb-rhbz795424-bitpos-25of25.patch
+++ b/gdb-rhbz795424-bitpos-25of25.patch
@@ -57,7 +57,7 @@ Content-Disposition: attachment; filename=f77-bounds.patch
 diff --git a/gdb/f-lang.h b/gdb/f-lang.h
 --- a/gdb/f-lang.h
 +++ b/gdb/f-lang.h
-@@ -49,9 +49,9 @@ struct common_block
+@@ -47,9 +47,9 @@ struct common_block
    struct symbol *contents[1];
  };
  
diff --git a/gdb-stale-frame_info.patch b/gdb-stale-frame_info.patch
deleted file mode 100644
index b1dc173..0000000
--- a/gdb-stale-frame_info.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-stale-frame_info.patch
-
-;; Workaround crashes from stale frame_info pointer (BZ 804256).
-;;=push+jan
-
-http://sourceware.org/ml/gdb-patches/2012-04/msg00058.html
-
-Hi,
-
-I did not look at which commit caused this regression but apparently it was
-introduced at least with multi-inferiors.
-
-I understand this fix is not right fix of the crash; but in most GDB cases one
-does not use multi-inferior so why to regress single-inferior by it.
-Some more simple solutions still fix the single-inferior mode but they
-regressed the multi-inferior mode
-	gdb.threads/no-unwaited-for-left.exp
-	gdb.multi/base.exp
-so I had to put there that sorting magic.
-
-With proper C++ sanity check of stale live frame_info references the testcase
-would be simple without the "frame_garbage_collection" reproducer below.
-It is also reproducible just with valgrind but regularly running the whole
-testsuite under valgrind I did not find feasible.
-
-No regressions on {x86_64,x86_64-m32,i686}-fedora17-linux-gnu.
-
-Thanks,
-Jan
-
-gdb/
-2012-04-04  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	Workaround PR backtrace/13866.
-	* progspace.c (switch_to_program_space_and_thread): Try not to call
-	switch_to_thread.
-
-diff --git a/gdb/progspace-and-thread.c b/gdb/progspace-and-thread.c
---- a/gdb/progspace-and-thread.c
-+++ b/gdb/progspace-and-thread.c
-@@ -23,15 +23,29 @@
- void
- switch_to_program_space_and_thread (program_space *pspace)
- {
--  inferior *inf = find_inferior_for_program_space (pspace);
-+  inferior *inf = current_inferior ();
-+
-+  if (inf->pspace != pspace)
-+    inf = find_inferior_for_program_space (pspace);
- 
-   if (inf != NULL && inf->pid != 0)
-     {
-       thread_info *tp = any_live_thread_of_process (inf->pid);
-+      thread_info *current_tp = NULL;
-+
-+      if (ptid_get_pid (inferior_ptid) == inf->pid)
-+	current_tp = find_thread_ptid (inferior_ptid);
- 
-       if (tp != NULL)
- 	{
--	  switch_to_thread (tp->ptid);
-+	  /* Prefer primarily thread not THREAD_EXITED and secondarily thread
-+	     not EXECUTING.  */
-+	  if (current_tp == NULL
-+	      || (tp->state != THREAD_EXITED
-+		  && current_tp->state == THREAD_EXITED)
-+	      || (!tp->executing && current_tp->executing))
-+	    switch_to_thread (tp->ptid);
-+
- 	  /* Switching thread switches pspace implicitly.  We're
- 	     done.  */
- 	  return;
diff --git a/gdb-vla-intel-fortran-strides.patch b/gdb-vla-intel-fortran-strides.patch
index 8dd7b55..847c7cc 100644
--- a/gdb-vla-intel-fortran-strides.patch
+++ b/gdb-vla-intel-fortran-strides.patch
@@ -1038,7 +1038,7 @@ diff --git a/gdb/parse.c b/gdb/parse.c
 diff --git a/gdb/rust-exp.y b/gdb/rust-exp.y
 --- a/gdb/rust-exp.y
 +++ b/gdb/rust-exp.y
-@@ -2477,24 +2477,28 @@ convert_ast_to_expression (struct parser_state *state,
+@@ -2478,24 +2478,28 @@ convert_ast_to_expression (struct parser_state *state,
  
      case OP_RANGE:
        {
diff --git a/gdb.spec b/gdb.spec
index f5ee03f..4fd3db7 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -18,7 +18,7 @@
 Name: %{?scl_prefix}gdb
 
 # Freeze it when GDB gets branched
-%global snapsrc    20180618
+%global snapsrc    20180624
 # See timestamp of source gnulib installed into gdb/gnulib/ .
 %global snapgnulib 20161115
 %global tarname gdb-%{version}
@@ -26,7 +26,7 @@ Version: 8.1.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: 24%{?dist}
+Release: 25%{?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
 Group: Development/Debuggers
@@ -1040,6 +1040,9 @@ fi
 %endif
 
 %changelog
+* Sun Jun 24 2018 Sergio Durigan Junior <sergiodj@redhat.com> - 8.1.50.20180624-25.fc29
+- Rebase to FSF GDB 8.1.50.20180624 (8.2pre).
+
 * Wed Jun 20 2018 Sergio Durigan Junior <sergiodj@redhat.com> - 8.1.50.20180618-24.fc29
 - Add BuildRequires: mpfr-devel (RH BZ 1593280).
 
diff --git a/sources b/sources
index 5cc77a6..23ef074 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (gdb-libstdc++-v3-python-7.1.1-20170526.tar.xz) = 3d540b99581ffa4cf2810bec979c9a01a1f8ce782b7c8efb46b40dd2421d60cdb0e52b53c5477c3e86a57957a2a14489f5c29dc53868738a1ef79e79cf76d0a1
 SHA512 (v1.6.1.tar.gz) = c7c9c8ba78021fff3fde12a216f5729c6031114e5a727f49b7ff1a31c53b5ddba24d1b3aee252d8278ecd1fafe78a44ed059c12b9eb29eca33093e0720673468
-SHA512 (gdb-8.1.50.20180618.tar.xz) = dffafcfbec2bc8deb27c411451b7cacab21aeded6d1ca1b89c12fa292bcbb6007a0b4cea3604dcea737e5353e9c71c6c2ec111806145fd79d4e30c7662608b6d
+SHA512 (gdb-8.1.50.20180624.tar.xz) = aaf9a9cb270f12b103d34e30fd5fcb180583a7b0fedeb05e3abf79762243abc9acfc168a770df20f81447c7641f44fb99fea7800fd25696fb8a2fde4b82171eb