From 538775743e032ebfd78a0b2ab912ff4e4c9455a3 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:44 +0100
Subject: [PATCH 1/6] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 gdb.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gdb.spec b/gdb.spec
index 4f3c41a..5174edd 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -33,7 +33,6 @@ Version: 8.2.50.%{snapsrc}
 Release: 13%{?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
 # Do not provide URL for snapshots as the file lasts there only for 2 days.
 # ftp://sourceware.org/pub/gdb/releases/FIXME{tarname}.tar.xz
 Source: %{tarname}.tar.xz
@@ -69,7 +68,6 @@ Requires: gdb-headless%{?_isa} = %{version}-%{release}
 See package 'gdb-headless'.
 
 %package headless
-Group: Development/Debuggers
 %endif
 
 Summary: A GNU source-level debugger for C, C++, Fortran, Go and other languages
@@ -373,7 +371,6 @@ and printing their data.
 
 %package gdbserver
 Summary: A standalone server for GDB (the GNU source-level debugger)
-Group: Development/Debuggers
 
 %description gdbserver
 GDB, the GNU debugger, allows you to debug programs written in C, C++,
@@ -386,7 +383,6 @@ machine than the one which is running the program being debugged.
 %package doc
 Summary: Documentation for GDB (the GNU source-level debugger)
 License: GFDL
-Group: Documentation
 BuildArch: noarch
 %if 0%{?scl:1}
 # As of F-28, packages won't need to call /sbin/install-info by hand

From 46d477eac9c057c071b5188aa35640cb505a7e39 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 20:41:52 +0000
Subject: [PATCH 2/6] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 gdb.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gdb.spec b/gdb.spec
index 5174edd..5a9a35b 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -30,7 +30,7 @@ Version: 8.2.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: 13%{?dist}
+Release: 14%{?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.
@@ -1028,6 +1028,9 @@ fi
 %endif
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Jan 21 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 8.2.50.20190120-13.fc30
 - Rebase to FSF GDB 8.2.50.20190120 (8.3pre).
 - Fix 'gdb does crash randomly on loading symbols or setting a breakpoint'

From c60e39b61c28da7efc1e3b623c9ee455e613af79 Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@redhat.com>
Date: Tue, 5 Feb 2019 13:26:09 -0500
Subject: [PATCH 3/6] Remove libmpx dependency when using '--with testsuite',
 since GCC9   has dropped support for it.

---
 gdb.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gdb.spec b/gdb.spec
index 5a9a35b..81c57e1 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -30,7 +30,7 @@ Version: 8.2.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: 14%{?dist}
+Release: 15%{?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.
@@ -299,9 +299,6 @@ BuildRequires: prelink
 %endif
 %endif
 %if 0%{!?rhel:1} || 0%{?rhel} > 7
-%ifarch %{ix86} x86_64
-BuildRequires: libmpx%{bits_local} libmpx%{bits_other}
-%endif
 BuildRequires: opencl-headers ocl-icd-devel%{bits_local} ocl-icd-devel%{bits_other}
 %endif
 %if 0%{!?rhel:1} || 0%{?rhel} > 7
@@ -1028,6 +1025,10 @@ fi
 %endif
 
 %changelog
+* Tue Feb  5 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 8.2.50.20190120-15
+- Remove libmpx dependency when using '--with testsuite', since GCC9
+  has dropped support for it.
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From e5955df97ad5b79df56d95f2a0061677a71ce95c Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 17 Feb 2019 09:30:50 +0100
Subject: [PATCH 4/6] Rebuild for readline 8.0

---
 gdb.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gdb.spec b/gdb.spec
index 81c57e1..09b1900 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -30,7 +30,7 @@ Version: 8.2.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: 15%{?dist}
+Release: 16%{?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
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org>
+- Rebuild for readline 8.0
+
 * Tue Feb  5 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 8.2.50.20190120-15
 - Remove libmpx dependency when using '--with testsuite', since GCC9
   has dropped support for it.

From 9404c96ac60a3b9c5ffc3eceb456a615946d1428 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 17 Feb 2019 22:57:49 +0100
Subject: [PATCH 5/6] Disable temporarily guile support

guile 2.0 currently fails to build from source so it is not possible to
get it to use readline 8.0.

Let's disable guile support until GDB will be ported to 2.2[0] or 2.0
build will be fixed[1].

[0] https://sourceware.org/bugzilla/show_bug.cgi?id=21104
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1675089

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 gdb.spec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gdb.spec b/gdb.spec
index 09b1900..916e153 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -30,7 +30,7 @@ Version: 8.2.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: 16%{?dist}
+Release: 17%{?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.
@@ -227,7 +227,7 @@ BuildRequires: texlive-collection-latexrecommended
 BuildRequires: /usr/bin/pod2man
 %if 0%{!?rhel:1} || 0%{?rhel} > 7
 BuildRequires: libbabeltrace-devel%{buildisa}
-BuildRequires: guile-devel%{buildisa}
+#BuildRequires: guile-devel%{buildisa}
 %endif
 %global have_libipt 0
 %if 0%{!?rhel:1} || 0%{?rhel} > 7 || (0%{?rhel} == 7 && 0%{?scl:1})
@@ -565,12 +565,11 @@ export CXXFLAGS="$CFLAGS"
 	--disable-rpath						\
 	--without-stage1-ldflags				\
 	--disable-libmcheck					\
+	--without-guile						\
 %if 0%{!?rhel:1} || 0%{?rhel} > 7
 	--with-babeltrace					\
-	--with-guile						\
 %else
 	--without-babeltrace					\
-	--without-guile						\
 %endif
 %if 0%{!?rhel:1} || 0%{?rhel} > 6
 	--with-system-readline					\
@@ -1025,7 +1024,10 @@ fi
 %endif
 
 %changelog
-* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org>
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 8.2.50.20190120-17
+- Disable temporarily guile support
+
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 8.2.50.20190120-16
 - Rebuild for readline 8.0
 
 * Tue Feb  5 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 8.2.50.20190120-15

From b1bf7bc64928a790e077293eb65d024180ba5f2b Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@redhat.com>
Date: Tue, 19 Feb 2019 19:05:21 -0500
Subject: [PATCH 6/6] Rebase to FSF GDB 8.2.50.20190219 (8.3pre). BuildRequire
 on 'source-highlight-devel' and enable styled output.

---
 .gitignore                                    |  2 +-
 _gdb.spec.Patch.include                       |  7 ---
 _gdb.spec.patch.include                       |  1 -
 _git_upstream_commit                          |  2 +-
 _patch_order                                  |  1 -
 ...337-resolve-tls-without-debuginfo-v2.patch |  2 +-
 ...379-solib-trampoline-lookup-lock-fix.patch |  2 +-
 gdb-6.6-buildid-locate-rpm.patch              |  6 +--
 gdb-6.6-buildid-locate.patch                  | 16 +++---
 gdb-6.8-quit-never-aborts.patch               |  2 +-
 gdb-archer-pie-addons-keep-disabled.patch     |  4 +-
 gdb-archer.patch                              | 16 +++---
 gdb-attach-fail-reasons-5of5.patch            |  4 +-
 gdb-btrobust.patch                            |  6 +--
 gdb-bz533176-fortran-omp-step.patch           |  4 +-
 gdb-bz541866-rwatch-before-run.patch          | 10 ++--
 gdb-bz568248-oom-is-error.patch               |  2 +-
 gdb-container-rh-pkg.patch                    |  2 +-
 gdb-fix-bfd-error-temp.patch                  | 23 --------
 gdb-gnat-dwarf-crash-3of3.patch               | 12 ++---
 gdb-moribund-utrace-workaround.patch          |  2 +-
 gdb-python-gil.patch                          |  8 +--
 gdb-readline62-ask-more-rh.patch              |  2 +-
 gdb-rhbz795424-bitpos-20of25.patch            | 54 +++++++++----------
 gdb-rhbz795424-bitpos-21of25.patch            |  2 +-
 gdb-rhbz795424-bitpos-22of25.patch            | 14 ++---
 gdb-rhbz795424-bitpos-23of25.patch            |  2 +-
 gdb-rhbz795424-bitpos-25of25.patch            |  2 +-
 gdb.spec                                      |  9 +++-
 sources                                       |  2 +-
 30 files changed, 97 insertions(+), 124 deletions(-)
 delete mode 100644 gdb-fix-bfd-error-temp.patch

diff --git a/.gitignore b/.gitignore
index 0ba913a..a7163be 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.2.50.20190120.tar.xz
+/gdb-8.2.50.20190219.tar.xz
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index 4ee9916..74e8a67 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -474,10 +474,3 @@ Patch115: gdb-rhbz1553104-s390x-arch12-test.patch
 # Author: Sergio Durigan Junior.
 Patch116: gdb-rhbz795424-bitpos-arrayview.patch
 
-# Temporary fix for:
-# BUILDSTDERR: ../../bfd/elf32-arm.c: In function 'elf32_arm_final_link_relocate':
-# BUILDSTDERR: ../../bfd/elf32-arm.c:10907:10: error: absolute value function 'labs' given an argument of type 'bfd_signed_vma' {aka 'long long int'} but has parameter of type 'long int' which may cause truncation of value [-Werror=absolute-value]
-# BUILDSTDERR: 10907 |  value = labs (relocation);
-# BUILDSTDERR:       |          ^~~~
-Patch117: gdb-fix-bfd-error-temp.patch
-
diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index ff3c3b3..f0da001 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -114,4 +114,3 @@
 %patch114 -p1
 %patch115 -p1
 %patch116 -p1
-%patch117 -p1
diff --git a/_git_upstream_commit b/_git_upstream_commit
index cb73bf2..88ccee7 100644
--- a/_git_upstream_commit
+++ b/_git_upstream_commit
@@ -1 +1 @@
-3e80dafbfee64a4a9cdec17d60a3e18cf1fef28f
+c72e75a64030b0f6535a80481f37968ad55c333a
diff --git a/_patch_order b/_patch_order
index 8fac571..b59f1cf 100644
--- a/_patch_order
+++ b/_patch_order
@@ -114,4 +114,3 @@ gdb-archer.patch
 gdb-vla-intel-fix-print-char-array.patch
 gdb-rhbz1553104-s390x-arch12-test.patch
 gdb-rhbz795424-bitpos-arrayview.patch
-gdb-fix-bfd-error-temp.patch
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 808aba2..b36e47e 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
-@@ -1184,6 +1184,10 @@ print_command_1 (const char *exp, int voidprint)
+@@ -1183,6 +1183,10 @@ print_command_1 (const char *exp, int voidprint)
  
    if (exp && *exp)
      {
diff --git a/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch b/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
index 1cec1e5..319515b 100644
--- a/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
+++ b/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
@@ -11,7 +11,7 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
 diff --git a/gdb/symtab.c b/gdb/symtab.c
 --- a/gdb/symtab.c
 +++ b/gdb/symtab.c
-@@ -3161,6 +3161,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
+@@ -3177,6 +3177,13 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
  	     SYMBOL_LINKAGE_NAME (msymbol)); */
  	  ;
  	/* fall through */
diff --git a/gdb-6.6-buildid-locate-rpm.patch b/gdb-6.6-buildid-locate-rpm.patch
index a74ea53..36527b9 100644
--- a/gdb-6.6-buildid-locate-rpm.patch
+++ b/gdb-6.6-buildid-locate-rpm.patch
@@ -1459,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)
+@@ -365,7 +365,7 @@ build_id_locate_exec (int from_tty)
          symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
      }
    else
@@ -1472,7 +1472,7 @@ diff --git a/gdb/event-top.c b/gdb/event-top.c
 --- a/gdb/event-top.c
 +++ b/gdb/event-top.c
 @@ -40,6 +40,7 @@
- #include "buffer.h"
+ #include "common/buffer.h"
  #include "ser-event.h"
  #include "gdb_select.h"
 +#include "symfile.h"
@@ -1488,7 +1488,7 @@ diff --git a/gdb/event-top.c b/gdb/event-top.c
    /* Do not call the python hook on an explicit prompt change as
       passed to this function, as this forms a secondary/local prompt,
       IE, displayed but not set.  */
-@@ -772,7 +775,10 @@ command_line_handler (gdb::unique_xmalloc_ptr<char> &&rl)
+@@ -770,7 +773,10 @@ command_line_handler (gdb::unique_xmalloc_ptr<char> &&rl)
        command_handler (cmd);
  
        if (ui->prompt_state != PROMPTED)
diff --git a/gdb-6.6-buildid-locate.patch b/gdb-6.6-buildid-locate.patch
index 2c0f59f..4c9a1e6 100644
--- a/gdb-6.6-buildid-locate.patch
+++ b/gdb-6.6-buildid-locate.patch
@@ -915,10 +915,10 @@ diff --git a/gdb/coffread.c b/gdb/coffread.c
 diff --git a/gdb/corelow.c b/gdb/corelow.c
 --- a/gdb/corelow.c
 +++ b/gdb/corelow.c
-@@ -46,6 +46,10 @@
+@@ -43,6 +43,10 @@
  #include "gdb_bfd.h"
  #include "completer.h"
- #include "filestuff.h"
+ #include "common/filestuff.h"
 +#include "auxv.h"
 +#include "elf/common.h"
 +#include "gdbcmd.h"
@@ -926,7 +926,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)
+@@ -320,6 +324,54 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
      inferior_ptid = ptid;			/* Yes, make it current.  */
  }
  
@@ -981,7 +981,7 @@ 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
-@@ -459,6 +511,14 @@ core_target_open (const char *arg, int from_tty)
+@@ -455,6 +507,14 @@ core_target_open (const char *arg, int from_tty)
  	switch_to_thread (thread);
      }
  
