From d60ed8334e06e45ab038f74cf73ca740015023a2 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 20 2020 12:10:47 +0000
Subject: import gdb-7.6.1-119.el7


---

diff --git a/SOURCES/gdb-rhbz1639077-symlink-default-symtab.patch b/SOURCES/gdb-rhbz1639077-symlink-default-symtab.patch
index 3e01722..6ed264f 100644
--- a/SOURCES/gdb-rhbz1639077-symlink-default-symtab.patch
+++ b/SOURCES/gdb-rhbz1639077-symlink-default-symtab.patch
@@ -53,30 +53,6 @@ Date:   Fri Feb 22 09:39:35 2019 -0800
             * gdb.base/symlink-sourcefile.c: New file.
             * gdb.base/symlink-sourcefile.exp: New file.
 
-Index: gdb-7.6.1/gdb/linespec.c
-===================================================================
---- gdb-7.6.1.orig/gdb/linespec.c
-+++ gdb-7.6.1/gdb/linespec.c
-@@ -1844,17 +1844,15 @@ create_sals_line_offset (struct linespec
-   if (VEC_length (symtab_p, ls->file_symtabs) == 1
-       && VEC_index (symtab_p, ls->file_symtabs, 0) == NULL)
-     {
--      const char *fullname;
--
-       set_current_program_space (self->program_space);
- 
-       /* Make sure we have at least a default source line.  */
-       set_default_source_symtab_and_line ();
-       initialize_defaults (&self->default_symtab, &self->default_line);
--      fullname = symtab_to_fullname (self->default_symtab);
-       VEC_pop (symtab_p, ls->file_symtabs);
-       VEC_free (symtab_p, ls->file_symtabs);
--      ls->file_symtabs = collect_symtabs_from_filename (fullname);
-+      ls->file_symtabs
-+	= collect_symtabs_from_filename (self->default_symtab->filename);
-       use_default = 1;
-     }
- 
 Index: gdb-7.6.1/gdb/testsuite/gdb.base/symlink-sourcefile.c
 ===================================================================
 --- /dev/null
@@ -112,7 +88,7 @@ Index: gdb-7.6.1/gdb/testsuite/gdb.base/symlink-sourcefile.exp
 ===================================================================
 --- /dev/null
 +++ gdb-7.6.1/gdb/testsuite/gdb.base/symlink-sourcefile.exp
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,65 @@
 +# Copyright 2019 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -157,8 +133,27 @@ Index: gdb-7.6.1/gdb/testsuite/gdb.base/symlink-sourcefile.exp
 +}
 +
 +# Using a line number ensures that the default symtab is used.
-+gdb_breakpoint [gdb_get_line_number "break here" $srcfile] message
-+gdb_continue_to_breakpoint "run to breakpoint marker"
++gdb_test_no_output "set basenames-may-differ on"
++set line [gdb_get_line_number "break here" $srcfile]
++gdb_breakpoint $line message
++gdb_continue_to_breakpoint "run to file-less breakpoint marker"
++
++if {![runto_main]} {
++    untested "could not run to main"
++    return -1
++}
++
++gdb_breakpoint "$linksrc:$line" message
++gdb_continue_to_breakpoint "run to symlink itself breakpoint marker"
++
++if {![runto_main]} {
++    untested "could not run to main"
++    return -1
++}
++
++gdb_test_no_output "set basenames-may-differ on"
++gdb_breakpoint "$srcfile:$line" message
++gdb_continue_to_breakpoint "run to symlink target breakpoint marker"
 Index: gdb-7.6.1/gdb/testsuite/lib/gdb.exp
 ===================================================================
 --- gdb-7.6.1.orig/gdb/testsuite/lib/gdb.exp
diff --git a/SPECS/gdb.spec b/SPECS/gdb.spec
index 7fe5321..75b0ef9 100644
--- a/SPECS/gdb.spec
+++ b/SPECS/gdb.spec
@@ -42,7 +42,7 @@ Version: 7.6.1
 
 # 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: 116%{?dist}
+Release: 119%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain
 Group: Development/Debuggers
@@ -2022,6 +2022,17 @@ fi
 %endif # 0%{!?el5:1} || "%{_target_cpu}" == "noarch"
 
 %changelog
+* Sun Dec  1 2019 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.6.1-119.el7
+- Fix the source files symlinks (Jan Kratochvil, RH BZ 1639077 and RH BZ 1750470).
+
+* Mon Nov 18 2019 Keith Seitz <keiths@redhat.com> - 7.6.1-118.el7
+- Really fix breakpoint reset error when symtab is symlinked
+  (Keith Seitz, RH BZ 1750470)
+
+* Mon Nov 11 2019 Keith Seitz <keiths@redhat.com> - 7.6.1-117.el7
+- Fix breakpoint reset error when symtab is symlinked
+  (Keith Seitz, RH BZ 1750470)
+
 * Wed Jul 24 2019 Keith Seitz <keiths@redhat.com> - 7.6.1-116.el7
 - Backport print inferior-events patch
   (Sergio Durigan et al, RH BZ 1677918)