diff --git a/SOURCES/gdb-rhbz1507150-dts61z-split-dwarf.patch b/SOURCES/gdb-rhbz1507150-dts61z-split-dwarf.patch new file mode 100644 index 0000000..4e7f028 --- /dev/null +++ b/SOURCES/gdb-rhbz1507150-dts61z-split-dwarf.patch @@ -0,0 +1,14 @@ +https://bugzilla.redhat.com/show_bug.cgi?id=1507150 + +diff -up gdb-7.12.1/gdb/dwarf2read.c.orig gdb-7.12.1/gdb/dwarf2read.c +--- gdb-7.12.1/gdb/dwarf2read.c.orig 2017-10-30 20:57:55.729999711 -0200 ++++ gdb-7.12.1/gdb/dwarf2read.c 2017-10-30 21:06:31.180999709 -0200 +@@ -17306,7 +17306,7 @@ dwarf2_string_attr (struct die_info *die + if (attr != NULL) + { + if (attr->form == DW_FORM_strp || attr->form == DW_FORM_string +- || attr->form == DW_FORM_GNU_strp_alt) ++ || attr->form == DW_FORM_GNU_str_index || attr->form == DW_FORM_GNU_strp_alt) + str = DW_STRING (attr); + else + complaint (&symfile_complaints, diff --git a/SPECS/gdb.spec b/SPECS/gdb.spec index e2d0f3f..e359e39 100644 --- a/SPECS/gdb.spec +++ b/SPECS/gdb.spec @@ -26,7 +26,7 @@ Version: 7.12.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: 47%{?dist} +Release: 48%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL Group: Development/Debuggers @@ -649,6 +649,9 @@ Patch1152: gdb-libexec-add-index.patch # Fix gdb-add-index for 444 *.debug files. Patch1153: gdb-add-index-chmod.patch +# Backport a fix for -gsplit-dwarf debuggees (RH BZ 1507150). +Patch1264: gdb-rhbz1507150-dts61z-split-dwarf.patch + %if 0%{!?rhel:1} || 0%{?rhel} > 6 # RL_STATE_FEDORA_GDB would not be found for: # Patch642: gdb-readline62-ask-more-rh.patch @@ -1021,6 +1024,7 @@ done %patch1151 -p1 %patch1152 -p1 %patch1153 -p1 +%patch1264 -p1 %patch1075 -p1 %if 0%{?rhel:1} && 0%{?rhel} <= 7 @@ -1584,6 +1588,9 @@ then fi %changelog +* Wed Nov 1 2017 Jan Kratochvil - 7.12.1-48.el7 +- Backport a fix for -gsplit-dwarf debuggees (RH BZ 1507150). + * Wed Mar 8 2017 Jan Kratochvil - 7.12.1-47.fc25 - Fix EOL escape in multiline command segv (Pedro Alves, RH BZ 1429172).