@@ -996,7 +996,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
-@@ -1067,4 +1127,11 @@ void
+@@ -1063,4 +1123,11 @@ void
  _initialize_corelow (void)
  {
    add_target (core_target_info, core_target_open, filename_completer);
@@ -1123,7 +1123,7 @@ diff --git a/gdb/objfiles.h b/gdb/objfiles.h
 diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c
 --- a/gdb/python/py-objfile.c
 +++ b/gdb/python/py-objfile.c
-@@ -133,7 +133,7 @@ objfpy_get_build_id (PyObject *self, void *closure)
+@@ -132,7 +132,7 @@ objfpy_get_build_id (PyObject *self, void *closure)
  
    TRY
      {
@@ -1132,7 +1132,7 @@ diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c
      }
    CATCH (except, RETURN_MASK_ALL)
      {
-@@ -536,7 +536,7 @@ objfpy_lookup_objfile_by_build_id (const char *build_id)
+@@ -535,7 +535,7 @@ objfpy_lookup_objfile_by_build_id (const char *build_id)
        /* Don't return separate debug files.  */
        if (objfile->separate_debug_objfile_backlink != NULL)
  	continue;
@@ -1272,7 +1272,7 @@ diff --git a/gdb/testsuite/gdb.base/new-ui-pending-input.exp b/gdb/testsuite/gdb
 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
 --- a/gdb/testsuite/lib/gdb.exp
 +++ b/gdb/testsuite/lib/gdb.exp
-@@ -1706,6 +1706,16 @@ proc default_gdb_start { } {
+@@ -1697,6 +1697,16 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
      }
diff --git a/gdb-6.8-quit-never-aborts.patch b/gdb-6.8-quit-never-aborts.patch
index 0fdb23b..dc66e93 100644
--- a/gdb-6.8-quit-never-aborts.patch
+++ b/gdb-6.8-quit-never-aborts.patch
@@ -62,7 +62,7 @@ diff --git a/gdb/top.c b/gdb/top.c
 diff --git a/gdb/utils.c b/gdb/utils.c
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
-@@ -99,6 +99,13 @@ static std::chrono::steady_clock::duration prompt_for_continue_wait_time;
+@@ -100,6 +100,13 @@ static std::chrono::steady_clock::duration prompt_for_continue_wait_time;
  
  static int debug_timestamp = 0;
  
diff --git a/gdb-archer-pie-addons-keep-disabled.patch b/gdb-archer-pie-addons-keep-disabled.patch
index 1092c35..df78828 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
-@@ -15505,6 +15505,50 @@ static struct cmd_list_element *enablebreaklist = NULL;
+@@ -15441,6 +15441,50 @@ static struct cmd_list_element *enablebreaklist = NULL;
  
  cmd_list_element *commands_cmd_element = nullptr;
  
@@ -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
-@@ -1676,6 +1676,9 @@ extern const char *ep_parse_optional_if_clause (const char **arg);
+@@ -1664,6 +1664,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 1bad3c9..2d107fc 100644
--- a/gdb-archer.patch
+++ b/gdb-archer.patch
@@ -365,8 +365,8 @@ 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
-@@ -686,6 +686,9 @@ class gdbpy_enter_varobj : public gdbpy_enter
- 
+@@ -711,6 +711,9 @@ private:
+   PyThreadState *m_save;
  };
  
 +struct cleanup *ensure_python_env (struct gdbarch *gdbarch,
@@ -381,13 +381,13 @@ diff --git a/gdb/python/python.c b/gdb/python/python.c
 @@ -94,6 +94,8 @@ const struct extension_language_defn extension_language_python =
  #include "linespec.h"
  #include "source.h"
- #include "version.h"
+ #include "common/version.h"
 +#include "inferior.h"
 +#include "gdbthread.h"
  #include "target.h"
  #include "gdbthread.h"
  #include "interps.h"
-@@ -236,6 +238,29 @@ gdbpy_enter::~gdbpy_enter ()
+@@ -235,6 +237,29 @@ gdbpy_enter::~gdbpy_enter ()
    restore_active_ext_lang (m_previous_active);
  }
  
@@ -417,7 +417,7 @@ diff --git a/gdb/python/python.c b/gdb/python/python.c
  /* Set the quit flag.  */
  
  static void
-@@ -1313,6 +1338,92 @@ gdbpy_print_stack_or_quit ()
+@@ -1315,6 +1340,92 @@ gdbpy_print_stack_or_quit ()
  
  
  
@@ -510,7 +510,7 @@ diff --git a/gdb/python/python.c b/gdb/python/python.c
  /* Return a sequence holding all the Progspaces.  */
  
  static PyObject *
-@@ -1967,6 +2078,8 @@ PyMethodDef python_GdbMethods[] =
+@@ -1969,6 +2080,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." },
@@ -532,7 +532,7 @@ diff --git a/gdb/python/python.h b/gdb/python/python.h
  
 +extern void run_python_script (int argc, char **argv);
 +
- #endif /* GDB_PYTHON_H */
+ #endif /* PYTHON_PYTHON_H */
 diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
 --- a/gdb/testsuite/gdb.python/py-frame.exp
 +++ b/gdb/testsuite/gdb.python/py-frame.exp
@@ -575,7 +575,7 @@ 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
-@@ -218,6 +218,14 @@ is_root_p (const struct varobj *var)
+@@ -217,6 +217,14 @@ is_root_p (const struct varobj *var)
  }
  
  #ifdef HAVE_PYTHON
diff --git a/gdb-attach-fail-reasons-5of5.patch b/gdb-attach-fail-reasons-5of5.patch
index 0b39616..7848929 100644
--- a/gdb-attach-fail-reasons-5of5.patch
+++ b/gdb-attach-fail-reasons-5of5.patch
@@ -276,9 +276,9 @@ 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
-@@ -1097,7 +1097,17 @@ linux_nat_target::create_inferior (const char *exec_file,
+@@ -1099,7 +1099,17 @@ linux_nat_target::create_inferior (const char *exec_file,
    /* Make sure we report all signals during startup.  */
-   pass_signals (0, NULL);
+   pass_signals ({});
  
 -  inf_ptrace_target::create_inferior (exec_file, allargs, env, from_tty);
 +  TRY
diff --git a/gdb-btrobust.patch b/gdb-btrobust.patch
index f1f12a0..c162628 100644
--- a/gdb-btrobust.patch
+++ b/gdb-btrobust.patch
@@ -14,7 +14,7 @@ printed, but a default backtrace will occur in this case.
 diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
 --- a/gdb/python/py-framefilter.c
 +++ b/gdb/python/py-framefilter.c
-@@ -1140,6 +1140,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
+@@ -1139,6 +1139,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
  				       htab_eq_pointer,
  				       NULL));
  
@@ -22,7 +22,7 @@ diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
    while (true)
      {
        gdbpy_ref<> item (PyIter_Next (iterable.get ()));
-@@ -1148,8 +1149,8 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
+@@ -1147,8 +1148,8 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
  	{
  	  if (PyErr_Occurred ())
  	    {
@@ -33,7 +33,7 @@ diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
  	    }
  	  break;
  	}
-@@ -1182,7 +1183,8 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
+@@ -1181,7 +1182,8 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
        /* Do not exit on error printing a single frame.  Print the
  	 error and continue with other frames.  */
        if (success == EXT_LANG_BT_ERROR)
diff --git a/gdb-bz533176-fortran-omp-step.patch b/gdb-bz533176-fortran-omp-step.patch
index 9c3bdc9..07c3e0e 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
-@@ -6535,6 +6535,16 @@ process_event_stop_test (struct execution_control_state *ecs)
+@@ -6510,6 +6510,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
-@@ -6568,6 +6578,7 @@ process_event_stop_test (struct execution_control_state *ecs)
+@@ -6543,6 +6553,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 609ad22..fb90054 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
-@@ -8777,7 +8777,7 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
+@@ -8773,7 +8773,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)
      {
-@@ -14335,7 +14335,7 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
+@@ -14271,7 +14271,7 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
  
    if (bpt->type == bp_hardware_breakpoint)
      {
@@ -97,7 +97,7 @@ new file mode 100644
 diff --git a/gdb/configure.nat b/gdb/configure.nat
 --- a/gdb/configure.nat
 +++ b/gdb/configure.nat
-@@ -244,6 +244,7 @@ case ${gdb_host} in
+@@ -245,6 +245,7 @@ case ${gdb_host} in
  		;;
  	    i386)
  		# Host: Intel 386 running GNU/Linux.
@@ -105,7 +105,7 @@ diff --git a/gdb/configure.nat b/gdb/configure.nat
  		NATDEPFILES="${NATDEPFILES} x86-nat.o nat/x86-dregs.o \
  		i386-linux-nat.o x86-linux-nat.o nat/linux-btrace.o \
  		nat/x86-linux.o nat/x86-linux-dregs.o"
-@@ -300,6 +301,7 @@ case ${gdb_host} in
+@@ -301,6 +302,7 @@ case ${gdb_host} in
  	case ${gdb_host_cpu} in
  	    i386)
  		# Host: GNU/Linux x86-64
@@ -116,7 +116,7 @@ diff --git a/gdb/configure.nat b/gdb/configure.nat
 diff --git a/gdb/target.h b/gdb/target.h
 --- a/gdb/target.h
 +++ b/gdb/target.h
-@@ -1972,9 +1972,11 @@ extern struct thread_info *target_thread_handle_to_thread_info
+@@ -1971,9 +1971,11 @@ extern struct thread_info *target_thread_handle_to_thread_info
     one.  OTHERTYPE is the number of watchpoints of other types than
     this one used so far.  */
  
diff --git a/gdb-bz568248-oom-is-error.patch b/gdb-bz568248-oom-is-error.patch
index 595b0c4..d08aefb 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
-@@ -720,13 +720,11 @@ malloc_failure (long size)
+@@ -721,13 +721,11 @@ malloc_failure (long size)
  {
    if (size > 0)
      {
diff --git a/gdb-container-rh-pkg.patch b/gdb-container-rh-pkg.patch
index f5da5ef..87c53dd 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
-@@ -13967,7 +13967,17 @@ remote_target::pid_to_exec_file (int pid)
+@@ -13966,7 +13966,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-fix-bfd-error-temp.patch b/gdb-fix-bfd-error-temp.patch
deleted file mode 100644
index d0927fd..0000000
--- a/gdb-fix-bfd-error-temp.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Sergio Durigan Junior <sergiodj@redhat.com>
-Date: Mon, 21 Jan 2019 15:24:46 -0500
-Subject: gdb-fix-bfd-error-temp.patch
-
-;; Temporary fix for:
-;; BUILDSTDERR: ../../bfd/elf32-arm.c: In function 'elf32_arm_final_link_relocate':
-;; BUILDSTDERR: ../../bfd/elf32-arm.c:10907:10: error: absolute value function 'labs' given an argument of type 'bfd_signed_vma' {aka 'long long int'} but has parameter of type 'long int' which may cause truncation of value [-Werror=absolute-value]
-;; BUILDSTDERR: 10907 |  value = labs (relocation);
-;; BUILDSTDERR:       |          ^~~~
-
-diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
---- a/bfd/elf32-arm.c
-+++ b/bfd/elf32-arm.c
-@@ -10904,7 +10904,7 @@ elf32_arm_final_link_relocate (reloc_howto_type *	    howto,
- 
- 	/* PR 21523: Use an absolute value.  The user of this reloc will
- 	   have already selected an ADD or SUB insn appropriately.  */
--	value = labs (relocation);
-+	value = llabs (relocation);
- 
- 	if (value >= 0x1000)
- 	  return bfd_reloc_overflow;
diff --git a/gdb-gnat-dwarf-crash-3of3.patch b/gdb-gnat-dwarf-crash-3of3.patch
index 64465e4..6db7801 100644
--- a/gdb-gnat-dwarf-crash-3of3.patch
+++ b/gdb-gnat-dwarf-crash-3of3.patch
@@ -76,7 +76,7 @@ diff --git a/gdb/infrun.c b/gdb/infrun.c
 diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
-@@ -191,6 +191,12 @@ struct linux_nat_target *linux_target;
+@@ -192,6 +192,12 @@ struct linux_nat_target *linux_target;
  /* Does the current host support PTRACE_GETREGSET?  */
  enum tribool have_ptrace_getregset = TRIBOOL_UNKNOWN;
  
@@ -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,
-@@ -1035,6 +1041,9 @@ linux_nat_post_attach_wait (ptid_t ptid, int *signalled)
+@@ -1037,6 +1043,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 /
-@@ -1367,6 +1376,25 @@ get_detach_signal (struct lwp_info *lp)
+@@ -1369,6 +1378,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;
  }
  
-@@ -1515,6 +1543,10 @@ linux_nat_target::detach (inferior *inf, int from_tty)
+@@ -1517,6 +1545,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
      }
  }
  
-@@ -1773,6 +1805,16 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
+@@ -1775,6 +1807,16 @@ linux_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
        return;
      }
  
@@ -153,7 +153,7 @@ diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
    if (resume_many)
      iterate_over_lwps (ptid, linux_nat_resume_callback, lp);
  
-@@ -3761,6 +3803,10 @@ linux_nat_target::mourn_inferior ()
+@@ -3763,6 +3805,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 5b18546..a32f942 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
-@@ -11986,6 +11986,8 @@ update_global_location_list (enum ugll_insert_mode insert_mode)
+@@ -11929,6 +11929,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-python-gil.patch b/gdb-python-gil.patch
index 2b9afe2..5603bd2 100644
--- a/gdb-python-gil.patch
+++ b/gdb-python-gil.patch
@@ -39,7 +39,7 @@ diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
 diff --git a/gdb/python/python.c b/gdb/python/python.c
 --- a/gdb/python/python.c
 +++ b/gdb/python/python.c
-@@ -545,12 +545,16 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
+@@ -544,12 +544,16 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
  {
    const char *arg;
    PyObject *from_tty_obj = NULL, *to_string_obj = NULL;
@@ -60,7 +60,7 @@ diff --git a/gdb/python/python.c b/gdb/python/python.c
      return NULL;
  
    from_tty = 0;
-@@ -571,6 +575,15 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
+@@ -570,6 +574,15 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
        to_string = cmp;
      }
  
@@ -76,7 +76,7 @@ diff --git a/gdb/python/python.c b/gdb/python/python.c
    std::string to_string_res;
  
    scoped_restore preventer = prevent_dont_repeat ();
-@@ -593,6 +606,13 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
+@@ -594,6 +607,13 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
  
        counted_command_line lines = read_command_lines_1 (reader, 1, nullptr);
  
@@ -90,7 +90,7 @@ diff --git a/gdb/python/python.c b/gdb/python/python.c
        {
  	scoped_restore save_async = make_scoped_restore (&current_ui->async,
  							 0);
-@@ -611,12 +631,24 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
+@@ -612,12 +632,24 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
  	  execute_control_commands (lines.get (), from_tty);
        }
  
diff --git a/gdb-readline62-ask-more-rh.patch b/gdb-readline62-ask-more-rh.patch
index e13ccc1..5a5a177 100644
--- a/gdb-readline62-ask-more-rh.patch
+++ b/gdb-readline62-ask-more-rh.patch
@@ -9,7 +9,7 @@ Subject: gdb-readline62-ask-more-rh.patch
 diff --git a/gdb/event-top.c b/gdb/event-top.c
 --- a/gdb/event-top.c
 +++ b/gdb/event-top.c
-@@ -1181,6 +1181,13 @@ gdb_setup_readline (int editing)
+@@ -1179,6 +1179,13 @@ gdb_setup_readline (int editing)
  {
    struct ui *ui = current_ui;
  
diff --git a/gdb-rhbz795424-bitpos-20of25.patch b/gdb-rhbz795424-bitpos-20of25.patch
index 6114e0b..59d0421 100644
--- a/gdb-rhbz795424-bitpos-20of25.patch
+++ b/gdb-rhbz795424-bitpos-20of25.patch
@@ -882,7 +882,7 @@ diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
 diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
 --- a/gdb/ada-typeprint.c
 +++ b/gdb/ada-typeprint.c
-@@ -891,8 +891,8 @@ ada_print_type (struct type *type0, const char *varstring,
+@@ -895,8 +895,8 @@ ada_print_type (struct type *type0, const char *varstring,
  	    const char *name = ada_type_name (type);
  
  	    if (!ada_is_range_type_name (name))
@@ -893,7 +893,7 @@ diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
  	    else
  	      {
  		fprintf_filtered (stream, "range ");
-@@ -913,7 +913,8 @@ ada_print_type (struct type *type0, const char *varstring,
+@@ -917,7 +917,8 @@ ada_print_type (struct type *type0, const char *varstring,
  	  }
  	break;
        case TYPE_CODE_FLT:
@@ -1107,7 +1107,7 @@ diff --git a/gdb/annotate.c b/gdb/annotate.c
 diff --git a/gdb/annotate.h b/gdb/annotate.h
 --- a/gdb/annotate.h
 +++ b/gdb/annotate.h
-@@ -102,8 +102,8 @@ extern void annotate_frame_source_end (void);
+@@ -105,8 +105,8 @@ extern void annotate_frame_source_end (void);
  extern void annotate_frame_where (void);
  extern void annotate_frame_end (void);
  
@@ -1301,7 +1301,7 @@ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
  				CORE_ADDR addr2)
  {
    return ((gdbarch_has_global_breakpoints (target_gdbarch ())
-@@ -10875,7 +10875,7 @@ can_use_hardware_watchpoint (const std::vector<value_ref_ptr> &vals)
+@@ -10859,7 +10859,7 @@ can_use_hardware_watchpoint (const std::vector<value_ref_ptr> &vals)
  		      && TYPE_CODE (vtype) != TYPE_CODE_ARRAY))
  		{
  		  CORE_ADDR vaddr = value_address (v);
@@ -1322,7 +1322,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
-@@ -429,7 +429,7 @@ public:
+@@ -417,7 +417,7 @@ public:
    /* For hardware watchpoints, the size of the memory region being
       watched.  For hardware ranged breakpoints, the size of the
       breakpoint range.  */
@@ -1712,7 +1712,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
-@@ -28,7 +28,7 @@ extern int f_parse (struct parser_state *);
+@@ -31,7 +31,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 *);
  
@@ -1893,7 +1893,7 @@ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
  	   const char *name)
  {
    struct type *type;
-@@ -3343,8 +3343,8 @@ is_public_ancestor (struct type *base, struct type *dclass)
+@@ -3340,8 +3340,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;
-@@ -3355,7 +3355,7 @@ is_unique_ancestor_worker (struct type *base, struct type *dclass,
+@@ -3352,7 +3352,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));
  
-@@ -3396,7 +3396,7 @@ is_unique_ancestor_worker (struct type *base, struct type *dclass,
+@@ -3393,7 +3393,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),
-@@ -4623,7 +4623,7 @@ recursive_dump_type (struct type *type, int spaces)
+@@ -4620,7 +4620,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 ");
-@@ -5068,7 +5068,7 @@ copy_type (const struct type *type)
+@@ -5065,7 +5065,7 @@ copy_type (const struct type *type)
  
  struct type *
  arch_type (struct gdbarch *gdbarch,
@@ -2194,7 +2194,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
-@@ -32,7 +32,7 @@ extern void m2_print_typedef (struct type *, struct symbol *,
+@@ -35,7 +35,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);
  
@@ -2374,7 +2374,7 @@ diff --git a/gdb/nat/x86-dregs.c b/gdb/nat/x86-dregs.c
 diff --git a/gdb/nat/x86-dregs.h b/gdb/nat/x86-dregs.h
 --- a/gdb/nat/x86-dregs.h
 +++ b/gdb/nat/x86-dregs.h
-@@ -116,7 +116,7 @@ extern int x86_dr_remove_watchpoint (struct x86_debug_reg_state *state,
+@@ -117,7 +117,7 @@ extern int x86_dr_remove_watchpoint (struct x86_debug_reg_state *state,
  /* Return non-zero if we can watch a memory region that starts at
     address ADDR and whose length is LEN bytes.  */
  extern int x86_dr_region_ok_for_watchpoint (struct x86_debug_reg_state *state,
@@ -2507,7 +2507,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
-@@ -34,7 +34,7 @@ extern void pascal_print_type (struct type *, const char *, struct ui_file *,
+@@ -37,7 +37,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 *);
  
@@ -2516,7 +2516,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 *);
-@@ -48,13 +48,13 @@ extern void pascal_type_print_method_args (const char *, const char *,
+@@ -51,13 +51,13 @@ extern void pascal_type_print_method_args (const char *, const char *,
  /* These are in p-lang.c: */
  
  extern int
@@ -2582,7 +2582,7 @@ diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
-@@ -277,7 +277,7 @@ print_formatted (struct value *val, int size,
+@@ -276,7 +276,7 @@ print_formatted (struct value *val, int size,
  		 struct ui_file *stream)
  {
    struct type *type = check_typedef (value_type (val));
@@ -2591,7 +2591,7 @@ diff --git a/gdb/printcmd.c b/gdb/printcmd.c
  
    if (VALUE_LVAL (val) == lval_memory)
      next_address = value_address (val) + len;
-@@ -353,7 +353,7 @@ print_scalar_formatted (const gdb_byte *valaddr, struct type *type,
+@@ -352,7 +352,7 @@ print_scalar_formatted (const gdb_byte *valaddr, struct type *type,
  			int size, struct ui_file *stream)
  {
    struct gdbarch *gdbarch = get_type_arch (type);
@@ -2615,7 +2615,7 @@ 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
-@@ -793,7 +793,7 @@ regcache::cooked_write (int regnum, const gdb_byte *buf)
+@@ -763,7 +763,7 @@ regcache::cooked_write (int regnum, const gdb_byte *buf)
  /* See regcache.h.  */
  
  enum register_status
@@ -2624,7 +2624,7 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
  			      gdb_byte *out, bool is_raw)
  {
    int reg_size = register_size (arch (), regnum);
-@@ -860,7 +860,7 @@ reg_buffer::raw_collect_part (int regnum, int offset, int len,
+@@ -830,7 +830,7 @@ reg_buffer::raw_collect_part (int regnum, int offset, int len,
  /* See regcache.h.  */
  
  enum register_status
@@ -2633,7 +2633,7 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
  		      const gdb_byte *in, bool is_raw)
  {
    int reg_size = register_size (arch (), regnum);
-@@ -931,7 +931,7 @@ reg_buffer::raw_supply_part (int regnum, int offset, int len,
+@@ -901,7 +901,7 @@ reg_buffer::raw_supply_part (int regnum, int offset, int len,
  }
  
  enum register_status
@@ -2642,7 +2642,7 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
  				  gdb_byte *buf)
  {
    assert_regnum (regnum);
-@@ -941,7 +941,7 @@ readable_regcache::raw_read_part (int regnum, int offset, int len,
+@@ -911,7 +911,7 @@ readable_regcache::raw_read_part (int regnum, int offset, int len,
  /* See regcache.h.  */
  
  void
@@ -2651,7 +2651,7 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
  			  const gdb_byte *buf)
  {
    assert_regnum (regnum);
-@@ -951,7 +951,7 @@ regcache::raw_write_part (int regnum, int offset, int len,
+@@ -921,7 +921,7 @@ regcache::raw_write_part (int regnum, int offset, int len,
  /* See regcache.h.  */
  
  enum register_status
@@ -2660,7 +2660,7 @@ diff --git a/gdb/regcache.c b/gdb/regcache.c
  				     gdb_byte *buf)
  {
    gdb_assert (regnum >= 0 && regnum < m_descr->nr_cooked_registers);
-@@ -961,7 +961,7 @@ readable_regcache::cooked_read_part (int regnum, int offset, int len,
+@@ -931,7 +931,7 @@ readable_regcache::cooked_read_part (int regnum, int offset, int len,
  /* See regcache.h.  */
  
  void
@@ -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
-@@ -459,7 +459,7 @@ public:
+@@ -458,7 +458,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;
-@@ -10407,7 +10407,7 @@ int remote_hw_watchpoint_length_limit = -1;
+@@ -10406,7 +10406,7 @@ int remote_hw_watchpoint_length_limit = -1;
  int remote_hw_breakpoint_limit = -1;
  
  int
@@ -2918,7 +2918,7 @@ diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
 diff --git a/gdb/target.c b/gdb/target.c
 --- a/gdb/target.c
 +++ b/gdb/target.c
-@@ -59,7 +59,7 @@ static int default_watchpoint_addr_within_range (struct target_ops *,
+@@ -58,7 +58,7 @@ static int default_watchpoint_addr_within_range (struct target_ops *,
  						 CORE_ADDR, CORE_ADDR, int);
  
  static int default_region_ok_for_hw_watchpoint (struct target_ops *,
@@ -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 *);
  
-@@ -3095,7 +3095,7 @@ target_fileio_read_stralloc (struct inferior *inf, const char *filename)
+@@ -3103,7 +3103,7 @@ target_fileio_read_stralloc (struct inferior *inf, const char *filename)
  
  static int
  default_region_ok_for_hw_watchpoint (struct target_ops *self,
diff --git a/gdb-rhbz795424-bitpos-21of25.patch b/gdb-rhbz795424-bitpos-21of25.patch
index 9fb4376..43e0955 100644
--- a/gdb-rhbz795424-bitpos-21of25.patch
+++ b/gdb-rhbz795424-bitpos-21of25.patch
@@ -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
-@@ -2899,6 +2899,17 @@ string_to_core_addr (const char *my_string)
+@@ -2933,6 +2933,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 c4feeca..d4d1f03 100644
--- a/gdb-rhbz795424-bitpos-22of25.patch
+++ b/gdb-rhbz795424-bitpos-22of25.patch
@@ -274,7 +274,7 @@ diff --git a/gdb/nat/aarch64-linux-hw-point.h b/gdb/nat/aarch64-linux-hw-point.h
 -int aarch64_linux_region_ok_for_watchpoint (CORE_ADDR addr, int len);
 +int aarch64_linux_region_ok_for_watchpoint (CORE_ADDR addr, LONGEST len);
  
- #endif /* AARCH64_LINUX_HW_POINT_H */
+ #endif /* NAT_AARCH64_LINUX_HW_POINT_H */
 diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
 --- a/gdb/ppc-linux-nat.c
 +++ b/gdb/ppc-linux-nat.c
@@ -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
-@@ -451,7 +451,7 @@ public:
+@@ -450,7 +450,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;
  
-@@ -10336,7 +10336,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len,
+@@ -10335,7 +10335,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);
-@@ -10356,7 +10356,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len,
+@@ -10355,7 +10355,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,
+@@ -10384,7 +10384,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);
@@ -517,7 +517,7 @@ diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
 diff --git a/gdb/target.c b/gdb/target.c
 --- a/gdb/target.c
 +++ b/gdb/target.c
-@@ -56,7 +56,7 @@ static void generic_tls_error (void) ATTRIBUTE_NORETURN;
+@@ -55,7 +55,7 @@ static void generic_tls_error (void) ATTRIBUTE_NORETURN;
  static void default_terminal_info (struct target_ops *, const char *, int);
  
  static int default_watchpoint_addr_within_range (struct target_ops *,
@@ -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);
-@@ -3103,7 +3103,7 @@ default_region_ok_for_hw_watchpoint (struct target_ops *self,
+@@ -3111,7 +3111,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 97755ca..051906c 100644
--- a/gdb-rhbz795424-bitpos-23of25.patch
+++ b/gdb-rhbz795424-bitpos-23of25.patch
@@ -551,7 +551,7 @@ diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c
 diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
 --- a/gdb/m32r-tdep.c
 +++ b/gdb/m32r-tdep.c
-@@ -672,7 +672,7 @@ m32r_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
+@@ -671,7 +671,7 @@ m32r_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
    CORE_ADDR regval;
    gdb_byte *val;
    gdb_byte valbuf[M32R_ARG_REGISTER_SIZE];
diff --git a/gdb-rhbz795424-bitpos-25of25.patch b/gdb-rhbz795424-bitpos-25of25.patch
index de6a324..73f057a 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
-@@ -47,9 +47,9 @@ struct common_block
+@@ -50,9 +50,9 @@ struct common_block
    struct symbol *contents[1];
  };
  
diff --git a/gdb.spec b/gdb.spec
index 916e153..f38f8eb 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -22,7 +22,7 @@
 Name: %{?scl_prefix}gdb
 
 # Freeze it when GDB gets branched
-%global snapsrc    20190120
+%global snapsrc    20190219
 # See timestamp of source gnulib installed into gdb/gnulib/ .
 %global snapgnulib 20161115
 %global tarname gdb-%{version}
@@ -30,7 +30,7 @@ Version: 8.2.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: 17%{?dist}
+Release: 18%{?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.
@@ -245,6 +245,7 @@ BuildRequires: libipt-devel%{buildisa}
 # DTS RHEL-6 has mpfr-2 while GDB requires mpfr-3.
 BuildRequires: mpfr-devel%{buildisa}
 %endif
+BuildRequires: source-highlight-devel
 
 %if 0%{?_with_testsuite:1}
 
@@ -1024,6 +1025,10 @@ fi
 %endif
 
 %changelog
+* Tue Feb 19 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 8.2.50.20190219-18
+- Rebase to FSF GDB 8.2.50.20190219 (8.3pre).
+- BuildRequire on 'source-highlight-devel' and enable styled output.
+
 * Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 8.2.50.20190120-17
 - Disable temporarily guile support
 
diff --git a/sources b/sources
index 0b83dbc..6057799 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.2.50.20190120.tar.xz) = e9b1c216b3630951df4c7fca4ed58ad6b48e8060482d5e82eb23d9980eeef5891c3f21191f2ff8c7cfa2b974a9e6cf5882c199ea64fe4c25fb034995eb61c6bc
+SHA512 (gdb-8.2.50.20190219.tar.xz) = 8c95b02681d3a996f3745d0a838f3837f4dcfad043b61ae24cececd029bbaa392b605841bb8a96f5d4a09d3412480edd8d3f6de5572074692cb5244c697a6358